Fix errors on amino conversions

initia-labs · Jan 10, 2025 · aa998d5 · aa998d5
1 parent d59c008
commit aa998d5
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@initia/initia.js",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "The JavaScript SDK for Initia",
   "license": "Apache-2.0",
   "author": "Initia Foundation",

diff --git a/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts b/src/core/ibc/applications/nft-transfer/msgs/MsgNftTransfer.ts
@@ -92,7 +92,7 @@ export class MsgNftTransfer extends JSONSerializable<
       token_ids,
       sender,
       receiver,
-      timeout_height ? Height.fromAmino(timeout_height) : undefined,
+      Height.fromAmino(timeout_height),
       timeout_timestamp,
       memo
     )
@@ -119,9 +119,9 @@ export class MsgNftTransfer extends JSONSerializable<
         token_ids,
         sender,
         receiver,
-        timeout_height: timeout_height?.toAmino(),
+        timeout_height: timeout_height?.toAmino() ?? {},
         timeout_timestamp,
-        memo,
+        memo: memo === '' ? undefined : memo,
       },
     }
   }
@@ -253,7 +253,7 @@ export namespace MsgNftTransfer {
       token_ids: string[]
       sender: AccAddress
       receiver: string
-      timeout_height?: Height.Amino
+      timeout_height: Height.Amino
       timeout_timestamp?: string
       memo?: string
     }

diff --git a/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts b/src/core/ibc/applications/transfer/msgs/MsgTransfer.ts
@@ -87,7 +87,7 @@ export class MsgTransfer extends JSONSerializable<
       token ? Coin.fromAmino(token) : undefined,
       sender,
       receiver,
-      timeout_height ? Height.fromAmino(timeout_height) : undefined,
+      Height.fromAmino(timeout_height),
       timeout_timestamp,
       memo
     )
@@ -112,9 +112,9 @@ export class MsgTransfer extends JSONSerializable<
         token: token?.toAmino(),
         sender,
         receiver,
-        timeout_height: timeout_height?.toAmino(),
+        timeout_height: timeout_height?.toAmino() ?? {},
         timeout_timestamp,
-        memo,
+        memo: memo === '' ? undefined : memo,
       },
     }
   }
@@ -238,7 +238,7 @@ export namespace MsgTransfer {
       token?: Coin.Amino
       sender: AccAddress
       receiver: string
-      timeout_height?: Height.Amino
+      timeout_height: Height.Amino
       timeout_timestamp?: string
       memo?: string
     }

diff --git a/src/core/wasm/msgs/MsgExecuteContract.ts b/src/core/wasm/msgs/MsgExecuteContract.ts
@@ -34,7 +34,12 @@ export class MsgExecuteContract extends JSONSerializable<
       value: { sender, contract, msg, funds },
     } = data
 
-    return new MsgExecuteContract(sender, contract, msg, Coins.fromAmino(funds))
+    return new MsgExecuteContract(
+      sender,
+      contract,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
+      Coins.fromAmino(funds)
+    )
   }
 
   public toAmino(): MsgExecuteContract.Amino {
@@ -44,15 +49,21 @@ export class MsgExecuteContract extends JSONSerializable<
       value: {
         sender,
         contract,
-        msg,
+        msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
         funds: funds.toAmino(),
       },
     }
   }
 
   public static fromData(data: MsgExecuteContract.Data): MsgExecuteContract {
     const { sender, contract, msg, funds } = data
-    return new MsgExecuteContract(sender, contract, msg, Coins.fromData(funds))
+
+    return new MsgExecuteContract(
+      sender,
+      contract,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
+      Coins.fromData(funds)
+    )
   }
 
   public toData(): MsgExecuteContract.Data {
@@ -61,7 +72,7 @@ export class MsgExecuteContract extends JSONSerializable<
       '@type': '/cosmwasm.wasm.v1.MsgExecuteContract',
       sender,
       contract,
-      msg,
+      msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
       funds: funds.toData(),
     }
   }
@@ -105,7 +116,7 @@ export namespace MsgExecuteContract {
     value: {
       sender: AccAddress
       contract: AccAddress
-      msg: string
+      msg: JSON
       funds: Coins.Amino
     }
   }
@@ -114,7 +125,7 @@ export namespace MsgExecuteContract {
     '@type': '/cosmwasm.wasm.v1.MsgExecuteContract'
     sender: AccAddress
     contract: AccAddress
-    msg: string
+    msg: JSON
     funds: Coins.Data
   }
 

diff --git a/src/core/wasm/msgs/MsgInstantiateContract.ts b/src/core/wasm/msgs/MsgInstantiateContract.ts
@@ -45,7 +45,7 @@ export class MsgInstantiateContract extends JSONSerializable<
       admin,
       parseInt(code_id),
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromAmino(funds)
     )
   }
@@ -59,7 +59,7 @@ export class MsgInstantiateContract extends JSONSerializable<
         admin,
         code_id: code_id.toFixed(),
         label,
-        msg,
+        msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
         funds: funds.toAmino(),
       },
     }
@@ -74,7 +74,7 @@ export class MsgInstantiateContract extends JSONSerializable<
       admin,
       parseInt(code_id),
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromData(funds)
     )
   }
@@ -87,7 +87,7 @@ export class MsgInstantiateContract extends JSONSerializable<
       admin,
       code_id: code_id.toFixed(),
       label,
-      msg,
+      msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
       funds: funds.toData(),
     }
   }
