From cf29e32d955cabfb79fd3086de33fb4e814c7a70 Mon Sep 17 00:00:00 2001 From: yito88 Date: Wed, 22 May 2024 03:09:48 +0200 Subject: [PATCH] Namada 0.36.1 --- Cargo.lock | 165 ++++++++++++++------------ Cargo.toml | 8 +- crates/relayer/src/chain/namada/tx.rs | 2 +- 3 files changed, 97 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4aac975a4..34a75ad1c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,7 +204,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-traits", + "num-traits 0.2.17", "zeroize", ] @@ -220,7 +220,7 @@ dependencies = [ "ark-std", "derivative", "num-bigint", - "num-traits", + "num-traits 0.2.17", "paste", "rustc_version 0.3.3", "zeroize", @@ -243,7 +243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ "num-bigint", - "num-traits", + "num-traits 0.2.17", "quote", "syn 1.0.109", ] @@ -264,7 +264,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ - "num-traits", + "num-traits 0.2.17", "rand 0.8.5", ] @@ -889,7 +889,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits", + "num-traits 0.2.17", "wasm-bindgen", "windows-targets 0.48.5", ] @@ -2003,7 +2003,7 @@ dependencies = [ "libm", "num-bigint", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -3290,7 +3290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" dependencies = [ "integer-sqrt", - "num-traits", + "num-traits 0.2.17", "uint", ] @@ -3412,7 +3412,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -3604,7 +3604,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" +source = "git+https://github.com/anoma/masp?rev=3aacc707c5948e7423589ac617305448bead9842#3aacc707c5948e7423589ac617305448bead9842" dependencies = [ "borsh 1.2.1", "chacha20", @@ -3617,7 +3617,7 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" +source = "git+https://github.com/anoma/masp?rev=3aacc707c5948e7423589ac617305448bead9842#3aacc707c5948e7423589ac617305448bead9842" dependencies = [ "aes", "bip0039", @@ -3637,7 +3637,7 @@ dependencies = [ "masp_note_encryption", "memuse", "nonempty", - "num-traits", + "num-traits 0.2.19", "rand 0.8.5", "rand_core 0.6.4", "sha2 0.10.8", @@ -3648,7 +3648,7 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=b5e87a01c5928ce341f2d2a63a6fa6c4033be395#b5e87a01c5928ce341f2d2a63a6fa6c4033be395" +source = "git+https://github.com/anoma/masp?rev=3aacc707c5948e7423589ac617305448bead9842#3aacc707c5948e7423589ac617305448bead9842" dependencies = [ "bellman", "blake2b_simd", @@ -3775,8 +3775,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "namada_account" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "linkme", @@ -3789,8 +3789,8 @@ dependencies = [ [[package]] name = "namada_controller" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "namada_core", "smooth-operator", @@ -3799,8 +3799,8 @@ dependencies = [ [[package]] name = "namada_core" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "bech32 0.8.1", "borsh 1.2.1", @@ -3823,7 +3823,7 @@ dependencies = [ "namada_migrations", "num-integer", "num-rational", - "num-traits", + "num-traits 0.2.17", "num256", "num_enum", "primitive-types", @@ -3846,8 +3846,8 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "ethabi", @@ -3878,8 +3878,8 @@ dependencies = [ [[package]] name = "namada_events" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "linkme", @@ -3894,8 +3894,8 @@ dependencies = [ [[package]] name = "namada_gas" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "linkme", @@ -3909,8 +3909,8 @@ dependencies = [ [[package]] name = "namada_governance" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "itertools 0.12.1", @@ -3932,8 +3932,8 @@ dependencies = [ [[package]] name = "namada_ibc" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "ibc", @@ -3962,8 +3962,8 @@ dependencies = [ [[package]] name = "namada_macros" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "data-encoding", "proc-macro2", @@ -3974,8 +3974,8 @@ dependencies = [ [[package]] name = "namada_merkle_tree" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "eyre", @@ -3989,8 +3989,8 @@ dependencies = [ [[package]] name = "namada_migrations" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "lazy_static", "linkme", @@ -3999,8 +3999,8 @@ dependencies = [ [[package]] name = "namada_parameters" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "namada_core", @@ -4011,8 +4011,8 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "data-encoding", @@ -4028,7 +4028,7 @@ dependencies = [ "namada_parameters", "namada_storage", "namada_trans_token", - "num-traits", + "num-traits 0.2.17", "once_cell", "serde", "smooth-operator", @@ -4038,16 +4038,16 @@ dependencies = [ [[package]] name = "namada_replay_protection" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "namada_core", ] [[package]] name = "namada_sdk" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "async-trait", "bimap", @@ -4083,7 +4083,7 @@ dependencies = [ "namada_token", "namada_tx", "namada_vote_ext", - "num-traits", + "num-traits 0.2.17", "num256", "orion", "owo-colors", @@ -4113,8 +4113,8 @@ dependencies = [ [[package]] name = "namada_shielded_token" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "masp_primitives", @@ -4131,8 +4131,8 @@ dependencies = [ [[package]] name = "namada_state" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "ics23", @@ -4159,8 +4159,8 @@ dependencies = [ [[package]] name = "namada_storage" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "itertools 0.12.1", @@ -4179,8 +4179,8 @@ dependencies = [ [[package]] name = "namada_token" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "namada_core", "namada_events", @@ -4191,8 +4191,8 @@ dependencies = [ [[package]] name = "namada_trans_token" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "konst", "namada_core", @@ -4202,8 +4202,8 @@ dependencies = [ [[package]] name = "namada_tx" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "ark-bls12-381", "bitflags 2.5.0", @@ -4217,8 +4217,8 @@ dependencies = [ "namada_gas", "namada_macros", "namada_migrations", - "num-derive", - "num-traits", + "num-derive 0.4.2", + "num-traits 0.2.17", "prost", "prost-types", "serde", @@ -4230,8 +4230,8 @@ dependencies = [ [[package]] name = "namada_vote_ext" -version = "0.35.1" -source = "git+https://github.com/anoma/namada?rev=e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66#e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" +version = "0.36.1" +source = "git+https://github.com/anoma/namada#0017f90838a9774fe19f0e905c33cecd86c36fa7" dependencies = [ "borsh 1.2.1", "linkme", @@ -4269,7 +4269,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4280,7 +4280,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", "serde", ] @@ -4290,7 +4290,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4304,6 +4304,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -4311,7 +4322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4322,7 +4333,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -4334,7 +4345,7 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits", + "num-traits 0.2.17", "serde", ] @@ -4348,6 +4359,14 @@ dependencies = [ "libm", ] +[[package]] +name = "num-traits" +version = "0.2.19" +source = "git+https://github.com/heliaxdev/num-traits?rev=3f3657caa34b8e116fdf3f8a3519c4ac29f012fe#3f3657caa34b8e116fdf3f8a3519c4ac29f012fe" +dependencies = [ + "autocfg", +] + [[package]] name = "num256" version = "0.3.5" @@ -4356,8 +4375,8 @@ checksum = "aa9b5179e82f0867b23e0b9b822493821f9345561f271364f409c8e4a058367d" dependencies = [ "lazy_static", "num", - "num-derive", - "num-traits", + "num-derive 0.3.3", + "num-traits 0.2.17", "serde", "serde_derive", ] @@ -4919,7 +4938,7 @@ checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ "bitflags 2.5.0", "lazy_static", - "num-traits", + "num-traits 0.2.17", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", @@ -5351,7 +5370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", - "num-traits", + "num-traits 0.2.17", ] [[package]] @@ -6000,7 +6019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", - "num-traits", + "num-traits 0.2.17", "thiserror", "time", ] @@ -6266,7 +6285,7 @@ dependencies = [ "flex-error", "futures", "k256", - "num-traits", + "num-traits 0.2.17", "once_cell", "prost", "prost-types", diff --git a/Cargo.toml b/Cargo.toml index 93c4ed7e96..a1978816c4 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", rev = "e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" } -namada_parameters = { git = "https://github.com/anoma/namada", rev = "e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" } -namada_sdk = { git = "https://github.com/anoma/namada", rev = "e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" } -namada_trans_token = { git = "https://github.com/anoma/namada", rev = "e344f3aabbbfeb9c8ccb6d9750627fd34d4e8d66" } +namada_ibc = { git = "https://github.com/anoma/namada", version = "0.36.1" } +namada_parameters = { git = "https://github.com/anoma/namada", version = "0.36.1" } +namada_sdk = { git = "https://github.com/anoma/namada", version = "0.36.1" } +namada_trans_token = { git = "https://github.com/anoma/namada", version = "0.36.1" } # 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 bda29cc1d7..a2e3aa7b31 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -349,7 +349,7 @@ impl NamadaChain { .find_public_key(pkh.to_string()) .map_err(|e| NamadaError::namada(namada_sdk::error::Error::Other(e.to_string())))?; - if tx::is_reveal_pk_needed(self.ctx.client(), address, args.force) + if tx::is_reveal_pk_needed(self.ctx.client(), address) .await .map_err(NamadaError::namada)? {