@keplr-wallet/cosmos 0.9.6 → 0.9.7

package/build/account/account.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/account/account.spec.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = require("./index");
+describe("Test account parse", () => {
+    test("Test fromAminoJSON", () => {
+        // Base account
+        let account = index_1.BaseAccount.fromAminoJSON({
+            height: "8409557",
+            result: {
+                type: "cosmos-sdk/BaseAccount",
+                value: {
+                    address: "cosmos1vv6hruquzpty4xpks9znkw8gys5x4nsnqw9f4k",
+                    public_key: {
+                        type: "tendermint/PubKeySecp256k1",
+                        value: "Avn3xBbmE0+MEyWMuxhmjjiX1GtCUVyv/Mavg8OcRIm4",
+                    },
+                    account_number: "9736",
+                    sequence: "971",
+                },
+            },
+        });
+        expect(account.getAddress()).toBe("cosmos1vv6hruquzpty4xpks9znkw8gys5x4nsnqw9f4k");
+        expect(account.getSequence().toString()).toBe("971");
+        expect(account.getAccountNumber().toString()).toBe("9736");
+        expect(account.getType()).toBe("cosmos-sdk/BaseAccount");
+        // Vesting account
+        account = index_1.BaseAccount.fromAminoJSON({
+            height: "8409738",
+            result: {
+                type: "cosmos-sdk/DelayedVestingAccount",
+                value: {
+                    base_vesting_account: {
+                        base_account: {
+                            address: "cosmos1x3rhderemr703f4lxktk2da99vl5crs28ur3xl",
+                            public_key: {
+                                type: "tendermint/PubKeySecp256k1",
+                                value: "A+Zzm/8QhyL00ISXgiAgeW6zeqZHezVFi2w3iQkJeKyP",
+                            },
+                            account_number: "367245",
+                            sequence: "7",
+                        },
+                        original_vesting: [{ denom: "uatom", amount: "16666660000" }],
+                        delegated_free: [],
+                        delegated_vesting: [],
+                        end_time: "1719752607",
+                    },
+                },
+            },
+        });
+        expect(account.getAddress()).toBe("cosmos1x3rhderemr703f4lxktk2da99vl5crs28ur3xl");
+        expect(account.getSequence().toString()).toBe("7");
+        expect(account.getAccountNumber().toString()).toBe("367245");
+        expect(account.getType()).toBe("cosmos-sdk/DelayedVestingAccount");
+        // Custom account that embeds the base account (ethermint)
+        account = index_1.BaseAccount.fromAminoJSON({
+            height: "449",
+            result: {
+                base_account: {
+                    address: "evmos1w3ygakvq5snf30pca5g8pnyvvfr7x28djnj34m",
+                    public_key: {
+                        type: "tendermint/PubKeySecp256k1",
+                        value: "AulWtcPTIZWd/CnkFkQOMqDOwU7e+U/Iq8Tli1nhBq6j",
+                    },
+                    account_number: "11",
+                    sequence: "1",
+                },
+                code_hash: "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+            },
+        });
+        expect(account.getAddress()).toBe("evmos1w3ygakvq5snf30pca5g8pnyvvfr7x28djnj34m");
+        expect(account.getSequence().toString()).toBe("1");
+        expect(account.getAccountNumber().toString()).toBe("11");
+        expect(account.getType()).toBe("");
+    });
+});
+//# sourceMappingURL=account.spec.js.map

package/build/account/account.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"account.spec.js","sourceRoot":"","sources":["../../src/account/account.spec.ts"],"names":[],"mappings":";;AAAA,mCAAsC;AAEtC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC9B,eAAe;QACf,IAAI,OAAO,GAAG,mBAAW,CAAC,aAAa,CAAC;YACtC,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE;gBACN,IAAI,EAAE,wBAAwB;gBAC9B,KAAK,EAAE;oBACL,OAAO,EAAE,+CAA+C;oBACxD,UAAU,EAAE;wBACV,IAAI,EAAE,4BAA4B;wBAClC,KAAK,EAAE,8CAA8C;qBACtD;oBACD,cAAc,EAAE,MAAM;oBACtB,QAAQ,EAAE,KAAK;iBAChB;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAC/B,+CAA+C,CAChD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAEzD,kBAAkB;QAClB,OAAO,GAAG,mBAAW,CAAC,aAAa,CAAC;YAClC,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE;gBACN,IAAI,EAAE,kCAAkC;gBACxC,KAAK,EAAE;oBACL,oBAAoB,EAAE;wBACpB,YAAY,EAAE;4BACZ,OAAO,EAAE,+CAA+C;4BACxD,UAAU,EAAE;gCACV,IAAI,EAAE,4BAA4B;gCAClC,KAAK,EAAE,8CAA8C;6BACtD;4BACD,cAAc,EAAE,QAAQ;4BACxB,QAAQ,EAAE,GAAG;yBACd;wBACD,gBAAgB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;wBAC7D,cAAc,EAAE,EAAE;wBAClB,iBAAiB,EAAE,EAAE;wBACrB,QAAQ,EAAE,YAAY;qBACvB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAC/B,+CAA+C,CAChD,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAEnE,0DAA0D;QAC1D,OAAO,GAAG,mBAAW,CAAC,aAAa,CAAC;YAClC,MAAM,EAAE,KAAK;YACb,MAAM,EAAE;gBACN,YAAY,EAAE;oBACZ,OAAO,EAAE,8CAA8C;oBACvD,UAAU,EAAE;wBACV,IAAI,EAAE,4BAA4B;wBAClC,KAAK,EAAE,8CAA8C;qBACtD;oBACD,cAAc,EAAE,IAAI;oBACpB,QAAQ,EAAE,GAAG;iBACd;gBACD,SAAS,EACP,oEAAoE;aACvE;SAGK,CAAC,CAAC;QAEV,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAC/B,8CAA8C,CAC/C,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/account/index.js

@@ -36,6 +36,12 @@ class BaseAccount {
         }
         const type = obj.type || "";
         let value = "value" in obj ? obj.value : obj;
+        // If the chain modifies the account type, handle the case where the account type embeds the base account.
+        // (Actually, the only existent case is ethermint, and this is the line for handling ethermint)
+        const baseAccount = value.BaseAccount || value.baseAccount || value.base_account;
+        if (baseAccount) {
+            value = baseAccount;
+        }
         // If the account is the vesting account that embeds the base vesting account,
         // the actual base account exists under the base vesting account.
         // But, this can be different according to the version of cosmos-sdk.

package/build/account/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAyC;AAUzC,MAAa,WAAW;IAwEtB,YACqB,IAAY,EACZ,OAAe,EACf,aAAkB,EAClB,QAAa;QAHb,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAQ;QACf,kBAAa,GAAb,aAAa,CAAK;QAClB,aAAQ,GAAR,QAAQ,CAAK;IAC/B,CAAC;IA5EG,MAAM,CAAO,aAAa,CAC/B,QAAuB,EACvB,OAAe;IACf,4FAA4F;IAC5F,+GAA+G;IAC/G,uBAAgC,KAAK;;YAErC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAC;YAE9D,OAAO,WAAW,CAAC,aAAa,CAC9B,MAAM,CAAC,IAAI,EACX,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACpC,CAAC;QACJ,CAAC;KAAA;IAEM,MAAM,CAAC,aAAa,CACzB,GAQgC;IAChC,4FAA4F;IAC5F,+GAA+G;IAC/G,uBAA+B,EAAE;QAEjC,IAAI,QAAQ,IAAI,GAAG,EAAE;YACnB,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;SAClB;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAE5B,IAAI,KAAK,GAAG,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QAE7C,8EAA8E;QAC9E,iEAAiE;QACjE,qEAAqE;QACrE,8CAA8C;QAC9C,MAAM,kBAAkB,GACtB,KAAK,CAAC,kBAAkB;YACxB,KAAK,CAAC,kBAAkB;YACxB,KAAK,CAAC,oBAAoB,CAAC;QAC7B,IAAI,kBAAkB,EAAE;YACtB,KAAK;gBACH,kBAAkB,CAAC,WAAW;oBAC9B,kBAAkB,CAAC,WAAW;oBAC9B,kBAAkB,CAAC,YAAY,CAAC;SACnC;QAED,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,oBAAoB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACzE;YACD,OAAO,GAAG,oBAAoB,CAAC;SAChC;QAED,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;QAC3C,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEhC,OAAO,IAAI,WAAW,CACpB,IAAI,EACJ,OAAO,EACP,IAAI,UAAG,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,GAAG,CAAC,EAC7B,IAAI,UAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,GAAG,CAAC,CACzB,CAAC;IACJ,CAAC;IASD,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA9FD,kCA8FC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAyC;AAUzC,MAAa,WAAW;IAgFtB,YACqB,IAAY,EACZ,OAAe,EACf,aAAkB,EAClB,QAAa;QAHb,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAQ;QACf,kBAAa,GAAb,aAAa,CAAK;QAClB,aAAQ,GAAR,QAAQ,CAAK;IAC/B,CAAC;IApFG,MAAM,CAAO,aAAa,CAC/B,QAAuB,EACvB,OAAe;IACf,4FAA4F;IAC5F,+GAA+G;IAC/G,uBAAgC,KAAK;;YAErC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAC;YAE9D,OAAO,WAAW,CAAC,aAAa,CAC9B,MAAM,CAAC,IAAI,EACX,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACpC,CAAC;QACJ,CAAC;KAAA;IAEM,MAAM,CAAC,aAAa,CACzB,GAQgC;IAChC,4FAA4F;IAC5F,+GAA+G;IAC/G,uBAA+B,EAAE;QAEjC,IAAI,QAAQ,IAAI,GAAG,EAAE;YACnB,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;SAClB;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QAE5B,IAAI,KAAK,GAAG,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QAE7C,0GAA0G;QAC1G,+FAA+F;QAC/F,MAAM,WAAW,GACf,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC;QAC/D,IAAI,WAAW,EAAE;YACf,KAAK,GAAG,WAAW,CAAC;SACrB;QAED,8EAA8E;QAC9E,iEAAiE;QACjE,qEAAqE;QACrE,8CAA8C;QAC9C,MAAM,kBAAkB,GACtB,KAAK,CAAC,kBAAkB;YACxB,KAAK,CAAC,kBAAkB;YACxB,KAAK,CAAC,oBAAoB,CAAC;QAC7B,IAAI,kBAAkB,EAAE;YACtB,KAAK;gBACH,kBAAkB,CAAC,WAAW;oBAC9B,kBAAkB,CAAC,WAAW;oBAC9B,kBAAkB,CAAC,YAAY,CAAC;SACnC;QAED,IAAI,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,CAAC,oBAAoB,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACzE;YACD,OAAO,GAAG,oBAAoB,CAAC;SAChC;QAED,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;QAC3C,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEhC,OAAO,IAAI,WAAW,CACpB,IAAI,EACJ,OAAO,EACP,IAAI,UAAG,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,GAAG,CAAC,EAC7B,IAAI,UAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,GAAG,CAAC,CACzB,CAAC;IACJ,CAAC;IASD,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAtGD,kCAsGC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/cosmos",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -10,8 +10,9 @@
   },
   "scripts": {
     "clean": "rm -rf node_modules; rm -rf build",
-    "build": "tsc; mkdir -p build/stargate/proto/generated && cp ./src/stargate/proto/generated/* ./build/stargate/proto/generated",
-    "dev": "tsc -w",
+    "build": "yarn build:proto && tsc",
+    "build:proto": "mkdir -p build/stargate/proto/generated && cp ./src/stargate/proto/generated/* ./build/stargate/proto/generated",
+    "dev": "yarn build:proto && tsc -w",
     "test": "jest --passWithNoTests",
     "lint-test": "eslint \"src/**/*\" && prettier --check \"src/**/*\"",
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
@@ -26,5 +27,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.10.2"
   },
