diff --git a/Cargo.lock b/Cargo.lock index 0764362ba4..97eaea935e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3670,8 +3670,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "namada_core" -version = "0.28.0" -source = "git+https://github.com/anoma/namada?tag=v0.28.0#9562c1602be0c7a9e40cc486cc673203b6737a98" +version = "0.29.0" +source = "git+https://github.com/anoma/namada?tag=v0.29.0#76840b5dbe1a335f45fd468ff3636825dce9df89" dependencies = [ "ark-bls12-381", "ark-serialize", @@ -3694,6 +3694,7 @@ dependencies = [ "k256", "masp_primitives", "namada_macros", + "num-derive", "num-integer", "num-rational 0.4.1", "num-traits", @@ -3720,8 +3721,8 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" -version = "0.28.0" -source = "git+https://github.com/anoma/namada?tag=v0.28.0#9562c1602be0c7a9e40cc486cc673203b6737a98" +version = "0.29.0" +source = "git+https://github.com/anoma/namada?tag=v0.29.0#76840b5dbe1a335f45fd468ff3636825dce9df89" dependencies = [ "borsh", "borsh-ext", @@ -3742,8 +3743,8 @@ dependencies = [ [[package]] name = "namada_macros" -version = "0.28.0" -source = "git+https://github.com/anoma/namada?tag=v0.28.0#9562c1602be0c7a9e40cc486cc673203b6737a98" +version = "0.29.0" +source = "git+https://github.com/anoma/namada?tag=v0.29.0#76840b5dbe1a335f45fd468ff3636825dce9df89" dependencies = [ "proc-macro2", "quote", @@ -3752,8 +3753,8 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" -version = "0.28.0" -source = "git+https://github.com/anoma/namada?tag=v0.28.0#9562c1602be0c7a9e40cc486cc673203b6737a98" +version = "0.29.0" +source = "git+https://github.com/anoma/namada?tag=v0.29.0#76840b5dbe1a335f45fd468ff3636825dce9df89" dependencies = [ "borsh", "data-encoding", @@ -3767,8 +3768,8 @@ dependencies = [ [[package]] name = "namada_sdk" -version = "0.28.0" -source = "git+https://github.com/anoma/namada?tag=v0.28.0#9562c1602be0c7a9e40cc486cc673203b6737a98" +version = "0.29.0" +source = "git+https://github.com/anoma/namada?tag=v0.29.0#76840b5dbe1a335f45fd468ff3636825dce9df89" dependencies = [ "async-trait", "bimap", @@ -3782,6 +3783,7 @@ dependencies = [ "fd-lock", "futures", "itertools 0.10.5", + "lazy_static", "masp_primitives", "masp_proofs", "namada_core", diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index 4fde8114b1..dbb51f1825 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -111,7 +111,7 @@ default-features = false [dependencies.namada_sdk] git = "https://github.com/anoma/namada" -tag = "v0.28.0" +tag = "v0.29.0" features = ["std"] [dev-dependencies] diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs index b9853ac069..28035af716 100644 --- a/crates/relayer/src/chain/namada.rs +++ b/crates/relayer/src/chain/namada.rs @@ -43,7 +43,7 @@ use namada_sdk::core::types::token; use namada_sdk::io::NullIo; use namada_sdk::masp::fs::FsShieldedUtils; use namada_sdk::masp::ShieldedContext; -use namada_sdk::proof_of_stake::storage as pos_storage; +use namada_sdk::proof_of_stake::storage_key as pos_storage_key; use namada_sdk::proof_of_stake::OwnedPosParams; use namada_sdk::queries::Client as SdkClient; use namada_sdk::wallet::Store; @@ -140,7 +140,7 @@ impl NamadaChain { } fn get_unbonding_time(&self) -> Result { - let key = pos_storage::params_key(); + let key = pos_storage_key::params_key(); let (value, _) = self.query(key, QueryHeight::Latest, IncludeProof::No)?; let pos_params = OwnedPosParams::try_from_slice(&value[..]).map_err(NamadaError::borsh_decode)?; @@ -422,17 +422,11 @@ impl ChainEndpoint for NamadaChain { let denom_key = token::denom_key(&token); let (value, _) = self.query(denom_key, QueryHeight::Latest, IncludeProof::No)?; let denominated_amount = if value.is_empty() { - token::DenominatedAmount { - amount, - denom: 0.into(), - } + token::DenominatedAmount::new(amount, 0.into()) } else { let token_denom = token::Denomination::try_from_slice(&value[..]) .map_err(NamadaError::borsh_decode)?; - token::DenominatedAmount { - amount, - denom: token_denom, - } + token::DenominatedAmount::new(amount, token_denom) }; Ok(Balance { @@ -458,17 +452,11 @@ impl ChainEndpoint for NamadaChain { let (value, _) = self.query(denom_key, QueryHeight::Latest, IncludeProof::No)?; let denominated_amount = if value.is_empty() { - token::DenominatedAmount { - amount, - denom: 0.into(), - } + token::DenominatedAmount::new(amount, 0.into()) } else { let namada_denom = token::Denomination::try_from_slice(&value[..]) .map_err(NamadaError::borsh_decode)?; - token::DenominatedAmount { - amount, - denom: namada_denom, - } + token::DenominatedAmount::new(amount, namada_denom) }; let balance = Balance { amount: denominated_amount.to_string(), diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs index 4acf1dda18..59546d4d9a 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -80,7 +80,7 @@ impl NamadaChain { serialized_tx: None, owner: relayer_addr.clone(), }; - let (mut tx, signing_data, _epoch) = rt + let (mut tx, signing_data) = rt .block_on(args.build(&self.ctx)) .map_err(NamadaError::namada)?; rt.block_on( @@ -158,10 +158,9 @@ impl NamadaChain { .await .map_err(NamadaError::namada)? { - let (mut tx, signing_data, _epoch) = - tx::build_reveal_pk(&self.ctx, args, &public_key) - .await - .map_err(NamadaError::namada)?; + let (mut tx, signing_data) = tx::build_reveal_pk(&self.ctx, args, &public_key) + .await + .map_err(NamadaError::namada)?; self.ctx .sign(&mut tx, args, signing_data, signing::default_sign, ()) .await diff --git a/e2e/namada-gaia-simple-transfers b/e2e/namada-gaia-simple-transfers index 1cca1451e1..405d210922 100755 --- a/e2e/namada-gaia-simple-transfers +++ b/e2e/namada-gaia-simple-transfers @@ -86,7 +86,7 @@ cargo run --bin hermes -- --config config_for_namada.toml \ --new-client-connection --yes echo "~~ Transfer 100 samoleans from Gaia to Namada ~~" -namada_receiver=$(${NAMADAW} --base-dir ${base_dir} address find --alias relayer | awk '{print $4}') +namada_receiver=$(${NAMADAW} --base-dir ${base_dir} find --alias relayer | awk '/"relayer":/{print $3}') cargo run --bin hermes -- --config config_for_namada.toml \ tx ft-transfer \ --dst-chain ${chain_id} \ diff --git a/e2e/namada-simple-transfers b/e2e/namada-simple-transfers index 1737d406d1..c8098d6702 100755 --- a/e2e/namada-simple-transfers +++ b/e2e/namada-simple-transfers @@ -81,8 +81,8 @@ ${NAMADAC} --base-dir ${base_dir_b} transfer \ --node ${LEDGER_ADDR_B} # Get the receiver addresses -receiver_a=$(${NAMADAW} --base-dir ${base_dir_a} address find --alias relayer | awk '{print $4}') -receiver_b=$(${NAMADAW} --base-dir ${base_dir_b} address find --alias relayer | awk '{print $4}') +receiver_a=$(${NAMADAW} --base-dir ${base_dir_a} find --alias relayer | awk '/"relayer":/{print $3}') +receiver_b=$(${NAMADAW} --base-dir ${base_dir_b} find --alias relayer | awk '/"relayer":/{print $3}') echo "~~ Transfer 100 apfel from chain_a to chain_b ~~" ${NAMADAC} --base-dir ${base_dir_a} ibc-transfer \ diff --git a/scripts/setup-namada b/scripts/setup-namada index 2d441b665d..bed96d11ad 100755 --- a/scripts/setup-namada +++ b/scripts/setup-namada @@ -142,7 +142,7 @@ function init_relayer_acc() { local base_dir=${DATA_DIR}/namada-${suffix} ${NAMADAW} --base-dir ${base_dir} \ - key gen --alias relayer --unsafe-dont-encrypt + gen --alias relayer --unsafe-dont-encrypt } function add_relayer_key() { @@ -206,11 +206,11 @@ sed -i .bak \ ${NAMADAN} --base-dir ${DATA_DIR}/namada-a/setup/validator-0 \ ledger run > ${DATA_DIR}/namada-a/namada.log 2>&1 & echo "Namada chain A's PID = $!" +sleep 5 ${NAMADAN} --base-dir ${DATA_DIR}/namada-b/setup/validator-0 \ ledger run > ${DATA_DIR}/namada-b/namada.log 2>&1 & echo "Namada chain B's PID = $!" - sleep 5 # Create "relayer" account on each chain @@ -218,8 +218,8 @@ init_relayer_acc "a" ${chain_id_a} init_relayer_acc "b" ${chain_id_b} # Get token addresses -nam_addr_a=$(${NAMADAW} --base-dir ${DATA_DIR}/namada-a address find --alias nam | awk '{print $4}') -nam_addr_b=$(${NAMADAW} --base-dir ${DATA_DIR}/namada-b address find --alias nam | awk '{print $4}') +nam_addr_a=$(${NAMADAW} --base-dir ${DATA_DIR}/namada-a find --alias nam | awk '/"nam":/{print $3}') +nam_addr_b=$(${NAMADAW} --base-dir ${DATA_DIR}/namada-b find --alias nam | awk '/"nam":/{print $3}') # Make Hermes config cd ${HERMES_DIR} diff --git a/scripts/setup-namada-single-node b/scripts/setup-namada-single-node index b981bc6582..2a1e3e2ab3 100755 --- a/scripts/setup-namada-single-node +++ b/scripts/setup-namada-single-node @@ -121,7 +121,7 @@ function init_relayer_acc() { local base_dir=${DATA_DIR}/namada ${NAMADAW} --base-dir ${base_dir} \ - key gen --alias relayer --unsafe-dont-encrypt + gen --alias relayer --unsafe-dont-encrypt } function fund_relayer_acc() { @@ -165,7 +165,7 @@ sleep 10 fund_relayer_acc "albert" ${LEDGER_ADDR} -nam_addr=$(${NAMADAW} --base-dir ${DATA_DIR}/namada address find --alias nam | awk '{print $4}') +nam_addr=$(${NAMADAW} --base-dir ${DATA_DIR}/namada find --alias nam | awk '/"nam":/{print $3}') # for the relayer cd ${HERMES_DIR}