Updated Namada SDK to the one provided by the hardware integration br…

…anch.

Cargo.toml

@@ -39,7 +39,7 @@ tendermint-rpc                   = { version = "0.38.1" }
 tendermint-testgen               = { version = "0.38.1" }
 
 # Namada dependencies
-namada_sdk        = { git = "https://github.com/anoma/namada", version = "0.44.0" }
+namada_sdk        = { git = "https://github.com/anoma/namada", branch = "murisi/integrate-hw-masp" }
 
 # Other dependencies
 abscissa_core            = "=0.6.0"

crates/relayer/src/chain/namada/tx.rs

@@ -47,16 +47,15 @@ impl NamadaChain {
             code_path: Some(PathBuf::from(tx::TX_IBC_WASM)),
             data_path: None,
             serialized_tx: None,
-            owner: relayer_addr.clone(),
-            disposable_signing_key: false,
+            owner: Some(relayer_addr.clone()),
         };
         let mut txs = Vec::new();
         for msg in msgs {
             let (mut tx, signing_data) = rt
                 .block_on(args.build(&self.ctx))
                 .map_err(NamadaError::namada)?;
             self.set_tx_data(&mut tx, msg)?;
-            txs.push((tx, signing_data));
+            txs.push((tx, signing_data.expect("SigningData should exist")));
         }
         let (mut tx, signing_data) = tx::build_batch(txs).map_err(NamadaError::namada)?;
         // This is fine, as only the relayers is signing the transactions

tools/test-framework/src/util/namada.rs

@@ -5,8 +5,8 @@ use ibc_relayer_types::core::ics24_host::identifier::{ChannelId, ClientId, PortI
 use ibc_relayer_types::events::IbcEventType;
 use ibc_relayer_types::Height;
 use itertools::Itertools;
-use namada_sdk::ibc::storage::{consensus_height, consensus_state_prefix};
 use namada_sdk::events::extend::Height as HeightAttr;
+use namada_sdk::ibc::storage::{consensus_height, consensus_state_prefix};
 use namada_sdk::queries::RPC;
 use namada_sdk::storage::{Key, PrefixValue};
 use namada_sdk::tx::Tx;