diff --git a/Cargo.lock b/Cargo.lock index 08477ccfa0..56168dc00a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3826,7 +3826,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "masp_note_encryption" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=71b36beba21e35f8611f3ba6910ed5b78ec11af1#71b36beba21e35f8611f3ba6910ed5b78ec11af1" +source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" dependencies = [ "borsh 1.5.0", "chacha20", @@ -3839,7 +3839,7 @@ dependencies = [ [[package]] name = "masp_primitives" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=71b36beba21e35f8611f3ba6910ed5b78ec11af1#71b36beba21e35f8611f3ba6910ed5b78ec11af1" +source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" dependencies = [ "aes", "bip0039", @@ -3870,7 +3870,7 @@ dependencies = [ [[package]] name = "masp_proofs" version = "1.0.0" -source = "git+https://github.com/anoma/masp?rev=71b36beba21e35f8611f3ba6910ed5b78ec11af1#71b36beba21e35f8611f3ba6910ed5b78ec11af1" +source = "git+https://github.com/anoma/masp?rev=8d83b172698098fba393006016072bc201ed9ab7#8d83b172698098fba393006016072bc201ed9ab7" dependencies = [ "bellman", "blake2b_simd", @@ -3999,7 +3999,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "namada_account" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "linkme", @@ -4013,7 +4013,7 @@ dependencies = [ [[package]] name = "namada_controller" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "namada_core", "smooth-operator", @@ -4023,7 +4023,7 @@ dependencies = [ [[package]] name = "namada_core" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "bech32 0.8.1", "borsh 1.5.0", @@ -4071,7 +4071,7 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "ethers", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "namada_events" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "linkme", @@ -4114,7 +4114,7 @@ dependencies = [ [[package]] name = "namada_gas" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "linkme", @@ -4129,7 +4129,7 @@ dependencies = [ [[package]] name = "namada_governance" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4152,7 +4152,7 @@ dependencies = [ [[package]] name = "namada_ibc" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "ibc", @@ -4180,7 +4180,7 @@ dependencies = [ [[package]] name = "namada_macros" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "data-encoding", "proc-macro2", @@ -4192,7 +4192,7 @@ dependencies = [ [[package]] name = "namada_merkle_tree" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "eyre", @@ -4207,7 +4207,7 @@ dependencies = [ [[package]] name = "namada_migrations" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "lazy_static", "linkme", @@ -4217,7 +4217,7 @@ dependencies = [ [[package]] name = "namada_parameters" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "namada_core", "namada_macros", @@ -4229,7 +4229,7 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "konst", @@ -4254,7 +4254,7 @@ dependencies = [ [[package]] name = "namada_replay_protection" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "namada_core", ] @@ -4262,7 +4262,7 @@ dependencies = [ [[package]] name = "namada_sdk" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "async-trait", "bimap", @@ -4329,7 +4329,7 @@ dependencies = [ [[package]] name = "namada_shielded_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "lazy_static", @@ -4350,7 +4350,7 @@ dependencies = [ [[package]] name = "namada_state" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4374,7 +4374,7 @@ dependencies = [ [[package]] name = "namada_storage" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "itertools 0.12.1", @@ -4394,7 +4394,7 @@ dependencies = [ [[package]] name = "namada_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "namada_core", @@ -4409,7 +4409,7 @@ dependencies = [ [[package]] name = "namada_trans_token" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "konst", "namada_core", @@ -4420,7 +4420,7 @@ dependencies = [ [[package]] name = "namada_tx" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "ark-bls12-381", "bitflags 2.5.0", @@ -4450,7 +4450,7 @@ dependencies = [ [[package]] name = "namada_vote_ext" version = "0.39.0" -source = "git+https://github.com/anoma/namada?rev=7dd97fa8600b5a467eda2eebaace1b66a0d66231#7dd97fa8600b5a467eda2eebaace1b66a0d66231" +source = "git+https://github.com/anoma/namada?rev=7e23015cbb878f5c2a69042cf8bafcd49d51b238#7e23015cbb878f5c2a69042cf8bafcd49d51b238" dependencies = [ "borsh 1.5.0", "linkme", diff --git a/Cargo.toml b/Cargo.toml index de6f79745c..bc4f556fba 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 = "7dd97fa8600b5a467eda2eebaace1b66a0d66231" } -namada_parameters = { git = "https://github.com/anoma/namada", rev = "7dd97fa8600b5a467eda2eebaace1b66a0d66231" } -namada_sdk = { git = "https://github.com/anoma/namada", rev = "7dd97fa8600b5a467eda2eebaace1b66a0d66231" } -namada_token = { git = "https://github.com/anoma/namada", rev = "7dd97fa8600b5a467eda2eebaace1b66a0d66231" } +namada_ibc = { git = "https://github.com/anoma/namada", rev = "7e23015cbb878f5c2a69042cf8bafcd49d51b238" } +namada_parameters = { git = "https://github.com/anoma/namada", rev = "7e23015cbb878f5c2a69042cf8bafcd49d51b238" } +namada_sdk = { git = "https://github.com/anoma/namada", rev = "7e23015cbb878f5c2a69042cf8bafcd49d51b238" } +namada_token = { git = "https://github.com/anoma/namada", rev = "7e23015cbb878f5c2a69042cf8bafcd49d51b238" } # 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 b041e7d755..a51ebea4a5 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -23,7 +23,7 @@ use namada_sdk::ibc::core::host::types::identifiers::{ChannelId, PortId}; use namada_sdk::masp::{PaymentAddress, TransferTarget}; use namada_sdk::masp_primitives::transaction::Transaction as MaspTransaction; use namada_sdk::{signing, tx, Namada}; -use namada_token::ShieldingTransfer; +use namada_token::Transfer; use tendermint_proto::Protobuf; use tendermint_rpc::endpoint::broadcast::tx_sync::Response; use tracing::{debug, debug_span, trace}; @@ -214,7 +214,7 @@ impl NamadaChain { channel_id: &ChannelId, packet_data: &[u8], is_refund: bool, - ) -> Result, Error> { + ) -> Result, Error> { let transfer = serde_json::from_slice::(packet_data) .ok() .and_then(|data| {