@keplr-wallet/cosmos 0.10.0 → 0.10.1

package/build/stargate/codec/index.d.ts

@@ -1,18 +1,24 @@
-import { google } from "../proto";
 import * as $protobuf from "protobufjs";
+import { Any } from "@keplr-wallet/proto-types/google/protobuf/any";
 export * from "./unknown";
+export declare type AnyWithUnpacked = Any | (Any & {
+    unpacked: unknown;
+    factory: ProtoFactory;
+});
+interface ProtoFactory {
+    encode: (message: any, writer?: $protobuf.Writer) => $protobuf.Writer;
+    decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
+    fromJSON: (object: any) => any;
+    toJSON: (message: any) => unknown;
+}
 export declare class ProtoCodec {
-    protected typeUrlMap: Map<string, {
-        decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
-    }>;
+    protected typeUrlMap: Map<string, ProtoFactory>;
     /**
      * Unpack the any to the registered message.
      * NOTE: If there is no matched message, it will not throw an error but return the `UnknownMessage` class.
-     * @param iAny
+     * @param any
      */
-    unpackAny(iAny: google.protobuf.IAny): any;
-    registerAny(typeUrl: string, message: {
-        decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
-    }): void;
+    unpackAny(any: Any): AnyWithUnpacked;
+    registerAny(typeUrl: string, message: ProtoFactory): void;
 }
 export declare const defaultProtoCodec: ProtoCodec;

package/build/stargate/codec/index.js

