Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Namada SDK to the one provided by the hardware integration branch #43

Draft
wants to merge 1 commit into
base: namada-0.44
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 61 additions & 61 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions crates/relayer/src/chain/namada/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/util/namada.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading