fixup! Merge branch 'yuji/ibc_shielded_transfer' (#2322)

apps/src/lib/client/tx.rs

@@ -967,7 +967,7 @@ where
         &args.source.effective_address(),
     )
     .await?;
-    let (mut tx, signing_data) = args.build(namada).await?;
+    let (mut tx, signing_data, _) = args.build(namada).await?;
 
     if args.tx.dump_tx {
         tx::dump_tx(namada.io(), &args.tx, tx);
@@ -976,6 +976,8 @@ where
 
         namada.submit(tx, &args.tx).await?;
     }
+    // NOTE that the tx could fail when its submission epoch doesn't match
+    // construction epoch
 
     Ok(())
 }

core/src/types/ibc.rs

@@ -16,8 +16,8 @@ use crate::ibc::apps::transfer::types::{Memo, PrefixedDenom, TracePath};
 use crate::ibc::core::handler::types::events::{
     Error as IbcEventError, IbcEvent as RawIbcEvent,
 };
-pub use crate::ledger::ibc::storage::is_ibc_key;
 use crate::ibc::primitives::proto::Protobuf;
+pub use crate::ledger::ibc::storage::is_ibc_key;
 use crate::tendermint::abci::Event as AbciEvent;
 use crate::types::masp::PaymentAddress;
 use crate::types::token::Transfer;

sdk/src/args.rs

@@ -397,7 +397,8 @@ impl TxIbcTransfer {
     pub async fn build(
         &self,
         context: &impl Namada,
-    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData)> {
+    ) -> crate::error::Result<(crate::proto::Tx, SigningTxData, Option<Epoch>)>
+    {
         tx::build_ibc_transfer(context, self).await
     }
 }