@@ -139,7 +139,7 @@ export namespace MsgInstantiateContract {
       admin?: AccAddress
       code_id: string
       label?: string
-      msg: string
+      msg: JSON
       funds: Coins.Amino
     }
   }
@@ -150,7 +150,7 @@ export namespace MsgInstantiateContract {
     admin?: AccAddress
     code_id: string
     label?: string
-    msg: string
+    msg: JSON
     funds: Coins.Data
   }
 

diff --git a/src/core/wasm/msgs/MsgInstantiateContractV2.ts b/src/core/wasm/msgs/MsgInstantiateContractV2.ts
@@ -49,7 +49,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable<
       admin,
       parseInt(code_id),
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromAmino(funds),
       salt,
       fix_msg
@@ -65,7 +65,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable<
         admin,
         code_id: code_id.toFixed(),
         label,
-        msg,
+        msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
         funds: funds.toAmino(),
         salt,
         fix_msg,
@@ -82,7 +82,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable<
       admin,
       parseInt(code_id),
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromData(funds),
       salt,
       fix_msg
@@ -97,7 +97,7 @@ export class MsgInstantiateContractV2 extends JSONSerializable<
       admin,
       code_id: code_id.toFixed(),
       label,
-      msg,
+      msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
       funds: funds.toData(),
       salt,
       fix_msg,
@@ -155,7 +155,7 @@ export namespace MsgInstantiateContractV2 {
       admin?: AccAddress
       code_id: string
       label?: string
-      msg: string
+      msg: JSON
       funds: Coins.Amino
       salt: string
       fix_msg: boolean
@@ -168,7 +168,7 @@ export namespace MsgInstantiateContractV2 {
     admin?: AccAddress
     code_id: string
     label?: string
-    msg: string
+    msg: JSON
     funds: Coins.Data
     salt: string
     fix_msg: boolean

diff --git a/src/core/wasm/msgs/MsgMigrateContract.ts b/src/core/wasm/msgs/MsgMigrateContract.ts
@@ -31,7 +31,12 @@ export class MsgMigrateContract extends JSONSerializable<
       value: { sender, contract, code_id, msg },
     } = data
 
-    return new MsgMigrateContract(sender, contract, parseInt(code_id), msg)
+    return new MsgMigrateContract(
+      sender,
+      contract,
+      parseInt(code_id),
+      Buffer.from(JSON.stringify(msg)).toString('base64')
+    )
   }
 
   public toAmino(): MsgMigrateContract.Amino {
@@ -42,14 +47,20 @@ export class MsgMigrateContract extends JSONSerializable<
         sender,
         contract,
         code_id: code_id.toFixed(),
-        msg,
+        msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
       },
     }
   }
 
   public static fromData(data: MsgMigrateContract.Data): MsgMigrateContract {
     const { sender, contract, code_id, msg } = data
-    return new MsgMigrateContract(sender, contract, parseInt(code_id), msg)
+
+    return new MsgMigrateContract(
+      sender,
+      contract,
+      parseInt(code_id),
+      Buffer.from(JSON.stringify(msg)).toString('base64')
+    )
   }
 
   public toData(): MsgMigrateContract.Data {
@@ -59,7 +70,7 @@ export class MsgMigrateContract extends JSONSerializable<
       sender,
       contract,
       code_id: code_id.toFixed(),
-      msg,
+      msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
     }
   }
 
@@ -103,7 +114,7 @@ export namespace MsgMigrateContract {
       sender: AccAddress
       contract: AccAddress
       code_id: string
-      msg: string
+      msg: JSON
     }
   }
 
@@ -112,7 +123,7 @@ export namespace MsgMigrateContract {
     sender: AccAddress
     contract: AccAddress
     code_id: string
-    msg: string
+    msg: JSON
   }
 
   export type Proto = MsgMigrateContract_pb

diff --git a/src/core/wasm/msgs/MsgStoreAndInstantiateContract.ts b/src/core/wasm/msgs/MsgStoreAndInstantiateContract.ts
@@ -73,7 +73,7 @@ export class MsgStoreAndInstantiateContract extends JSONSerializable<
       unpin_code,
       admin,
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromAmino(funds),
       source,
       builder,
@@ -105,7 +105,7 @@ export class MsgStoreAndInstantiateContract extends JSONSerializable<
         unpin_code,
         admin,
         label,
-        msg,
+        msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
         funds: funds.toAmino(),
         source,
         builder,
@@ -140,7 +140,7 @@ export class MsgStoreAndInstantiateContract extends JSONSerializable<
       unpin_code,
       admin,
       label,
-      msg,
+      Buffer.from(JSON.stringify(msg)).toString('base64'),
       Coins.fromData(funds),
       source,
       builder,
@@ -171,7 +171,7 @@ export class MsgStoreAndInstantiateContract extends JSONSerializable<
       unpin_code,
       admin,
       label,
-      msg,
+      msg: JSON.parse(Buffer.from(msg, 'base64').toString()),
       funds: funds.toData(),
       source,
       builder,
@@ -253,7 +253,7 @@ export namespace MsgStoreAndInstantiateContract {
       unpin_code?: boolean
       admin?: AccAddress
       label?: string
-      msg: string
+      msg: JSON
       funds: Coins.Amino
       source: string
       builder: string
@@ -269,7 +269,7 @@ export namespace MsgStoreAndInstantiateContract {
     unpin_code?: boolean
     admin?: AccAddress
     label?: string
-    msg: string
+    msg: JSON
     funds: Coins.Amino
     source: string
     builder: string