diff --git a/packages/stargate/src/codec/confio/proofs.ts b/packages/stargate/src/codec/confio/proofs.ts
index 0c1e23e3..6ab7047e 100644
--- a/packages/stargate/src/codec/confio/proofs.ts
+++ b/packages/stargate/src/codec/confio/proofs.ts
@@ -358,10 +358,12 @@ export const ExistenceProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ExistenceProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseExistenceProof } as ExistenceProof;
     message.path = [];
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -388,6 +390,8 @@ export const ExistenceProof = {
   fromJSON(object: any): ExistenceProof {
     const message = { ...baseExistenceProof } as ExistenceProof;
     message.path = [];
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -466,9 +470,10 @@ export const NonExistenceProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): NonExistenceProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseNonExistenceProof } as NonExistenceProof;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -491,6 +496,7 @@ export const NonExistenceProof = {
 
   fromJSON(object: any): NonExistenceProof {
     const message = { ...baseNonExistenceProof } as NonExistenceProof;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -558,7 +564,7 @@ export const CommitmentProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CommitmentProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommitmentProof } as CommitmentProof;
     while (reader.pos < end) {
@@ -670,9 +676,10 @@ export const LeafOp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): LeafOp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseLeafOp } as LeafOp;
+    message.prefix = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -701,6 +708,7 @@ export const LeafOp = {
 
   fromJSON(object: any): LeafOp {
     const message = { ...baseLeafOp } as LeafOp;
+    message.prefix = new Uint8Array();
     if (object.hash !== undefined && object.hash !== null) {
       message.hash = hashOpFromJSON(object.hash);
     } else {
@@ -786,9 +794,11 @@ export const InnerOp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): InnerOp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseInnerOp } as InnerOp;
+    message.prefix = new Uint8Array();
+    message.suffix = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -811,6 +821,8 @@ export const InnerOp = {
 
   fromJSON(object: any): InnerOp {
     const message = { ...baseInnerOp } as InnerOp;
+    message.prefix = new Uint8Array();
+    message.suffix = new Uint8Array();
     if (object.hash !== undefined && object.hash !== null) {
       message.hash = hashOpFromJSON(object.hash);
     } else {
@@ -876,7 +888,7 @@ export const ProofSpec = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ProofSpec {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseProofSpec } as ProofSpec;
     while (reader.pos < end) {
@@ -998,10 +1010,11 @@ export const InnerSpec = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): InnerSpec {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseInnerSpec } as InnerSpec;
     message.childOrder = [];
+    message.emptyChild = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1041,6 +1054,7 @@ export const InnerSpec = {
   fromJSON(object: any): InnerSpec {
     const message = { ...baseInnerSpec } as InnerSpec;
     message.childOrder = [];
+    message.emptyChild = new Uint8Array();
     if (object.childOrder !== undefined && object.childOrder !== null) {
       for (const e of object.childOrder) {
         message.childOrder.push(Number(e));
@@ -1138,7 +1152,7 @@ export const BatchProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BatchProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBatchProof } as BatchProof;
     message.entries = [];
@@ -1203,7 +1217,7 @@ export const BatchEntry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BatchEntry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBatchEntry } as BatchEntry;
     while (reader.pos < end) {
@@ -1277,7 +1291,7 @@ export const CompressedBatchProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CompressedBatchProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCompressedBatchProof } as CompressedBatchProof;
     message.entries = [];
@@ -1363,7 +1377,7 @@ export const CompressedBatchEntry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CompressedBatchEntry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCompressedBatchEntry } as CompressedBatchEntry;
     while (reader.pos < end) {
@@ -1445,10 +1459,12 @@ export const CompressedExistenceProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CompressedExistenceProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCompressedExistenceProof } as CompressedExistenceProof;
     message.path = [];
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1482,6 +1498,8 @@ export const CompressedExistenceProof = {
   fromJSON(object: any): CompressedExistenceProof {
     const message = { ...baseCompressedExistenceProof } as CompressedExistenceProof;
     message.path = [];
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -1560,9 +1578,10 @@ export const CompressedNonExistenceProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CompressedNonExistenceProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCompressedNonExistenceProof } as CompressedNonExistenceProof;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1585,6 +1604,7 @@ export const CompressedNonExistenceProof = {
 
   fromJSON(object: any): CompressedNonExistenceProof {
     const message = { ...baseCompressedNonExistenceProof } as CompressedNonExistenceProof;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -1674,3 +1694,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/auth/v1beta1/auth.ts b/packages/stargate/src/codec/cosmos/auth/v1beta1/auth.ts
index 886ff5b9..3f916fe3 100644
--- a/packages/stargate/src/codec/cosmos/auth/v1beta1/auth.ts
+++ b/packages/stargate/src/codec/cosmos/auth/v1beta1/auth.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Any } from "../../../google/protobuf/any";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { Any } from "../../../google/protobuf/any";
 
 export const protobufPackage = "cosmos.auth.v1beta1";
 
@@ -53,7 +53,7 @@ export const BaseAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BaseAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBaseAccount } as BaseAccount;
     while (reader.pos < end) {
@@ -157,7 +157,7 @@ export const ModuleAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ModuleAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseModuleAccount } as ModuleAccount;
     message.permissions = [];
@@ -266,7 +266,7 @@ export const Params = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Params {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseParams } as Params;
     while (reader.pos < end) {
@@ -380,3 +380,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/auth/v1beta1/query.ts b/packages/stargate/src/codec/cosmos/auth/v1beta1/query.ts
index cc5cc5f1..fef54147 100644
--- a/packages/stargate/src/codec/cosmos/auth/v1beta1/query.ts
+++ b/packages/stargate/src/codec/cosmos/auth/v1beta1/query.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Any } from "../../../google/protobuf/any";
 import { Params } from "../../../cosmos/auth/v1beta1/auth";
-import _m0 from "protobufjs/minimal";
-import Long from "long";
 
 export const protobufPackage = "cosmos.auth.v1beta1";
 
@@ -38,7 +38,7 @@ export const QueryAccountRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryAccountRequest } as QueryAccountRequest;
     while (reader.pos < end) {
@@ -93,7 +93,7 @@ export const QueryAccountResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryAccountResponse } as QueryAccountResponse;
     while (reader.pos < end) {
@@ -146,7 +146,7 @@ export const QueryParamsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsRequest } as QueryParamsRequest;
     while (reader.pos < end) {
@@ -187,7 +187,7 @@ export const QueryParamsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsResponse } as QueryParamsResponse;
     while (reader.pos < end) {
@@ -271,3 +271,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/bank/v1beta1/bank.ts b/packages/stargate/src/codec/cosmos/bank/v1beta1/bank.ts
index 43fa84f5..c402fe79 100644
--- a/packages/stargate/src/codec/cosmos/bank/v1beta1/bank.ts
+++ b/packages/stargate/src/codec/cosmos/bank/v1beta1/bank.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { Coin } from "../../../cosmos/base/v1beta1/coin";
 
 export const protobufPackage = "cosmos.bank.v1beta1";
 
@@ -90,7 +90,7 @@ export const Params = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Params {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseParams } as Params;
     message.sendEnabled = [];
@@ -169,7 +169,7 @@ export const SendEnabled = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SendEnabled {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSendEnabled } as SendEnabled;
     while (reader.pos < end) {
@@ -241,7 +241,7 @@ export const Input = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Input {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseInput } as Input;
     message.coins = [];
@@ -320,7 +320,7 @@ export const Output = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Output {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseOutput } as Output;
     message.coins = [];
@@ -396,7 +396,7 @@ export const Supply = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Supply {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSupply } as Supply;
     message.total = [];
@@ -464,7 +464,7 @@ export const DenomUnit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DenomUnit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDenomUnit } as DenomUnit;
     message.aliases = [];
@@ -563,7 +563,7 @@ export const Metadata = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Metadata {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMetadata } as Metadata;
     message.denomUnits = [];
@@ -666,3 +666,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/bank/v1beta1/query.ts b/packages/stargate/src/codec/cosmos/bank/v1beta1/query.ts
index 4e4e81b9..c01223cf 100644
--- a/packages/stargate/src/codec/cosmos/bank/v1beta1/query.ts
+++ b/packages/stargate/src/codec/cosmos/bank/v1beta1/query.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import { PageRequest, PageResponse } from "../../../cosmos/base/query/v1beta1/pagination";
 import { Params, Metadata } from "../../../cosmos/bank/v1beta1/bank";
-import _m0 from "protobufjs/minimal";
-import Long from "long";
 
 export const protobufPackage = "cosmos.bank.v1beta1";
 
@@ -121,7 +121,7 @@ export const QueryBalanceRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryBalanceRequest } as QueryBalanceRequest;
     while (reader.pos < end) {
@@ -190,7 +190,7 @@ export const QueryBalanceResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryBalanceResponse } as QueryBalanceResponse;
     while (reader.pos < end) {
@@ -249,7 +249,7 @@ export const QueryAllBalancesRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllBalancesRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryAllBalancesRequest } as QueryAllBalancesRequest;
     while (reader.pos < end) {
@@ -322,7 +322,7 @@ export const QueryAllBalancesResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllBalancesResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryAllBalancesResponse } as QueryAllBalancesResponse;
     message.balances = [];
@@ -396,7 +396,7 @@ export const QueryTotalSupplyRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalSupplyRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryTotalSupplyRequest } as QueryTotalSupplyRequest;
     while (reader.pos < end) {
@@ -437,7 +437,7 @@ export const QueryTotalSupplyResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalSupplyResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryTotalSupplyResponse } as QueryTotalSupplyResponse;
     message.supply = [];
@@ -499,7 +499,7 @@ export const QuerySupplyOfRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyOfRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQuerySupplyOfRequest } as QuerySupplyOfRequest;
     while (reader.pos < end) {
@@ -554,7 +554,7 @@ export const QuerySupplyOfResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyOfResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQuerySupplyOfResponse } as QuerySupplyOfResponse;
     while (reader.pos < end) {
@@ -606,7 +606,7 @@ export const QueryParamsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsRequest } as QueryParamsRequest;
     while (reader.pos < end) {
@@ -647,7 +647,7 @@ export const QueryParamsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsResponse } as QueryParamsResponse;
     while (reader.pos < end) {
@@ -702,7 +702,7 @@ export const QueryDenomsMetadataRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomsMetadataRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDenomsMetadataRequest } as QueryDenomsMetadataRequest;
     while (reader.pos < end) {
@@ -761,7 +761,7 @@ export const QueryDenomsMetadataResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomsMetadataResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDenomsMetadataResponse } as QueryDenomsMetadataResponse;
     message.metadatas = [];
@@ -838,7 +838,7 @@ export const QueryDenomMetadataRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomMetadataRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDenomMetadataRequest } as QueryDenomMetadataRequest;
     while (reader.pos < end) {
@@ -893,7 +893,7 @@ export const QueryDenomMetadataResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomMetadataResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDenomMetadataResponse } as QueryDenomMetadataResponse;
     while (reader.pos < end) {
@@ -1018,3 +1018,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/bank/v1beta1/tx.ts b/packages/stargate/src/codec/cosmos/bank/v1beta1/tx.ts
index 5aeee5b9..ef6e5401 100644
--- a/packages/stargate/src/codec/cosmos/bank/v1beta1/tx.ts
+++ b/packages/stargate/src/codec/cosmos/bank/v1beta1/tx.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import { Input, Output } from "../../../cosmos/bank/v1beta1/bank";
-import _m0 from "protobufjs/minimal";
-import Long from "long";
 
 export const protobufPackage = "cosmos.bank.v1beta1";
 
@@ -42,7 +42,7 @@ export const MsgSend = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSend {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSend } as MsgSend;
     message.amount = [];
@@ -129,7 +129,7 @@ export const MsgSendResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSendResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSendResponse } as MsgSendResponse;
     while (reader.pos < end) {
@@ -173,7 +173,7 @@ export const MsgMultiSend = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgMultiSend {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgMultiSend } as MsgMultiSend;
     message.inputs = [];
@@ -253,7 +253,7 @@ export const MsgMultiSendResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgMultiSendResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgMultiSendResponse } as MsgMultiSendResponse;
     while (reader.pos < end) {
@@ -323,3 +323,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/base/abci/v1beta1/abci.ts b/packages/stargate/src/codec/cosmos/base/abci/v1beta1/abci.ts
index 2feb981f..c10203cd 100644
--- a/packages/stargate/src/codec/cosmos/base/abci/v1beta1/abci.ts
+++ b/packages/stargate/src/codec/cosmos/base/abci/v1beta1/abci.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
 import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Any } from "../../../../google/protobuf/any";
 import { Event } from "../../../../tendermint/abci/types";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.base.abci.v1beta1";
 
@@ -194,7 +194,7 @@ export const TxResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxResponse } as TxResponse;
     message.logs = [];
@@ -416,7 +416,7 @@ export const ABCIMessageLog = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ABCIMessageLog {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseABCIMessageLog } as ABCIMessageLog;
     message.events = [];
@@ -509,7 +509,7 @@ export const StringEvent = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): StringEvent {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseStringEvent } as StringEvent;
     message.attributes = [];
