From 707a547902b7e2db36de6f757409341d20a421c9 Mon Sep 17 00:00:00 2001 From: bengtlofgren Date: Tue, 26 Sep 2023 19:47:26 +0100 Subject: [PATCH] fixed to work with v0.23 --- Cargo.lock | 65 +++++++++------------------ crates/relayer/Cargo.toml | 4 +- crates/relayer/src/chain/namada.rs | 2 +- crates/relayer/src/chain/namada/tx.rs | 31 ++++++------- crates/relayer/src/error.rs | 4 +- 5 files changed, 41 insertions(+), 65 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bec12ecf77..70f990d827 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2357,8 +2357,8 @@ dependencies = [ [[package]] name = "ethbridge-bridge-contract" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" +version = "0.24.0" +source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.24.0#d66708bb8a734111988b9eaf08c7473bd7020c00" dependencies = [ "ethbridge-bridge-events", "ethbridge-structs", @@ -2368,8 +2368,8 @@ dependencies = [ [[package]] name = "ethbridge-bridge-events" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" +version = "0.24.0" +source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.24.0#d66708bb8a734111988b9eaf08c7473bd7020c00" dependencies = [ "ethabi", "ethbridge-structs", @@ -2379,40 +2379,17 @@ dependencies = [ [[package]] name = "ethbridge-events" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" +version = "0.24.0" +source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.24.0#d66708bb8a734111988b9eaf08c7473bd7020c00" dependencies = [ "ethbridge-bridge-events", - "ethbridge-governance-events", "ethers", ] -[[package]] -name = "ethbridge-governance-contract" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" -dependencies = [ - "ethbridge-governance-events", - "ethbridge-structs", - "ethers", - "ethers-contract", -] - -[[package]] -name = "ethbridge-governance-events" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" -dependencies = [ - "ethabi", - "ethbridge-structs", - "ethers", - "ethers-contract", -] - [[package]] name = "ethbridge-structs" -version = "0.23.0" -source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.23.0#1bb96e06cbc3889aa46a01e3768bf25f0c78168a" +version = "0.24.0" +source = "git+https://github.com/heliaxdev/ethbridge-rs?tag=v0.24.0#d66708bb8a734111988b9eaf08c7473bd7020c00" dependencies = [ "ethabi", "ethers", @@ -4634,8 +4611,8 @@ dependencies = [ [[package]] name = "namada" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "async-trait", "bimap", @@ -4646,7 +4623,6 @@ dependencies = [ "derivation-path", "derivative", "ethbridge-bridge-contract", - "ethbridge-governance-contract", "ethers", "eyre", "futures", @@ -4693,8 +4669,8 @@ dependencies = [ [[package]] name = "namada_apps" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "ark-serialize", "ark-std", @@ -4718,7 +4694,6 @@ dependencies = [ "ethabi", "ethbridge-bridge-events", "ethbridge-events", - "ethbridge-governance-events", "eyre", "fd-lock", "ferveo", @@ -4778,8 +4753,8 @@ dependencies = [ [[package]] name = "namada_core" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "ark-bls12-381", "ark-ec", @@ -4831,8 +4806,8 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "borsh 0.9.4", "ethers", @@ -4852,8 +4827,8 @@ dependencies = [ [[package]] name = "namada_macros" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "proc-macro2", "quote", @@ -4862,8 +4837,8 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" -version = "0.22.0" -source = "git+https://github.com/anoma/namada?rev=9b67281e359ebff5467cad57c866fbcf91eb80c8#9b67281e359ebff5467cad57c866fbcf91eb80c8" +version = "0.23.0" +source = "git+https://github.com/anoma/namada?rev=v0.23.0#8635da4f742e983cf5caa00a2825c03660345957" dependencies = [ "borsh 0.9.4", "data-encoding", diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index e513403372..ccc7a4cba5 100644 --- a/crates/relayer/Cargo.toml +++ b/crates/relayer/Cargo.toml @@ -26,8 +26,8 @@ ibc-relayer-types = { version = "0.25.0", path = "../relayer-types", features = ics23 = { version = "0.10.1" } borsh = "0.9.0" -namada_apps = { git = "https://github.com/anoma/namada", rev = "9b67281e359ebff5467cad57c866fbcf91eb80c8" } -namada = { git = "https://github.com/anoma/namada", rev = "9b67281e359ebff5467cad57c866fbcf91eb80c8" } +namada_apps = { git = "https://github.com/anoma/namada", rev = "v0.23.0" } +namada = { git = "https://github.com/anoma/namada", rev = "v0.23.0" } subtle-encoding = "0.5" humantime-serde = "1.1.1" serde = "1.0" diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs index 2bf9defe02..a16def4ca3 100644 --- a/crates/relayer/src/chain/namada.rs +++ b/crates/relayer/src/chain/namada.rs @@ -39,7 +39,7 @@ use namada::ledger::parameters::storage as param_storage; use namada::ledger::parameters::EpochDuration; use namada::ledger::storage::ics23_specs::ibc_proof_specs; use namada::ledger::storage::Sha256Hasher; -use namada::ledger::wallet::Wallet; +use namada::sdk::wallet::Wallet; use namada::proof_of_stake::parameters::PosParams; use namada::proof_of_stake::storage as pos_storage; use namada::tendermint::block::Height as TmHeight; diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs index 7599026d93..5e24121a69 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -6,17 +6,18 @@ use std::time::Instant; use borsh::BorshDeserialize; use ibc_proto::google::protobuf::Any; -use namada::ledger::args::{Tx as TxArgs, TxCustom}; -use namada::ledger::masp::ShieldedContext; +use namada::sdk::args::{Tx as TxArgs, TxCustom}; +use namada::sdk::masp::ShieldedContext; use namada::ledger::parameters::storage as parameter_storage; -use namada::ledger::rpc::TxBroadcastData; -use namada::ledger::wallet::Wallet; -use namada::ledger::{signing, tx}; +use namada::sdk::rpc::TxBroadcastData; +use namada::sdk::wallet::Wallet; +use namada::sdk::{signing, tx}; use namada::tendermint_rpc::endpoint::broadcast::tx_sync::Response as AbciPlusRpcResponse; use namada::tendermint_rpc::HttpClient; use namada::types::address::{Address, ImplicitAddress}; use namada::types::chain::ChainId; -use namada::types::error::Error as NamadaError; +use namada::sdk::error::Error as NamadaError; +use namada::types::io::DefaultIo; use namada::types::key::RefTo; use namada::types::transaction::{GasLimit, TxType}; use namada_apps::cli::api::CliClient; @@ -109,11 +110,11 @@ impl NamadaChain { let signing_data = self .rt - .block_on(signing::aux_signing_data( + .block_on(signing::aux_signing_data::<_,_,DefaultIo>( &client, &mut self.wallet, &args.tx, - &Some(args.owner.clone()), + Some(args.owner.clone()), Some(args.owner.clone()), )) .map_err(Error::namada_tx)?; @@ -129,7 +130,7 @@ impl NamadaChain { let mut shielded = ShieldedContext::::default(); let (mut tx, _) = self .rt - .block_on(tx::build_custom( + .block_on(tx::build_custom::<_,_,_,DefaultIo>( &client, &mut self.wallet, &mut shielded, @@ -139,7 +140,7 @@ impl NamadaChain { .map_err(Error::namada_tx)?; self.rt - .block_on(signing::generate_test_vector( + .block_on(signing::generate_test_vector::<_,_,DefaultIo>( &client, &mut self.wallet, &tx, @@ -162,7 +163,7 @@ impl NamadaChain { }; let mut response = self .rt - .block_on(tx::broadcast_tx(&self.rpc_client, &to_broadcast)) + .block_on(tx::broadcast_tx::<_,DefaultIo>(&self.rpc_client, &to_broadcast)) .map_err(Error::namada_tx)?; // overwrite the tx decrypted hash for the tx query response.hash = decrypted_hash.parse().expect("invalid hash"); @@ -226,10 +227,10 @@ impl NamadaChain { if tx::is_reveal_pk_needed(client, address, args.force).await? { let signing_data = - signing::aux_signing_data(client, wallet, args, &None, None).await?; + signing::aux_signing_data::<_,_,DefaultIo>(client, wallet, args, None, None).await?; let mut shielded = ShieldedContext::::default(); - let (mut tx, _) = tx::build_reveal_pk( + let (mut tx, _) = tx::build_reveal_pk::<_,_,_,DefaultIo>( client, wallet, &mut shielded, @@ -240,11 +241,11 @@ impl NamadaChain { ) .await?; - signing::generate_test_vector(client, wallet, &tx).await?; + signing::generate_test_vector::<_,_,DefaultIo>(client, wallet, &tx).await?; signing::sign_tx(wallet, args, &mut tx, signing_data)?; - tx::process_tx(client, wallet, args, tx).await?; + tx::process_tx::<_,_,DefaultIo>(client, wallet, args, tx).await?; } } diff --git a/crates/relayer/src/error.rs b/crates/relayer/src/error.rs index 0f823364f6..184687618d 100644 --- a/crates/relayer/src/error.rs +++ b/crates/relayer/src/error.rs @@ -10,7 +10,7 @@ use namada::tendermint::Error as AbciPlusTmError; use namada::tendermint::Error as NamadaTendermintError; use namada::tendermint_proto::Error as AbciPlusTmProtoError; use namada::tendermint_rpc::Error as TendermintAbciPlusRpcError; -use namada::types::error::Error as NamadaTxError; +use namada::sdk::error::Error as NamadaTxError; use namada::types::token::Amount; use prost::{DecodeError, EncodeError}; use regex::Regex; @@ -603,7 +603,7 @@ define_error! { |_| { "Namada wallet has not been initialized yet" }, NamadaKeyPairNotFound - [ TraceError ] + [ TraceError ] |_| { "The keypair was not found" }, NamadaAddressNotFound