Add Client class to serve as a general purpose base without message types

packages/stargate/src/events.ts

@@ -1,5 +1,5 @@
 import { fromUtf8 } from "@cosmjs/encoding";
-import { tendermint34, tendermint37 } from "@cosmjs/tendermint-rpc";
+import { comet38, tendermint34, tendermint37 } from "@cosmjs/tendermint-rpc";
 
 /**
  * An event attribute.
@@ -33,7 +33,7 @@ export interface Event {
  * Takes a Tendermint 0.34 or 0.37 event with binary encoded key and value
  * and converts it into an `Event` with string attributes.
  */
-export function fromTendermintEvent(event: tendermint34.Event | tendermint37.Event): Event {
+export function fromTendermintEvent(event: tendermint34.Event | tendermint37.Event | comet38.Event): Event {
   return {
     type: event.type,
     attributes: event.attributes.map(

packages/stargate/src/index.ts

@@ -1,5 +1,20 @@
 export { Account, accountFromAny, AccountParser } from "./accounts";
 export { AminoConverter, AminoConverters, AminoTypes } from "./aminotypes";
+export {
+  assertIsDeliverTxFailure,
+  assertIsDeliverTxSuccess,
+  Block,
+  BlockHeader,
+  BroadcastTxError,
+  Client,
+  ClientOptions,
+  DeliverTxResponse,
+  IndexedTx,
+  isDeliverTxFailure,
+  isDeliverTxSuccess,
+  SequenceResponse,
+  TimeoutError,
+} from "./client";
 export { Attribute, Event, fromTendermintEvent } from "./events";
 export { calculateFee, GasPrice } from "./fee";
 export * as logs from "./logs";
@@ -121,21 +136,7 @@ export {
   SigningStargateClient,
   SigningStargateClientOptions,
 } from "./signingstargateclient";
-export {
-  assertIsDeliverTxFailure,
-  assertIsDeliverTxSuccess,
-  Block,
-  BlockHeader,
-  BroadcastTxError,
-  DeliverTxResponse,
-  IndexedTx,
-  isDeliverTxFailure,
-  isDeliverTxSuccess,
-  SequenceResponse,
-  StargateClient,
-  StargateClientOptions,
-  TimeoutError,
-} from "./stargateclient";
+export { StargateClient, StargateClientOptions } from "./stargateclient";
 export { StdFee } from "@cosmjs/amino";
 export { Coin, coin, coins, makeCosmoshubPath, parseCoins } from "@cosmjs/proto-signing";
 

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

@@ -4,9 +4,9 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { assertDefined, sleep } from "@cosmjs/utils";
 import { GenericAuthorization } from "cosmjs-types/cosmos/authz/v1beta1/authz";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

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

@@ -4,9 +4,9 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

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

@@ -4,9 +4,9 @@ import { assert, sleep } from "@cosmjs/utils";
 import { TextProposal, VoteOption } from "cosmjs-types/cosmos/gov/v1beta1/gov";
 import { Any } from "cosmjs-types/google/protobuf/any";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { longify } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

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

@@ -13,9 +13,9 @@ import {
 import { Any } from "cosmjs-types/google/protobuf/any";
 import Long from "long";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { longify, QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

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

@@ -3,9 +3,9 @@ import { Random } from "@cosmjs/crypto";
 import { fromBech32, toBase64, toBech32 } from "@cosmjs/encoding";
 import { DirectSecp256k1HdWallet, encodePubkey } from "@cosmjs/proto-signing";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { calculateFee } from "../../fee";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultGasPrice,
   defaultSigningClientOptions,

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

@@ -4,9 +4,9 @@ import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { sleep } from "@cosmjs/utils";
 import { MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { QueryClient } from "../../queryclient";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

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

@@ -4,9 +4,10 @@ import { assertDefined, sleep } from "@cosmjs/utils";
 import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import Long from "long";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { QueryClient } from "../../queryclient";
 import { defaultRegistryTypes, SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess, StargateClient } from "../../stargateclient";
+import { StargateClient } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

packages/stargate/src/modules/vesting/messages.spec.ts

@@ -3,8 +3,8 @@ import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
 import { MsgCreateVestingAccount } from "cosmjs-types/cosmos/vesting/v1beta1/tx";
 import Long from "long";
 
+import { assertIsDeliverTxSuccess } from "../../client";
 import { SigningStargateClient } from "../../signingstargateclient";
-import { assertIsDeliverTxSuccess } from "../../stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

packages/stargate/src/multisignature.spec.ts

@@ -9,10 +9,11 @@ import { coins } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
 import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 
+import { assertIsDeliverTxSuccess } from "./client";
 import { MsgSendEncodeObject } from "./modules";
 import { makeCompactBitArray, makeMultisignedTxBytes } from "./multisignature";
 import { SignerData, SigningStargateClient } from "./signingstargateclient";
-import { assertIsDeliverTxSuccess, StargateClient } from "./stargateclient";
+import { StargateClient } from "./stargateclient";
 import { faucet, pendingWithoutSimapp, simapp } from "./testutils.spec";
 
 describe("multisignature", () => {

packages/stargate/src/signingstargateclient.spec.ts

@@ -22,6 +22,7 @@ import Long from "long";
 import protobuf from "protobufjs/minimal";
 
 import { AminoTypes } from "./aminotypes";
+import { assertIsDeliverTxFailure, assertIsDeliverTxSuccess, isDeliverTxFailure } from "./client";
 import {
   AminoMsgDelegate,
   MsgDelegateEncodeObject,
@@ -34,7 +35,6 @@ import {
   SigningStargateClient,
   SigningStargateClientOptions,
 } from "./signingstargateclient";
-import { assertIsDeliverTxFailure, assertIsDeliverTxSuccess, isDeliverTxFailure } from "./stargateclient";
 import {
   defaultGasPrice,
   defaultSendFee,

packages/stargate/src/signingstargateclient.ts

@@ -29,6 +29,7 @@ import { Height } from "cosmjs-types/ibc/core/client/v1/client";
 import Long from "long";
 
 import { AminoConverters, AminoTypes } from "./aminotypes";
+import { DeliverTxResponse } from "./client";
 import { calculateFee, GasPrice } from "./fee";
 import {
   authzTypes,
@@ -56,7 +57,7 @@ import {
   createStakingAminoConverters,
   createVestingAminoConverters,
 } from "./modules";
-import { DeliverTxResponse, StargateClient, StargateClientOptions } from "./stargateclient";
+import { StargateClient, StargateClientOptions } from "./stargateclient";
 
 export const defaultRegistryTypes: ReadonlyArray<[string, GeneratedType]> = [
   ["/cosmos.base.v1beta1.Coin", Coin],

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

@@ -14,8 +14,9 @@ import { MsgSendResponse } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
+import { DeliverTxResponse, isDeliverTxFailure, isDeliverTxSuccess } from "./client";
 import { isMsgSendEncodeObject } from "./modules";
-import { DeliverTxResponse, isDeliverTxFailure, isDeliverTxSuccess, StargateClient } from "./stargateclient";
+import { StargateClient } from "./stargateclient";
 import {
   defaultSigningClientOptions,
   faucet,

packages/stargate/src/stargateclient.spec.ts

@@ -19,10 +19,9 @@ import {
   DeliverTxResponse,
   isDeliverTxFailure,
   isDeliverTxSuccess,
-  PrivateStargateClient,
-  StargateClient,
   TimeoutError,
-} from "./stargateclient";
+} from "./client";
+import { PrivateStargateClient, StargateClient } from "./stargateclient";
 import {
   faucet,
   makeRandomAddress,
@@ -98,7 +97,7 @@ describe("StargateClient", () => {
       pendingWithoutSimapp();
       const client = await StargateClient.connect(simapp.tendermintUrl);
       const openedClient = client as unknown as PrivateStargateClient;
-      const getCodeSpy = spyOn(openedClient.cometClient!, "status").and.callThrough();
+      const getCodeSpy = spyOn(openedClient.client.cometClient!, "status").and.callThrough();
 
       expect(await client.getChainId()).toEqual(simapp.chainId); // from network
       expect(await client.getChainId()).toEqual(simapp.chainId); // from cache