@@ -588,7 +588,7 @@ export const Attribute = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Attribute {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseAttribute } as Attribute;
     while (reader.pos < end) {
@@ -660,7 +660,7 @@ export const GasInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): GasInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseGasInfo } as GasInfo;
     while (reader.pos < end) {
@@ -735,10 +735,11 @@ export const Result = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Result {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResult } as Result;
     message.events = [];
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -762,6 +763,7 @@ export const Result = {
   fromJSON(object: any): Result {
     const message = { ...baseResult } as Result;
     message.events = [];
+    message.data = new Uint8Array();
     if (object.data !== undefined && object.data !== null) {
       message.data = bytesFromBase64(object.data);
     }
@@ -827,7 +829,7 @@ export const SimulationResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SimulationResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSimulationResponse } as SimulationResponse;
     while (reader.pos < end) {
@@ -900,9 +902,10 @@ export const MsgData = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgData {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgData } as MsgData;
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -922,6 +925,7 @@ export const MsgData = {
 
   fromJSON(object: any): MsgData {
     const message = { ...baseMsgData } as MsgData;
+    message.data = new Uint8Array();
     if (object.msgType !== undefined && object.msgType !== null) {
       message.msgType = String(object.msgType);
     } else {
@@ -968,7 +972,7 @@ export const TxMsgData = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxMsgData {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxMsgData } as TxMsgData;
     message.data = [];
@@ -1051,7 +1055,7 @@ export const SearchTxsResult = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SearchTxsResult {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSearchTxsResult } as SearchTxsResult;
     message.txs = [];
@@ -1213,3 +1217,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/base/query/v1beta1/pagination.ts b/packages/stargate/src/codec/cosmos/base/query/v1beta1/pagination.ts
index 45715b50..0fa76d91 100644
--- a/packages/stargate/src/codec/cosmos/base/query/v1beta1/pagination.ts
+++ b/packages/stargate/src/codec/cosmos/base/query/v1beta1/pagination.ts
@@ -82,9 +82,10 @@ export const PageRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PageRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePageRequest } as PageRequest;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -110,6 +111,7 @@ export const PageRequest = {
 
   fromJSON(object: any): PageRequest {
     const message = { ...basePageRequest } as PageRequest;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -181,9 +183,10 @@ export const PageResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PageResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePageResponse } as PageResponse;
+    message.nextKey = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -203,6 +206,7 @@ export const PageResponse = {
 
   fromJSON(object: any): PageResponse {
     const message = { ...basePageResponse } as PageResponse;
+    message.nextKey = new Uint8Array();
     if (object.nextKey !== undefined && object.nextKey !== null) {
       message.nextKey = bytesFromBase64(object.nextKey);
     }
@@ -279,3 +283,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/base/v1beta1/coin.ts b/packages/stargate/src/codec/cosmos/base/v1beta1/coin.ts
index e682a9a7..0a13bcca 100644
--- a/packages/stargate/src/codec/cosmos/base/v1beta1/coin.ts
+++ b/packages/stargate/src/codec/cosmos/base/v1beta1/coin.ts
@@ -50,7 +50,7 @@ export const Coin = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Coin {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCoin } as Coin;
     while (reader.pos < end) {
@@ -122,7 +122,7 @@ export const DecCoin = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DecCoin {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDecCoin } as DecCoin;
     while (reader.pos < end) {
@@ -191,7 +191,7 @@ export const IntProto = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): IntProto {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseIntProto } as IntProto;
     while (reader.pos < end) {
@@ -246,7 +246,7 @@ export const DecProto = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DecProto {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDecProto } as DecProto;
     while (reader.pos < end) {
@@ -300,3 +300,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/crypto/multisig/v1beta1/multisig.ts b/packages/stargate/src/codec/cosmos/crypto/multisig/v1beta1/multisig.ts
index 11fdaf82..a15c5cca 100644
--- a/packages/stargate/src/codec/cosmos/crypto/multisig/v1beta1/multisig.ts
+++ b/packages/stargate/src/codec/cosmos/crypto/multisig/v1beta1/multisig.ts
@@ -35,7 +35,7 @@ export const MultiSignature = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MultiSignature {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMultiSignature } as MultiSignature;
     message.signatures = [];
@@ -100,9 +100,10 @@ export const CompactBitArray = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CompactBitArray {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCompactBitArray } as CompactBitArray;
+    message.elems = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -122,6 +123,7 @@ export const CompactBitArray = {
 
   fromJSON(object: any): CompactBitArray {
     const message = { ...baseCompactBitArray } as CompactBitArray;
+    message.elems = new Uint8Array();
     if (object.extraBitsStored !== undefined && object.extraBitsStored !== null) {
       message.extraBitsStored = Number(object.extraBitsStored);
     } else {
@@ -198,3 +200,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/crypto/secp256k1/keys.ts b/packages/stargate/src/codec/cosmos/crypto/secp256k1/keys.ts
index 984a320a..40b46508 100644
--- a/packages/stargate/src/codec/cosmos/crypto/secp256k1/keys.ts
+++ b/packages/stargate/src/codec/cosmos/crypto/secp256k1/keys.ts
@@ -31,9 +31,10 @@ export const PubKey = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PubKey {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePubKey } as PubKey;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -50,6 +51,7 @@ export const PubKey = {
 
   fromJSON(object: any): PubKey {
     const message = { ...basePubKey } as PubKey;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -85,9 +87,10 @@ export const PrivKey = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PrivKey {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePrivKey } as PrivKey;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -104,6 +107,7 @@ export const PrivKey = {
 
   fromJSON(object: any): PrivKey {
     const message = { ...basePrivKey } as PrivKey;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -169,3 +173,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/distribution/v1beta1/distribution.ts b/packages/stargate/src/codec/cosmos/distribution/v1beta1/distribution.ts
index b50ba1b5..8cf94c10 100644
--- a/packages/stargate/src/codec/cosmos/distribution/v1beta1/distribution.ts
+++ b/packages/stargate/src/codec/cosmos/distribution/v1beta1/distribution.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from "long";
-import { DecCoin, Coin } from "../../../cosmos/base/v1beta1/coin";
 import _m0 from "protobufjs/minimal";
+import { DecCoin, Coin } from "../../../cosmos/base/v1beta1/coin";
 
 export const protobufPackage = "cosmos.distribution.v1beta1";
 
@@ -151,7 +151,7 @@ export const Params = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Params {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseParams } as Params;
     while (reader.pos < end) {
@@ -251,7 +251,7 @@ export const ValidatorHistoricalRewards = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorHistoricalRewards {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorHistoricalRewards } as ValidatorHistoricalRewards;
     message.cumulativeRewardRatio = [];
@@ -332,7 +332,7 @@ export const ValidatorCurrentRewards = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorCurrentRewards {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorCurrentRewards } as ValidatorCurrentRewards;
     message.rewards = [];
@@ -408,7 +408,7 @@ export const ValidatorAccumulatedCommission = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorAccumulatedCommission {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorAccumulatedCommission } as ValidatorAccumulatedCommission;
     message.commission = [];
@@ -470,7 +470,7 @@ export const ValidatorOutstandingRewards = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorOutstandingRewards {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorOutstandingRewards } as ValidatorOutstandingRewards;
     message.rewards = [];
@@ -535,7 +535,7 @@ export const ValidatorSlashEvent = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSlashEvent {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorSlashEvent } as ValidatorSlashEvent;
     while (reader.pos < end) {
@@ -605,7 +605,7 @@ export const ValidatorSlashEvents = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSlashEvents {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorSlashEvents } as ValidatorSlashEvents;
     message.validatorSlashEvents = [];
@@ -669,7 +669,7 @@ export const FeePool = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): FeePool {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseFeePool } as FeePool;
     message.communityPool = [];
@@ -740,7 +740,7 @@ export const CommunityPoolSpendProposal = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CommunityPoolSpendProposal {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommunityPoolSpendProposal } as CommunityPoolSpendProposal;
     message.amount = [];
@@ -850,7 +850,7 @@ export const DelegatorStartingInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DelegatorStartingInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDelegatorStartingInfo } as DelegatorStartingInfo;
     while (reader.pos < end) {
@@ -937,7 +937,7 @@ export const DelegationDelegatorReward = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DelegationDelegatorReward {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDelegationDelegatorReward } as DelegationDelegatorReward;
     message.reward = [];
@@ -1034,7 +1034,7 @@ export const CommunityPoolSpendProposalWithDeposit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CommunityPoolSpendProposalWithDeposit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommunityPoolSpendProposalWithDeposit } as CommunityPoolSpendProposalWithDeposit;
     while (reader.pos < end) {
@@ -1146,3 +1146,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/distribution/v1beta1/query.ts b/packages/stargate/src/codec/cosmos/distribution/v1beta1/query.ts
index 4e264cf4..3fbf7a7d 100644
--- a/packages/stargate/src/codec/cosmos/distribution/v1beta1/query.ts
+++ b/packages/stargate/src/codec/cosmos/distribution/v1beta1/query.ts
@@ -1,4 +1,6 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import {
   Params,
   ValidatorOutstandingRewards,
@@ -6,10 +8,8 @@ import {
   ValidatorSlashEvent,
   DelegationDelegatorReward,
 } from "../../../cosmos/distribution/v1beta1/distribution";
-import Long from "long";
 import { PageRequest, PageResponse } from "../../../cosmos/base/query/v1beta1/pagination";
 import { DecCoin } from "../../../cosmos/base/v1beta1/coin";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.distribution.v1beta1";
 
@@ -182,7 +182,7 @@ export const QueryParamsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsRequest } as QueryParamsRequest;
     while (reader.pos < end) {
@@ -223,7 +223,7 @@ export const QueryParamsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsResponse } as QueryParamsResponse;
     while (reader.pos < end) {
@@ -281,7 +281,7 @@ export const QueryValidatorOutstandingRewardsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryValidatorOutstandingRewardsRequest,
@@ -347,7 +347,7 @@ export const QueryValidatorOutstandingRewardsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryValidatorOutstandingRewardsResponse,
@@ -411,7 +411,7 @@ export const QueryValidatorCommissionRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorCommissionRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorCommissionRequest } as QueryValidatorCommissionRequest;
     while (reader.pos < end) {
@@ -466,7 +466,7 @@ export const QueryValidatorCommissionResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorCommissionResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorCommissionResponse } as QueryValidatorCommissionResponse;
     while (reader.pos < end) {
@@ -537,7 +537,7 @@ export const QueryValidatorSlashesRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorSlashesRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorSlashesRequest } as QueryValidatorSlashesRequest;
     while (reader.pos < end) {
@@ -640,7 +640,7 @@ export const QueryValidatorSlashesResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorSlashesResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorSlashesResponse } as QueryValidatorSlashesResponse;
     message.slashes = [];
@@ -720,7 +720,7 @@ export const QueryDelegationRewardsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRewardsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationRewardsRequest } as QueryDelegationRewardsRequest;
     while (reader.pos < end) {
@@ -789,7 +789,7 @@ export const QueryDelegationRewardsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRewardsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationRewardsResponse } as QueryDelegationRewardsResponse;
     message.rewards = [];
@@ -851,7 +851,7 @@ export const QueryDelegationTotalRewardsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationTotalRewardsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationTotalRewardsRequest } as QueryDelegationTotalRewardsRequest;
     while (reader.pos < end) {
@@ -909,7 +909,7 @@ export const QueryDelegationTotalRewardsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationTotalRewardsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationTotalRewardsResponse } as QueryDelegationTotalRewardsResponse;
     message.rewards = [];
@@ -992,7 +992,7 @@ export const QueryDelegatorValidatorsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorsRequest } as QueryDelegatorValidatorsRequest;
     while (reader.pos < end) {
@@ -1047,7 +1047,7 @@ export const QueryDelegatorValidatorsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorsResponse } as QueryDelegatorValidatorsResponse;
     message.validators = [];
@@ -1112,7 +1112,7 @@ export const QueryDelegatorWithdrawAddressRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorWithdrawAddressRequest } as QueryDelegatorWithdrawAddressRequest;
     while (reader.pos < end) {
@@ -1172,7 +1172,7 @@ export const QueryDelegatorWithdrawAddressResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorWithdrawAddressResponse } as QueryDelegatorWithdrawAddressResponse;
     while (reader.pos < end) {
@@ -1226,7 +1226,7 @@ export const QueryCommunityPoolRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryCommunityPoolRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryCommunityPoolRequest } as QueryCommunityPoolRequest;
     while (reader.pos < end) {
@@ -1267,7 +1267,7 @@ export const QueryCommunityPoolResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryCommunityPoolResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryCommunityPoolResponse } as QueryCommunityPoolResponse;
     message.pool = [];
@@ -1433,3 +1433,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/distribution/v1beta1/tx.ts b/packages/stargate/src/codec/cosmos/distribution/v1beta1/tx.ts
index 4bbde5f3..0ae09469 100644
--- a/packages/stargate/src/codec/cosmos/distribution/v1beta1/tx.ts
+++ b/packages/stargate/src/codec/cosmos/distribution/v1beta1/tx.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Coin } from "../../../cosmos/base/v1beta1/coin";
-import _m0 from "protobufjs/minimal";
 import Long from "long";
+import _m0 from "protobufjs/minimal";
+import { Coin } from "../../../cosmos/base/v1beta1/coin";
 
 export const protobufPackage = "cosmos.distribution.v1beta1";
 
@@ -66,7 +66,7 @@ export const MsgSetWithdrawAddress = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSetWithdrawAddress {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSetWithdrawAddress } as MsgSetWithdrawAddress;
     while (reader.pos < end) {
@@ -132,7 +132,7 @@ export const MsgSetWithdrawAddressResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSetWithdrawAddressResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSetWithdrawAddressResponse } as MsgSetWithdrawAddressResponse;
     while (reader.pos < end) {
@@ -176,7 +176,7 @@ export const MsgWithdrawDelegatorReward = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawDelegatorReward {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgWithdrawDelegatorReward } as MsgWithdrawDelegatorReward;
     while (reader.pos < end) {
@@ -242,7 +242,7 @@ export const MsgWithdrawDelegatorRewardResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawDelegatorRewardResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgWithdrawDelegatorRewardResponse } as MsgWithdrawDelegatorRewardResponse;
     while (reader.pos < end) {
@@ -283,7 +283,7 @@ export const MsgWithdrawValidatorCommission = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawValidatorCommission {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgWithdrawValidatorCommission } as MsgWithdrawValidatorCommission;
     while (reader.pos < end) {
@@ -335,7 +335,7 @@ export const MsgWithdrawValidatorCommissionResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawValidatorCommissionResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseMsgWithdrawValidatorCommissionResponse,
@@ -387,7 +387,7 @@ export const MsgFundCommunityPool = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgFundCommunityPool {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgFundCommunityPool } as MsgFundCommunityPool;
     message.amount = [];
@@ -460,7 +460,7 @@ export const MsgFundCommunityPoolResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgFundCommunityPoolResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgFundCommunityPoolResponse } as MsgFundCommunityPoolResponse;
     while (reader.pos < end) {
@@ -562,3 +562,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/staking/v1beta1/query.ts b/packages/stargate/src/codec/cosmos/staking/v1beta1/query.ts
index 3dbc572d..65bc922c 100644
--- a/packages/stargate/src/codec/cosmos/staking/v1beta1/query.ts
+++ b/packages/stargate/src/codec/cosmos/staking/v1beta1/query.ts
@@ -1,4 +1,6 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { PageRequest, PageResponse } from "../../../cosmos/base/query/v1beta1/pagination";
 import {
   Validator,
@@ -9,8 +11,6 @@ import {
   Params,
   RedelegationResponse,
 } from "../../../cosmos/staking/v1beta1/staking";
-import Long from "long";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.staking.v1beta1";
 
@@ -278,7 +278,7 @@ export const QueryValidatorsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorsRequest } as QueryValidatorsRequest;
     while (reader.pos < end) {
@@ -351,7 +351,7 @@ export const QueryValidatorsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorsResponse } as QueryValidatorsResponse;
     message.validators = [];
@@ -428,7 +428,7 @@ export const QueryValidatorRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorRequest } as QueryValidatorRequest;
     while (reader.pos < end) {
@@ -483,7 +483,7 @@ export const QueryValidatorResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorResponse } as QueryValidatorResponse;
     while (reader.pos < end) {
@@ -542,7 +542,7 @@ export const QueryValidatorDelegationsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorDelegationsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorDelegationsRequest } as QueryValidatorDelegationsRequest;
     while (reader.pos < end) {
@@ -615,7 +615,7 @@ export const QueryValidatorDelegationsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorDelegationsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryValidatorDelegationsResponse } as QueryValidatorDelegationsResponse;
     message.delegationResponses = [];
@@ -700,7 +700,7 @@ export const QueryValidatorUnbondingDelegationsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryValidatorUnbondingDelegationsRequest,
@@ -784,7 +784,7 @@ export const QueryValidatorUnbondingDelegationsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryValidatorUnbondingDelegationsResponse,
@@ -874,7 +874,7 @@ export const QueryDelegationRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationRequest } as QueryDelegationRequest;
     while (reader.pos < end) {
@@ -943,7 +943,7 @@ export const QueryDelegationResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegationResponse } as QueryDelegationResponse;
     while (reader.pos < end) {
@@ -1004,7 +1004,7 @@ export const QueryUnbondingDelegationRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnbondingDelegationRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnbondingDelegationRequest } as QueryUnbondingDelegationRequest;
     while (reader.pos < end) {
@@ -1073,7 +1073,7 @@ export const QueryUnbondingDelegationResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnbondingDelegationResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnbondingDelegationResponse } as QueryUnbondingDelegationResponse;
     while (reader.pos < end) {
@@ -1132,7 +1132,7 @@ export const QueryDelegatorDelegationsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorDelegationsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorDelegationsRequest } as QueryDelegatorDelegationsRequest;
     while (reader.pos < end) {
@@ -1205,7 +1205,7 @@ export const QueryDelegatorDelegationsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorDelegationsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorDelegationsResponse } as QueryDelegatorDelegationsResponse;
     message.delegationResponses = [];
@@ -1290,7 +1290,7 @@ export const QueryDelegatorUnbondingDelegationsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryDelegatorUnbondingDelegationsRequest,
@@ -1374,7 +1374,7 @@ export const QueryDelegatorUnbondingDelegationsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = {
       ...baseQueryDelegatorUnbondingDelegationsResponse,
@@ -1474,7 +1474,7 @@ export const QueryRedelegationsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryRedelegationsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryRedelegationsRequest } as QueryRedelegationsRequest;
     while (reader.pos < end) {
@@ -1575,7 +1575,7 @@ export const QueryRedelegationsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryRedelegationsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryRedelegationsResponse } as QueryRedelegationsResponse;
     message.redelegationResponses = [];
@@ -1657,7 +1657,7 @@ export const QueryDelegatorValidatorsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorsRequest } as QueryDelegatorValidatorsRequest;
     while (reader.pos < end) {
@@ -1730,7 +1730,7 @@ export const QueryDelegatorValidatorsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorsResponse } as QueryDelegatorValidatorsResponse;
     message.validators = [];
@@ -1810,7 +1810,7 @@ export const QueryDelegatorValidatorRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorRequest } as QueryDelegatorValidatorRequest;
     while (reader.pos < end) {
@@ -1879,7 +1879,7 @@ export const QueryDelegatorValidatorResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryDelegatorValidatorResponse } as QueryDelegatorValidatorResponse;
     while (reader.pos < end) {
@@ -1935,7 +1935,7 @@ export const QueryHistoricalInfoRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryHistoricalInfoRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryHistoricalInfoRequest } as QueryHistoricalInfoRequest;
     while (reader.pos < end) {
@@ -1990,7 +1990,7 @@ export const QueryHistoricalInfoResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryHistoricalInfoResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryHistoricalInfoResponse } as QueryHistoricalInfoResponse;
     while (reader.pos < end) {
@@ -2042,7 +2042,7 @@ export const QueryPoolRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPoolRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPoolRequest } as QueryPoolRequest;
     while (reader.pos < end) {
@@ -2083,7 +2083,7 @@ export const QueryPoolResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPoolResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPoolResponse } as QueryPoolResponse;
     while (reader.pos < end) {
@@ -2135,7 +2135,7 @@ export const QueryParamsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsRequest } as QueryParamsRequest;
     while (reader.pos < end) {
@@ -2176,7 +2176,7 @@ export const QueryParamsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryParamsResponse } as QueryParamsResponse;
     while (reader.pos < end) {
@@ -2380,3 +2380,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/staking/v1beta1/staking.ts b/packages/stargate/src/codec/cosmos/staking/v1beta1/staking.ts
index 7756de3f..3edbd241 100644
--- a/packages/stargate/src/codec/cosmos/staking/v1beta1/staking.ts
+++ b/packages/stargate/src/codec/cosmos/staking/v1beta1/staking.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Header } from "../../../tendermint/types/types";
 import { Any } from "../../../google/protobuf/any";
-import Long from "long";
 import { Duration } from "../../../google/protobuf/duration";
 import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import { Timestamp } from "../../../google/protobuf/timestamp";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.staking.v1beta1";
 
@@ -308,7 +308,7 @@ export const HistoricalInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): HistoricalInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseHistoricalInfo } as HistoricalInfo;
     message.valset = [];
@@ -390,7 +390,7 @@ export const CommissionRates = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CommissionRates {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommissionRates } as CommissionRates;
     while (reader.pos < end) {
@@ -476,7 +476,7 @@ export const Commission = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Commission {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommission } as Commission;
     while (reader.pos < end) {
@@ -517,8 +517,7 @@ export const Commission = {
       (obj.commissionRates = message.commissionRates
         ? CommissionRates.toJSON(message.commissionRates)
         : undefined);
-    message.updateTime !== undefined &&
-      (obj.updateTime = message.updateTime !== undefined ? message.updateTime.toISOString() : null);
+    message.updateTime !== undefined && (obj.updateTime = message.updateTime.toISOString());
     return obj;
   },
 
@@ -561,7 +560,7 @@ export const Description = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Description {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDescription } as Description;
     while (reader.pos < end) {
@@ -710,7 +709,7 @@ export const Validator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Validator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidator } as Validator;
     while (reader.pos < end) {
@@ -830,8 +829,7 @@ export const Validator = {
       (obj.description = message.description ? Description.toJSON(message.description) : undefined);
     message.unbondingHeight !== undefined &&
       (obj.unbondingHeight = (message.unbondingHeight || Long.ZERO).toString());
-    message.unbondingTime !== undefined &&
-      (obj.unbondingTime = message.unbondingTime !== undefined ? message.unbondingTime.toISOString() : null);
+    message.unbondingTime !== undefined && (obj.unbondingTime = message.unbondingTime.toISOString());
     message.commission !== undefined &&
       (obj.commission = message.commission ? Commission.toJSON(message.commission) : undefined);
     message.minSelfDelegation !== undefined && (obj.minSelfDelegation = message.minSelfDelegation);
@@ -910,7 +908,7 @@ export const ValAddresses = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValAddresses {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValAddresses } as ValAddresses;
     message.addresses = [];
@@ -975,7 +973,7 @@ export const DVPair = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DVPair {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDVPair } as DVPair;
     while (reader.pos < end) {
@@ -1044,7 +1042,7 @@ export const DVPairs = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DVPairs {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDVPairs } as DVPairs;
     message.pairs = [];
@@ -1112,7 +1110,7 @@ export const DVVTriplet = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DVVTriplet {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDVVTriplet } as DVVTriplet;
     while (reader.pos < end) {
@@ -1195,7 +1193,7 @@ export const DVVTriplets = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DVVTriplets {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDVVTriplets } as DVVTriplets;
     message.triplets = [];
@@ -1263,7 +1261,7 @@ export const Delegation = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Delegation {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDelegation } as Delegation;
     while (reader.pos < end) {
@@ -1352,7 +1350,7 @@ export const UnbondingDelegation = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): UnbondingDelegation {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseUnbondingDelegation } as UnbondingDelegation;
     message.entries = [];
@@ -1451,7 +1449,7 @@ export const UnbondingDelegationEntry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): UnbondingDelegationEntry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseUnbondingDelegationEntry } as UnbondingDelegationEntry;
     while (reader.pos < end) {
@@ -1506,9 +1504,7 @@ export const UnbondingDelegationEntry = {
     const obj: any = {};
     message.creationHeight !== undefined &&
       (obj.creationHeight = (message.creationHeight || Long.ZERO).toString());
-    message.completionTime !== undefined &&
-      (obj.completionTime =
-        message.completionTime !== undefined ? message.completionTime.toISOString() : null);
+    message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString());
     message.initialBalance !== undefined && (obj.initialBalance = message.initialBalance);
     message.balance !== undefined && (obj.balance = message.balance);
     return obj;
@@ -1560,7 +1556,7 @@ export const RedelegationEntry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationEntry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRedelegationEntry } as RedelegationEntry;
     while (reader.pos < end) {
@@ -1615,9 +1611,7 @@ export const RedelegationEntry = {
     const obj: any = {};
     message.creationHeight !== undefined &&
       (obj.creationHeight = (message.creationHeight || Long.ZERO).toString());
-    message.completionTime !== undefined &&
-      (obj.completionTime =
-        message.completionTime !== undefined ? message.completionTime.toISOString() : null);
+    message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString());
     message.initialBalance !== undefined && (obj.initialBalance = message.initialBalance);
     message.sharesDst !== undefined && (obj.sharesDst = message.sharesDst);
     return obj;
@@ -1669,7 +1663,7 @@ export const Redelegation = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Redelegation {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRedelegation } as Redelegation;
     message.entries = [];
@@ -1785,7 +1779,7 @@ export const Params = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Params {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseParams } as Params;
     while (reader.pos < end) {
@@ -1900,7 +1894,7 @@ export const DelegationResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DelegationResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDelegationResponse } as DelegationResponse;
     while (reader.pos < end) {
@@ -1974,7 +1968,7 @@ export const RedelegationEntryResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationEntryResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRedelegationEntryResponse } as RedelegationEntryResponse;
     while (reader.pos < end) {
@@ -2049,7 +2043,7 @@ export const RedelegationResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRedelegationResponse } as RedelegationResponse;
     message.entries = [];
@@ -2129,7 +2123,7 @@ export const Pool = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Pool {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePool } as Pool;
     while (reader.pos < end) {
diff --git a/packages/stargate/src/codec/cosmos/staking/v1beta1/tx.ts b/packages/stargate/src/codec/cosmos/staking/v1beta1/tx.ts
index 662f5b36..0f8c9d85 100644
--- a/packages/stargate/src/codec/cosmos/staking/v1beta1/tx.ts
+++ b/packages/stargate/src/codec/cosmos/staking/v1beta1/tx.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Description, CommissionRates } from "../../../cosmos/staking/v1beta1/staking";
 import { Any } from "../../../google/protobuf/any";
 import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import { Timestamp } from "../../../google/protobuf/timestamp";
-import Long from "long";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.staking.v1beta1";
 
@@ -112,7 +112,7 @@ export const MsgCreateValidator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateValidator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgCreateValidator } as MsgCreateValidator;
     while (reader.pos < end) {
@@ -250,7 +250,7 @@ export const MsgCreateValidatorResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateValidatorResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgCreateValidatorResponse } as MsgCreateValidatorResponse;
     while (reader.pos < end) {
@@ -300,7 +300,7 @@ export const MsgEditValidator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgEditValidator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgEditValidator } as MsgEditValidator;
     while (reader.pos < end) {
@@ -395,7 +395,7 @@ export const MsgEditValidatorResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgEditValidatorResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgEditValidatorResponse } as MsgEditValidatorResponse;
     while (reader.pos < end) {
@@ -442,7 +442,7 @@ export const MsgDelegate = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgDelegate {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgDelegate } as MsgDelegate;
     while (reader.pos < end) {
@@ -522,7 +522,7 @@ export const MsgDelegateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgDelegateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgDelegateResponse } as MsgDelegateResponse;
     while (reader.pos < end) {
@@ -576,7 +576,7 @@ export const MsgBeginRedelegate = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgBeginRedelegate {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgBeginRedelegate } as MsgBeginRedelegate;
     while (reader.pos < end) {
@@ -673,7 +673,7 @@ export const MsgBeginRedelegateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgBeginRedelegateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgBeginRedelegateResponse } as MsgBeginRedelegateResponse;
     while (reader.pos < end) {
@@ -702,9 +702,7 @@ export const MsgBeginRedelegateResponse = {
 
   toJSON(message: MsgBeginRedelegateResponse): unknown {
     const obj: any = {};
-    message.completionTime !== undefined &&
-      (obj.completionTime =
-        message.completionTime !== undefined ? message.completionTime.toISOString() : null);
+    message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString());
     return obj;
   },
 
@@ -736,7 +734,7 @@ export const MsgUndelegate = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUndelegate {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUndelegate } as MsgUndelegate;
     while (reader.pos < end) {
@@ -819,7 +817,7 @@ export const MsgUndelegateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUndelegateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUndelegateResponse } as MsgUndelegateResponse;
     while (reader.pos < end) {
@@ -848,9 +846,7 @@ export const MsgUndelegateResponse = {
 
   toJSON(message: MsgUndelegateResponse): unknown {
     const obj: any = {};
-    message.completionTime !== undefined &&
-      (obj.completionTime =
-        message.completionTime !== undefined ? message.completionTime.toISOString() : null);
+    message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString());
     return obj;
   },
 
diff --git a/packages/stargate/src/codec/cosmos/tx/signing/v1beta1/signing.ts b/packages/stargate/src/codec/cosmos/tx/signing/v1beta1/signing.ts
index e49a7573..7daebd1b 100644
--- a/packages/stargate/src/codec/cosmos/tx/signing/v1beta1/signing.ts
+++ b/packages/stargate/src/codec/cosmos/tx/signing/v1beta1/signing.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { Any } from "../../../../google/protobuf/any";
 import Long from "long";
-import { CompactBitArray } from "../../../../cosmos/crypto/multisig/v1beta1/multisig";
 import _m0 from "protobufjs/minimal";
+import { Any } from "../../../../google/protobuf/any";
+import { CompactBitArray } from "../../../../cosmos/crypto/multisig/v1beta1/multisig";
 
 export const protobufPackage = "cosmos.tx.signing.v1beta1";
 
@@ -127,7 +127,7 @@ export const SignatureDescriptors = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptors {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignatureDescriptors } as SignatureDescriptors;
     message.signatures = [];
@@ -195,7 +195,7 @@ export const SignatureDescriptor = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignatureDescriptor } as SignatureDescriptor;
     while (reader.pos < end) {
@@ -283,7 +283,7 @@ export const SignatureDescriptor_Data = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignatureDescriptor_Data } as SignatureDescriptor_Data;
     while (reader.pos < end) {
@@ -357,9 +357,10 @@ export const SignatureDescriptor_Data_Single = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data_Single {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignatureDescriptor_Data_Single } as SignatureDescriptor_Data_Single;
+    message.signature = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -379,6 +380,7 @@ export const SignatureDescriptor_Data_Single = {
 
   fromJSON(object: any): SignatureDescriptor_Data_Single {
     const message = { ...baseSignatureDescriptor_Data_Single } as SignatureDescriptor_Data_Single;
+    message.signature = new Uint8Array();
     if (object.mode !== undefined && object.mode !== null) {
       message.mode = signModeFromJSON(object.mode);
     } else {
@@ -430,7 +432,7 @@ export const SignatureDescriptor_Data_Multi = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data_Multi {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignatureDescriptor_Data_Multi } as SignatureDescriptor_Data_Multi;
     message.signatures = [];
@@ -537,3 +539,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/tx/v1beta1/tx.ts b/packages/stargate/src/codec/cosmos/tx/v1beta1/tx.ts
index 5b23d016..c54138fa 100644
--- a/packages/stargate/src/codec/cosmos/tx/v1beta1/tx.ts
+++ b/packages/stargate/src/codec/cosmos/tx/v1beta1/tx.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
 import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Any } from "../../../google/protobuf/any";
 import { SignMode, signModeFromJSON, signModeToJSON } from "../../../cosmos/tx/signing/v1beta1/signing";
 import { CompactBitArray } from "../../../cosmos/crypto/multisig/v1beta1/multisig";
 import { Coin } from "../../../cosmos/base/v1beta1/coin";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "cosmos.tx.v1beta1";
 
@@ -224,7 +224,7 @@ export const Tx = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Tx {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTx } as Tx;
     message.signatures = [];
@@ -321,10 +321,12 @@ export const TxRaw = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxRaw {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxRaw } as TxRaw;
     message.signatures = [];
+    message.bodyBytes = new Uint8Array();
+    message.authInfoBytes = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -348,6 +350,8 @@ export const TxRaw = {
   fromJSON(object: any): TxRaw {
     const message = { ...baseTxRaw } as TxRaw;
     message.signatures = [];
+    message.bodyBytes = new Uint8Array();
+    message.authInfoBytes = new Uint8Array();
     if (object.bodyBytes !== undefined && object.bodyBytes !== null) {
       message.bodyBytes = bytesFromBase64(object.bodyBytes);
     }
@@ -422,9 +426,11 @@ export const SignDoc = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignDoc {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignDoc } as SignDoc;
+    message.bodyBytes = new Uint8Array();
+    message.authInfoBytes = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -450,6 +456,8 @@ export const SignDoc = {
 
   fromJSON(object: any): SignDoc {
     const message = { ...baseSignDoc } as SignDoc;
+    message.bodyBytes = new Uint8Array();
+    message.authInfoBytes = new Uint8Array();
     if (object.bodyBytes !== undefined && object.bodyBytes !== null) {
       message.bodyBytes = bytesFromBase64(object.bodyBytes);
     }
@@ -534,7 +542,7 @@ export const TxBody = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxBody {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxBody } as TxBody;
     message.messages = [];
@@ -672,7 +680,7 @@ export const AuthInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): AuthInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseAuthInfo } as AuthInfo;
     message.signerInfos = [];
@@ -754,7 +762,7 @@ export const SignerInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignerInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignerInfo } as SignerInfo;
     while (reader.pos < end) {
@@ -842,7 +850,7 @@ export const ModeInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseModeInfo } as ModeInfo;
     while (reader.pos < end) {
@@ -913,7 +921,7 @@ export const ModeInfo_Single = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo_Single {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseModeInfo_Single } as ModeInfo_Single;
     while (reader.pos < end) {
@@ -971,7 +979,7 @@ export const ModeInfo_Multi = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo_Multi {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseModeInfo_Multi } as ModeInfo_Multi;
     message.modeInfos = [];
@@ -1057,7 +1065,7 @@ export const Fee = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Fee {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseFee } as Fee;
     message.amount = [];
@@ -1191,3 +1199,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/cosmos/vesting/v1beta1/vesting.ts b/packages/stargate/src/codec/cosmos/vesting/v1beta1/vesting.ts
index f9f2d0ea..3679fa38 100644
--- a/packages/stargate/src/codec/cosmos/vesting/v1beta1/vesting.ts
+++ b/packages/stargate/src/codec/cosmos/vesting/v1beta1/vesting.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { BaseAccount } from "../../../cosmos/auth/v1beta1/auth";
 import Long from "long";
-import { Coin } from "../../../cosmos/base/v1beta1/coin";
 import _m0 from "protobufjs/minimal";
+import { BaseAccount } from "../../../cosmos/auth/v1beta1/auth";
+import { Coin } from "../../../cosmos/base/v1beta1/coin";
 
 export const protobufPackage = "cosmos.vesting.v1beta1";
 
@@ -75,7 +75,7 @@ export const BaseVestingAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BaseVestingAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBaseVestingAccount } as BaseVestingAccount;
     message.originalVesting = [];
@@ -211,7 +211,7 @@ export const ContinuousVestingAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ContinuousVestingAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseContinuousVestingAccount } as ContinuousVestingAccount;
     while (reader.pos < end) {
@@ -283,7 +283,7 @@ export const DelayedVestingAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DelayedVestingAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDelayedVestingAccount } as DelayedVestingAccount;
     while (reader.pos < end) {
@@ -344,7 +344,7 @@ export const Period = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Period {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePeriod } as Period;
     message.amount = [];
@@ -426,7 +426,7 @@ export const PeriodicVestingAccount = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PeriodicVestingAccount {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePeriodicVestingAccount } as PeriodicVestingAccount;
     message.vestingPeriods = [];
@@ -518,3 +518,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/google/protobuf/any.ts b/packages/stargate/src/codec/google/protobuf/any.ts
index 80a855cc..dba234c5 100644
--- a/packages/stargate/src/codec/google/protobuf/any.ts
+++ b/packages/stargate/src/codec/google/protobuf/any.ts
@@ -134,9 +134,10 @@ export const Any = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Any {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseAny } as Any;
+    message.value = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -156,6 +157,7 @@ export const Any = {
 
   fromJSON(object: any): Any {
     const message = { ...baseAny } as Any;
+    message.value = new Uint8Array();
     if (object.typeUrl !== undefined && object.typeUrl !== null) {
       message.typeUrl = String(object.typeUrl);
     } else {
@@ -232,3 +234,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/google/protobuf/duration.ts b/packages/stargate/src/codec/google/protobuf/duration.ts
index b56dde8f..70351f03 100644
--- a/packages/stargate/src/codec/google/protobuf/duration.ts
+++ b/packages/stargate/src/codec/google/protobuf/duration.ts
@@ -96,7 +96,7 @@ export const Duration = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Duration {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDuration } as Duration;
     while (reader.pos < end) {
@@ -164,3 +164,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/google/protobuf/timestamp.ts b/packages/stargate/src/codec/google/protobuf/timestamp.ts
index a6b054fe..4d90eb03 100644
--- a/packages/stargate/src/codec/google/protobuf/timestamp.ts
+++ b/packages/stargate/src/codec/google/protobuf/timestamp.ts
@@ -127,7 +127,7 @@ export const Timestamp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Timestamp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTimestamp } as Timestamp;
     while (reader.pos < end) {
@@ -195,3 +195,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/applications/transfer/v1/tx.ts b/packages/stargate/src/codec/ibc/applications/transfer/v1/tx.ts
index e849dd43..e51d5dd6 100644
--- a/packages/stargate/src/codec/ibc/applications/transfer/v1/tx.ts
+++ b/packages/stargate/src/codec/ibc/applications/transfer/v1/tx.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { Coin } from "../../../../cosmos/base/v1beta1/coin";
-import { Height } from "../../../../ibc/core/client/v1/client";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { Coin } from "../../../../cosmos/base/v1beta1/coin";
+import { Height } from "../../../../ibc/core/client/v1/client";
 
 export const protobufPackage = "ibc.applications.transfer.v1";
 
@@ -72,7 +72,7 @@ export const MsgTransfer = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTransfer {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTransfer } as MsgTransfer;
     while (reader.pos < end) {
@@ -210,7 +210,7 @@ export const MsgTransferResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTransferResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTransferResponse } as MsgTransferResponse;
     while (reader.pos < end) {
@@ -272,3 +272,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/channel/v1/channel.ts b/packages/stargate/src/codec/ibc/core/channel/v1/channel.ts
index 9d1f25a0..340e2808 100644
--- a/packages/stargate/src/codec/ibc/core/channel/v1/channel.ts
+++ b/packages/stargate/src/codec/ibc/core/channel/v1/channel.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from "long";
-import { Height } from "../../../../ibc/core/client/v1/client";
 import _m0 from "protobufjs/minimal";
+import { Height } from "../../../../ibc/core/client/v1/client";
 
 export const protobufPackage = "ibc.core.channel.v1";
 
@@ -246,7 +246,7 @@ export const Channel = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Channel {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseChannel } as Channel;
     message.connectionHops = [];
@@ -390,7 +390,7 @@ export const IdentifiedChannel = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): IdentifiedChannel {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseIdentifiedChannel } as IdentifiedChannel;
     message.connectionHops = [];
@@ -540,7 +540,7 @@ export const Counterparty = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Counterparty {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCounterparty } as Counterparty;
     while (reader.pos < end) {
@@ -637,9 +637,10 @@ export const Packet = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Packet {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePacket } as Packet;
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -677,6 +678,7 @@ export const Packet = {
 
   fromJSON(object: any): Packet {
     const message = { ...basePacket } as Packet;
+    message.data = new Uint8Array();
     if (object.sequence !== undefined && object.sequence !== null) {
       message.sequence = Long.fromString(object.sequence);
     } else {
@@ -800,9 +802,10 @@ export const PacketState = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PacketState {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePacketState } as PacketState;
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -828,6 +831,7 @@ export const PacketState = {
 
   fromJSON(object: any): PacketState {
     const message = { ...basePacketState } as PacketState;
+    message.data = new Uint8Array();
     if (object.portId !== undefined && object.portId !== null) {
       message.portId = String(object.portId);
     } else {
@@ -899,7 +903,7 @@ export const Acknowledgement = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Acknowledgement {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseAcknowledgement } as Acknowledgement;
     while (reader.pos < end) {
@@ -997,3 +1001,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/channel/v1/query.ts b/packages/stargate/src/codec/ibc/core/channel/v1/query.ts
index 512cb5cc..a588a939 100644
--- a/packages/stargate/src/codec/ibc/core/channel/v1/query.ts
+++ b/packages/stargate/src/codec/ibc/core/channel/v1/query.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Channel, IdentifiedChannel, PacketState } from "../../../../ibc/core/channel/v1/channel";
 import { Height, IdentifiedClientState } from "../../../../ibc/core/client/v1/client";
 import { PageRequest, PageResponse } from "../../../../cosmos/base/query/v1beta1/pagination";
-import Long from "long";
 import { Any } from "../../../../google/protobuf/any";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "ibc.core.channel.v1";
 
@@ -341,7 +341,7 @@ export const QueryChannelRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelRequest } as QueryChannelRequest;
     while (reader.pos < end) {
@@ -416,9 +416,10 @@ export const QueryChannelResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelResponse } as QueryChannelResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -441,6 +442,7 @@ export const QueryChannelResponse = {
 
   fromJSON(object: any): QueryChannelResponse {
     const message = { ...baseQueryChannelResponse } as QueryChannelResponse;
+    message.proof = new Uint8Array();
     if (object.channel !== undefined && object.channel !== null) {
       message.channel = Channel.fromJSON(object.channel);
     } else {
@@ -500,7 +502,7 @@ export const QueryChannelsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelsRequest } as QueryChannelsRequest;
     while (reader.pos < end) {
@@ -562,7 +564,7 @@ export const QueryChannelsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelsResponse } as QueryChannelsResponse;
     message.channels = [];
@@ -656,7 +658,7 @@ export const QueryConnectionChannelsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionChannelsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionChannelsRequest } as QueryConnectionChannelsRequest;
     while (reader.pos < end) {
@@ -732,7 +734,7 @@ export const QueryConnectionChannelsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionChannelsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionChannelsResponse } as QueryConnectionChannelsResponse;
     message.channels = [];
@@ -826,7 +828,7 @@ export const QueryChannelClientStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelClientStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelClientStateRequest } as QueryChannelClientStateRequest;
     while (reader.pos < end) {
@@ -901,9 +903,10 @@ export const QueryChannelClientStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelClientStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelClientStateResponse } as QueryChannelClientStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -926,6 +929,7 @@ export const QueryChannelClientStateResponse = {
 
   fromJSON(object: any): QueryChannelClientStateResponse {
     const message = { ...baseQueryChannelClientStateResponse } as QueryChannelClientStateResponse;
+    message.proof = new Uint8Array();
     if (object.identifiedClientState !== undefined && object.identifiedClientState !== null) {
       message.identifiedClientState = IdentifiedClientState.fromJSON(object.identifiedClientState);
     } else {
@@ -1001,7 +1005,7 @@ export const QueryChannelConsensusStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelConsensusStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelConsensusStateRequest } as QueryChannelConsensusStateRequest;
     while (reader.pos < end) {
@@ -1109,9 +1113,10 @@ export const QueryChannelConsensusStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryChannelConsensusStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryChannelConsensusStateResponse } as QueryChannelConsensusStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1137,6 +1142,7 @@ export const QueryChannelConsensusStateResponse = {
 
   fromJSON(object: any): QueryChannelConsensusStateResponse {
     const message = { ...baseQueryChannelConsensusStateResponse } as QueryChannelConsensusStateResponse;
+    message.proof = new Uint8Array();
     if (object.consensusState !== undefined && object.consensusState !== null) {
       message.consensusState = Any.fromJSON(object.consensusState);
     } else {
@@ -1213,7 +1219,7 @@ export const QueryPacketCommitmentRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketCommitmentRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketCommitmentRequest } as QueryPacketCommitmentRequest;
     while (reader.pos < end) {
@@ -1302,9 +1308,11 @@ export const QueryPacketCommitmentResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketCommitmentResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketCommitmentResponse } as QueryPacketCommitmentResponse;
+    message.commitment = new Uint8Array();
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1327,6 +1335,8 @@ export const QueryPacketCommitmentResponse = {
 
   fromJSON(object: any): QueryPacketCommitmentResponse {
     const message = { ...baseQueryPacketCommitmentResponse } as QueryPacketCommitmentResponse;
+    message.commitment = new Uint8Array();
+    message.proof = new Uint8Array();
     if (object.commitment !== undefined && object.commitment !== null) {
       message.commitment = bytesFromBase64(object.commitment);
     }
@@ -1392,7 +1402,7 @@ export const QueryPacketCommitmentsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketCommitmentsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketCommitmentsRequest } as QueryPacketCommitmentsRequest;
     while (reader.pos < end) {
@@ -1482,7 +1492,7 @@ export const QueryPacketCommitmentsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketCommitmentsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketCommitmentsResponse } as QueryPacketCommitmentsResponse;
     message.commitments = [];
@@ -1579,7 +1589,7 @@ export const QueryPacketReceiptRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketReceiptRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketReceiptRequest } as QueryPacketReceiptRequest;
     while (reader.pos < end) {
@@ -1668,9 +1678,10 @@ export const QueryPacketReceiptResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketReceiptResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketReceiptResponse } as QueryPacketReceiptResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1693,6 +1704,7 @@ export const QueryPacketReceiptResponse = {
 
   fromJSON(object: any): QueryPacketReceiptResponse {
     const message = { ...baseQueryPacketReceiptResponse } as QueryPacketReceiptResponse;
+    message.proof = new Uint8Array();
     if (object.received !== undefined && object.received !== null) {
       message.received = Boolean(object.received);
     } else {
@@ -1757,7 +1769,7 @@ export const QueryPacketAcknowledgementRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketAcknowledgementRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketAcknowledgementRequest } as QueryPacketAcknowledgementRequest;
     while (reader.pos < end) {
@@ -1846,9 +1858,11 @@ export const QueryPacketAcknowledgementResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketAcknowledgementResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketAcknowledgementResponse } as QueryPacketAcknowledgementResponse;
+    message.acknowledgement = new Uint8Array();
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1871,6 +1885,8 @@ export const QueryPacketAcknowledgementResponse = {
 
   fromJSON(object: any): QueryPacketAcknowledgementResponse {
     const message = { ...baseQueryPacketAcknowledgementResponse } as QueryPacketAcknowledgementResponse;
+    message.acknowledgement = new Uint8Array();
+    message.proof = new Uint8Array();
     if (object.acknowledgement !== undefined && object.acknowledgement !== null) {
       message.acknowledgement = bytesFromBase64(object.acknowledgement);
     }
@@ -1936,7 +1952,7 @@ export const QueryPacketAcknowledgementsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketAcknowledgementsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketAcknowledgementsRequest } as QueryPacketAcknowledgementsRequest;
     while (reader.pos < end) {
@@ -2026,7 +2042,7 @@ export const QueryPacketAcknowledgementsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryPacketAcknowledgementsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryPacketAcknowledgementsResponse } as QueryPacketAcknowledgementsResponse;
     message.acknowledgements = [];
@@ -2129,7 +2145,7 @@ export const QueryUnreceivedPacketsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnreceivedPacketsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnreceivedPacketsRequest } as QueryUnreceivedPacketsRequest;
     message.packetCommitmentSequences = [];
@@ -2233,7 +2249,7 @@ export const QueryUnreceivedPacketsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnreceivedPacketsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnreceivedPacketsResponse } as QueryUnreceivedPacketsResponse;
     message.sequences = [];
@@ -2324,7 +2340,7 @@ export const QueryUnreceivedAcksRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnreceivedAcksRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnreceivedAcksRequest } as QueryUnreceivedAcksRequest;
     message.packetAckSequences = [];
@@ -2426,7 +2442,7 @@ export const QueryUnreceivedAcksResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnreceivedAcksResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryUnreceivedAcksResponse } as QueryUnreceivedAcksResponse;
     message.sequences = [];
@@ -2512,7 +2528,7 @@ export const QueryNextSequenceReceiveRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryNextSequenceReceiveRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryNextSequenceReceiveRequest } as QueryNextSequenceReceiveRequest;
     while (reader.pos < end) {
@@ -2587,9 +2603,10 @@ export const QueryNextSequenceReceiveResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryNextSequenceReceiveResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryNextSequenceReceiveResponse } as QueryNextSequenceReceiveResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -2612,6 +2629,7 @@ export const QueryNextSequenceReceiveResponse = {
 
   fromJSON(object: any): QueryNextSequenceReceiveResponse {
     const message = { ...baseQueryNextSequenceReceiveResponse } as QueryNextSequenceReceiveResponse;
+    message.proof = new Uint8Array();
     if (object.nextSequenceReceive !== undefined && object.nextSequenceReceive !== null) {
       message.nextSequenceReceive = Long.fromString(object.nextSequenceReceive);
     } else {
@@ -2852,3 +2870,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/channel/v1/tx.ts b/packages/stargate/src/codec/ibc/core/channel/v1/tx.ts
index a63d8a14..5ef7d1dd 100644
--- a/packages/stargate/src/codec/ibc/core/channel/v1/tx.ts
+++ b/packages/stargate/src/codec/ibc/core/channel/v1/tx.ts
@@ -1,8 +1,8 @@
 /* eslint-disable */
-import { Channel, Packet } from "../../../../ibc/core/channel/v1/channel";
-import { Height } from "../../../../ibc/core/client/v1/client";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { Channel, Packet } from "../../../../ibc/core/channel/v1/channel";
+import { Height } from "../../../../ibc/core/client/v1/client";
 
 export const protobufPackage = "ibc.core.channel.v1";
 
@@ -165,7 +165,7 @@ export const MsgChannelOpenInit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenInit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenInit } as MsgChannelOpenInit;
     while (reader.pos < end) {
@@ -246,7 +246,7 @@ export const MsgChannelOpenInitResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenInitResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenInitResponse } as MsgChannelOpenInitResponse;
     while (reader.pos < end) {
@@ -310,9 +310,10 @@ export const MsgChannelOpenTry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenTry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenTry } as MsgChannelOpenTry;
+    message.proofInit = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -347,6 +348,7 @@ export const MsgChannelOpenTry = {
 
   fromJSON(object: any): MsgChannelOpenTry {
     const message = { ...baseMsgChannelOpenTry } as MsgChannelOpenTry;
+    message.proofInit = new Uint8Array();
     if (object.portId !== undefined && object.portId !== null) {
       message.portId = String(object.portId);
     } else {
@@ -449,7 +451,7 @@ export const MsgChannelOpenTryResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenTryResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenTryResponse } as MsgChannelOpenTryResponse;
     while (reader.pos < end) {
@@ -514,9 +516,10 @@ export const MsgChannelOpenAck = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenAck {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenAck } as MsgChannelOpenAck;
+    message.proofTry = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -551,6 +554,7 @@ export const MsgChannelOpenAck = {
 
   fromJSON(object: any): MsgChannelOpenAck {
     const message = { ...baseMsgChannelOpenAck } as MsgChannelOpenAck;
+    message.proofTry = new Uint8Array();
     if (object.portId !== undefined && object.portId !== null) {
       message.portId = String(object.portId);
     } else {
@@ -651,7 +655,7 @@ export const MsgChannelOpenAckResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenAckResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenAckResponse } as MsgChannelOpenAckResponse;
     while (reader.pos < end) {
@@ -704,9 +708,10 @@ export const MsgChannelOpenConfirm = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenConfirm {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenConfirm } as MsgChannelOpenConfirm;
+    message.proofAck = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -735,6 +740,7 @@ export const MsgChannelOpenConfirm = {
 
   fromJSON(object: any): MsgChannelOpenConfirm {
     const message = { ...baseMsgChannelOpenConfirm } as MsgChannelOpenConfirm;
+    message.proofAck = new Uint8Array();
     if (object.portId !== undefined && object.portId !== null) {
       message.portId = String(object.portId);
     } else {
@@ -812,7 +818,7 @@ export const MsgChannelOpenConfirmResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelOpenConfirmResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelOpenConfirmResponse } as MsgChannelOpenConfirmResponse;
     while (reader.pos < end) {
@@ -859,7 +865,7 @@ export const MsgChannelCloseInit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelCloseInit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelCloseInit } as MsgChannelCloseInit;
     while (reader.pos < end) {
@@ -939,7 +945,7 @@ export const MsgChannelCloseInitResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelCloseInitResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelCloseInitResponse } as MsgChannelCloseInitResponse;
     while (reader.pos < end) {
@@ -992,9 +998,10 @@ export const MsgChannelCloseConfirm = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelCloseConfirm {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelCloseConfirm } as MsgChannelCloseConfirm;
+    message.proofInit = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1023,6 +1030,7 @@ export const MsgChannelCloseConfirm = {
 
   fromJSON(object: any): MsgChannelCloseConfirm {
     const message = { ...baseMsgChannelCloseConfirm } as MsgChannelCloseConfirm;
+    message.proofInit = new Uint8Array();
     if (object.portId !== undefined && object.portId !== null) {
       message.portId = String(object.portId);
     } else {
@@ -1102,7 +1110,7 @@ export const MsgChannelCloseConfirmResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgChannelCloseConfirmResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgChannelCloseConfirmResponse } as MsgChannelCloseConfirmResponse;
     while (reader.pos < end) {
@@ -1152,9 +1160,10 @@ export const MsgRecvPacket = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgRecvPacket {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgRecvPacket } as MsgRecvPacket;
+    message.proofCommitment = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1180,6 +1189,7 @@ export const MsgRecvPacket = {
 
   fromJSON(object: any): MsgRecvPacket {
     const message = { ...baseMsgRecvPacket } as MsgRecvPacket;
+    message.proofCommitment = new Uint8Array();
     if (object.packet !== undefined && object.packet !== null) {
       message.packet = Packet.fromJSON(object.packet);
     } else {
@@ -1248,7 +1258,7 @@ export const MsgRecvPacketResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgRecvPacketResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgRecvPacketResponse } as MsgRecvPacketResponse;
     while (reader.pos < end) {
@@ -1301,9 +1311,10 @@ export const MsgTimeout = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTimeout {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTimeout } as MsgTimeout;
+    message.proofUnreceived = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1332,6 +1343,7 @@ export const MsgTimeout = {
 
   fromJSON(object: any): MsgTimeout {
     const message = { ...baseMsgTimeout } as MsgTimeout;
+    message.proofUnreceived = new Uint8Array();
     if (object.packet !== undefined && object.packet !== null) {
       message.packet = Packet.fromJSON(object.packet);
     } else {
@@ -1412,7 +1424,7 @@ export const MsgTimeoutResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTimeoutResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTimeoutResponse } as MsgTimeoutResponse;
     while (reader.pos < end) {
@@ -1468,9 +1480,11 @@ export const MsgTimeoutOnClose = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTimeoutOnClose {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTimeoutOnClose } as MsgTimeoutOnClose;
+    message.proofUnreceived = new Uint8Array();
+    message.proofClose = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1502,6 +1516,8 @@ export const MsgTimeoutOnClose = {
 
   fromJSON(object: any): MsgTimeoutOnClose {
     const message = { ...baseMsgTimeoutOnClose } as MsgTimeoutOnClose;
+    message.proofUnreceived = new Uint8Array();
+    message.proofClose = new Uint8Array();
     if (object.packet !== undefined && object.packet !== null) {
       message.packet = Packet.fromJSON(object.packet);
     } else {
@@ -1594,7 +1610,7 @@ export const MsgTimeoutOnCloseResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgTimeoutOnCloseResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgTimeoutOnCloseResponse } as MsgTimeoutOnCloseResponse;
     while (reader.pos < end) {
@@ -1647,9 +1663,11 @@ export const MsgAcknowledgement = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgAcknowledgement {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgAcknowledgement } as MsgAcknowledgement;
+    message.acknowledgement = new Uint8Array();
+    message.proofAcked = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1678,6 +1696,8 @@ export const MsgAcknowledgement = {
 
   fromJSON(object: any): MsgAcknowledgement {
     const message = { ...baseMsgAcknowledgement } as MsgAcknowledgement;
+    message.acknowledgement = new Uint8Array();
+    message.proofAcked = new Uint8Array();
     if (object.packet !== undefined && object.packet !== null) {
       message.packet = Packet.fromJSON(object.packet);
     } else {
@@ -1758,7 +1778,7 @@ export const MsgAcknowledgementResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgAcknowledgementResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgAcknowledgementResponse } as MsgAcknowledgementResponse;
     while (reader.pos < end) {
@@ -1923,3 +1943,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/client/v1/client.ts b/packages/stargate/src/codec/ibc/core/client/v1/client.ts
index b3abb226..c06f4b25 100644
--- a/packages/stargate/src/codec/ibc/core/client/v1/client.ts
+++ b/packages/stargate/src/codec/ibc/core/client/v1/client.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Any } from "../../../../google/protobuf/any";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { Any } from "../../../../google/protobuf/any";
 
 export const protobufPackage = "ibc.core.client.v1";
 
@@ -89,7 +89,7 @@ export const IdentifiedClientState = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): IdentifiedClientState {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseIdentifiedClientState } as IdentifiedClientState;
     while (reader.pos < end) {
@@ -162,7 +162,7 @@ export const ConsensusStateWithHeight = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConsensusStateWithHeight {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConsensusStateWithHeight } as ConsensusStateWithHeight;
     while (reader.pos < end) {
@@ -235,7 +235,7 @@ export const ClientConsensusStates = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ClientConsensusStates {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseClientConsensusStates } as ClientConsensusStates;
     message.consensusStates = [];
@@ -322,7 +322,7 @@ export const ClientUpdateProposal = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ClientUpdateProposal {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseClientUpdateProposal } as ClientUpdateProposal;
     while (reader.pos < end) {
@@ -422,7 +422,7 @@ export const Height = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Height {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseHeight } as Height;
     while (reader.pos < end) {
@@ -493,7 +493,7 @@ export const Params = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Params {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseParams } as Params;
     message.allowedClients = [];
@@ -554,3 +554,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/client/v1/query.ts b/packages/stargate/src/codec/ibc/core/client/v1/query.ts
index ac232e7e..c4452839 100644
--- a/packages/stargate/src/codec/ibc/core/client/v1/query.ts
+++ b/packages/stargate/src/codec/ibc/core/client/v1/query.ts
@@ -1,4 +1,6 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Any } from "../../../../google/protobuf/any";
 import {
   Height,
@@ -7,8 +9,6 @@ import {
   ConsensusStateWithHeight,
 } from "../../../../ibc/core/client/v1/client";
 import { PageRequest, PageResponse } from "../../../../cosmos/base/query/v1beta1/pagination";
-import Long from "long";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "ibc.core.client.v1";
 
@@ -129,7 +129,7 @@ export const QueryClientStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientStateRequest } as QueryClientStateRequest;
     while (reader.pos < end) {
@@ -190,9 +190,10 @@ export const QueryClientStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientStateResponse } as QueryClientStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -215,6 +216,7 @@ export const QueryClientStateResponse = {
 
   fromJSON(object: any): QueryClientStateResponse {
     const message = { ...baseQueryClientStateResponse } as QueryClientStateResponse;
+    message.proof = new Uint8Array();
     if (object.clientState !== undefined && object.clientState !== null) {
       message.clientState = Any.fromJSON(object.clientState);
     } else {
@@ -274,7 +276,7 @@ export const QueryClientStatesRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientStatesRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientStatesRequest } as QueryClientStatesRequest;
     while (reader.pos < end) {
@@ -333,7 +335,7 @@ export const QueryClientStatesResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientStatesResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientStatesResponse } as QueryClientStatesResponse;
     message.clientStates = [];
@@ -424,7 +426,7 @@ export const QueryConsensusStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConsensusStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConsensusStateRequest } as QueryConsensusStateRequest;
     while (reader.pos < end) {
@@ -529,9 +531,10 @@ export const QueryConsensusStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConsensusStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConsensusStateResponse } as QueryConsensusStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -554,6 +557,7 @@ export const QueryConsensusStateResponse = {
 
   fromJSON(object: any): QueryConsensusStateResponse {
     const message = { ...baseQueryConsensusStateResponse } as QueryConsensusStateResponse;
+    message.proof = new Uint8Array();
     if (object.consensusState !== undefined && object.consensusState !== null) {
       message.consensusState = Any.fromJSON(object.consensusState);
     } else {
@@ -616,7 +620,7 @@ export const QueryConsensusStatesRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConsensusStatesRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConsensusStatesRequest } as QueryConsensusStatesRequest;
     while (reader.pos < end) {
@@ -689,7 +693,7 @@ export const QueryConsensusStatesResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConsensusStatesResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConsensusStatesResponse } as QueryConsensusStatesResponse;
     message.consensusStates = [];
@@ -765,7 +769,7 @@ export const QueryClientParamsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientParamsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientParamsRequest } as QueryClientParamsRequest;
     while (reader.pos < end) {
@@ -806,7 +810,7 @@ export const QueryClientParamsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientParamsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientParamsResponse } as QueryClientParamsResponse;
     while (reader.pos < end) {
@@ -951,3 +955,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/client/v1/tx.ts b/packages/stargate/src/codec/ibc/core/client/v1/tx.ts
index fae3215e..37a14e5b 100644
--- a/packages/stargate/src/codec/ibc/core/client/v1/tx.ts
+++ b/packages/stargate/src/codec/ibc/core/client/v1/tx.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { Any } from "../../../../google/protobuf/any";
-import _m0 from "protobufjs/minimal";
 import Long from "long";
+import _m0 from "protobufjs/minimal";
+import { Any } from "../../../../google/protobuf/any";
 
 export const protobufPackage = "ibc.core.client.v1";
 
@@ -89,7 +89,7 @@ export const MsgCreateClient = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateClient {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgCreateClient } as MsgCreateClient;
     while (reader.pos < end) {
@@ -171,7 +171,7 @@ export const MsgCreateClientResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateClientResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgCreateClientResponse } as MsgCreateClientResponse;
     while (reader.pos < end) {
@@ -218,7 +218,7 @@ export const MsgUpdateClient = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateClient {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUpdateClient } as MsgUpdateClient;
     while (reader.pos < end) {
@@ -298,7 +298,7 @@ export const MsgUpdateClientResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateClientResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUpdateClientResponse } as MsgUpdateClientResponse;
     while (reader.pos < end) {
@@ -354,9 +354,11 @@ export const MsgUpgradeClient = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpgradeClient {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUpgradeClient } as MsgUpgradeClient;
+    message.proofUpgradeClient = new Uint8Array();
+    message.proofUpgradeConsensusState = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -388,6 +390,8 @@ export const MsgUpgradeClient = {
 
   fromJSON(object: any): MsgUpgradeClient {
     const message = { ...baseMsgUpgradeClient } as MsgUpgradeClient;
+    message.proofUpgradeClient = new Uint8Array();
+    message.proofUpgradeConsensusState = new Uint8Array();
     if (object.clientId !== undefined && object.clientId !== null) {
       message.clientId = String(object.clientId);
     } else {
@@ -482,7 +486,7 @@ export const MsgUpgradeClientResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpgradeClientResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgUpgradeClientResponse } as MsgUpgradeClientResponse;
     while (reader.pos < end) {
@@ -529,7 +533,7 @@ export const MsgSubmitMisbehaviour = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitMisbehaviour {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSubmitMisbehaviour } as MsgSubmitMisbehaviour;
     while (reader.pos < end) {
@@ -610,7 +614,7 @@ export const MsgSubmitMisbehaviourResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitMisbehaviourResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgSubmitMisbehaviourResponse } as MsgSubmitMisbehaviourResponse;
     while (reader.pos < end) {
@@ -727,3 +731,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/commitment/v1/commitment.ts b/packages/stargate/src/codec/ibc/core/commitment/v1/commitment.ts
index 72a18bfa..fed759d2 100644
--- a/packages/stargate/src/codec/ibc/core/commitment/v1/commitment.ts
+++ b/packages/stargate/src/codec/ibc/core/commitment/v1/commitment.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
-import { CommitmentProof } from "../../../../confio/proofs";
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { CommitmentProof } from "../../../../confio/proofs";
 
 export const protobufPackage = "ibc.core.commitment.v1";
 
@@ -53,9 +53,10 @@ export const MerkleRoot = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MerkleRoot {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMerkleRoot } as MerkleRoot;
+    message.hash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -72,6 +73,7 @@ export const MerkleRoot = {
 
   fromJSON(object: any): MerkleRoot {
     const message = { ...baseMerkleRoot } as MerkleRoot;
+    message.hash = new Uint8Array();
     if (object.hash !== undefined && object.hash !== null) {
       message.hash = bytesFromBase64(object.hash);
     }
@@ -107,9 +109,10 @@ export const MerklePrefix = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MerklePrefix {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMerklePrefix } as MerklePrefix;
+    message.keyPrefix = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -126,6 +129,7 @@ export const MerklePrefix = {
 
   fromJSON(object: any): MerklePrefix {
     const message = { ...baseMerklePrefix } as MerklePrefix;
+    message.keyPrefix = new Uint8Array();
     if (object.keyPrefix !== undefined && object.keyPrefix !== null) {
       message.keyPrefix = bytesFromBase64(object.keyPrefix);
     }
@@ -163,7 +167,7 @@ export const MerklePath = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MerklePath {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMerklePath } as MerklePath;
     message.keyPath = [];
@@ -225,7 +229,7 @@ export const MerkleProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MerkleProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMerkleProof } as MerkleProof;
     message.proofs = [];
@@ -317,3 +321,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/connection/v1/connection.ts b/packages/stargate/src/codec/ibc/core/connection/v1/connection.ts
index b060bbb8..14935d29 100644
--- a/packages/stargate/src/codec/ibc/core/connection/v1/connection.ts
+++ b/packages/stargate/src/codec/ibc/core/connection/v1/connection.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from "long";
-import { MerklePrefix } from "../../../../ibc/core/commitment/v1/commitment";
 import _m0 from "protobufjs/minimal";
+import { MerklePrefix } from "../../../../ibc/core/commitment/v1/commitment";
 
 export const protobufPackage = "ibc.core.connection.v1";
 
@@ -171,7 +171,7 @@ export const ConnectionEnd = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConnectionEnd {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConnectionEnd } as ConnectionEnd;
     message.versions = [];
@@ -305,7 +305,7 @@ export const IdentifiedConnection = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): IdentifiedConnection {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseIdentifiedConnection } as IdentifiedConnection;
     message.versions = [];
@@ -444,7 +444,7 @@ export const Counterparty = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Counterparty {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCounterparty } as Counterparty;
     while (reader.pos < end) {
@@ -528,7 +528,7 @@ export const ClientPaths = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ClientPaths {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseClientPaths } as ClientPaths;
     message.paths = [];
@@ -593,7 +593,7 @@ export const ConnectionPaths = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConnectionPaths {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConnectionPaths } as ConnectionPaths;
     message.paths = [];
@@ -672,7 +672,7 @@ export const Version = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Version {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseVersion } as Version;
     message.features = [];
@@ -747,3 +747,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/connection/v1/query.ts b/packages/stargate/src/codec/ibc/core/connection/v1/query.ts
index 3a1fdb36..edd1b256 100644
--- a/packages/stargate/src/codec/ibc/core/connection/v1/query.ts
+++ b/packages/stargate/src/codec/ibc/core/connection/v1/query.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { ConnectionEnd, IdentifiedConnection } from "../../../../ibc/core/connection/v1/connection";
 import { Height, IdentifiedClientState } from "../../../../ibc/core/client/v1/client";
 import { PageRequest, PageResponse } from "../../../../cosmos/base/query/v1beta1/pagination";
-import Long from "long";
 import { Any } from "../../../../google/protobuf/any";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "ibc.core.connection.v1";
 
@@ -133,7 +133,7 @@ export const QueryConnectionRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionRequest } as QueryConnectionRequest;
     while (reader.pos < end) {
@@ -194,9 +194,10 @@ export const QueryConnectionResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionResponse } as QueryConnectionResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -219,6 +220,7 @@ export const QueryConnectionResponse = {
 
   fromJSON(object: any): QueryConnectionResponse {
     const message = { ...baseQueryConnectionResponse } as QueryConnectionResponse;
+    message.proof = new Uint8Array();
     if (object.connection !== undefined && object.connection !== null) {
       message.connection = ConnectionEnd.fromJSON(object.connection);
     } else {
@@ -278,7 +280,7 @@ export const QueryConnectionsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionsRequest } as QueryConnectionsRequest;
     while (reader.pos < end) {
@@ -340,7 +342,7 @@ export const QueryConnectionsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionsResponse } as QueryConnectionsResponse;
     message.connections = [];
@@ -431,7 +433,7 @@ export const QueryClientConnectionsRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientConnectionsRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientConnectionsRequest } as QueryClientConnectionsRequest;
     while (reader.pos < end) {
@@ -492,10 +494,11 @@ export const QueryClientConnectionsResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryClientConnectionsResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryClientConnectionsResponse } as QueryClientConnectionsResponse;
     message.connectionPaths = [];
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -519,6 +522,7 @@ export const QueryClientConnectionsResponse = {
   fromJSON(object: any): QueryClientConnectionsResponse {
     const message = { ...baseQueryClientConnectionsResponse } as QueryClientConnectionsResponse;
     message.connectionPaths = [];
+    message.proof = new Uint8Array();
     if (object.connectionPaths !== undefined && object.connectionPaths !== null) {
       for (const e of object.connectionPaths) {
         message.connectionPaths.push(String(e));
@@ -582,7 +586,7 @@ export const QueryConnectionClientStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionClientStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionClientStateRequest } as QueryConnectionClientStateRequest;
     while (reader.pos < end) {
@@ -643,9 +647,10 @@ export const QueryConnectionClientStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionClientStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionClientStateResponse } as QueryConnectionClientStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -668,6 +673,7 @@ export const QueryConnectionClientStateResponse = {
 
   fromJSON(object: any): QueryConnectionClientStateResponse {
     const message = { ...baseQueryConnectionClientStateResponse } as QueryConnectionClientStateResponse;
+    message.proof = new Uint8Array();
     if (object.identifiedClientState !== undefined && object.identifiedClientState !== null) {
       message.identifiedClientState = IdentifiedClientState.fromJSON(object.identifiedClientState);
     } else {
@@ -742,7 +748,7 @@ export const QueryConnectionConsensusStateRequest = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionConsensusStateRequest {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionConsensusStateRequest } as QueryConnectionConsensusStateRequest;
     while (reader.pos < end) {
@@ -841,9 +847,10 @@ export const QueryConnectionConsensusStateResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): QueryConnectionConsensusStateResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseQueryConnectionConsensusStateResponse } as QueryConnectionConsensusStateResponse;
+    message.proof = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -869,6 +876,7 @@ export const QueryConnectionConsensusStateResponse = {
 
   fromJSON(object: any): QueryConnectionConsensusStateResponse {
     const message = { ...baseQueryConnectionConsensusStateResponse } as QueryConnectionConsensusStateResponse;
+    message.proof = new Uint8Array();
     if (object.consensusState !== undefined && object.consensusState !== null) {
       message.consensusState = Any.fromJSON(object.consensusState);
     } else {
@@ -1042,3 +1050,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/core/connection/v1/tx.ts b/packages/stargate/src/codec/ibc/core/connection/v1/tx.ts
index 408f6e35..a30e8c49 100644
--- a/packages/stargate/src/codec/ibc/core/connection/v1/tx.ts
+++ b/packages/stargate/src/codec/ibc/core/connection/v1/tx.ts
@@ -1,9 +1,9 @@
 /* eslint-disable */
-import { Counterparty, Version } from "../../../../ibc/core/connection/v1/connection";
 import Long from "long";
+import _m0 from "protobufjs/minimal";
+import { Counterparty, Version } from "../../../../ibc/core/connection/v1/connection";
 import { Any } from "../../../../google/protobuf/any";
 import { Height } from "../../../../ibc/core/client/v1/client";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "ibc.core.connection.v1";
 
@@ -118,7 +118,7 @@ export const MsgConnectionOpenInit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenInit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenInit } as MsgConnectionOpenInit;
     while (reader.pos < end) {
@@ -228,7 +228,7 @@ export const MsgConnectionOpenInitResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenInitResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenInitResponse } as MsgConnectionOpenInitResponse;
     while (reader.pos < end) {
@@ -307,10 +307,13 @@ export const MsgConnectionOpenTry = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenTry {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenTry } as MsgConnectionOpenTry;
     message.counterpartyVersions = [];
+    message.proofInit = new Uint8Array();
+    message.proofClient = new Uint8Array();
+    message.proofConsensus = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -361,6 +364,9 @@ export const MsgConnectionOpenTry = {
   fromJSON(object: any): MsgConnectionOpenTry {
     const message = { ...baseMsgConnectionOpenTry } as MsgConnectionOpenTry;
     message.counterpartyVersions = [];
+    message.proofInit = new Uint8Array();
+    message.proofClient = new Uint8Array();
+    message.proofConsensus = new Uint8Array();
     if (object.clientId !== undefined && object.clientId !== null) {
       message.clientId = String(object.clientId);
     } else {
@@ -527,7 +533,7 @@ export const MsgConnectionOpenTryResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenTryResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenTryResponse } as MsgConnectionOpenTryResponse;
     while (reader.pos < end) {
@@ -595,9 +601,12 @@ export const MsgConnectionOpenAck = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenAck {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenAck } as MsgConnectionOpenAck;
+    message.proofTry = new Uint8Array();
+    message.proofClient = new Uint8Array();
+    message.proofConsensus = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -641,6 +650,9 @@ export const MsgConnectionOpenAck = {
 
   fromJSON(object: any): MsgConnectionOpenAck {
     const message = { ...baseMsgConnectionOpenAck } as MsgConnectionOpenAck;
+    message.proofTry = new Uint8Array();
+    message.proofClient = new Uint8Array();
+    message.proofConsensus = new Uint8Array();
     if (object.connectionId !== undefined && object.connectionId !== null) {
       message.connectionId = String(object.connectionId);
     } else {
@@ -779,7 +791,7 @@ export const MsgConnectionOpenAckResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenAckResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenAckResponse } as MsgConnectionOpenAckResponse;
     while (reader.pos < end) {
@@ -829,9 +841,10 @@ export const MsgConnectionOpenConfirm = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenConfirm {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenConfirm } as MsgConnectionOpenConfirm;
+    message.proofAck = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -857,6 +870,7 @@ export const MsgConnectionOpenConfirm = {
 
   fromJSON(object: any): MsgConnectionOpenConfirm {
     const message = { ...baseMsgConnectionOpenConfirm } as MsgConnectionOpenConfirm;
+    message.proofAck = new Uint8Array();
     if (object.connectionId !== undefined && object.connectionId !== null) {
       message.connectionId = String(object.connectionId);
     } else {
@@ -923,7 +937,7 @@ export const MsgConnectionOpenConfirmResponse = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): MsgConnectionOpenConfirmResponse {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMsgConnectionOpenConfirmResponse } as MsgConnectionOpenConfirmResponse;
     while (reader.pos < end) {
@@ -1040,3 +1054,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/ibc/lightclients/tendermint/v1/tendermint.ts b/packages/stargate/src/codec/ibc/lightclients/tendermint/v1/tendermint.ts
index 0e3feb14..fcc05779 100644
--- a/packages/stargate/src/codec/ibc/lightclients/tendermint/v1/tendermint.ts
+++ b/packages/stargate/src/codec/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -1,13 +1,13 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Duration } from "../../../../google/protobuf/duration";
 import { Height } from "../../../../ibc/core/client/v1/client";
 import { MerkleRoot } from "../../../../ibc/core/commitment/v1/commitment";
 import { SignedHeader } from "../../../../tendermint/types/types";
 import { ValidatorSet } from "../../../../tendermint/types/validator";
-import Long from "long";
 import { Timestamp } from "../../../../google/protobuf/timestamp";
 import { ProofSpec } from "../../../../confio/proofs";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "ibc.lightclients.tendermint.v1";
 
@@ -148,7 +148,7 @@ export const ClientState = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ClientState {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseClientState } as ClientState;
     message.proofSpecs = [];
@@ -371,9 +371,10 @@ export const ConsensusState = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConsensusState {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConsensusState } as ConsensusState;
+    message.nextValidatorsHash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -396,6 +397,7 @@ export const ConsensusState = {
 
   fromJSON(object: any): ConsensusState {
     const message = { ...baseConsensusState } as ConsensusState;
+    message.nextValidatorsHash = new Uint8Array();
     if (object.timestamp !== undefined && object.timestamp !== null) {
       message.timestamp = fromJsonTimestamp(object.timestamp);
     } else {
@@ -414,8 +416,7 @@ export const ConsensusState = {
 
   toJSON(message: ConsensusState): unknown {
     const obj: any = {};
-    message.timestamp !== undefined &&
-      (obj.timestamp = message.timestamp !== undefined ? message.timestamp.toISOString() : null);
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp.toISOString());
     message.root !== undefined && (obj.root = message.root ? MerkleRoot.toJSON(message.root) : undefined);
     message.nextValidatorsHash !== undefined &&
       (obj.nextValidatorsHash = base64FromBytes(
@@ -462,7 +463,7 @@ export const Misbehaviour = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Misbehaviour {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseMisbehaviour } as Misbehaviour;
     while (reader.pos < end) {
@@ -556,7 +557,7 @@ export const Header = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Header {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseHeader } as Header;
     while (reader.pos < end) {
@@ -662,7 +663,7 @@ export const Fraction = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Fraction {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseFraction } as Fraction;
     while (reader.pos < end) {
diff --git a/packages/stargate/src/codec/tendermint/abci/types.ts b/packages/stargate/src/codec/tendermint/abci/types.ts
index 374cb3c9..2cc12dc5 100644
--- a/packages/stargate/src/codec/tendermint/abci/types.ts
+++ b/packages/stargate/src/codec/tendermint/abci/types.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
 import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Header } from "../../tendermint/types/types";
 import { ProofOps } from "../../tendermint/crypto/proof";
 import { EvidenceParams, ValidatorParams, VersionParams } from "../../tendermint/types/params";
 import { PublicKey } from "../../tendermint/crypto/keys";
 import { Timestamp } from "../../google/protobuf/timestamp";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "tendermint.abci";
 
@@ -586,7 +586,7 @@ export const Request = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Request {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequest } as Request;
     while (reader.pos < end) {
@@ -858,7 +858,7 @@ export const RequestEcho = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestEcho {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestEcho } as RequestEcho;
     while (reader.pos < end) {
@@ -910,7 +910,7 @@ export const RequestFlush = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestFlush {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestFlush } as RequestFlush;
     while (reader.pos < end) {
@@ -957,7 +957,7 @@ export const RequestInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestInfo } as RequestInfo;
     while (reader.pos < end) {
@@ -1044,7 +1044,7 @@ export const RequestSetOption = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestSetOption {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestSetOption } as RequestSetOption;
     while (reader.pos < end) {
@@ -1128,10 +1128,11 @@ export const RequestInitChain = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestInitChain {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestInitChain } as RequestInitChain;
     message.validators = [];
+    message.appStateBytes = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1164,6 +1165,7 @@ export const RequestInitChain = {
   fromJSON(object: any): RequestInitChain {
     const message = { ...baseRequestInitChain } as RequestInitChain;
     message.validators = [];
+    message.appStateBytes = new Uint8Array();
     if (object.time !== undefined && object.time !== null) {
       message.time = fromJsonTimestamp(object.time);
     } else {
@@ -1197,7 +1199,7 @@ export const RequestInitChain = {
 
   toJSON(message: RequestInitChain): unknown {
     const obj: any = {};
-    message.time !== undefined && (obj.time = message.time !== undefined ? message.time.toISOString() : null);
+    message.time !== undefined && (obj.time = message.time.toISOString());
     message.chainId !== undefined && (obj.chainId = message.chainId);
     message.consensusParams !== undefined &&
       (obj.consensusParams = message.consensusParams
@@ -1274,9 +1276,10 @@ export const RequestQuery = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestQuery {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestQuery } as RequestQuery;
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1302,6 +1305,7 @@ export const RequestQuery = {
 
   fromJSON(object: any): RequestQuery {
     const message = { ...baseRequestQuery } as RequestQuery;
+    message.data = new Uint8Array();
     if (object.data !== undefined && object.data !== null) {
       message.data = bytesFromBase64(object.data);
     }
@@ -1379,10 +1383,11 @@ export const RequestBeginBlock = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestBeginBlock {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestBeginBlock } as RequestBeginBlock;
     message.byzantineValidators = [];
+    message.hash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1409,6 +1414,7 @@ export const RequestBeginBlock = {
   fromJSON(object: any): RequestBeginBlock {
     const message = { ...baseRequestBeginBlock } as RequestBeginBlock;
     message.byzantineValidators = [];
+    message.hash = new Uint8Array();
     if (object.hash !== undefined && object.hash !== null) {
       message.hash = bytesFromBase64(object.hash);
     }
@@ -1488,9 +1494,10 @@ export const RequestCheckTx = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestCheckTx {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestCheckTx } as RequestCheckTx;
+    message.tx = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1510,6 +1517,7 @@ export const RequestCheckTx = {
 
   fromJSON(object: any): RequestCheckTx {
     const message = { ...baseRequestCheckTx } as RequestCheckTx;
+    message.tx = new Uint8Array();
     if (object.tx !== undefined && object.tx !== null) {
       message.tx = bytesFromBase64(object.tx);
     }
@@ -1556,9 +1564,10 @@ export const RequestDeliverTx = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestDeliverTx {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestDeliverTx } as RequestDeliverTx;
+    message.tx = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1575,6 +1584,7 @@ export const RequestDeliverTx = {
 
   fromJSON(object: any): RequestDeliverTx {
     const message = { ...baseRequestDeliverTx } as RequestDeliverTx;
+    message.tx = new Uint8Array();
     if (object.tx !== undefined && object.tx !== null) {
       message.tx = bytesFromBase64(object.tx);
     }
@@ -1610,7 +1620,7 @@ export const RequestEndBlock = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestEndBlock {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestEndBlock } as RequestEndBlock;
     while (reader.pos < end) {
@@ -1662,7 +1672,7 @@ export const RequestCommit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestCommit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestCommit } as RequestCommit;
     while (reader.pos < end) {
@@ -1700,7 +1710,7 @@ export const RequestListSnapshots = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestListSnapshots {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestListSnapshots } as RequestListSnapshots;
     while (reader.pos < end) {
@@ -1744,9 +1754,10 @@ export const RequestOfferSnapshot = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestOfferSnapshot {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestOfferSnapshot } as RequestOfferSnapshot;
+    message.appHash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1766,6 +1777,7 @@ export const RequestOfferSnapshot = {
 
   fromJSON(object: any): RequestOfferSnapshot {
     const message = { ...baseRequestOfferSnapshot } as RequestOfferSnapshot;
+    message.appHash = new Uint8Array();
     if (object.snapshot !== undefined && object.snapshot !== null) {
       message.snapshot = Snapshot.fromJSON(object.snapshot);
     } else {
@@ -1819,7 +1831,7 @@ export const RequestLoadSnapshotChunk = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestLoadSnapshotChunk {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestLoadSnapshotChunk } as RequestLoadSnapshotChunk;
     while (reader.pos < end) {
@@ -1908,9 +1920,10 @@ export const RequestApplySnapshotChunk = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): RequestApplySnapshotChunk {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseRequestApplySnapshotChunk } as RequestApplySnapshotChunk;
+    message.chunk = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1933,6 +1946,7 @@ export const RequestApplySnapshotChunk = {
 
   fromJSON(object: any): RequestApplySnapshotChunk {
     const message = { ...baseRequestApplySnapshotChunk } as RequestApplySnapshotChunk;
+    message.chunk = new Uint8Array();
     if (object.index !== undefined && object.index !== null) {
       message.index = Number(object.index);
     } else {
@@ -2035,7 +2049,7 @@ export const Response = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Response {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponse } as Response;
     while (reader.pos < end) {
@@ -2322,7 +2336,7 @@ export const ResponseException = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseException {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseException } as ResponseException;
     while (reader.pos < end) {
@@ -2377,7 +2391,7 @@ export const ResponseEcho = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseEcho {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseEcho } as ResponseEcho;
     while (reader.pos < end) {
@@ -2429,7 +2443,7 @@ export const ResponseFlush = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseFlush {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseFlush } as ResponseFlush;
     while (reader.pos < end) {
@@ -2487,9 +2501,10 @@ export const ResponseInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseInfo } as ResponseInfo;
+    message.lastBlockAppHash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -2518,6 +2533,7 @@ export const ResponseInfo = {
 
   fromJSON(object: any): ResponseInfo {
     const message = { ...baseResponseInfo } as ResponseInfo;
+    message.lastBlockAppHash = new Uint8Array();
     if (object.data !== undefined && object.data !== null) {
       message.data = String(object.data);
     } else {
@@ -2606,7 +2622,7 @@ export const ResponseSetOption = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseSetOption {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseSetOption } as ResponseSetOption;
     while (reader.pos < end) {
@@ -2695,10 +2711,11 @@ export const ResponseInitChain = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseInitChain {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseInitChain } as ResponseInitChain;
     message.validators = [];
+    message.appHash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -2722,6 +2739,7 @@ export const ResponseInitChain = {
   fromJSON(object: any): ResponseInitChain {
     const message = { ...baseResponseInitChain } as ResponseInitChain;
     message.validators = [];
+    message.appHash = new Uint8Array();
     if (object.consensusParams !== undefined && object.consensusParams !== null) {
       message.consensusParams = ConsensusParams.fromJSON(object.consensusParams);
     } else {
@@ -2818,9 +2836,11 @@ export const ResponseQuery = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseQuery {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseQuery } as ResponseQuery;
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -2861,6 +2881,8 @@ export const ResponseQuery = {
 
   fromJSON(object: any): ResponseQuery {
     const message = { ...baseResponseQuery } as ResponseQuery;
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     if (object.code !== undefined && object.code !== null) {
       message.code = Number(object.code);
     } else {
@@ -2984,7 +3006,7 @@ export const ResponseBeginBlock = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseBeginBlock {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseBeginBlock } as ResponseBeginBlock;
     message.events = [];
@@ -3074,10 +3096,11 @@ export const ResponseCheckTx = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseCheckTx {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseCheckTx } as ResponseCheckTx;
     message.events = [];
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -3116,6 +3139,7 @@ export const ResponseCheckTx = {
   fromJSON(object: any): ResponseCheckTx {
     const message = { ...baseResponseCheckTx } as ResponseCheckTx;
     message.events = [];
+    message.data = new Uint8Array();
     if (object.code !== undefined && object.code !== null) {
       message.code = Number(object.code);
     } else {
@@ -3261,10 +3285,11 @@ export const ResponseDeliverTx = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseDeliverTx {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseDeliverTx } as ResponseDeliverTx;
     message.events = [];
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -3303,6 +3328,7 @@ export const ResponseDeliverTx = {
   fromJSON(object: any): ResponseDeliverTx {
     const message = { ...baseResponseDeliverTx } as ResponseDeliverTx;
     message.events = [];
+    message.data = new Uint8Array();
     if (object.code !== undefined && object.code !== null) {
       message.code = Number(object.code);
     } else {
@@ -3426,7 +3452,7 @@ export const ResponseEndBlock = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseEndBlock {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseEndBlock } as ResponseEndBlock;
     message.validatorUpdates = [];
@@ -3529,9 +3555,10 @@ export const ResponseCommit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseCommit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseCommit } as ResponseCommit;
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -3551,6 +3578,7 @@ export const ResponseCommit = {
 
   fromJSON(object: any): ResponseCommit {
     const message = { ...baseResponseCommit } as ResponseCommit;
+    message.data = new Uint8Array();
     if (object.data !== undefined && object.data !== null) {
       message.data = bytesFromBase64(object.data);
     }
@@ -3597,7 +3625,7 @@ export const ResponseListSnapshots = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseListSnapshots {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseListSnapshots } as ResponseListSnapshots;
     message.snapshots = [];
@@ -3659,7 +3687,7 @@ export const ResponseOfferSnapshot = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseOfferSnapshot {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseOfferSnapshot } as ResponseOfferSnapshot;
     while (reader.pos < end) {
@@ -3714,9 +3742,10 @@ export const ResponseLoadSnapshotChunk = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseLoadSnapshotChunk {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseLoadSnapshotChunk } as ResponseLoadSnapshotChunk;
+    message.chunk = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -3733,6 +3762,7 @@ export const ResponseLoadSnapshotChunk = {
 
   fromJSON(object: any): ResponseLoadSnapshotChunk {
     const message = { ...baseResponseLoadSnapshotChunk } as ResponseLoadSnapshotChunk;
+    message.chunk = new Uint8Array();
     if (object.chunk !== undefined && object.chunk !== null) {
       message.chunk = bytesFromBase64(object.chunk);
     }
@@ -3776,7 +3806,7 @@ export const ResponseApplySnapshotChunk = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ResponseApplySnapshotChunk {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseResponseApplySnapshotChunk } as ResponseApplySnapshotChunk;
     message.refetchChunks = [];
@@ -3889,7 +3919,7 @@ export const ConsensusParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConsensusParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConsensusParams } as ConsensusParams;
     while (reader.pos < end) {
@@ -3993,7 +4023,7 @@ export const BlockParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BlockParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBlockParams } as BlockParams;
     while (reader.pos < end) {
@@ -4065,7 +4095,7 @@ export const LastCommitInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): LastCommitInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseLastCommitInfo } as LastCommitInfo;
     message.votes = [];
@@ -4144,7 +4174,7 @@ export const Event = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Event {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseEvent } as Event;
     message.attributes = [];
@@ -4226,9 +4256,11 @@ export const EventAttribute = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): EventAttribute {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseEventAttribute } as EventAttribute;
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -4251,6 +4283,8 @@ export const EventAttribute = {
 
   fromJSON(object: any): EventAttribute {
     const message = { ...baseEventAttribute } as EventAttribute;
+    message.key = new Uint8Array();
+    message.value = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -4316,9 +4350,10 @@ export const TxResult = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxResult {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxResult } as TxResult;
+    message.tx = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -4344,6 +4379,7 @@ export const TxResult = {
 
   fromJSON(object: any): TxResult {
     const message = { ...baseTxResult } as TxResult;
+    message.tx = new Uint8Array();
     if (object.height !== undefined && object.height !== null) {
       message.height = Long.fromString(object.height);
     } else {
@@ -4416,9 +4452,10 @@ export const Validator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Validator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidator } as Validator;
+    message.address = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -4438,6 +4475,7 @@ export const Validator = {
 
   fromJSON(object: any): Validator {
     const message = { ...baseValidator } as Validator;
+    message.address = new Uint8Array();
     if (object.address !== undefined && object.address !== null) {
       message.address = bytesFromBase64(object.address);
     }
@@ -4487,7 +4525,7 @@ export const ValidatorUpdate = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorUpdate {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorUpdate } as ValidatorUpdate;
     while (reader.pos < end) {
@@ -4560,7 +4598,7 @@ export const VoteInfo = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): VoteInfo {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseVoteInfo } as VoteInfo;
     while (reader.pos < end) {
@@ -4642,7 +4680,7 @@ export const Evidence = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Evidence {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseEvidence } as Evidence;
     while (reader.pos < end) {
@@ -4707,7 +4745,7 @@ export const Evidence = {
     message.validator !== undefined &&
       (obj.validator = message.validator ? Validator.toJSON(message.validator) : undefined);
     message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString());
-    message.time !== undefined && (obj.time = message.time !== undefined ? message.time.toISOString() : null);
+    message.time !== undefined && (obj.time = message.time.toISOString());
     message.totalVotingPower !== undefined &&
       (obj.totalVotingPower = (message.totalVotingPower || Long.ZERO).toString());
     return obj;
@@ -4767,9 +4805,11 @@ export const Snapshot = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Snapshot {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSnapshot } as Snapshot;
+    message.hash = new Uint8Array();
+    message.metadata = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -4798,6 +4838,8 @@ export const Snapshot = {
 
   fromJSON(object: any): Snapshot {
     const message = { ...baseSnapshot } as Snapshot;
+    message.hash = new Uint8Array();
+    message.metadata = new Uint8Array();
     if (object.height !== undefined && object.height !== null) {
       message.height = Long.fromString(object.height);
     } else {
diff --git a/packages/stargate/src/codec/tendermint/crypto/keys.ts b/packages/stargate/src/codec/tendermint/crypto/keys.ts
index c0c2302f..64825aed 100644
--- a/packages/stargate/src/codec/tendermint/crypto/keys.ts
+++ b/packages/stargate/src/codec/tendermint/crypto/keys.ts
@@ -24,7 +24,7 @@ export const PublicKey = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PublicKey {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePublicKey } as PublicKey;
     while (reader.pos < end) {
@@ -121,3 +121,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/tendermint/crypto/proof.ts b/packages/stargate/src/codec/tendermint/crypto/proof.ts
index c58f3341..7d9eb01a 100644
--- a/packages/stargate/src/codec/tendermint/crypto/proof.ts
+++ b/packages/stargate/src/codec/tendermint/crypto/proof.ts
@@ -60,10 +60,11 @@ export const Proof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Proof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseProof } as Proof;
     message.aunts = [];
+    message.leafHash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -90,6 +91,7 @@ export const Proof = {
   fromJSON(object: any): Proof {
     const message = { ...baseProof } as Proof;
     message.aunts = [];
+    message.leafHash = new Uint8Array();
     if (object.total !== undefined && object.total !== null) {
       message.total = Long.fromString(object.total);
     } else {
@@ -166,9 +168,10 @@ export const ValueOp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValueOp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValueOp } as ValueOp;
+    message.key = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -188,6 +191,7 @@ export const ValueOp = {
 
   fromJSON(object: any): ValueOp {
     const message = { ...baseValueOp } as ValueOp;
+    message.key = new Uint8Array();
     if (object.key !== undefined && object.key !== null) {
       message.key = bytesFromBase64(object.key);
     }
@@ -240,7 +244,7 @@ export const DominoOp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): DominoOp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseDominoOp } as DominoOp;
     while (reader.pos < end) {
@@ -329,9 +333,11 @@ export const ProofOp = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ProofOp {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseProofOp } as ProofOp;
+    message.key = new Uint8Array();
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -354,6 +360,8 @@ export const ProofOp = {
 
   fromJSON(object: any): ProofOp {
     const message = { ...baseProofOp } as ProofOp;
+    message.key = new Uint8Array();
+    message.data = new Uint8Array();
     if (object.type !== undefined && object.type !== null) {
       message.type = String(object.type);
     } else {
@@ -410,7 +418,7 @@ export const ProofOps = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ProofOps {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseProofOps } as ProofOps;
     message.ops = [];
@@ -502,3 +510,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/tendermint/libs/bits/types.ts b/packages/stargate/src/codec/tendermint/libs/bits/types.ts
index 6b0ed9c1..52471ff8 100644
--- a/packages/stargate/src/codec/tendermint/libs/bits/types.ts
+++ b/packages/stargate/src/codec/tendermint/libs/bits/types.ts
@@ -25,7 +25,7 @@ export const BitArray = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BitArray {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBitArray } as BitArray;
     message.elems = [];
@@ -107,3 +107,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/tendermint/types/params.ts b/packages/stargate/src/codec/tendermint/types/params.ts
index e8bc7d97..ed99af74 100644
--- a/packages/stargate/src/codec/tendermint/types/params.ts
+++ b/packages/stargate/src/codec/tendermint/types/params.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from "long";
-import { Duration } from "../../google/protobuf/duration";
 import _m0 from "protobufjs/minimal";
+import { Duration } from "../../google/protobuf/duration";
 
 export const protobufPackage = "tendermint.types";
 
@@ -105,7 +105,7 @@ export const ConsensusParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ConsensusParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConsensusParams } as ConsensusParams;
     while (reader.pos < end) {
@@ -212,7 +212,7 @@ export const BlockParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BlockParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBlockParams } as BlockParams;
     while (reader.pos < end) {
@@ -301,7 +301,7 @@ export const EvidenceParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): EvidenceParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseEvidenceParams } as EvidenceParams;
     while (reader.pos < end) {
@@ -386,7 +386,7 @@ export const ValidatorParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorParams } as ValidatorParams;
     message.pubKeyTypes = [];
@@ -448,7 +448,7 @@ export const VersionParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): VersionParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseVersionParams } as VersionParams;
     while (reader.pos < end) {
@@ -506,7 +506,7 @@ export const HashedParams = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): HashedParams {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseHashedParams } as HashedParams;
     while (reader.pos < end) {
@@ -575,3 +575,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/tendermint/types/types.ts b/packages/stargate/src/codec/tendermint/types/types.ts
index fa2ff7b2..a39dae03 100644
--- a/packages/stargate/src/codec/tendermint/types/types.ts
+++ b/packages/stargate/src/codec/tendermint/types/types.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
+import Long from "long";
+import _m0 from "protobufjs/minimal";
 import { Proof } from "../../tendermint/crypto/proof";
 import { Consensus } from "../../tendermint/version/types";
-import Long from "long";
 import { ValidatorSet } from "../../tendermint/types/validator";
 import { Timestamp } from "../../google/protobuf/timestamp";
-import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "tendermint.types";
 
@@ -237,9 +237,10 @@ export const PartSetHeader = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): PartSetHeader {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePartSetHeader } as PartSetHeader;
+    message.hash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -259,6 +260,7 @@ export const PartSetHeader = {
 
   fromJSON(object: any): PartSetHeader {
     const message = { ...basePartSetHeader } as PartSetHeader;
+    message.hash = new Uint8Array();
     if (object.total !== undefined && object.total !== null) {
       message.total = Number(object.total);
     } else {
@@ -311,9 +313,10 @@ export const Part = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Part {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...basePart } as Part;
+    message.bytes = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -336,6 +339,7 @@ export const Part = {
 
   fromJSON(object: any): Part {
     const message = { ...basePart } as Part;
+    message.bytes = new Uint8Array();
     if (object.index !== undefined && object.index !== null) {
       message.index = Number(object.index);
     } else {
@@ -396,9 +400,10 @@ export const BlockID = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BlockID {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBlockID } as BlockID;
+    message.hash = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -418,6 +423,7 @@ export const BlockID = {
 
   fromJSON(object: any): BlockID {
     const message = { ...baseBlockID } as BlockID;
+    message.hash = new Uint8Array();
     if (object.hash !== undefined && object.hash !== null) {
       message.hash = bytesFromBase64(object.hash);
     }
@@ -504,9 +510,18 @@ export const Header = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Header {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseHeader } as Header;
+    message.lastCommitHash = new Uint8Array();
+    message.dataHash = new Uint8Array();
+    message.validatorsHash = new Uint8Array();
+    message.nextValidatorsHash = new Uint8Array();
+    message.consensusHash = new Uint8Array();
+    message.appHash = new Uint8Array();
+    message.lastResultsHash = new Uint8Array();
+    message.evidenceHash = new Uint8Array();
+    message.proposerAddress = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -562,6 +577,15 @@ export const Header = {
 
   fromJSON(object: any): Header {
     const message = { ...baseHeader } as Header;
+    message.lastCommitHash = new Uint8Array();
+    message.dataHash = new Uint8Array();
+    message.validatorsHash = new Uint8Array();
+    message.nextValidatorsHash = new Uint8Array();
+    message.consensusHash = new Uint8Array();
+    message.appHash = new Uint8Array();
+    message.lastResultsHash = new Uint8Array();
+    message.evidenceHash = new Uint8Array();
+    message.proposerAddress = new Uint8Array();
     if (object.version !== undefined && object.version !== null) {
       message.version = Consensus.fromJSON(object.version);
     } else {
@@ -623,7 +647,7 @@ export const Header = {
       (obj.version = message.version ? Consensus.toJSON(message.version) : undefined);
     message.chainId !== undefined && (obj.chainId = message.chainId);
     message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString());
-    message.time !== undefined && (obj.time = message.time !== undefined ? message.time.toISOString() : null);
+    message.time !== undefined && (obj.time = message.time.toISOString());
     message.lastBlockId !== undefined &&
       (obj.lastBlockId = message.lastBlockId ? BlockID.toJSON(message.lastBlockId) : undefined);
     message.lastCommitHash !== undefined &&
@@ -748,7 +772,7 @@ export const Data = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Data {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseData } as Data;
     message.txs = [];
@@ -831,9 +855,11 @@ export const Vote = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Vote {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseVote } as Vote;
+    message.validatorAddress = new Uint8Array();
+    message.signature = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -871,6 +897,8 @@ export const Vote = {
 
   fromJSON(object: any): Vote {
     const message = { ...baseVote } as Vote;
+    message.validatorAddress = new Uint8Array();
+    message.signature = new Uint8Array();
     if (object.type !== undefined && object.type !== null) {
       message.type = signedMsgTypeFromJSON(object.type);
     } else {
@@ -917,8 +945,7 @@ export const Vote = {
     message.round !== undefined && (obj.round = message.round);
     message.blockId !== undefined &&
       (obj.blockId = message.blockId ? BlockID.toJSON(message.blockId) : undefined);
-    message.timestamp !== undefined &&
-      (obj.timestamp = message.timestamp !== undefined ? message.timestamp.toISOString() : null);
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp.toISOString());
     message.validatorAddress !== undefined &&
       (obj.validatorAddress = base64FromBytes(
         message.validatorAddress !== undefined ? message.validatorAddress : new Uint8Array(),
@@ -997,7 +1024,7 @@ export const Commit = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Commit {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommit } as Commit;
     message.signatures = [];
@@ -1111,9 +1138,11 @@ export const CommitSig = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): CommitSig {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseCommitSig } as CommitSig;
+    message.validatorAddress = new Uint8Array();
+    message.signature = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1139,6 +1168,8 @@ export const CommitSig = {
 
   fromJSON(object: any): CommitSig {
     const message = { ...baseCommitSig } as CommitSig;
+    message.validatorAddress = new Uint8Array();
+    message.signature = new Uint8Array();
     if (object.blockIdFlag !== undefined && object.blockIdFlag !== null) {
       message.blockIdFlag = blockIDFlagFromJSON(object.blockIdFlag);
     } else {
@@ -1165,8 +1196,7 @@ export const CommitSig = {
       (obj.validatorAddress = base64FromBytes(
         message.validatorAddress !== undefined ? message.validatorAddress : new Uint8Array(),
       ));
-    message.timestamp !== undefined &&
-      (obj.timestamp = message.timestamp !== undefined ? message.timestamp.toISOString() : null);
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp.toISOString());
     message.signature !== undefined &&
       (obj.signature = base64FromBytes(
         message.signature !== undefined ? message.signature : new Uint8Array(),
@@ -1229,9 +1259,10 @@ export const Proposal = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Proposal {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseProposal } as Proposal;
+    message.signature = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1266,6 +1297,7 @@ export const Proposal = {
 
   fromJSON(object: any): Proposal {
     const message = { ...baseProposal } as Proposal;
+    message.signature = new Uint8Array();
     if (object.type !== undefined && object.type !== null) {
       message.type = signedMsgTypeFromJSON(object.type);
     } else {
@@ -1310,8 +1342,7 @@ export const Proposal = {
     message.polRound !== undefined && (obj.polRound = message.polRound);
     message.blockId !== undefined &&
       (obj.blockId = message.blockId ? BlockID.toJSON(message.blockId) : undefined);
-    message.timestamp !== undefined &&
-      (obj.timestamp = message.timestamp !== undefined ? message.timestamp.toISOString() : null);
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp.toISOString());
     message.signature !== undefined &&
       (obj.signature = base64FromBytes(
         message.signature !== undefined ? message.signature : new Uint8Array(),
@@ -1374,7 +1405,7 @@ export const SignedHeader = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SignedHeader {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSignedHeader } as SignedHeader;
     while (reader.pos < end) {
@@ -1446,7 +1477,7 @@ export const LightBlock = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): LightBlock {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseLightBlock } as LightBlock;
     while (reader.pos < end) {
@@ -1526,7 +1557,7 @@ export const BlockMeta = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): BlockMeta {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseBlockMeta } as BlockMeta;
     while (reader.pos < end) {
@@ -1630,9 +1661,11 @@ export const TxProof = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): TxProof {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseTxProof } as TxProof;
+    message.rootHash = new Uint8Array();
+    message.data = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -1655,6 +1688,8 @@ export const TxProof = {
 
   fromJSON(object: any): TxProof {
     const message = { ...baseTxProof } as TxProof;
+    message.rootHash = new Uint8Array();
+    message.data = new Uint8Array();
     if (object.rootHash !== undefined && object.rootHash !== null) {
       message.rootHash = bytesFromBase64(object.rootHash);
     }
diff --git a/packages/stargate/src/codec/tendermint/types/validator.ts b/packages/stargate/src/codec/tendermint/types/validator.ts
index be7652cb..93dfee3f 100644
--- a/packages/stargate/src/codec/tendermint/types/validator.ts
+++ b/packages/stargate/src/codec/tendermint/types/validator.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import Long from "long";
-import { PublicKey } from "../../tendermint/crypto/keys";
 import _m0 from "protobufjs/minimal";
+import { PublicKey } from "../../tendermint/crypto/keys";
 
 export const protobufPackage = "tendermint.types";
 
@@ -40,7 +40,7 @@ export const ValidatorSet = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSet {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidatorSet } as ValidatorSet;
     message.validators = [];
@@ -141,9 +141,10 @@ export const Validator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Validator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseValidator } as Validator;
+    message.address = new Uint8Array();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -169,6 +170,7 @@ export const Validator = {
 
   fromJSON(object: any): Validator {
     const message = { ...baseValidator } as Validator;
+    message.address = new Uint8Array();
     if (object.address !== undefined && object.address !== null) {
       message.address = bytesFromBase64(object.address);
     }
@@ -242,7 +244,7 @@ export const SimpleValidator = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): SimpleValidator {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseSimpleValidator } as SimpleValidator;
     while (reader.pos < end) {
@@ -342,3 +344,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}
diff --git a/packages/stargate/src/codec/tendermint/version/types.ts b/packages/stargate/src/codec/tendermint/version/types.ts
index 3a018249..60862cc3 100644
--- a/packages/stargate/src/codec/tendermint/version/types.ts
+++ b/packages/stargate/src/codec/tendermint/version/types.ts
@@ -38,7 +38,7 @@ export const App = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): App {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseApp } as App;
     while (reader.pos < end) {
@@ -110,7 +110,7 @@ export const Consensus = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): Consensus {
-    const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input;
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = { ...baseConsensus } as Consensus;
     while (reader.pos < end) {
@@ -178,3 +178,8 @@ export type DeepPartial<T> = T extends Builtin
   : T extends {}
   ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
+
+if (_m0.util.Long !== Long) {
+  _m0.util.Long = Long as any;
+  _m0.configure();
+}