Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update namada to 0.31.4 #629

Merged
merged 1 commit into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/genesis/localnet/balances.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# As for the established addresses, these are derived from their respective
# genesis tx toml files.

[token.naan]
[token.NAM]
# albert
tnam1qxfj3sf6a0meahdu9t6znp05g8zx4dkjtgyn9gfu = "2000000"
tpknam1qrnw8mxyqlj60mykgevnldcj5mg2fya7fs5a8xqdkd2gwtxhef0zy8a2wha = "2000000"
Expand Down
4 changes: 2 additions & 2 deletions e2e/genesis/localnet/parameters.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# General protocol parameters.
[parameters]
native_token = "naan"
native_token = "NAM"
# Minimum number of blocks in an epoch.
min_num_of_blocks = 4
# Maximum expected time per block (in seconds).
Expand Down Expand Up @@ -28,7 +28,7 @@ fee_unshielding_descriptions_limit = 15

# Map of the cost per gas unit for every token allowed for fee payment
[parameters.minimum_gas_price]
naan = "0.000001"
NAM = "0.000001"

# Proof of stake parameters.
[pos_params]
Expand Down
4 changes: 2 additions & 2 deletions e2e/genesis/localnet/tokens.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Token accounts with their validity predicates

[token.naan]
[token.NAM]
denom = 6

[token.naan.masp_params]
[token.NAM.masp_params]
max_reward_rate = "0.01"
kd_gain_nom = "0.25"
kp_gain_nom = "0.25"
Expand Down
2 changes: 1 addition & 1 deletion e2e/setup-namada.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -x

VERSION="v0.31.1"
VERSION="v0.31.4"
CURRENT_VERSION=""
NAMADA_DIR=".namada"
NAMADA_BASE_DIR=".namada/basedir"
Expand Down
11 changes: 4 additions & 7 deletions e2e/src/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ describe("Namada", () => {

test("import account & derive addresses", async () => {
await importAccount(browser, page);
// Wait for close page button
const closePageBtn = await page.waitForSelector(
"[data-testid='setup-close-page-btn']",
{}
);
expect(closePageBtn).not.toBeNull();
});

test("import accounts with passphrases", async () => {
Expand All @@ -101,7 +95,10 @@ describe("Namada", () => {
);
expect(closePageBtn).not.toBeNull();

await importAccount(browser, page, { passphrase: passphrase1 });
await importAccount(browser, page, {
passphrase: passphrase1,
skipExpect: true,
});

// Wait for alert
const errorAlert = await page.waitForSelector(
Expand Down
11 changes: 9 additions & 2 deletions e2e/src/partial/setup.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as puppeteer from "puppeteer";

import {
allowClipboardRead,
openSetup,
Expand All @@ -10,7 +9,7 @@ import { alias0, mnemonic0, pwd } from "../utils/values";
export const importAccount = async (
browser: puppeteer.Browser,
page: puppeteer.Page,
options?: { passphrase?: string }
options?: { passphrase?: string; skipExpect?: boolean }
): Promise<void> => {
await openSetup(browser, page);

Expand Down Expand Up @@ -67,6 +66,14 @@ export const importAccount = async (
await page.waitForSelector("[data-testid='setup-import-keys-next-button']")
)?.click();
await page.waitForNavigation();

if (!options?.skipExpect) {
const closePageBtn = await page.waitForSelector(
"[data-testid='setup-close-page-btn']",
{}
);
expect(closePageBtn).not.toBeNull();
}
};

export const createAccount = async (
Expand Down
84 changes: 42 additions & 42 deletions packages/shared/lib/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/shared/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ gloo-utils = { version = "0.1.5", features = ["serde"] }
js-sys = "0.3.60"
masp_primitives = { git = "https://github.com/anoma/masp", tag = "v1.1.0" }
masp_proofs = { git = "https://github.com/anoma/masp", tag = "v1.1.0", default-features = false, features = ["local-prover"] }
namada = { git = "https://github.com/anoma/namada", version = "0.31.1", default-features = false, features = ["namada-sdk"] }
namada = { git = "https://github.com/anoma/namada", version = "0.31.4", default-features = false, features = ["namada-sdk"] }
rand = "0.8.5"
rexie = "0.5"
serde = "^1.0.181"
Expand Down
Loading