fix: move optional value to end of schema, no empty memo (#1379)

anoma · Dec 4, 2024 · ee49600 · ee49600 · github-actions · Dec 4, 2024
1 parent 7fa916b
commit ee49600
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/apps/namadillo/package.json b/apps/namadillo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@namada/namadillo",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Namadillo",
   "repository": "https://github.com/anoma/namada-interface/",
   "author": "Heliax Dev <info@heliax.dev>",

diff --git a/apps/namadillo/src/lib/query.ts b/apps/namadillo/src/lib/query.ts
@@ -50,7 +50,7 @@ const getTxProps = (
   account: Account,
   gasConfig: GasConfig,
   chain: ChainSettings,
-  memo: string = ""
+  memo?: string
 ): WrapperTxProps => {
   invariant(
     !!account.publicKey,
@@ -93,7 +93,7 @@ export const buildTx = async <T>(
   queryProps: T[],
   txFn: (wrapperTxProps: WrapperTxProps, props: T) => Promise<TxMsgValue>,
   publicKeyRevealed: boolean,
-  memo = ""
+  memo?: string
 ): Promise<EncodedTxData<T>> => {
   const { tx } = sdk;
   const wrapperTxProps = getTxProps(account, gasConfig, chain, memo);
@@ -184,7 +184,7 @@ export const buildTxPair = async <T>(
   queryProps: T[],
   txFn: (wrapperTxProps: WrapperTxProps, props: T) => Promise<TxMsgValue>,
   owner: string,
-  memo = ""
+  memo?: string
 ): Promise<TransactionPair<T>> => {
   const sdk = await getSdkInstance();
   const publicKeyRevealed = await isPublicKeyRevealed(account.address);

diff --git a/packages/sdk/src/tx/tx.ts b/packages/sdk/src/tx/tx.ts
@@ -467,7 +467,7 @@ export class Tx {
     return {
       ...wrapperTx,
       commitments: commitments.map(
-        ({ txType, hash, txCodeId, memo, data }) => ({
+        ({ txType, hash, txCodeId, data, memo }) => ({
           txType: txType as TxType,
           hash,
           txCodeId,

diff --git a/packages/shared/lib/src/sdk/tx.rs b/packages/shared/lib/src/sdk/tx.rs
@@ -211,8 +211,8 @@ pub struct Commitment {
     tx_type: TxType,
     hash: String,
     tx_code_id: String,
-    memo: Option<String>,
     data: Vec<u8>,
+    memo: Option<String>,
 }
 
 #[derive(BorshSerialize, BorshDeserialize)]
@@ -242,6 +242,7 @@ impl TxDetails {
                     let memo = tx
                         .memo(&cmt)
                         .map(|memo_bytes| String::from_utf8_lossy(&memo_bytes).to_string());
+
                     let hash = cmt.get_hash().to_string();
                     let tx_code_id = tx
                         .get_section(cmt.code_sechash())
@@ -265,8 +266,8 @@ impl TxDetails {
                                 tx_type,
                                 hash,
                                 tx_code_id,
-                                memo,
                                 data,
+                                memo,
                             });
                         }
                     }

diff --git a/packages/types/src/tx/schema/txDetails.ts b/packages/types/src/tx/schema/txDetails.ts
@@ -12,11 +12,11 @@ export class CommitmentMsgValue {
   @field({ type: "string" })
   txCodeId!: string;
 
-  @field({ type: option("string") })
-  memo?: string;
-
   @field({ type: vec("u8") })
   data!: Uint8Array;
+
+  @field({ type: option("string") })
+  memo?: string;
 }
 
 export class TxDetailsMsgValue {