Merge pull request #5 from heliaxdev/bengt/v0.23-compatability

fixed to work with v0.23
heliaxdev · Sep 26, 2023 · 50a124a · 50a124a
2 parents 818bfe1 + 5c601ae
commit 50a124a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -39,9 +39,9 @@ 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::proof_of_stake::parameters::PosParams;
 use namada::proof_of_stake::storage as pos_storage;
+use namada::sdk::wallet::Wallet;
 use namada::tendermint::block::Height as TmHeight;
 use namada::tendermint_rpc::{Client, HttpClient, Url};
 use namada::types::address::{Address, InternalAddress};

diff --git 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::ledger::parameters::storage as parameter_storage;
-use namada::ledger::rpc::TxBroadcastData;
-use namada::ledger::wallet::Wallet;
-use namada::ledger::{signing, tx};
+use namada::sdk::args::{Tx as TxArgs, TxCustom};
+use namada::sdk::error::Error as NamadaError;
+use namada::sdk::masp::ShieldedContext;
+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::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::<CLIShieldedUtils>::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,10 @@ 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 +230,11 @@ 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::<CLIShieldedUtils>::default();
-                let (mut tx, _) = tx::build_reveal_pk(
+                let (mut tx, _) = tx::build_reveal_pk::<_, _, _, DefaultIo>(
                     client,
                     wallet,
                     &mut shielded,
@@ -240,11 +245,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
@@ -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::sdk::error::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;
@@ -603,7 +603,7 @@ define_error! {
             |_| { "Namada wallet has not been initialized yet" },
 
         NamadaKeyPairNotFound
-            [ TraceError<namada::ledger::wallet::FindKeyError> ]
+            [ TraceError<namada::sdk::wallet::FindKeyError> ]
             |_| { "The keypair was not found" },
 
         NamadaAddressNotFound

diff --git a/e2e/namada-e2e-test b/e2e/namada-e2e-test
@@ -35,11 +35,11 @@ function init_relayer_balance() {
   do
       ${NAMADAC} --base-dir ${base_dir} \
         transfer \
-        --source faucet \
+        --source albert \
         --target relayer \
         --token nam \
         --amount 1000 \
-        --signing-keys relayer \
+        --signing-keys albert-key \
         --node ${ledger_addr}
 
       cnt=$((${cnt} + 1))

diff --git a/scripts/setup-namada b/scripts/setup-namada
@@ -133,6 +133,8 @@ function init_relayer_acc() {
   local base_dir=${DATA_DIR}/namada-${suffix}/.namada
   local wallet_dir=${HERMES_DIR}/namada_wallet/${chain_id}
 
+  cp ${base_dir}/${chain_id}/setup/other/wallet.toml ${base_dir}/${chain_id}/wallet.toml
+
   ${NAMADAW} --base-dir ${base_dir} \
     key gen --alias relayer --unsafe-dont-encrypt