-  "gitHead": "e78b5b9d3a30e42a28cace30ed4b97a14bc92803"
+  "gitHead": "5295e9b866f01459b7809b54b6cf9c146b115721"
 }

package/src/account/account.spec.ts

@@ -0,0 +1,88 @@
+import { BaseAccount } from "./index";
+
+describe("Test account parse", () => {
+  test("Test fromAminoJSON", () => {
+    // Base account
+    let account = BaseAccount.fromAminoJSON({
+      height: "8409557",
+      result: {
+        type: "cosmos-sdk/BaseAccount",
+        value: {
+          address: "cosmos1vv6hruquzpty4xpks9znkw8gys5x4nsnqw9f4k",
+          public_key: {
+            type: "tendermint/PubKeySecp256k1",
+            value: "Avn3xBbmE0+MEyWMuxhmjjiX1GtCUVyv/Mavg8OcRIm4",
+          },
+          account_number: "9736",
+          sequence: "971",
+        },
+      },
+    });
+
+    expect(account.getAddress()).toBe(
+      "cosmos1vv6hruquzpty4xpks9znkw8gys5x4nsnqw9f4k"
+    );
+    expect(account.getSequence().toString()).toBe("971");
+    expect(account.getAccountNumber().toString()).toBe("9736");
+    expect(account.getType()).toBe("cosmos-sdk/BaseAccount");
+
+    // Vesting account
+    account = BaseAccount.fromAminoJSON({
+      height: "8409738",
+      result: {
+        type: "cosmos-sdk/DelayedVestingAccount",
+        value: {
+          base_vesting_account: {
+            base_account: {
+              address: "cosmos1x3rhderemr703f4lxktk2da99vl5crs28ur3xl",
+              public_key: {
+                type: "tendermint/PubKeySecp256k1",
+                value: "A+Zzm/8QhyL00ISXgiAgeW6zeqZHezVFi2w3iQkJeKyP",
+              },
+              account_number: "367245",
+              sequence: "7",
+            },
+            original_vesting: [{ denom: "uatom", amount: "16666660000" }],
+            delegated_free: [],
+            delegated_vesting: [],
+            end_time: "1719752607",
+          },
+        },
+      },
+    });
+
+    expect(account.getAddress()).toBe(
+      "cosmos1x3rhderemr703f4lxktk2da99vl5crs28ur3xl"
+    );
+    expect(account.getSequence().toString()).toBe("7");
+    expect(account.getAccountNumber().toString()).toBe("367245");
+    expect(account.getType()).toBe("cosmos-sdk/DelayedVestingAccount");
+
+    // Custom account that embeds the base account (ethermint)
+    account = BaseAccount.fromAminoJSON({
+      height: "449",
+      result: {
+        base_account: {
+          address: "evmos1w3ygakvq5snf30pca5g8pnyvvfr7x28djnj34m",
+          public_key: {
+            type: "tendermint/PubKeySecp256k1",
+            value: "AulWtcPTIZWd/CnkFkQOMqDOwU7e+U/Iq8Tli1nhBq6j",
+          },
+          account_number: "11",
+          sequence: "1",
+        },
+        code_hash:
+          "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      },
+      // Above makes the type error.
+      // But, just test that it can be parsed with ignoring the type error.
+    } as any);
+
+    expect(account.getAddress()).toBe(
+      "evmos1w3ygakvq5snf30pca5g8pnyvvfr7x28djnj34m"
+    );
+    expect(account.getSequence().toString()).toBe("1");
+    expect(account.getAccountNumber().toString()).toBe("11");
+    expect(account.getType()).toBe("");
+  });
+});

package/src/account/index.ts

@@ -46,6 +46,14 @@ export class BaseAccount implements Account {
 
     let value = "value" in obj ? obj.value : obj;
 
+    // If the chain modifies the account type, handle the case where the account type embeds the base account.
+    // (Actually, the only existent case is ethermint, and this is the line for handling ethermint)
+    const baseAccount =
+      value.BaseAccount || value.baseAccount || value.base_account;
+    if (baseAccount) {
+      value = baseAccount;
+    }
+
     // If the account is the vesting account that embeds the base vesting account,
     // the actual base account exists under the base vesting account.
     // But, this can be different according to the version of cosmos-sdk.