Fix Injective MsgExecuteContractCompat to remove funds when empty (…

…#38)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## `v0.0.51`
+
+### Fixes
+
+- Fixed MetaMask on Injective to work correctly with `MsgExecuteContractCompat` when `funds` are empty
+
 ## `v0.0.50`
 
 ### Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosmes",
-  "version": "0.0.50",
+  "version": "0.0.51",
   "private": false,
   "packageManager": "pnpm@8.3.0",
   "sideEffects": false,

src/client/models/MsgExecuteContractInjective.ts

@@ -1,4 +1,4 @@
-import { PlainMessage } from "@bufbuild/protobuf";
+import { PartialMessage } from "@bufbuild/protobuf";
 import { InjectiveWasmxV1MsgExecuteContractCompat as ProtoMsgExecuteContractCompat } from "cosmes/protobufs";
 
 import { Adapter } from "./Adapter";
@@ -12,16 +12,20 @@ type Data<T> = ConstructorParameters<typeof MsgExecuteContract<T>>[0];
  * MetaMask or EVM wallets. Otherwise, use `MsgExecuteContract` instead!
  */
 export class MsgExecuteContractInjective<T> implements Adapter {
-  private readonly data: PlainMessage<ProtoMsgExecuteContractCompat>;
+  private readonly data: PartialMessage<ProtoMsgExecuteContractCompat>;
 
   constructor(data: Data<T>) {
     this.data = {
-      ...data,
+      sender: data.sender,
+      contract: data.contract,
       msg: JSON.stringify(data.msg),
-      funds: data.funds
-        .map(({ amount, denom }) => `${amount}${denom}`)
-        .join(","),
     };
+    // Bug in Injective where `funds` must be removed if it is "empty"
+    if (data.funds.length > 0) {
+      this.data.funds = data.funds
+        .map(({ amount, denom }) => `${amount}${denom}`)
+        .join(",");
+    }
   }
 
   public toProto() {

src/wallet/wallets/metamask-injective/MetamaskInjectiveExtension.ts

@@ -151,8 +151,8 @@ export class MetamaskInjectiveExtension extends ConnectedWallet {
     // Only adding types for the first message likely means txs with different
     // messages cannot be executed, but this is similar to Injective's behaviour.
     // See: https://github.com/InjectiveLabs/injective-ts/blob/cd1e67f7fd039c93dd4c5134d2d8dbfe5d009d79/packages/sdk-ts/src/core/modules/tx/eip712/eip712.ts#L27
-    const aminoType = stdSignDoc.msgs[0].type;
-    switch (aminoType) {
+    const { type, value } = stdSignDoc.msgs[0];
+    switch (type) {
       case "cosmos-sdk/MsgSend":
         types.MsgValue = [
           { name: "from_address", type: "string" },
@@ -169,8 +169,11 @@ export class MetamaskInjectiveExtension extends ConnectedWallet {
           { name: "sender", type: "string" },
           { name: "contract", type: "string" },
           { name: "msg", type: "string" },
-          { name: "funds", type: "string" },
         ];
+        // Bug in Injective where `funds` must be removed if it is "empty"
+        if ("funds" in value) {
+          types.MsgValue.push({ name: "funds", type: "string" });
+        }
         break;
       default:
         // TODO: support other amino types