for Namada/#3297 - split transfer tx

informalsystems · Jun 14, 2024 · cc148b3 · cc148b3
1 parent 947856f
commit cc148b3
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,10 +39,17 @@ tendermint-rpc                   = { version = "=0.36.0" }
 tendermint-testgen               = { version = "=0.36.0" }
 
 # Namada dependencies
+<<<<<<< HEAD
 namada_ibc         = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
 namada_parameters  = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
 namada_sdk         = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
 namada_trans_token = { git = "https://github.com/anoma/namada", tag = "v0.37.0" }
+=======
+namada_ibc        = { git = "https://github.com/anoma/namada", rev = "a0e2e6c09e4d7a2ee6b3114b6ba6560204d722a6" }
+namada_parameters = { git = "https://github.com/anoma/namada", rev = "a0e2e6c09e4d7a2ee6b3114b6ba6560204d722a6" }
+namada_sdk        = { git = "https://github.com/anoma/namada", rev = "a0e2e6c09e4d7a2ee6b3114b6ba6560204d722a6" }
+namada_token      = { git = "https://github.com/anoma/namada", rev = "a0e2e6c09e4d7a2ee6b3114b6ba6560204d722a6" }
+>>>>>>> 1034b2d8 (for Namada/#3297 - split transfer tx)
 
 # Other dependencies
 abscissa_core            = "=0.6.0"

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -49,7 +49,7 @@ moka                             = { workspace = true, features = ["sync"] }
 namada_ibc                       = { workspace = true }
 namada_parameters                = { workspace = true }
 namada_sdk                       = { workspace = true }
-namada_trans_token               = { workspace = true }
+namada_token                     = { workspace = true }
 num-bigint                       = { workspace = true, features = ["serde"] }
 num-rational                     = { workspace = true, features = ["num-bigint", "serde"] }
 once_cell                        = { workspace = true }

diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs
@@ -50,8 +50,8 @@ use namada_sdk::storage::{Key, KeySeg, PrefixValue};
 use namada_sdk::wallet::Store;
 use namada_sdk::wallet::Wallet;
 use namada_sdk::{rpc, Namada, NamadaImpl};
-use namada_trans_token::storage_key::{balance_key, denom_key, is_any_token_balance_key};
-use namada_trans_token::{Amount, DenominatedAmount, Denomination};
+use namada_token::storage_key::{balance_key, denom_key, is_any_token_balance_key};
+use namada_token::{Amount, DenominatedAmount, Denomination};
 use tendermint::block::Height as TmHeight;
 use tendermint::{node, Time};
 use tendermint_light_client::types::LightBlock as TMLightBlock;

diff --git a/crates/relayer/src/chain/namada/tx.rs b/crates/relayer/src/chain/namada/tx.rs
@@ -19,11 +19,11 @@ 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_sdk::ibc::{MsgAcknowledgement, MsgRecvPacket, MsgTimeout};
+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};
-use namada_trans_token::Transfer;
+use namada_token::ShieldingTransfer;
 use tendermint_proto::Protobuf;
 use tendermint_rpc::endpoint::broadcast::tx_sync::Response;
 use tracing::{debug, debug_span, trace};
@@ -214,7 +214,7 @@ impl NamadaChain {
         channel_id: &ChannelId,
         packet_data: &[u8],
         is_refund: bool,
-    ) -> Result<Option<(Transfer, MaspTransaction)>, Error> {
+    ) -> Result<Option<(ShieldingTransfer, MaspTransaction)>, Error> {
         let transfer = serde_json::from_slice::<PacketData>(packet_data)
             .ok()
             .and_then(|data| {
@@ -277,7 +277,7 @@ impl NamadaChain {
             };
             Ok(self
                 .rt
-                .block_on(tx::gen_ibc_shielded_transfer(&self.ctx, args))
+                .block_on(tx::gen_ibc_shielding_transfer(&self.ctx, args))
                 .map_err(NamadaError::namada)?)
         } else {
             Ok(None)

diff --git a/e2e/namada-gaia-simple-transfers b/e2e/namada-gaia-simple-transfers
@@ -75,15 +75,15 @@ payment_addr_b=$(${NAMADAW} --base-dir ${base_dir} find --alias ${PAYMENT_ALIAS_
 
 # Initialize Relayer's balance on Namada
 ${NAMADAC} --base-dir ${base_dir} \
-  transfer \
+  transparent-transfer \
   --source albert \
   --target relayer \
   --token nam \
   --amount 10000 \
   --node ${NAMADA_LEDGER_ADDR}
 
 ${NAMADAC} --base-dir ${base_dir} \
-  transfer \
+  transparent-transfer \
   --source albert \
   --target relayer \
   --token apfel \

diff --git a/e2e/namada-simple-transfers b/e2e/namada-simple-transfers
@@ -4,7 +4,7 @@
 # `make build` and `make build-wasm-scripts` on Namada directory in advance
 # Run with `namada-simple-transfers ${namada_dir}`
 
-set -e
+set -ex
 
 NAMADA_DIR=$1
 if [ -z "${NAMADA_DIR}" ]
@@ -37,7 +37,7 @@ function init_relayer_balance() {
   local base_dir=${DATA_DIR}/namada-${suffix}
 
   ${NAMADAC} --base-dir ${base_dir} \
-    transfer \
+    transparent-transfer \
     --source albert \
     --target relayer \
     --token nam \
@@ -57,6 +57,7 @@ chain_b=$(echo ${ids} | awk '{print $2}')
 
 # Initialize the balances
 init_relayer_balance "a" ${LEDGER_ADDR_A}
+sleep 5
 init_relayer_balance "b" ${LEDGER_ADDR_B}
 
 # Create a channel
@@ -85,15 +86,15 @@ ${NAMADAW} --base-dir ${base_dir_b} gen-payment-addr --alias ${PAYMENT_ALIAS_B_2
 payment_addr_b_2=$(${NAMADAW} --base-dir ${base_dir_b} find --alias ${PAYMENT_ALIAS_B_2} | awk -v paymentAlias="${PAYMENT_ALIAS_B_2}" '{if($1 ~ paymentAlias) {print $2}}')
 
 # Faucet apfel on chain A and chain B
-${NAMADAC} --base-dir ${base_dir_a} transfer \
+${NAMADAC} --base-dir ${base_dir_a} transparent-transfer \
   --source albert \
   --target relayer \
   --token apfel \
   --amount 1000 \
   --signing-keys albert-key \
   --node ${LEDGER_ADDR_A}
 
-${NAMADAC} --base-dir ${base_dir_b} transfer \
+${NAMADAC} --base-dir ${base_dir_b} transparent-transfer \
   --source albert \
   --target relayer \
   --token apfel \
@@ -102,7 +103,7 @@ ${NAMADAC} --base-dir ${base_dir_b} transfer \
   --node ${LEDGER_ADDR_B}
 
 # Faucet apfel for shielded_a
-${NAMADAC} --base-dir ${base_dir_a} transfer \
+${NAMADAC} --base-dir ${base_dir_a} shield \
   --source albert \
   --target ${payment_addr_a} \
   --token apfel \

diff --git a/scripts/setup-namada-single-node b/scripts/setup-namada-single-node
@@ -131,7 +131,7 @@ function fund_relayer_acc() {
   local base_dir=${DATA_DIR}/namada
 
   ${NAMADAC} --base-dir ${base_dir} \
-    transfer --node ${LEDGER_ADDR} \
+    transparent-transfer --node ${LEDGER_ADDR} \
     --source ${account} --target relayer --amount 10000 --token NAM
 }