hyperweb-io · hoangdv2429 · Jun 27, 2023 · Jun 25, 2023 · Jun 25, 2023 · Jun 25, 2023
diff --git a/README.md b/README.md
diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts
@@ -45,7 +45,7 @@ export interface QueryAccountsRequestSDKType {
  */
 export interface QueryAccountsResponse {
   /** accounts are the existing accounts */
-  accounts: (BaseAccount & Any)[] | Any[];
+  accounts: (BaseAccount | Any)[] | Any[];
   /** pagination defines the pagination in the response. */
   pagination: PageResponse;
 }
@@ -141,7 +141,7 @@ export interface QueryParamsResponseSDKType {
 /** QueryAccountResponse is the response type for the Query/Account RPC method. */
 export interface QueryAccountResponse {
   /** account defines the account of the corresponding address. */
-  account: (BaseAccount & Any) | undefined;
+  account: BaseAccount | Any | undefined;
 }
 export interface QueryAccountResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse";
@@ -179,7 +179,7 @@ export interface QueryParamsRequestAminoMsg {
 export interface QueryParamsRequestSDKType {}
 /** QueryModuleAccountsResponse is the response type for the Query/ModuleAccounts RPC method. */
 export interface QueryModuleAccountsResponse {
-  accounts: (ModuleAccount & Any)[] | Any[];
+  accounts: (ModuleAccount | Any)[] | Any[];
 }
 export interface QueryModuleAccountsResponseProtoMsg {
   typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse";

diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts
@@ -47,7 +47,7 @@ export interface GenericAuthorizationSDKType {
  * the provide method with expiration time.
  */
 export interface Grant {
-  authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined;
+  authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined;
   /**
    * time when the grant will expire and will be pruned. If null, then the grant
    * doesn't have a time expiration (other conditions  in `authorization`
@@ -94,7 +94,7 @@ export interface GrantSDKType {
 export interface GrantAuthorization {
   granter: string;
   grantee: string;
-  authorization: (GenericAuthorization & DepositDeploymentAuthorization1 & DepositDeploymentAuthorization2 & SendAuthorization & StakeAuthorization & Any) | undefined;
+  authorization: GenericAuthorization | DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | SendAuthorization | StakeAuthorization | Any | undefined;
   expiration: Date;
 }
 export interface GrantAuthorizationProtoMsg {

diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts
@@ -8,7 +8,7 @@ export const protobufPackage = "cosmos.evidence.v1beta1";
  */
 export interface MsgSubmitEvidence {
   submitter: string;
-  evidence: (Any) | undefined;
+  evidence: Any | undefined;
 }
 export interface MsgSubmitEvidenceProtoMsg {
   typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence";

diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts
@@ -123,7 +123,7 @@ export interface PeriodicAllowanceSDKType {
 /** AllowedMsgAllowance creates allowance only for specified message types. */
 export interface AllowedMsgAllowance {
   /** allowance can be any of basic and periodic fee allowance. */
-  allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined;
+  allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined;
   /** allowed_messages are the messages for which the grantee has the access. */
   allowedMessages: string[];
 }
@@ -157,7 +157,7 @@ export interface Grant {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
   /** allowance can be any of basic, periodic, allowed fee allowance. */
-  allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined;
+  allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined;
 }
 export interface GrantProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.Grant";

diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts
@@ -13,7 +13,7 @@ export interface MsgGrantAllowance {
   /** grantee is the address of the user being granted an allowance of another user's funds. */
   grantee: string;
   /** allowance can be any of basic, periodic, allowed fee allowance. */
-  allowance: (BasicAllowance & PeriodicAllowance & AllowedMsgAllowance & Any) | undefined;
+  allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined;
 }
 export interface MsgGrantAllowanceProtoMsg {
   typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance";

diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts
@@ -15,7 +15,7 @@ export const protobufPackage = "cosmos.gov.v1";
  * proposal Content.
  */
 export interface MsgSubmitProposal {
-  messages: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any)[] | Any[];
+  messages: (TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any)[] | Any[];
   initialDeposit: Coin[];
   proposer: string;
   /** metadata is any arbitrary metadata attached to the proposal. */
@@ -79,7 +79,7 @@ export interface MsgSubmitProposalResponseSDKType {
  */
 export interface MsgExecLegacyContent {
   /** content is the proposal's content. */
-  content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined;
+  content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined;
   /** authority must be the gov module address. */
   authority: string;
 }

diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts
@@ -249,7 +249,7 @@ export interface DepositSDKType {
 /** Proposal defines the core field members of a governance proposal. */
 export interface Proposal {
   proposalId: Long;
-  content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined;
+  content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined;
   status: ProposalStatus;
   /**
    * final_tally_result is the final tally result of the proposal. When

diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts
@@ -14,7 +14,7 @@ export const protobufPackage = "cosmos.gov.v1beta1";
  * proposal Content.
  */
 export interface MsgSubmitProposal {
-  content: (TextProposal & RegisterIncentiveProposal & ClientUpdateProposal & UpgradeProposal & ReplacePoolIncentivesProposal & UpdatePoolIncentivesProposal & SetSuperfluidAssetsProposal & RemoveSuperfluidAssetsProposal & UpdateUnpoolWhiteListProposal & UpdateFeeTokenProposal & Any) | undefined;
+  content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined;
   initialDeposit: Coin[];
   proposer: string;
 }

diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts
@@ -253,7 +253,7 @@ export interface MsgCreateGroupPolicy {
   /** metadata is any arbitrary metadata attached to the group policy. */
   metadata: string;
   /** decision_policy specifies the group policy's decision policy. */
-  decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
+  decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined;
 }
 export interface MsgCreateGroupPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy";
@@ -351,7 +351,7 @@ export interface MsgCreateGroupWithPolicy {
   /** group_policy_as_admin is a boolean field, if set to true, the group policy account address will be used as group and group policy admin. */
   groupPolicyAsAdmin: boolean;
   /** decision_policy specifies the group policy's decision policy. */
-  decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
+  decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined;
 }
 export interface MsgCreateGroupWithPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy";
@@ -436,7 +436,7 @@ export interface MsgUpdateGroupPolicyDecisionPolicy {
   /** address is the account address of group policy. */
   address: string;
   /** decision_policy is the updated group policy's decision policy. */
-  decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
+  decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined;
 }
 export interface MsgUpdateGroupPolicyDecisionPolicyProtoMsg {
   typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy";

diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts
@@ -496,7 +496,7 @@ export interface GroupPolicyInfo {
    */
   version: Long;
   /** decision_policy specifies the group policy's decision policy. */
-  decisionPolicy: (ThresholdDecisionPolicy & PercentageDecisionPolicy & Any) | undefined;
+  decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined;
   /** created_at is a timestamp specifying when a group policy was created. */
   createdAt: Date;
 }

diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts
@@ -219,7 +219,7 @@ export interface Validator {
   /** operator_address defines the address of the validator's operator; bech encoded in JSON. */
   operatorAddress: string;
   /** consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. */
-  consensusPubkey: (Any) | undefined;
+  consensusPubkey: Any | undefined;
   /** jailed defined whether the validator has been jailed from bonded status or not. */
   jailed: boolean;
   /** status is the validator status (bonded/unbonding/unbonded). */

diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts
@@ -14,7 +14,7 @@ export interface MsgCreateValidator {
   minSelfDelegation: string;
   delegatorAddress: string;
   validatorAddress: string;
-  pubkey: (Any) | undefined;
+  pubkey: Any | undefined;
   value: Coin;
 }
 export interface MsgCreateValidatorProtoMsg {

diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts
@@ -223,7 +223,7 @@ export interface ContractInfo {
    * Extension is an extension point to store custom metadata within the
    * persistence model.
    */
-  extension: (Any) | undefined;
+  extension: Any | undefined;
 }
 export interface ContractInfoProtoMsg {
   typeUrl: "/cosmwasm.wasm.v1.ContractInfo";

diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/genesis.ts
@@ -31,7 +31,7 @@ export interface ParamsSDKType {
 }
 /** GenesisState defines the gamm module's genesis state. */
 export interface GenesisState {
-  pools: (Pool1 & Pool2 & Any)[] | Any[];
+  pools: (Pool1 | Pool2 | Any)[] | Any[];
   /** will be renamed to next_pool_id in an upcoming version */
   nextPoolNumber: Long;
   params: Params;

diff --git a/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputv2/osmosis/gamm/v1beta1/query.ts
@@ -32,7 +32,7 @@ export interface QueryPoolRequestSDKType {
   pool_id: Long;
 }
 export interface QueryPoolResponse {
-  pool: (Pool1 & Pool2 & Any) | undefined;
+  pool: Pool1 | Pool2 | Any | undefined;
 }
 export interface QueryPoolResponseProtoMsg {
   typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse";
@@ -74,7 +74,7 @@ export interface QueryPoolsRequestSDKType {
   pagination: PageRequestSDKType;
 }
 export interface QueryPoolsResponse {
-  pools: (Pool1 & Pool2 & Any)[] | Any[];
+  pools: (Pool1 | Pool2 | Any)[] | Any[];
   /** pagination defines the pagination in the response. */
   pagination: PageResponse;
 }
@@ -465,7 +465,7 @@ export interface QueryPoolsWithFilterRequestSDKType {
   pagination: PageRequestSDKType;
 }
 export interface QueryPoolsWithFilterResponse {
-  pools: (Pool1 & Pool2 & Any)[] | Any[];
+  pools: (Pool1 | Pool2 | Any)[] | Any[];
   /** pagination defines the pagination in the response. */
   pagination: PageResponse;
 }

diff --git a/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/audit/v1beta2/query.rpc.Query.ts
@@ -56,7 +56,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/cert/v1beta2/query.rpc.Query.ts
@@ -13,7 +13,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta1/query.rpc.Query.ts
@@ -33,7 +33,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/deployment/v1beta2/query.rpc.Query.ts
@@ -34,7 +34,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta1/query.rpc.Query.ts
@@ -30,7 +30,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/escrow/v1beta2/query.rpc.Query.ts
@@ -30,7 +30,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/market/v1beta2/query.rpc.Query.ts
@@ -61,7 +61,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts b/__fixtures__/v-next/outputv3/akash/provider/v1beta2/query.rpc.Query.ts
@@ -22,7 +22,7 @@ export class Query {
     });
   }
 }
-export class Querier {
+export class QueryClientImpl {
   private readonly url: string;
   constructor(url: string) {
     this.url = url;

diff --git a/__fixtures__/v-next/outputv3/akash/rpc.query.ts b/__fixtures__/v-next/outputv3/akash/rpc.query.ts
@@ -7,80 +7,80 @@ export const createGrpcGateWayClient = async ({
   return {
     akash: {
       audit: {
-        v1beta2: new (await import("./audit/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta2: new (await import("./audit/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       cert: {
-        v1beta2: new (await import("./cert/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta2: new (await import("./cert/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       deployment: {
-        v1beta1: new (await import("./deployment/v1beta1/query.rpc.Query")).Querier(endpoint),
-        v1beta2: new (await import("./deployment/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("./deployment/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint),
+        v1beta2: new (await import("./deployment/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       escrow: {
-        v1beta1: new (await import("./escrow/v1beta1/query.rpc.Query")).Querier(endpoint),
-        v1beta2: new (await import("./escrow/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("./escrow/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint),
+        v1beta2: new (await import("./escrow/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       market: {
-        v1beta2: new (await import("./market/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta2: new (await import("./market/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       provider: {
-        v1beta2: new (await import("./provider/v1beta2/query.rpc.Query")).Querier(endpoint)
+        v1beta2: new (await import("./provider/v1beta2/query.rpc.Query")).QueryClientImpl(endpoint)
       }
     },
     cosmos: {
       app: {
-        v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).Querier(endpoint)
+        v1alpha1: new (await import("../cosmos/app/v1alpha1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       auth: {
-        v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/auth/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       authz: {
-        v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/authz/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       bank: {
-        v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/bank/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       base: {
         tendermint: {
-          v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).Querier(endpoint)
+          v1beta1: new (await import("../cosmos/base/tendermint/v1beta1/query.rpc.Service")).ServiceClientImpl(endpoint)
         }
       },
       distribution: {
-        v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/distribution/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       evidence: {
-        v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/evidence/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       feegrant: {
-        v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/feegrant/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       gov: {
-        v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).Querier(endpoint),
-        v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1: new (await import("../cosmos/gov/v1/query.rpc.Query")).QueryClientImpl(endpoint),
+        v1beta1: new (await import("../cosmos/gov/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       group: {
-        v1: new (await import("../cosmos/group/v1/query.rpc.Query")).Querier(endpoint)
+        v1: new (await import("../cosmos/group/v1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       mint: {
-        v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/mint/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       nft: {
-        v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/nft/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       params: {
-        v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/params/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       slashing: {
-        v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/slashing/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       staking: {
-        v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/staking/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       },
       tx: {
-        v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/tx/v1beta1/service.rpc.Service")).ServiceClientImpl(endpoint)
       },
       upgrade: {
-        v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).Querier(endpoint)
+        v1beta1: new (await import("../cosmos/upgrade/v1beta1/query.rpc.Query")).QueryClientImpl(endpoint)
       }
     }
   };