Shielded frontend fee target for incoming IBC packets

Author: grarco

crates/apps_lib/src/cli.rs

@@ -3693,13 +3693,14 @@ pub mod args {
     pub const TARGET: Arg<WalletAddress> = arg("target");
     pub const TARGET_OPT: ArgOpt<WalletAddress> = arg_opt("target");
     pub const TEMPLATES_PATH: Arg<PathBuf> = arg("templates-path");
+    // FIXME: add the test prelude in the cli args too
     // WARNING: use only for testing purposes, MASP frontend fees don't make
     // sense when operating from the CLI
     pub const __TEST_FRONTEND_SUS_FEE: ArgOpt<WalletAddress> =
         arg_opt("frontend-sus-fee");
     // WARNING: use only for testing purposes, MASP frontend fees don't make
     // sense when operating from the CLI
-    pub const __TEST_FRONTEND_SUS_FEE_IBC: ArgOpt<WalletAddress> =
+    pub const __TEST_FRONTEND_SUS_FEE_IBC: ArgOpt<WalletPaymentAddr> =
         arg_opt("frontend-sus-fee-ibc");
     pub const TIMEOUT_HEIGHT: ArgOpt<u64> = arg_opt("timeout-height");
     pub const TIMEOUT_SEC_OFFSET: ArgOpt<u64> = arg_opt("timeout-sec-offset");
@@ -5200,6 +5201,12 @@ pub mod args {
             let chain_ctx = ctx.borrow_mut_chain_or_exit();
             let gas_spending_key =
                 self.gas_spending_key.map(|key| chain_ctx.get_cached(&key));
+            let frontend_sus_fee =
+                self.frontend_sus_fee.map(|fee| TxTransparentTarget {
+                    target: chain_ctx.get(&fee.target),
+                    token: chain_ctx.get(&fee.token),
+                    amount: fee.amount,
+                });
 
             Ok(TxIbcTransfer::<SdkTypes> {
                 tx,
@@ -5216,7 +5223,7 @@ pub mod args {
                 ibc_memo: self.ibc_memo,
                 gas_spending_key,
                 tx_code_path: self.tx_code_path.to_path_buf(),
-                frontend_sus_fee: None,
+                frontend_sus_fee,
             })
         }
     }

crates/sdk/src/args.rs

@@ -549,7 +549,7 @@ pub struct TxOsmosisSwap<C: NamadaTypes = SdkTypes> {
     /// The optional data for the frontend sustainability fee
     /// NOTE: if the swap is shielded (from MASP to MASP), no sustainability
     /// fee should be taken
-    pub frontend_sus_fee: Option<(C::Address, InputAmount)>,
+    pub frontend_sus_fee: Option<(C::PaymentAddress, InputAmount)>,
 }
 
 impl TxOsmosisSwap<SdkTypes> {
@@ -3244,6 +3244,7 @@ pub struct GenIbcShieldingTransfer<C: NamadaTypes = SdkTypes> {
     /// The output directory path to where serialize the data
     pub output_folder: Option<PathBuf>,
     /// The target address
+    // FIXME: why isn't this a payment address?
     pub target: C::TransferTarget,
     /// Transferred token amount
     pub amount: InputAmount,
@@ -3256,7 +3257,7 @@ pub struct GenIbcShieldingTransfer<C: NamadaTypes = SdkTypes> {
     /// shielding transaction since ics-20 only supports a single asset)
     /// NOTE: if the shielding operation is part of a swap, and this is
     /// shielded (from MASP to MASP), no sustainability fee should be taken
-    pub frontend_sus_fee: Option<(C::Address, InputAmount)>,
+    pub frontend_sus_fee: Option<(C::PaymentAddress, InputAmount)>,
 }
 
 /// IBC shielding transfer asset, to be used by [`GenIbcShieldingTransfer`]

crates/sdk/src/tx.rs

@@ -2843,14 +2843,21 @@ pub async fn build_ibc_transfer(
                     args.tx.force,
                 )
                 .await?;
+
+                masp_transfer_data.sources.push((
+                    args.source.clone(),
+                    args.token.clone(),
+                    validated_amount,
+                ));
                 masp_transfer_data.targets.push((
                     TransferTarget::Address(target.to_owned()),
                     token.to_owned(),
                     validated_amount,
                 ));
 
                 transfer = transfer
-                    .credit(
+                    .transfer(
+                        source.to_owned(),
                         target.to_owned(),
                         token.to_owned(),
                         validated_amount,
@@ -4243,7 +4250,7 @@ pub async fn gen_ibc_shielding_transfer<N: Namada>(
 
             (
                 vec![(
-                    TransferTarget::Address(target.to_owned()),
+                    TransferTarget::PaymentAddress(target.to_owned()),
                     token.to_owned(),
                     validated_fee_amount,
                 )],

crates/tests/src/e2e/ibc_tests.rs

@@ -3211,7 +3211,7 @@ fn transfer_from_cosmos(
     let chain_type =
         CosmosChainType::chain_type(test.net.chain_id.as_str()).unwrap();
     let rpc = format!("tcp://127.0.0.1:{}", chain_type.get_rpc_port_number());
-    // If the receiver is a pyament address we want to mask it to the more
+    // If the receiver is a payment address we want to mask it to the more
     // general MASP internal address to improve on privacy
     let receiver = match PaymentAddress::from_str(receiver.as_ref()) {
         Ok(_) => MASP.to_string(),
@@ -3229,6 +3229,8 @@ fn transfer_from_cosmos(
         sender.as_ref(),
         "--gas-prices",
         "0.001stake",
+        "--gas",
+        "250000",
         "--node",
         &rpc,
         "--keyring-backend",
@@ -3828,7 +3830,7 @@ fn frontend_sus_fee() -> Result<()> {
         100,
         &port_id_namada,
         &channel_id_namada,
-        Some(ESTER),
+        Some(AC_PAYMENT_ADDRESS),
     )?;
     transfer_from_cosmos(
         &test_gaia,
@@ -3852,10 +3854,11 @@ fn frontend_sus_fee() -> Result<()> {
     let ibc_denom_on_namada =
         format!("{port_id_namada}/{channel_id_namada}/{COSMOS_COIN}");
     check_shielded_balance(&test, AA_VIEWING_KEY, &ibc_denom_on_namada, 100)?;
+    check_shielded_balance(&test, AC_VIEWING_KEY, &ibc_denom_on_namada, 1)?;
     check_cosmos_balance(&test_gaia, COSMOS_USER, COSMOS_COIN, 899)?;
-    check_balance(&test, ESTER, &ibc_denom_on_namada, 1)?;
 
-    // Unshielding transfer 10 samoleans from Namada to Gaia
+    // Unshielding transfer 10 samoleans from Namada to Gaia with transparent
+    // frontend fee FIXME: need to test also the transparent version
     let gaia_receiver = find_cosmos_address(&test_gaia, COSMOS_USER)?;
     transfer(
         &test,
@@ -3881,8 +3884,9 @@ fn frontend_sus_fee() -> Result<()> {
         &test,
     )?;
     check_shielded_balance(&test, AA_VIEWING_KEY, &ibc_denom_on_namada, 89)?;
+    check_shielded_balance(&test, AC_VIEWING_KEY, &ibc_denom_on_namada, 1)?;
+    check_balance(&test, ESTER, &ibc_denom_on_namada, 1)?;
     check_cosmos_balance(&test_gaia, COSMOS_USER, COSMOS_COIN, 909)?;
-    check_balance(&test, ESTER, &ibc_denom_on_namada, 2)?;
 
     Ok(())
 }