Move encodeobjects to modules

packages/stargate/src/encodeobjects.ts

@@ -1,93 +0,0 @@
-import { EncodeObject } from "@cosmjs/proto-signing";
-import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
-import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
-import { MsgDeposit, MsgSubmitProposal, MsgVote } from "cosmjs-types/cosmos/gov/v1beta1/tx";
-import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
-import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
-
-export interface MsgSendEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.bank.v1beta1.MsgSend";
-  readonly value: Partial<MsgSend>;
-}
-
-export function isMsgSendEncodeObject(encodeObject: EncodeObject): encodeObject is MsgSendEncodeObject {
-  return (encodeObject as MsgSendEncodeObject).typeUrl === "/cosmos.bank.v1beta1.MsgSend";
-}
-
-export interface MsgDelegateEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.staking.v1beta1.MsgDelegate";
-  readonly value: Partial<MsgDelegate>;
-}
-
-export function isMsgDelegateEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgDelegateEncodeObject {
-  return (encodeObject as MsgDelegateEncodeObject).typeUrl === "/cosmos.staking.v1beta1.MsgDelegate";
-}
-
-export interface MsgUndelegateEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate";
-  readonly value: Partial<MsgUndelegate>;
-}
-
-export function isMsgUndelegateEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgUndelegateEncodeObject {
-  return (encodeObject as MsgUndelegateEncodeObject).typeUrl === "/cosmos.staking.v1beta1.MsgUndelegate";
-}
-
-export interface MsgWithdrawDelegatorRewardEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
-  readonly value: Partial<MsgWithdrawDelegatorReward>;
-}
-
-export function isMsgWithdrawDelegatorRewardEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgWithdrawDelegatorRewardEncodeObject {
-  return (
-    (encodeObject as MsgWithdrawDelegatorRewardEncodeObject).typeUrl ===
-    "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward"
-  );
-}
-
-export interface MsgTransferEncodeObject extends EncodeObject {
-  readonly typeUrl: "/ibc.applications.transfer.v1.MsgTransfer";
-  readonly value: Partial<MsgTransfer>;
-}
-
-export function isMsgTransferEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgTransferEncodeObject {
-  return (encodeObject as MsgTransferEncodeObject).typeUrl === "/ibc.applications.transfer.v1.MsgTransfer";
-}
-
-export interface MsgDepositEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.gov.v1beta1.MsgDeposit";
-  readonly value: Partial<MsgDeposit>;
-}
-
-export function isMsgDepositEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgSubmitProposalEncodeObject {
-  return (encodeObject as MsgDepositEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgDeposit";
-}
-
-export interface MsgSubmitProposalEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal";
-  readonly value: Partial<MsgSubmitProposal>;
-}
-
-export function isMsgSubmitProposalEncodeObject(
-  encodeObject: EncodeObject,
-): encodeObject is MsgSubmitProposalEncodeObject {
-  return (encodeObject as MsgSubmitProposalEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgSubmitProposal";
-}
-
-export interface MsgVoteEncodeObject extends EncodeObject {
-  readonly typeUrl: "/cosmos.gov.v1beta1.MsgVote";
-  readonly value: Partial<MsgVote>;
-}
-
-export function isMsgVoteEncodeObject(encodeObject: EncodeObject): encodeObject is MsgVoteEncodeObject {
-  return (encodeObject as MsgVoteEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgVote";
-}

packages/stargate/src/index.ts

@@ -36,24 +36,6 @@ export {
   isAminoMsgWithdrawValidatorCommission,
 } from "./aminomsgs";
 export { AminoConverter, AminoTypes, AminoTypesOptions } from "./aminotypes";
-export {
-  isMsgDelegateEncodeObject,
-  isMsgDepositEncodeObject,
-  isMsgSendEncodeObject,
-  isMsgSubmitProposalEncodeObject,
-  isMsgTransferEncodeObject,
-  isMsgUndelegateEncodeObject,
-  isMsgVoteEncodeObject,
-  isMsgWithdrawDelegatorRewardEncodeObject,
-  MsgDelegateEncodeObject,
-  MsgDepositEncodeObject,
-  MsgSendEncodeObject,
-  MsgSubmitProposalEncodeObject,
-  MsgTransferEncodeObject,
-  MsgUndelegateEncodeObject,
-  MsgVoteEncodeObject,
-  MsgWithdrawDelegatorRewardEncodeObject,
-} from "./encodeobjects";
 export { calculateFee, GasPrice } from "./fee";
 export * as logs from "./logs";
 export {
@@ -64,8 +46,24 @@ export {
   GovParamsType,
   GovProposalId,
   IbcExtension,
+  isMsgDelegateEncodeObject,
+  isMsgDepositEncodeObject,
+  isMsgSendEncodeObject,
+  isMsgSubmitProposalEncodeObject,
+  isMsgTransferEncodeObject,
+  isMsgUndelegateEncodeObject,
+  isMsgVoteEncodeObject,
+  isMsgWithdrawDelegatorRewardEncodeObject,
   MintExtension,
   MintParams,
+  MsgDelegateEncodeObject,
+  MsgDepositEncodeObject,
+  MsgSendEncodeObject,
+  MsgSubmitProposalEncodeObject,
+  MsgTransferEncodeObject,
+  MsgUndelegateEncodeObject,
+  MsgVoteEncodeObject,
+  MsgWithdrawDelegatorRewardEncodeObject,
   setupAuthExtension,
   setupBankExtension,
   setupDistributionExtension,

packages/stargate/src/modules/bank/messages.ts

@@ -1,7 +1,16 @@
-import { GeneratedType } from "@cosmjs/proto-signing";
+import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
 import { MsgMultiSend, MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 
 export const bankTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmos.bank.v1beta1.MsgMultiSend", MsgMultiSend],
   ["/cosmos.bank.v1beta1.MsgSend", MsgSend],
 ];
+
+export interface MsgSendEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.bank.v1beta1.MsgSend";
+  readonly value: Partial<MsgSend>;
+}
+
+export function isMsgSendEncodeObject(encodeObject: EncodeObject): encodeObject is MsgSendEncodeObject {
+  return (encodeObject as MsgSendEncodeObject).typeUrl === "/cosmos.bank.v1beta1.MsgSend";
+}

packages/stargate/src/modules/distribution/messages.ts

@@ -1,4 +1,4 @@
-import { GeneratedType } from "@cosmjs/proto-signing";
+import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
 import {
   MsgFundCommunityPool,
   MsgSetWithdrawAddress,
@@ -12,3 +12,17 @@ export const distributionTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", MsgWithdrawDelegatorReward],
   ["/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", MsgWithdrawValidatorCommission],
 ];
+
+export interface MsgWithdrawDelegatorRewardEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
+  readonly value: Partial<MsgWithdrawDelegatorReward>;
+}
+
+export function isMsgWithdrawDelegatorRewardEncodeObject(
+  object: EncodeObject,
+): object is MsgWithdrawDelegatorRewardEncodeObject {
+  return (
+    (object as MsgWithdrawDelegatorRewardEncodeObject).typeUrl ===
+    "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward"
+  );
+}

packages/stargate/src/modules/distribution/queries.spec.ts

@@ -4,7 +4,6 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
-import { MsgDelegateEncodeObject } from "../../encodeobjects";
 import { QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
 import { assertIsDeliverTxSuccess } from "../../stargateclient";
@@ -16,6 +15,7 @@ import {
   simappEnabled,
   validator,
 } from "../../testutils.spec";
+import { MsgDelegateEncodeObject } from "../";
 import { DistributionExtension, setupDistributionExtension } from "./queries";
 
 async function makeClientWithDistribution(

packages/stargate/src/modules/gov/messages.ts

@@ -1,4 +1,4 @@
-import { GeneratedType } from "@cosmjs/proto-signing";
+import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
 import { MsgDeposit, MsgSubmitProposal, MsgVote } from "cosmjs-types/cosmos/gov/v1beta1/tx";
 
 export const govTypes: ReadonlyArray<[string, GeneratedType]> = [
@@ -6,3 +6,32 @@ export const govTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmos.gov.v1beta1.MsgSubmitProposal", MsgSubmitProposal],
   ["/cosmos.gov.v1beta1.MsgVote", MsgVote],
 ];
+
+export interface MsgDepositEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.gov.v1beta1.MsgDeposit";
+  readonly value: Partial<MsgDeposit>;
+}
+
+export function isMsgDepositEncodeObject(object: EncodeObject): object is MsgSubmitProposalEncodeObject {
+  return (object as MsgDepositEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgDeposit";
+}
+
+export interface MsgSubmitProposalEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal";
+  readonly value: Partial<MsgSubmitProposal>;
+}
+
+export function isMsgSubmitProposalEncodeObject(
+  object: EncodeObject,
+): object is MsgSubmitProposalEncodeObject {
+  return (object as MsgSubmitProposalEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgSubmitProposal";
+}
+
+export interface MsgVoteEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.gov.v1beta1.MsgVote";
+  readonly value: Partial<MsgVote>;
+}
+
+export function isMsgVoteEncodeObject(object: EncodeObject): object is MsgVoteEncodeObject {
+  return (object as MsgVoteEncodeObject).typeUrl === "/cosmos.gov.v1beta1.MsgVote";
+}

packages/stargate/src/modules/gov/queries.spec.ts

@@ -13,11 +13,6 @@ import {
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
-import {
-  MsgDelegateEncodeObject,
-  MsgSubmitProposalEncodeObject,
-  MsgVoteEncodeObject,
-} from "../../encodeobjects";
 import { longify, QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
 import { assertIsDeliverTxSuccess } from "../../stargateclient";
@@ -31,6 +26,7 @@ import {
   simappEnabled,
   validator,
 } from "../../testutils.spec";
+import { MsgDelegateEncodeObject, MsgSubmitProposalEncodeObject, MsgVoteEncodeObject } from "../";
 import { GovExtension, setupGovExtension } from "./queries";
 
 async function makeClientWithGov(rpcUrl: string): Promise<[QueryClient & GovExtension, Tendermint34Client]> {

packages/stargate/src/modules/ibc/messages.ts

@@ -1,4 +1,4 @@
-import { GeneratedType } from "@cosmjs/proto-signing";
+import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
 import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import {
   MsgAcknowledgement,
@@ -46,3 +46,12 @@ export const ibcTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/ibc.core.connection.v1.MsgConnectionOpenInit", MsgConnectionOpenInit],
   ["/ibc.core.connection.v1.MsgConnectionOpenTry", MsgConnectionOpenTry],
 ];
+
+export interface MsgTransferEncodeObject extends EncodeObject {
+  readonly typeUrl: "/ibc.applications.transfer.v1.MsgTransfer";
+  readonly value: Partial<MsgTransfer>;
+}
+
+export function isMsgTransferEncodeObject(object: EncodeObject): object is MsgTransferEncodeObject {
+  return (object as MsgTransferEncodeObject).typeUrl === "/ibc.applications.transfer.v1.MsgTransfer";
+}

packages/stargate/src/modules/index.ts

@@ -1,16 +1,34 @@
 export { AuthExtension, setupAuthExtension } from "./auth/queries";
 export { authzTypes } from "./authz/messages";
-export { bankTypes } from "./bank/messages";
+export { bankTypes, isMsgSendEncodeObject, MsgSendEncodeObject } from "./bank/messages";
 export { BankExtension, setupBankExtension } from "./bank/queries";
-export { distributionTypes } from "./distribution/messages";
+export {
+  distributionTypes,
+  isMsgWithdrawDelegatorRewardEncodeObject,
+  MsgWithdrawDelegatorRewardEncodeObject,
+} from "./distribution/messages";
 export { DistributionExtension, setupDistributionExtension } from "./distribution/queries";
 export { feegrantTypes } from "./feegrant/messages";
-export { govTypes } from "./gov/messages";
+export {
+  govTypes,
+  isMsgDepositEncodeObject,
+  isMsgSubmitProposalEncodeObject,
+  isMsgVoteEncodeObject,
+  MsgDepositEncodeObject,
+  MsgSubmitProposalEncodeObject,
+  MsgVoteEncodeObject,
+} from "./gov/messages";
 export { GovExtension, GovParamsType, GovProposalId, setupGovExtension } from "./gov/queries";
-export { ibcTypes } from "./ibc/messages";
+export { ibcTypes, isMsgTransferEncodeObject, MsgTransferEncodeObject } from "./ibc/messages";
 export { IbcExtension, setupIbcExtension } from "./ibc/queries";
 export { MintExtension, MintParams, setupMintExtension } from "./mint/queries";
 export { setupSlashingExtension, SlashingExtension } from "./slashing/queries";
-export { stakingTypes } from "./staking/messages";
+export {
+  isMsgDelegateEncodeObject,
+  isMsgUndelegateEncodeObject,
+  MsgDelegateEncodeObject,
+  MsgUndelegateEncodeObject,
+  stakingTypes,
+} from "./staking/messages";
 export { setupStakingExtension, StakingExtension } from "./staking/queries";
 export { setupTxExtension, TxExtension } from "./tx/queries";

packages/stargate/src/modules/staking/messages.ts

@@ -1,4 +1,4 @@
-import { GeneratedType } from "@cosmjs/proto-signing";
+import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing";
 import {
   MsgBeginRedelegate,
   MsgCreateValidator,
@@ -14,3 +14,21 @@ export const stakingTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmos.staking.v1beta1.MsgEditValidator", MsgEditValidator],
   ["/cosmos.staking.v1beta1.MsgUndelegate", MsgUndelegate],
 ];
+
+export interface MsgDelegateEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.staking.v1beta1.MsgDelegate";
+  readonly value: Partial<MsgDelegate>;
+}
+
+export function isMsgDelegateEncodeObject(object: EncodeObject): object is MsgDelegateEncodeObject {
+  return (object as MsgDelegateEncodeObject).typeUrl === "/cosmos.staking.v1beta1.MsgDelegate";
+}
+
+export interface MsgUndelegateEncodeObject extends EncodeObject {
+  readonly typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate";
+  readonly value: Partial<MsgUndelegate>;
+}
+
+export function isMsgUndelegateEncodeObject(object: EncodeObject): object is MsgUndelegateEncodeObject {
+  return (object as MsgUndelegateEncodeObject).typeUrl === "/cosmos.staking.v1beta1.MsgUndelegate";
+}

packages/stargate/src/modules/staking/queries.spec.ts

@@ -4,7 +4,6 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
-import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "../../encodeobjects";
 import { QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
 import { assertIsDeliverTxSuccess } from "../../stargateclient";
@@ -16,6 +15,7 @@ import {
   simappEnabled,
   validator,
 } from "../../testutils.spec";
+import { MsgDelegateEncodeObject, MsgUndelegateEncodeObject } from "./messages";
 import { setupStakingExtension, StakingExtension } from "./queries";
 
 async function makeClientWithStaking(

packages/stargate/src/multisignature.spec.ts

@@ -10,7 +10,7 @@ import { assert } from "@cosmjs/utils";
 import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
-import { MsgSendEncodeObject } from "./encodeobjects";
+import { MsgSendEncodeObject } from "./modules";
 import { makeCompactBitArray, makeMultisignedTx } from "./multisignature";
 import { SignerData, SigningStargateClient } from "./signingstargateclient";
 import { assertIsDeliverTxSuccess, StargateClient } from "./stargateclient";

packages/stargate/src/signingstargateclient.spec.ts

@@ -11,7 +11,7 @@ import protobuf from "protobufjs/minimal";
 
 import { AminoMsgDelegate } from "./aminomsgs";
 import { AminoTypes } from "./aminotypes";
-import { MsgDelegateEncodeObject, MsgSendEncodeObject } from "./encodeobjects";
+import { MsgDelegateEncodeObject, MsgSendEncodeObject } from "./modules";
 import { PrivateSigningStargateClient, SigningStargateClient } from "./signingstargateclient";
 import { assertIsDeliverTxFailure, assertIsDeliverTxSuccess, isDeliverTxFailure } from "./stargateclient";
 import {

packages/stargate/src/signingstargateclient.ts

@@ -24,13 +24,6 @@ import { Height } from "cosmjs-types/ibc/core/client/v1/client";
 import Long from "long";
 
 import { AminoTypes } from "./aminotypes";
-import {
-  MsgDelegateEncodeObject,
-  MsgSendEncodeObject,
-  MsgTransferEncodeObject,
-  MsgUndelegateEncodeObject,
-  MsgWithdrawDelegatorRewardEncodeObject,
-} from "./encodeobjects";
 import { calculateFee, GasPrice } from "./fee";
 import {
   authzTypes,
@@ -39,6 +32,11 @@ import {
   feegrantTypes,
   govTypes,
   ibcTypes,
+  MsgDelegateEncodeObject,
+  MsgSendEncodeObject,
+  MsgTransferEncodeObject,
+  MsgUndelegateEncodeObject,
+  MsgWithdrawDelegatorRewardEncodeObject,
   stakingTypes,
 } from "./modules";
 import { DeliverTxResponse, StargateClient } from "./stargateclient";

packages/stargate/src/stargateclient.searchtx.spec.ts

@@ -13,7 +13,7 @@ import { assert, sleep } from "@cosmjs/utils";
 import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
-import { isMsgSendEncodeObject } from "./encodeobjects";
+import { isMsgSendEncodeObject } from "./modules";
 import { DeliverTxResponse, isDeliverTxFailure, isDeliverTxSuccess, StargateClient } from "./stargateclient";
 import {
   defaultSigningClientOptions,