feat: wup wip wuip

Author: mateuszjasiuk

packages/sdk/src/tx/tx.ts

@@ -484,13 +484,23 @@ export class Tx {
       // Wrapper fee payer is always defined at this point
       wrapperFeePayer: wrapperTx.wrapperFeePayer!,
       commitments: commitments.map(
-        ({ txType, hash, txCodeId, data, memo, maspTxIn, maspTxOut }) => ({
+        ({
+          txType,
+          hash,
+          txCodeId,
+          data,
+          memo,
+          maspTxIn,
+          maspTxOut,
+          maspTxConv,
+        }) => ({
           txType: txType as TxType,
           hash,
           txCodeId,
           memo,
           maspTxIn,
           maspTxOut,
+          maspTxConv,
           ...getProps(txType, data),
         })
       ),

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

@@ -5,7 +5,8 @@ use gloo_utils::format::JsValueSerdeExt;
 use namada_sdk::borsh::{self, BorshDeserialize, BorshSerialize};
 use namada_sdk::collections::HashSet;
 use namada_sdk::masp_primitives::transaction::components::sapling::builder::StoredBuildParams;
-use namada_sdk::masp_primitives::transaction::components::sapling::fees::{InputView, OutputView};
+use namada_sdk::masp_primitives::transaction::components::sapling::fees::{ConvertView, InputView, OutputView};
+use namada_sdk::masp_primitives::transaction::components::I128Sum;
 use namada_sdk::masp_primitives::zip32::ExtendedFullViewingKey;
 use namada_sdk::signing::SigningTxData;
 use namada_sdk::token::{Amount, DenominatedAmount, Transfer};
@@ -264,15 +265,22 @@ pub fn deserialize_tx(tx_bytes: Vec<u8>, wasm_hashes: JsValue) -> Result<Vec<u8>
     Ok(borsh::to_vec(&tx)?)
 }
 
-#[derive(BorshSerialize, BorshDeserialize)]
+#[derive(Debug, BorshSerialize, BorshDeserialize)]
 #[borsh(crate = "namada_sdk::borsh")]
 pub struct TxIn {
     pub token: String,
     pub value: String,
     pub owner: String,
 }
 
-#[derive(BorshSerialize, BorshDeserialize)]
+#[derive(Debug, BorshSerialize, BorshDeserialize)]
+#[borsh(crate = "namada_sdk::borsh")]
+pub struct TxConv {
+    pub token: String,
+    pub value: String,
+}
+
+#[derive(Debug, BorshSerialize, BorshDeserialize)]
 #[borsh(crate = "namada_sdk::borsh")]
 pub struct TxOut {
     pub token: String,
@@ -290,6 +298,7 @@ pub struct Commitment {
     memo: Option<String>,
     masp_tx_in: Option<Vec<TxIn>>,
     masp_tx_out: Option<Vec<TxOut>>,
+    masp_tx_conv: Option<Vec<TxConv>>,
 }
 
 #[derive(BorshSerialize, BorshDeserialize)]
@@ -352,7 +361,12 @@ impl TxDetails {
                             let tx_kind = transaction::TransactionKind::from(tx_type, &tx_data);
                             let data = tx_kind.to_bytes()?;
 
-                            let (inputs, outputs) = get_masp_details(&tx, &tx_kind);
+                            let (inputs, outputs, conversions) = get_masp_details(&tx, &tx_kind);
+
+                            web_sys::console::log_1(&format!(
+                                "Conversions: {:?}",
+                                conversions
+                            ).into());
 
                             commitments.push(Commitment {
                                 tx_type,
@@ -362,6 +376,7 @@ impl TxDetails {
                                 memo,
                                 masp_tx_out: outputs,
                                 masp_tx_in: inputs,
+                                masp_tx_conv: conversions,
                             });
                         }
                     }
@@ -380,7 +395,7 @@ impl TxDetails {
 fn get_masp_details(
     tx: &tx::Tx,
     tx_kind: &transaction::TransactionKind,
-) -> (Option<Vec<TxIn>>, Option<Vec<TxOut>>) {
+) -> (Option<Vec<TxIn>>, Option<Vec<TxOut>>, Option<Vec<TxConv>>) {
     let parse = |transfer: &Transfer| {
         if let Some(shielded_hash) = transfer.shielded_section_hash {
             let masp_builder = tx
@@ -410,6 +425,29 @@ fn get_masp_details(
                 })
                 .collect::<Vec<_>>();
 
+            let conversions = masp_builder.builder.sapling_converts().
+                iter()
+                .map(|convert| {
+                    let asset_data = asset_types
+                        .iter()
+                        .find(|ad| {
+                            let conv_asset_types = I128Sum::from(convert.conversion().clone()).asset_types()
+                            .cloned().collect::<Vec<_>>();
+                            let ad = ad.encode().unwrap();
+
+                            conv_asset_types.into_iter().any(|w| w == ad)
+                        })
+                        .expect("Asset data to exist");
+
+                    let amount = Amount::from_u64(convert.value());
+                    let denominated_amount = DenominatedAmount::new(amount, asset_data.denom);
+
+                    TxConv {
+                        token: asset_data.token.to_string(),
+                        value: denominated_amount.to_string(),
+                    }
+                }).collect::<Vec<_>>();
+
             let outputs = masp_builder
                 .builder
                 .sapling_outputs()
@@ -431,19 +469,19 @@ fn get_masp_details(
                 })
                 .collect::<Vec<_>>();
 
-            (Some(inputs), Some(outputs))
+            (Some(inputs), Some(outputs), Some(conversions))
         } else {
-            (None, None)
+            (None, None, None)
         }
     };
 
     match tx_kind {
         transaction::TransactionKind::IbcTransfer(ibc_transfer) => match &ibc_transfer.transfer {
             Some(transfer) => parse(transfer),
-            None => (None, None),
+            None => (None, None, None),
         },
         transaction::TransactionKind::Transfer(transfer) => parse(transfer),
-        _ => (None, None),
+        _ => (None, None , None),
     }
 }
 

packages/types/src/tx/schema/txDetails.ts

@@ -32,6 +32,18 @@ export class MaspTxOut {
   }
 }
 
+export class MaspTxConv {
+  @field({ type: "string" })
+  token!: string;
+
+  @field({ type: "string" })
+  value!: string;
+
+  constructor(data: MaspTxConv) {
+    Object.assign(this, data);
+  }
+}
+
 export class CommitmentMsgValue {
   @field({ type: "u8" })
   txType!: number;
@@ -54,6 +66,9 @@ export class CommitmentMsgValue {
   @field({ type: option(vec(MaspTxOut)) })
   maspTxOut?: MaspTxOut[];
 
+  @field({ type: option(vec(MaspTxConv)) })
+  maspTxConv?: MaspTxConv[];
+
   constructor(data: CommitmentMsgValue) {
     const maspTxIn =
       data.maspTxIn ?
@@ -63,11 +78,16 @@ export class CommitmentMsgValue {
       data.maspTxOut ?
         data.maspTxOut.map((txOut) => new MaspTxOut(txOut))
       : undefined;
+    const maspTxConv =
+      data.maspTxConv ?
+        data.maspTxConv.map((txConv) => new MaspTxConv(txConv))
+      : undefined;
 
     Object.assign(this, {
       ...data,
       maspTxIn,
       maspTxOut,
+      maspTxConv,
     });
   }
 }

packages/types/src/tx/types.ts

@@ -4,6 +4,7 @@ import {
   ClaimRewardsMsgValue,
   EthBridgeTransferMsgValue,
   IbcTransferMsgValue,
+  MaspTxConv,
   MaspTxIn,
   MaspTxOut,
   RedelegateMsgValue,
@@ -75,6 +76,7 @@ export type CommitmentDetailProps = SupportedTxProps & {
   memo?: string;
   maspTxIn?: MaspTxIn[];
   maspTxOut?: MaspTxOut[];
+  maspTxConv?: MaspTxConv[];
 };
 
 export type TxDetails = WrapperTxProps & {