fix: denominate nam before ibc withdraw (#2183)

Author: mateuszjasiuk

apps/namadillo/src/atoms/transfer/services.ts

@@ -42,11 +42,11 @@ export type WorkerTransferParams = {
 
 const workerBuildTxPair = async <T>({
   rpcUrl,
-  token,
+  nativeToken,
   buildTxFn,
 }: {
   rpcUrl: string;
-  token: Address;
+  nativeToken: Address;
   buildTxFn: (
     workerLink: Comlink.Remote<MaspTxWorkerApi>
   ) => Promise<EncodedTxData<T>>;
@@ -56,7 +56,7 @@ const workerBuildTxPair = async <T>({
   const workerLink = Comlink.wrap<MaspTxWorkerApi>(worker);
   await workerLink.init({
     type: "init",
-    payload: { rpcUrl, token, maspIndexerUrl: "" },
+    payload: { rpcUrl, token: nativeToken, maspIndexerUrl: "" },
   });
   const encodedTxData = await buildTxFn(workerLink);
   worker.terminate();
@@ -133,7 +133,7 @@ export const createShieldedTransferTx = async (
 
   return await workerBuildTxPair({
     rpcUrl,
-    token,
+    nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const msgValue = new ShieldedTransferMsgValue({
         gasSpendingKey: source,
@@ -185,7 +185,7 @@ export const createShieldingTransferTx = async (
 
   return await workerBuildTxPair({
     rpcUrl,
-    token,
+    nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const publicKeyRevealed = await isPublicKeyRevealed(account.address);
       const msgValue = new ShieldingTransferMsgValue({
@@ -239,7 +239,7 @@ export const createUnshieldingTransferTx = async (
 
   return await workerBuildTxPair({
     rpcUrl,
-    token,
+    nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const msgValue = new UnshieldingTransferMsgValue({
         source,
@@ -284,7 +284,7 @@ export const createIbcTx = async (
 
   return await workerBuildTxPair({
     rpcUrl,
-    token: props[0].token,
+    nativeToken: chain.nativeTokenAddress,
     buildTxFn: async (workerLink) => {
       const msgValue = new IbcTransferMsgValue({
         ...props[0],

packages/shared/lib/src/sdk/args.rs

@@ -860,6 +860,7 @@ impl IbcTransferMsg {
 pub fn ibc_transfer_tx_args(
     ibc_transfer_msg: &[u8],
     tx_msg: &[u8],
+    native_token: Address,
 ) -> Result<(args::TxIbcTransfer, Option<StoredBuildParams>), JsError> {
     let ibc_transfer_msg = IbcTransferMsg::try_from_slice(ibc_transfer_msg)?;
     let IbcTransferMsg {
@@ -887,11 +888,21 @@ pub fn ibc_transfer_tx_args(
     }?;
 
     let token = Address::from_str(&token)?;
-    let amount = Amount::from_str(&amount_in_base_denom, 0u8).expect("Amount to be valid.");
+
+    // As the value we get is always in the base denom, we can use from_string_precise to get the
+    // amount and drop denom info
+    let amount = Amount::from_string_precise(&amount_in_base_denom).expect("Amount to be valid.");
+
+    let denominated_amount = if token == native_token {
+        DenominatedAmount::native(amount)
+    } else {
+        DenominatedAmount::new(amount, 0u8.into())
+    };
+
     // Using InputAmount::Validated because the amount is already in the base
     // denom. If Unvalidated is used, the SDK will change the denom based on the
     // token address, which complicates knowing which amount to pass to this function.
-    let amount = InputAmount::Validated(amount.into());
+    let amount = InputAmount::Validated(denominated_amount);
     let port_id = PortId::from_str(&port_id).expect("Port id to be valid");
     let channel_id = ChannelId::from_str(&channel_id).expect("Channel id to be valid");
     let ibc_shielding_data = match shielding_data {

packages/shared/lib/src/sdk/mod.rs

@@ -752,7 +752,7 @@ impl Sdk {
         ibc_transfer_msg: &[u8],
         wrapper_tx_msg: &[u8],
     ) -> Result<JsValue, JsError> {
-        let (args, bparams) = args::ibc_transfer_tx_args(ibc_transfer_msg, wrapper_tx_msg)?;
+        let (args, bparams) = args::ibc_transfer_tx_args(ibc_transfer_msg, wrapper_tx_msg, self.namada.native_token())?;
 
         let bparams = if let Some(bparams) = bparams {
             BuildParams::StoredBuildParams(bparams)