@@ -11,8 +11,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultProtoCodec = exports.ProtoCodec = void 0;
-const proto_1 = require("../proto");
-const proto_2 = require("../proto");
+const tx_1 = require("@keplr-wallet/proto-types/cosmos/bank/v1beta1/tx");
+const tx_2 = require("@keplr-wallet/proto-types/cosmos/staking/v1beta1/tx");
+const tx_3 = require("@keplr-wallet/proto-types/cosmwasm/wasm/v1/tx");
 const unknown_1 = require("./unknown");
 __exportStar(require("./unknown"), exports);
 class ProtoCodec {
@@ -22,15 +23,17 @@ class ProtoCodec {
     /**
      * Unpack the any to the registered message.
      * NOTE: If there is no matched message, it will not throw an error but return the `UnknownMessage` class.
-     * @param iAny
+     * @param any
      */
-    unpackAny(iAny) {
-        const any = new proto_1.google.protobuf.Any(iAny);
-        if (!this.typeUrlMap.has(any.type_url)) {
-            return new unknown_1.UnknownMessage(any.type_url, any.value);
+    unpackAny(any) {
+        if (!this.typeUrlMap.has(any.typeUrl)) {
+            return new unknown_1.UnknownMessage(any.typeUrl, any.value);
         }
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this.typeUrlMap.get(any.type_url).decode(any.value);
+        const factory = this.typeUrlMap.get(any.typeUrl);
+        const unpacked = factory.decode(any.value);
+        return Object.assign(Object.assign({}, any), { unpacked,
+            factory });
     }
     registerAny(typeUrl, message) {
         this.typeUrlMap.set(typeUrl, message);
@@ -38,9 +41,9 @@ class ProtoCodec {
 }
 exports.ProtoCodec = ProtoCodec;
 exports.defaultProtoCodec = new ProtoCodec();
-exports.defaultProtoCodec.registerAny("/cosmos.bank.v1beta1.MsgSend", proto_2.cosmos.bank.v1beta1.MsgSend);
-exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgDelegate", proto_2.cosmos.staking.v1beta1.MsgDelegate);
-exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgUndelegate", proto_2.cosmos.staking.v1beta1.MsgUndelegate);
-exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgBeginRedelegate", proto_2.cosmos.staking.v1beta1.MsgBeginRedelegate);
-exports.defaultProtoCodec.registerAny("/cosmwasm.wasm.v1.MsgExecuteContract", proto_2.cosmwasm.wasm.v1.MsgExecuteContract);
+exports.defaultProtoCodec.registerAny("/cosmos.bank.v1beta1.MsgSend", tx_1.MsgSend);
+exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgDelegate", tx_2.MsgDelegate);
+exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgUndelegate", tx_2.MsgUndelegate);
+exports.defaultProtoCodec.registerAny("/cosmos.staking.v1beta1.MsgBeginRedelegate", tx_2.MsgBeginRedelegate);
+exports.defaultProtoCodec.registerAny("/cosmwasm.wasm.v1.MsgExecuteContract", tx_3.MsgExecuteContract);
 //# sourceMappingURL=index.js.map

package/build/stargate/codec/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/codec/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,oCAAkC;AAGlC,oCAA4C;AAC5C,uCAA2C;AAE3C,4CAA0B;AAE1B,MAAa,UAAU;IAAvB;QACY,eAAU,GAKhB,IAAI,GAAG,EAAE,CAAC;IA0BhB,CAAC;IAxBC;;;;OAIG;IACH,SAAS,CAAC,IAA0B;QAClC,MAAM,GAAG,GAAG,IAAI,cAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACtC,OAAO,IAAI,wBAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;SACpD;QAED,oEAAoE;QACpE,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED,WAAW,CACT,OAAe,EACf,OAEC;QAED,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AAhCD,gCAgCC;AAEY,QAAA,iBAAiB,GAAG,IAAI,UAAU,EAAE,CAAC;AAClD,yBAAiB,CAAC,WAAW,CAC3B,8BAA8B,EAC9B,cAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAC5B,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,qCAAqC,EACrC,cAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CACnC,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,uCAAuC,EACvC,cAAM,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CACrC,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,4CAA4C,EAC5C,cAAM,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAC1C,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,sCAAsC,EACtC,gBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CACpC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/codec/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAEA,yEAA2E;AAC3E,4EAI6D;AAC7D,sEAAmF;AACnF,uCAA2C;AAE3C,4CAA0B;AAa1B,MAAa,UAAU;IAAvB;QACY,eAAU,GAA8B,IAAI,GAAG,EAAE,CAAC;IA0B9D,CAAC;IAxBC;;;;OAIG;IACH,SAAS,CAAC,GAAQ;QAChB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,IAAI,wBAAc,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;SACnD;QAED,oEAAoE;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE3C,uCACK,GAAG,KACN,QAAQ;YACR,OAAO,IACP;IACJ,CAAC;IAED,WAAW,CAAC,OAAe,EAAE,OAAqB;QAChD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;CACF;AA3BD,gCA2BC;AAEY,QAAA,iBAAiB,GAAG,IAAI,UAAU,EAAE,CAAC;AAClD,yBAAiB,CAAC,WAAW,CAAC,8BAA8B,EAAE,YAAO,CAAC,CAAC;AACvE,yBAAiB,CAAC,WAAW,CAC3B,qCAAqC,EACrC,gBAAW,CACZ,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,uCAAuC,EACvC,kBAAa,CACd,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,4CAA4C,EAC5C,uBAAkB,CACnB,CAAC;AACF,yBAAiB,CAAC,WAAW,CAC3B,sCAAsC,EACtC,uBAAkB,CACnB,CAAC"}

package/build/stargate/codec/unknown.d.ts

@@ -1,4 +1,5 @@
-export declare class UnknownMessage {
+import { Any } from "@keplr-wallet/proto-types/google/protobuf/any";
+export declare class UnknownMessage implements Any {
     /** Any type_url. */
     protected readonly _typeUrl: string;
     /** Any value. */

package/build/stargate/codec/unknown.js.map

@@ -1 +1 @@
-{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/stargate/codec/unknown.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AAEjC,MAAa,cAAc;IACzB;IACE,oBAAoB;IACD,QAAgB;IACnC,iBAAiB;IACE,MAAkB;QAFlB,aAAQ,GAAR,QAAQ,CAAQ;QAEhB,WAAM,GAAN,MAAM,CAAY;IACpC,CAAC;IAEJ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAtBD,wCAsBC"}
+{"version":3,"file":"unknown.js","sourceRoot":"","sources":["../../../src/stargate/codec/unknown.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AAGjC,MAAa,cAAc;IACzB;IACE,oBAAoB;IACD,QAAgB;IACnC,iBAAiB;IACE,MAAkB;QAFlB,aAAQ,GAAR,QAAQ,CAAQ;QAEhB,WAAM,GAAN,MAAM,CAAY;IACpC,CAAC;IAEJ,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM;QACJ,OAAO;YACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAtBD,wCAsBC"}

package/build/stargate/decoder/decode.spec.js

@@ -74,7 +74,10 @@ d701a0c0a057374616b65120331303012580a500a460a1f2f636f736d6f732e63727970746f2e736
         assert_1.default.strictEqual(signDoc.chainId, "test");
         assert_1.default.strictEqual(signDoc.accountNumber, "1");
         assert_1.default.strictEqual(signDoc.txMsgs.length, 1);
-        const msg = signDoc.txMsgs[0];
+        if (!("unpacked" in signDoc.txMsgs[0])) {
+            throw new Error("Msgs not parsed properly");
+        }
+        const msg = signDoc.txMsgs[0].unpacked;
         assert_1.default.strictEqual(msg.fromAddress, "cosmos1xesvkr6d0j96j5zdcw5fmqxavjvuvqx2ygy7mp");
         assert_1.default.strictEqual(msg.toAddress, "cosmos1xesvkr6d0j96j5zdcw5fmqxavjvuvqx2ygy7mp");
         assert_1.default.strictEqual(msg.amount[0].denom, "stake");

package/build/stargate/decoder/decode.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"decode.spec.js","sourceRoot":"","sources":["../../../src/stargate/decoder/decode.spec.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,mCAA8C;AAI9C,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,wBAAwB,EAAE;QAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAuDG;;QAEH,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACvB;;;;;sDAKgD,EAChD,KAAK,CACN,CAAC;QAEF,MAAM,OAAO,GAAG,2BAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElD,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAE/C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAE7C,MAAM,GAAG,GAAgC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,gBAAM,CAAC,WAAW,CAChB,GAAG,CAAC,WAAW,EACf,+CAA+C,CAChD,CAAC;QACF,gBAAM,CAAC,WAAW,CAChB,GAAG,CAAC,SAAS,EACb,+CAA+C,CAChD,CAAC;QACF,gBAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACjD,gBAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAEhD,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;QAEjE,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3D,gBAAM,CAAC,WAAW,OAChB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,0CAAE,QAAQ,IAClD,GAAG,CACJ,CAAC;QACF,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,gBAAM,CAAC,WAAW,OAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,0CAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACtD,gBAAM,CAAC,WAAW,OAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,0CAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"decode.spec.js","sourceRoot":"","sources":["../../../src/stargate/decoder/decode.spec.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,mCAA8C;AAI9C,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,wBAAwB,EAAE;QAC3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAuDG;;QAEH,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CACvB;;;;;sDAKgD,EAChD,KAAK,CACN,CAAC;QAEF,MAAM,OAAO,GAAG,2BAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAElD,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAE/C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAE7C,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;YACtC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAmB,CAAC;QAClD,gBAAM,CAAC,WAAW,CAChB,GAAG,CAAC,WAAW,EACf,+CAA+C,CAChD,CAAC;QACF,gBAAM,CAAC,WAAW,CAChB,GAAG,CAAC,SAAS,EACb,+CAA+C,CAChD,CAAC;QACF,gBAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACjD,gBAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAEhD,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;QAEjE,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC3D,gBAAM,CAAC,WAAW,OAChB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,0CAAE,QAAQ,IAClD,GAAG,CACJ,CAAC;QACF,gBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,gBAAM,CAAC,WAAW,OAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,0CAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACtD,gBAAM,CAAC,WAAW,OAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,0CAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/stargate/decoder/index.d.ts

@@ -1,16 +1,15 @@
-import { cosmos } from "../proto";
-import SignDoc = cosmos.tx.v1beta1.SignDoc;
-import { ProtoCodec } from "../codec";
+import { SignDoc, TxBody, AuthInfo } from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
+import { AnyWithUnpacked, ProtoCodec } from "../codec";
 export declare class ProtoSignDocDecoder {
     readonly signDoc: SignDoc;
     protected readonly protoCodec: ProtoCodec;
     static decode(bytes: Uint8Array): ProtoSignDocDecoder;
-    protected _txBody?: cosmos.tx.v1beta1.TxBody;
-    protected _authInfo?: cosmos.tx.v1beta1.AuthInfo;
+    protected _txBody?: TxBody;
+    protected _authInfo?: AuthInfo;
     constructor(signDoc: SignDoc, protoCodec?: ProtoCodec);
-    get txBody(): cosmos.tx.v1beta1.TxBody;
-    get txMsgs(): any[];
-    get authInfo(): cosmos.tx.v1beta1.AuthInfo;
+    get txBody(): TxBody;
+    get txMsgs(): AnyWithUnpacked[];
+    get authInfo(): AuthInfo;
     get chainId(): string;
     get accountNumber(): string;
     toBytes(): Uint8Array;

package/build/stargate/decoder/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProtoSignDocDecoder = void 0;
-const proto_1 = require("../proto");
+const tx_1 = require("@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx");
 const codec_1 = require("../codec");
 class ProtoSignDocDecoder {
     constructor(signDoc, protoCodec = codec_1.defaultProtoCodec) {
@@ -9,11 +9,11 @@ class ProtoSignDocDecoder {
         this.protoCodec = protoCodec;
     }
     static decode(bytes) {
-        return new ProtoSignDocDecoder(proto_1.cosmos.tx.v1beta1.SignDoc.decode(bytes));
+        return new ProtoSignDocDecoder(tx_1.SignDoc.decode(bytes));
     }
     get txBody() {
         if (!this._txBody) {
-            this._txBody = proto_1.cosmos.tx.v1beta1.TxBody.decode(this.signDoc.bodyBytes);
+            this._txBody = tx_1.TxBody.decode(this.signDoc.bodyBytes);
         }
         return this._txBody;
     }
@@ -26,7 +26,7 @@ class ProtoSignDocDecoder {
     }
     get authInfo() {
         if (!this._authInfo) {
-            this._authInfo = proto_1.cosmos.tx.v1beta1.AuthInfo.decode(this.signDoc.authInfoBytes);
+            this._authInfo = tx_1.AuthInfo.decode(this.signDoc.authInfoBytes);
         }
         return this._authInfo;
     }
@@ -37,19 +37,24 @@ class ProtoSignDocDecoder {
         return this.signDoc.accountNumber.toString();
     }
     toBytes() {
-        return proto_1.cosmos.tx.v1beta1.SignDoc.encode(this.signDoc).finish();
+        return tx_1.SignDoc.encode(this.signDoc).finish();
     }
     toJSON() {
         return {
-            txBody: Object.assign(Object.assign({}, this.txBody.toJSON()), {
+            txBody: Object.assign(Object.assign({}, tx_1.TxBody.toJSON(this.txBody)), {
                 messages: this.txMsgs.map((msg) => {
-                    if (msg && msg.toJSON) {
-                        return msg.toJSON();
+                    if (msg) {
+                        if (msg instanceof codec_1.UnknownMessage) {
+                            return msg.toJSON();
+                        }
+                        if ("factory" in msg) {
+                            return msg.factory.toJSON(msg.unpacked);
+                        }
                     }
                     return msg;
                 }),
             }),
-            authInfo: this.authInfo.toJSON(),
+            authInfo: tx_1.AuthInfo.toJSON(this.authInfo),
             chainId: this.chainId,
             accountNumber: this.accountNumber,
         };

package/build/stargate/decoder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/decoder/index.ts"],"names":[],"mappings":";;;AAAA,oCAAkC;AAElC,oCAAyD;AAEzD,MAAa,mBAAmB;IAQ9B,YACkB,OAAgB,EACb,aAAyB,yBAAiB;QAD7C,YAAO,GAAP,OAAO,CAAS;QACb,eAAU,GAAV,UAAU,CAAgC;IAC5D,CAAC;IAVG,MAAM,CAAC,MAAM,CAAC,KAAiB;QACpC,OAAO,IAAI,mBAAmB,CAAC,cAAM,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,CAAC;IAUD,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,cAAM,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACxE;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,MAAM;QACR,MAAM,IAAI,GAAU,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SAC3C;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,cAAM,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAChD,IAAI,CAAC,OAAO,CAAC,aAAa,CAC3B,CAAC;SACH;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,OAAO,cAAM,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IACjE,CAAC;IAED,MAAM;QACJ,OAAO;YACL,MAAM,kCACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,GACpB;gBACD,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAChC,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE;wBACrB,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC;qBACrB;oBACD,OAAO,GAAG,CAAC;gBACb,CAAC,CAAC;aACH,CACF;YACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;CACF;AAtED,kDAsEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/decoder/index.ts"],"names":[],"mappings":";;;AAAA,uEAIwD;AACxD,oCAKkB;AAElB,MAAa,mBAAmB;IAQ9B,YACkB,OAAgB,EACb,aAAyB,yBAAiB;QAD7C,YAAO,GAAP,OAAO,CAAS;QACb,eAAU,GAAV,UAAU,CAAgC;IAC5D,CAAC;IAVG,MAAM,CAAC,MAAM,CAAC,KAAiB;QACpC,OAAO,IAAI,mBAAmB,CAAC,YAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;IAUD,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,WAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACtD;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,MAAM;QACR,MAAM,IAAI,GAAsB,EAAE,CAAC;QACnC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SAC3C;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,aAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;SAC9D;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,OAAO,YAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAC/C,CAAC;IAED,MAAM;QACJ,OAAO;YACL,MAAM,kCACA,WAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAS,GACnC;gBACD,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAChC,IAAI,GAAG,EAAE;wBACP,IAAI,GAAG,YAAY,sBAAc,EAAE;4BACjC,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC;yBACrB;wBACD,IAAI,SAAS,IAAI,GAAG,EAAE;4BACpB,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;yBACzC;qBACF;oBACD,OAAO,GAAG,CAAC;gBACb,CAAC,CAAC;aACH,CACF;YACD,QAAQ,EAAE,aAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;YACxC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;CACF;AAzED,kDAyEC"}

package/build/stargate/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./codec";
-export * from "./proto";
 export * from "./decoder";
 export * from "./wrapper";

package/build/stargate/index.js

@@ -11,7 +11,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./codec"), exports);
-__exportStar(require("./proto"), exports);
 __exportStar(require("./decoder"), exports);
 __exportStar(require("./wrapper"), exports);
 //# sourceMappingURL=index.js.map

package/build/stargate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/stargate/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/stargate/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B"}

package/build/stargate/wrapper/index.d.ts

@@ -1,14 +1,14 @@
 import { ProtoSignDocDecoder } from "../decoder";
 import { Coin, StdSignDoc } from "@cosmjs/launchpad";
-import { cosmos } from "../proto";
+import { SignDoc } from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
 export declare class SignDocWrapper {
-    protected readonly signDoc: StdSignDoc | cosmos.tx.v1beta1.SignDoc;
+    protected readonly signDoc: StdSignDoc | SignDoc;
     protected _protoSignDoc?: ProtoSignDocDecoder;
     readonly isADR36SignDoc: boolean;
     readonly mode: "amino" | "direct";
-    constructor(signDoc: StdSignDoc | cosmos.tx.v1beta1.SignDoc);
+    constructor(signDoc: StdSignDoc | SignDoc);
     static fromAminoSignDoc(signDoc: StdSignDoc): SignDocWrapper;
-    static fromDirectSignDoc(signDoc: cosmos.tx.v1beta1.SignDoc): SignDocWrapper;
+    static fromDirectSignDoc(signDoc: SignDoc): SignDocWrapper;
     static fromDirectSignDocBytes(signDocBytes: Uint8Array): SignDocWrapper;
     clone(): SignDocWrapper;
     get protoSignDoc(): ProtoSignDocDecoder;

package/build/stargate/wrapper/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignDocWrapper = void 0;
 const decoder_1 = require("../decoder");
-const proto_1 = require("../proto");
+const tx_1 = require("@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx");
 const adr_36_1 = require("../../adr-36");
 class SignDocWrapper {
     constructor(signDoc) {
@@ -31,7 +31,7 @@ class SignDocWrapper {
         return new SignDocWrapper(signDoc);
     }
     static fromDirectSignDocBytes(signDocBytes) {
-        return new SignDocWrapper(proto_1.cosmos.tx.v1beta1.SignDoc.decode(signDocBytes));
+        return new SignDocWrapper(tx_1.SignDoc.decode(signDocBytes));
     }
     clone() {
         return new SignDocWrapper(this.signDoc);
@@ -87,9 +87,14 @@ class SignDocWrapper {
         return this.aminoSignDoc.fee.amount;
     }
     get gas() {
-        var _a, _b, _c;
+        var _a;
         if (this.mode === "direct") {
-            return (_c = (_b = (_a = this.protoSignDoc.authInfo.fee) === null || _a === void 0 ? void 0 : _a.gasLimit) === null || _b === void 0 ? void 0 : _b.toNumber()) !== null && _c !== void 0 ? _c : 0;
+            if ((_a = this.protoSignDoc.authInfo.fee) === null || _a === void 0 ? void 0 : _a.gasLimit) {
+                return parseInt(this.protoSignDoc.authInfo.fee.gasLimit);
+            }
+            else {
+                return 0;
+            }
         }
         return parseInt(this.aminoSignDoc.fee.gas);
     }

package/build/stargate/wrapper/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/wrapper/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/stargate/wrapper/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/cosmos",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -10,23 +10,23 @@
   },
   "scripts": {
     "clean": "rm -rf node_modules; rm -rf build",
-    "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",
+    "build": "tsc",
+    "dev": "tsc -w",
     "test": "jest --passWithNoTests",
     "lint-test": "eslint \"src/**/*\" && prettier --check \"src/**/*\"",
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
   },
   "dependencies": {
     "@cosmjs/launchpad": "^0.24.0-alpha.25",
-    "@keplr-wallet/crypto": "0.10.0",
-    "@keplr-wallet/types": "0.10.0",
-    "@keplr-wallet/unit": "0.10.0",
+    "@keplr-wallet/crypto": "0.10.1",
+    "@keplr-wallet/proto-types": "0.10.1",
+    "@keplr-wallet/types": "0.10.1",
+    "@keplr-wallet/unit": "0.10.1",
     "axios": "^0.21.4",
     "bech32": "^1.1.4",
     "buffer": "^6.0.3",
     "long": "^4.0.0",
-    "protobufjs": "^6.10.2"
+    "protobufjs": "^6.11.2"
   },
-  "gitHead": "d36640a0e864a5c7c6bb65b4556ed38ead94afae"
+  "gitHead": "fe8b77605d5158bdb50ec8233dd698ad6e2e4f57"
 }

package/src/stargate/codec/index.ts

@@ -1,63 +1,71 @@
-import { google } from "../proto";
 import * as $protobuf from "protobufjs";
-
-import { cosmos, cosmwasm } from "../proto";
+import { Any } from "@keplr-wallet/proto-types/google/protobuf/any";
+import { MsgSend } from "@keplr-wallet/proto-types/cosmos/bank/v1beta1/tx";
+import {
+  MsgDelegate,
+  MsgUndelegate,
+  MsgBeginRedelegate,
+} from "@keplr-wallet/proto-types/cosmos/staking/v1beta1/tx";
+import { MsgExecuteContract } from "@keplr-wallet/proto-types/cosmwasm/wasm/v1/tx";
 import { UnknownMessage } from "./unknown";
 
 export * from "./unknown";
 
+export type AnyWithUnpacked =
+  | Any
+  | (Any & { unpacked: unknown; factory: ProtoFactory });
+
+interface ProtoFactory {
+  encode: (message: any, writer?: $protobuf.Writer) => $protobuf.Writer;
+  decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
+  fromJSON: (object: any) => any;
+  toJSON: (message: any) => unknown;
+}
+
 export class ProtoCodec {
-  protected typeUrlMap: Map<
-    string,
-    {
-      decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
-    }
-  > = new Map();
+  protected typeUrlMap: Map<string, ProtoFactory> = new Map();
 
   /**
    * Unpack the any to the registered message.
    * NOTE: If there is no matched message, it will not throw an error but return the `UnknownMessage` class.
-   * @param iAny
+   * @param any
    */
-  unpackAny(iAny: google.protobuf.IAny): any {
-    const any = new google.protobuf.Any(iAny);
-
-    if (!this.typeUrlMap.has(any.type_url)) {
-      return new UnknownMessage(any.type_url, any.value);
+  unpackAny(any: Any): AnyWithUnpacked {
+    if (!this.typeUrlMap.has(any.typeUrl)) {
+      return new UnknownMessage(any.typeUrl, any.value);
     }
 
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return this.typeUrlMap.get(any.type_url)!.decode(any.value);
+    const factory = this.typeUrlMap.get(any.typeUrl)!;
+    const unpacked = factory.decode(any.value);
+
+    return {
+      ...any,
+      unpacked,
+      factory,
+    };
   }
 
-  registerAny(
-    typeUrl: string,
-    message: {
-      decode: (r: $protobuf.Reader | Uint8Array, l?: number) => any;
-    }
-  ): void {
+  registerAny(typeUrl: string, message: ProtoFactory): void {
     this.typeUrlMap.set(typeUrl, message);
   }
 }
 
 export const defaultProtoCodec = new ProtoCodec();
-defaultProtoCodec.registerAny(
-  "/cosmos.bank.v1beta1.MsgSend",
-  cosmos.bank.v1beta1.MsgSend
-);
+defaultProtoCodec.registerAny("/cosmos.bank.v1beta1.MsgSend", MsgSend);
 defaultProtoCodec.registerAny(
   "/cosmos.staking.v1beta1.MsgDelegate",
-  cosmos.staking.v1beta1.MsgDelegate
+  MsgDelegate
 );
 defaultProtoCodec.registerAny(
   "/cosmos.staking.v1beta1.MsgUndelegate",
-  cosmos.staking.v1beta1.MsgUndelegate
+  MsgUndelegate
 );
 defaultProtoCodec.registerAny(
   "/cosmos.staking.v1beta1.MsgBeginRedelegate",
-  cosmos.staking.v1beta1.MsgBeginRedelegate
+  MsgBeginRedelegate
 );
 defaultProtoCodec.registerAny(
   "/cosmwasm.wasm.v1.MsgExecuteContract",
-  cosmwasm.wasm.v1.MsgExecuteContract
+  MsgExecuteContract
 );

package/src/stargate/codec/unknown.ts

@@ -1,6 +1,7 @@
 import { Buffer } from "buffer/";
+import { Any } from "@keplr-wallet/proto-types/google/protobuf/any";
 
-export class UnknownMessage {
+export class UnknownMessage implements Any {
   constructor(
     /** Any type_url. */
     protected readonly _typeUrl: string,

package/src/stargate/decoder/decode.spec.ts

@@ -1,7 +1,7 @@
 import assert from "assert";
 import { ProtoSignDocDecoder } from "./index";
 
-import { cosmos } from "../proto";
+import { MsgSend } from "@keplr-wallet/proto-types/cosmos/bank/v1beta1/tx";
 
 describe("Test decode sign doc", () => {
   it("should decode properly", function () {
@@ -79,7 +79,10 @@ d701a0c0a057374616b65120331303012580a500a460a1f2f636f736d6f732e63727970746f2e736
 
     assert.strictEqual(signDoc.txMsgs.length, 1);
 
-    const msg: cosmos.bank.v1beta1.MsgSend = signDoc.txMsgs[0];
+    if (!("unpacked" in signDoc.txMsgs[0])) {
+      throw new Error("Msgs not parsed properly");
+    }
+    const msg = signDoc.txMsgs[0].unpacked as MsgSend;
     assert.strictEqual(
       msg.fromAddress,
       "cosmos1xesvkr6d0j96j5zdcw5fmqxavjvuvqx2ygy7mp"

package/src/stargate/decoder/index.ts

@@ -1,30 +1,38 @@
-import { cosmos } from "../proto";
-import SignDoc = cosmos.tx.v1beta1.SignDoc;
-import { defaultProtoCodec, ProtoCodec } from "../codec";
+import {
+  SignDoc,
+  TxBody,
+  AuthInfo,
+} from "@keplr-wallet/proto-types/cosmos/tx/v1beta1/tx";
+import {
+  AnyWithUnpacked,
+  defaultProtoCodec,
+  ProtoCodec,
+  UnknownMessage,
+} from "../codec";
 
 export class ProtoSignDocDecoder {
   public static decode(bytes: Uint8Array): ProtoSignDocDecoder {
-    return new ProtoSignDocDecoder(cosmos.tx.v1beta1.SignDoc.decode(bytes));
+    return new ProtoSignDocDecoder(SignDoc.decode(bytes));
   }
 
-  protected _txBody?: cosmos.tx.v1beta1.TxBody;
-  protected _authInfo?: cosmos.tx.v1beta1.AuthInfo;
+  protected _txBody?: TxBody;
+  protected _authInfo?: AuthInfo;
 
   constructor(
     public readonly signDoc: SignDoc,
     protected readonly protoCodec: ProtoCodec = defaultProtoCodec
   ) {}
 
-  get txBody(): cosmos.tx.v1beta1.TxBody {
+  get txBody(): TxBody {
     if (!this._txBody) {
-      this._txBody = cosmos.tx.v1beta1.TxBody.decode(this.signDoc.bodyBytes);
+      this._txBody = TxBody.decode(this.signDoc.bodyBytes);
     }
 
     return this._txBody;
   }
 
-  get txMsgs(): any[] {
-    const msgs: any[] = [];
+  get txMsgs(): AnyWithUnpacked[] {
+    const msgs: AnyWithUnpacked[] = [];
     for (const msg of this.txBody.messages) {
       msgs.push(this.protoCodec.unpackAny(msg));
     }
@@ -32,11 +40,9 @@ export class ProtoSignDocDecoder {
     return msgs;
   }
 
-  get authInfo(): cosmos.tx.v1beta1.AuthInfo {
+  get authInfo(): AuthInfo {
     if (!this._authInfo) {
-      this._authInfo = cosmos.tx.v1beta1.AuthInfo.decode(
-        this.signDoc.authInfoBytes
-      );
+      this._authInfo = AuthInfo.decode(this.signDoc.authInfoBytes);
     }
 
     return this._authInfo;
@@ -51,23 +57,28 @@ export class ProtoSignDocDecoder {
   }
 
   toBytes(): Uint8Array {
-    return cosmos.tx.v1beta1.SignDoc.encode(this.signDoc).finish();
+    return SignDoc.encode(this.signDoc).finish();
   }
 
   toJSON(): any {
     return {
       txBody: {
-        ...this.txBody.toJSON(),
+        ...(TxBody.toJSON(this.txBody) as any),
         ...{
           messages: this.txMsgs.map((msg) => {
-            if (msg && msg.toJSON) {
-              return msg.toJSON();
+            if (msg) {
+              if (msg instanceof UnknownMessage) {
+                return msg.toJSON();
+              }
+              if ("factory" in msg) {
+                return msg.factory.toJSON(msg.unpacked);
+              }
             }
             return msg;
           }),
         },
       },
-      authInfo: this.authInfo.toJSON(),
+      authInfo: AuthInfo.toJSON(this.authInfo),
       chainId: this.chainId,
       accountNumber: this.accountNumber,
     };

package/src/stargate/index.ts

@@ -1,4 +1,3 @@
 export * from "./codec";
-export * from "./proto";
 export * from "./decoder";
 export * from "./wrapper";