Forces ibc shielding target argument to be a payment address

Author: grarco

crates/apps_lib/src/cli.rs

@@ -7509,7 +7509,7 @@ pub mod args {
         fn parse(matches: &ArgMatches) -> Self {
             let query = Query::parse(matches);
             let output_folder = OUTPUT_FOLDER_PATH.parse(matches);
-            let target = TRANSFER_TARGET.parse(matches);
+            let target = PAYMENT_ADDRESS_TARGET.parse(matches);
             let token = TOKEN_STR.parse(matches);
             let raw_amount = AMOUNT.parse(matches);
             let amount = InputAmount::Unvalidated(raw_amount);
@@ -7560,7 +7560,11 @@ pub mod args {
                 .arg(OUTPUT_FOLDER_PATH.def().help(wrap!(
                     "The output folder path where the artifact will be stored."
                 )))
-                .arg(TRANSFER_TARGET.def().help(wrap!("The target address.")))
+                .arg(
+                    PAYMENT_ADDRESS_TARGET
+                        .def()
+                        .help(wrap!("The shielded target account address.")),
+                )
                 .arg(TOKEN.def().help(wrap!("The transfer token.")))
                 .arg(
                     AMOUNT

crates/sdk/src/args.rs

@@ -719,10 +719,7 @@ impl TxOsmosisSwap<SdkTypes> {
                             ledger_address: transfer.tx.ledger_address.clone(),
                         },
                         output_folder: None,
-                        target:
-                            namada_core::masp::TransferTarget::PaymentAddress(
-                                payment_addr,
-                            ),
+                        target: payment_addr,
                         asset: IbcShieldingTransferAsset::Address(
                             namada_output_addr,
                         ),
@@ -3250,8 +3247,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,
+    pub target: C::PaymentAddress,
     /// Transferred token amount
     pub amount: InputAmount,
     /// The optional expiration of the masp shielding transaction

crates/sdk/src/tx.rs

@@ -4376,7 +4376,11 @@ pub async fn gen_ibc_shielding_transfer<N: Namada>(
         )],
         targets: [
             extra_target,
-            vec![(args.target, token.clone(), validated_amount)],
+            vec![(
+                TransferTarget::PaymentAddress(args.target),
+                token.clone(),
+                validated_amount,
+            )],
         ]
         .concat(),
     };