From 2c5cb71cc86922e942f73e701a9b26b9b000ed3d Mon Sep 17 00:00:00 2001 From: yito88 Date: Mon, 4 Sep 2023 15:12:07 +0200 Subject: [PATCH] for Namada 0.22.0 more --- Cargo.lock | 12 ++++++------ crates/relayer/Cargo.toml | 4 ++-- crates/relayer/src/chain/namada/tx.rs | 24 ++++++++++++++---------- crates/relayer/src/error.rs | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ca0058f81..4eadb3d0e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4635,7 +4635,7 @@ dependencies = [ [[package]] name = "namada" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "async-trait", "bimap", @@ -4694,7 +4694,7 @@ dependencies = [ [[package]] name = "namada_apps" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "ark-serialize", "ark-std", @@ -4779,7 +4779,7 @@ dependencies = [ [[package]] name = "namada_core" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "ark-bls12-381", "ark-ec", @@ -4832,7 +4832,7 @@ dependencies = [ [[package]] name = "namada_ethereum_bridge" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "borsh 0.9.4", "ethers", @@ -4853,7 +4853,7 @@ dependencies = [ [[package]] name = "namada_macros" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "proc-macro2", "quote", @@ -4863,7 +4863,7 @@ dependencies = [ [[package]] name = "namada_proof_of_stake" version = "0.21.1" -source = "git+https://github.com/anoma/namada?rev=8a131b588190ab4ff62dc5e86cf362e2a27044e3#8a131b588190ab4ff62dc5e86cf362e2a27044e3" +source = "git+https://github.com/anoma/namada?rev=e31b7c2fd74ff32afc11380c9fedfb65fd58140b#e31b7c2fd74ff32afc11380c9fedfb65fd58140b" dependencies = [ "borsh 0.9.4", "data-encoding", diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml index caa7bb69c6..d63846f3a8 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 = "8a131b588190ab4ff62dc5e86cf362e2a27044e3" } -namada = { git = "https://github.com/anoma/namada", rev = "8a131b588190ab4ff62dc5e86cf362e2a27044e3" } +namada_apps = { git = "https://github.com/anoma/namada", rev = "e31b7c2fd74ff32afc11380c9fedfb65fd58140b" } +namada = { git = "https://github.com/anoma/namada", rev = "e31b7c2fd74ff32afc11380c9fedfb65fd58140b" } subtle-encoding = "0.5" humantime-serde = "1.1.1" serde = "1.0" diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs index 3a0c2beeec..7599026d93 100644 --- a/crates/relayer/src/chain/namada/tx.rs +++ b/crates/relayer/src/chain/namada/tx.rs @@ -16,6 +16,7 @@ use namada::tendermint_rpc::endpoint::broadcast::tx_sync::Response as AbciPlusRp 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::types::key::RefTo; use namada::types::transaction::{GasLimit, TxType}; use namada_apps::cli::api::CliClient; @@ -137,13 +138,16 @@ impl NamadaChain { )) .map_err(Error::namada_tx)?; - self.rt.block_on(signing::generate_test_vector( - &client, - &mut self.wallet, - &tx, - )); + self.rt + .block_on(signing::generate_test_vector( + &client, + &mut self.wallet, + &tx, + )) + .map_err(Error::namada_tx)?; - signing::sign_tx(&mut self.wallet, &args.tx, &mut tx, signing_data); + signing::sign_tx(&mut self.wallet, &args.tx, &mut tx, signing_data) + .map_err(Error::namada_tx)?; let wrapper_hash = tx.header_hash().to_string(); let decrypted_hash = tx @@ -213,11 +217,11 @@ impl NamadaChain { client: &HttpClient, args: &TxArgs, address: &Address, - ) -> Result<(), tx::Error> { + ) -> Result<(), NamadaError> { if let Address::Implicit(ImplicitAddress(pkh)) = address { let key = wallet .find_key_by_pkh(pkh, args.clone().password) - .map_err(|e| tx::Error::Other(e.to_string()))?; + .map_err(|e| NamadaError::Other(e.to_string()))?; let public_key = key.ref_to(); if tx::is_reveal_pk_needed(client, address, args.force).await? { @@ -236,9 +240,9 @@ impl NamadaChain { ) .await?; - signing::generate_test_vector(client, wallet, &tx).await; + signing::generate_test_vector(client, wallet, &tx).await?; - signing::sign_tx(wallet, args, &mut tx, signing_data); + signing::sign_tx(wallet, args, &mut tx, signing_data)?; tx::process_tx(client, wallet, args, tx).await?; } diff --git a/crates/relayer/src/error.rs b/crates/relayer/src/error.rs index b06feef293..0f823364f6 100644 --- a/crates/relayer/src/error.rs +++ b/crates/relayer/src/error.rs @@ -6,11 +6,11 @@ use flex_error::{define_error, DisplayOnly, TraceError}; use http::uri::InvalidUri; use humantime::format_duration; use ibc_proto::protobuf::Error as TendermintProtoError; -use namada::ledger::tx::Error as NamadaTxError; 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::types::token::Amount; use prost::{DecodeError, EncodeError}; use regex::Regex;