From 1d21e3b770a7b2fa4578fc35772417526e739931 Mon Sep 17 00:00:00 2001 From: Murisi Tarusenga Date: Wed, 12 Jun 2024 20:36:56 +0200 Subject: [PATCH] Updated the Namada SDK dependency and adjusted denominations. --- Cargo.lock | 46 +++++++++++++-------------- Cargo.toml | 8 ++--- crates/relayer/src/chain/namada/tx.rs | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0569575b7..4d0eae25f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3974,7 +3974,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "namada_account" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "linkme", @@ -3988,7 +3988,7 @@ dependencies = [ [[package]] name = "namada_controller" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "namada_core", "smooth-operator", @@ -3998,7 +3998,7 @@ dependencies = [ [[package]] name = "namada_core" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "bech32 0.8.1", "borsh 1.5.0", @@ -4028,6 +4028,7 @@ dependencies = [ "prost-types", "rand 0.8.5", "rand_core 0.6.4", + "ripemd", "serde", "serde_json", "sha2 0.9.9", @@ -4045,7 +4046,7 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "ethers", @@ -4072,7 +4073,7 @@ dependencies = [ [[package]] name = "namada_events" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "linkme", @@ -4088,7 +4089,7 @@ dependencies = [ [[package]] name = "namada_gas" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "linkme", @@ -4103,7 +4104,7 @@ dependencies = [ [[package]] name = "namada_governance" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4126,7 +4127,7 @@ dependencies = [ [[package]] name = "namada_ibc" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "ibc", @@ -4154,7 +4155,7 @@ dependencies = [ [[package]] name = "namada_macros" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "data-encoding", "proc-macro2", @@ -4166,7 +4167,7 @@ dependencies = [ [[package]] name = "namada_merkle_tree" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "eyre", @@ -4181,7 +4182,7 @@ dependencies = [ [[package]] name = "namada_migrations" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "lazy_static", "linkme", @@ -4191,7 +4192,7 @@ dependencies = [ [[package]] name = "namada_parameters" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "namada_core", "namada_macros", @@ -4202,7 +4203,7 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "konst", @@ -4227,7 +4228,7 @@ dependencies = [ [[package]] name = "namada_replay_protection" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "namada_core", ] @@ -4235,7 +4236,7 @@ dependencies = [ [[package]] name = "namada_sdk" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "async-trait", "bimap", @@ -4281,7 +4282,6 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "regex", - "ripemd", "serde", "serde_json", "sha2 0.9.9", @@ -4301,7 +4301,7 @@ dependencies = [ [[package]] name = "namada_shielded_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "masp_primitives", @@ -4318,7 +4318,7 @@ dependencies = [ [[package]] name = "namada_state" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4342,7 +4342,7 @@ dependencies = [ [[package]] name = "namada_storage" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4362,7 +4362,7 @@ dependencies = [ [[package]] name = "namada_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "namada_core", @@ -4377,7 +4377,7 @@ dependencies = [ [[package]] name = "namada_trans_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "konst", "namada_core", @@ -4388,7 +4388,7 @@ dependencies = [ [[package]] name = "namada_tx" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "ark-bls12-381", "bitflags 2.5.0", @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "namada_vote_ext" version = "0.39.0" -source = "git+https://github.com/anoma/namada#879a3268f2edfbdd0da1c98cf0e4bbdac48f5b0d" +source = "git+https://github.com/anoma/namada?branch=murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0#cf10d047ba118e165eaa0431522d083065ff887a" dependencies = [ "borsh 1.5.0", "linkme", diff --git a/Cargo.toml b/Cargo.toml index 606857f367..9a75210c6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,10 +39,10 @@ tendermint-rpc = { version = "0.36.0" } tendermint-testgen = { version = "0.36.0" } # Namada dependencies -namada_ibc = { git = "https://github.com/anoma/namada", version = "0.39.0" } -namada_parameters = { git = "https://github.com/anoma/namada", version = "0.39.0" } -namada_sdk = { git = "https://github.com/anoma/namada", version = "0.39.0" } -namada_token = { git = "https://github.com/anoma/namada", version = "0.39.0" } +namada_ibc = { git = "https://github.com/anoma/namada", branch = "murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0" } +namada_parameters = { git = "https://github.com/anoma/namada", branch = "murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0" } +namada_sdk = { git = "https://github.com/anoma/namada", branch = "murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0" } +namada_token = { git = "https://github.com/anoma/namada", branch = "murisi/masp-ibc-replay-protection-using-txdata-on-0.39.0" } # Other dependencies abscissa_core = "=0.6.0" diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs index defa6e6e78..9c544f0d95 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -258,7 +258,7 @@ impl NamadaChain { if let Some((receiver, token, amount)) = transfer { self.rt.block_on(self.shielded_sync())?; - let amount = InputAmount::Unvalidated( + let amount = InputAmount::Validated( amount .parse() .map_err(|e| Error::send_tx(format!("invalid amount: {e}")))?,