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 the Namada SDK dependency and adjusted denominations. #34

Closed
wants to merge 1 commit into from
Closed
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
81 changes: 54 additions & 27 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ tendermint-rpc = { version = "0.36.0" }
tendermint-testgen = { version = "0.36.0" }

# Namada dependencies
namada_ibc = { git = "https://github.com/anoma/namada", version = "0.39.0" }
namada_parameters = { git = "https://github.com/anoma/namada", version = "0.39.0" }
namada_sdk = { git = "https://github.com/anoma/namada", version = "0.39.0" }
namada_token = { git = "https://github.com/anoma/namada", version = "0.39.0" }
namada_ibc = { git = "https://github.com/anoma/namada", branch = "murisi/draft-with-masp-ibc-replay-protection" }
namada_parameters = { git = "https://github.com/anoma/namada", branch = "murisi/draft-with-masp-ibc-replay-protection" }
namada_sdk = { git = "https://github.com/anoma/namada", branch = "murisi/draft-with-masp-ibc-replay-protection" }
namada_token = { git = "https://github.com/anoma/namada", branch = "murisi/draft-with-masp-ibc-replay-protection" }

# Other dependencies
abscissa_core = "=0.6.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/relayer/src/chain/namada/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use std::time::Instant;

use ibc_proto::google::protobuf::Any;
use itertools::Itertools;
use namada_ibc::{MsgAcknowledgement, MsgRecvPacket, MsgTimeout};
use namada_sdk::address::{Address, ImplicitAddress};
use namada_sdk::args::{self, TxBuilder};
use namada_sdk::args::{InputAmount, Tx as TxArgs, TxCustom};
Expand All @@ -19,7 +20,6 @@ use namada_sdk::ibc::core::channel::types::msgs::{
MsgTimeout as IbcMsgTimeout, ACKNOWLEDGEMENT_TYPE_URL, RECV_PACKET_TYPE_URL, TIMEOUT_TYPE_URL,
};
use namada_sdk::ibc::core::host::types::identifiers::{ChannelId, PortId};
use namada_ibc::{MsgAcknowledgement, MsgRecvPacket, MsgTimeout};
use namada_sdk::masp::{PaymentAddress, TransferTarget};
use namada_sdk::masp_primitives::transaction::Transaction as MaspTransaction;
use namada_sdk::{signing, tx, Namada};
Expand Down Expand Up @@ -258,7 +258,7 @@ impl NamadaChain {

if let Some((receiver, token, amount)) = transfer {
self.rt.block_on(self.shielded_sync())?;
let amount = InputAmount::Unvalidated(
let amount = InputAmount::Validated(
amount
.parse()
.map_err(|e| Error::send_tx(format!("invalid amount: {e}")))?,
Expand Down
Loading