@cosmwasm/ts-codegen 1.13.0 → 1.13.1

package/README.md

@@ -126,6 +126,44 @@ Typescript types and interfaces are generated in separate files so they can be i
 | `types.aliasExecuteMsg`  | generate a type alias based on the contract name                      |
 | `types.aliasEntryPoints` | generate type aliases for the entry points based on the contract name |
 
+### BaseClient
+The `baseClient.ts` will be generated as dependency for most files. It includes the base client for interchainjs.
+
+#### Gas Configuration
+
+The generated client provides flexible gas fee configuration options to handle different blockchain networks and fee settings.
+
+##### Default Gas Settings
+
+By default, the client uses a gas limit of `200000` for all transactions. You can customize this behavior through the `setDefaultGasAmount`.
+
+##### ChainConfig Options
+
+The `ChainConfig` interface supports two approaches for gas configuration:
+
+1. Chain Registry Integration (Recommended)
+
+When you provide chain information, the client automatically fetches gas prices from the chain registry:
+
+```typescript
+import { useChain } from '@interchain-kit/react';
+
+const { chain } = useChain('osmosistestnet');
+const chainConfig: ChainConfig = { chain: chain };
+```
+
+2. Manual Gas Price Configuration
+You can explicitly set gas prices for more control:
+
+```typescript
+const chainConfig: ChainConfig = {
+  gasPrice: {
+    denom: 'uosmo',
+    amount: '0.025'
+  }
+};
+```
+
 ### Client
 
 The `client` plugin will generate TS client classes for your contracts. This option generates a `QueryClient` for queries as well as a `Client` for queries and mutations.
@@ -173,7 +211,7 @@ Generate [recoil](https://recoiljs.org/) bindings for your contracts with the `r
 
 ### Message Composer
 
-Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `cosmjs` with the `message-composer` command.
+Generate pure message objects with the proper `utf8` encoding and `typeUrl` configured that you can broadcast yourself via `interchainjs` with the `message-composer` command.
 
 [see example output code](https://github.com/hyperweb-io/ts-codegen/blob/main/__output__/sg721/Sg721.message-composer.ts)
 

package/esm/helpers/baseClient.js

@@ -0,0 +1,184 @@
+export const baseClient = `
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
+`;

package/esm/helpers/contractContextBase.js

@@ -1,13 +1,15 @@
 export const contractContextBase = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -49,15 +51,15 @@ export class ContractBase<
 > {
 
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
   TSign?: new (
-    client: SigningCosmWasmClient,
+    client: ISigningCosmWasmClient,
     sender: string,
     contractAddress: string
   ) => TSign;
   TQuery?: new (
-    client: CosmWasmClient,
+    client: ICosmWasmClient,
     contractAddress: string
   ) => TQuery;
   TMsgComposer?: new (
@@ -67,15 +69,15 @@ export class ContractBase<
 
   constructor(
     address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    cosmWasmClient: ICosmWasmClient | undefined,
+    signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     TMsgComposer?: new (

package/esm/helpers/contractContextBaseShortHandCtor.js

@@ -1,13 +1,15 @@
 export const contractContextBaseShortHandCtor = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -49,15 +51,15 @@ export class ContractBase<
 > {
   constructor(
     protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    protected cosmWasmClient: ICosmWasmClient | undefined,
+    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     private TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     private TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     private TMsgComposer?: new (

package/esm/helpers/contractsContextTSX.js

@@ -1,16 +1,16 @@
 export const contractsContextTSX = `
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -22,9 +22,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;

package/esm/helpers/create-helpers.js

@@ -1,6 +1,6 @@
 import { sync as mkdirp } from 'mkdirp';
 import { basename, dirname, extname, join } from 'path';
-import { contractContextBase, contractContextBaseShortHandCtor, contractsContextTSX, } from '../helpers';
+import { contractContextBase, contractContextBaseShortHandCtor, contractsContextTSX, baseClient, } from '../helpers';
 import { writeContentToFile } from '../utils/files';
 import { header } from '../utils/header';
 const write = (outPath, file, content, varname) => {
@@ -17,6 +17,8 @@ const write = (outPath, file, content, varname) => {
 };
 export const createHelpers = (input, builderContext) => {
     const files = [];
+    // Always generate baseClient.ts since InterchainJS interfaces are needed by all clients
+    files.push(write(input.outPath, 'baseClient.ts', baseClient));
     if (input.options?.useContractsHook?.enabled &&
         Object.keys(builderContext.providers)?.length) {
         const useShorthandCtor = input.options?.useShorthandCtor;

package/esm/helpers/index.js

@@ -1,3 +1,4 @@
 export * from './contractContextBase';
 export * from './contractContextBaseShortHandCtor';
+export * from './baseClient';
 export * from './contractsContextTSX';

package/esm/plugins/provider-bundle.js

@@ -9,8 +9,10 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase {
         this.lifecycle = 'after';
         this.defaultContractName = 'contractContextProviders';
         this.utils = {
-            CosmWasmClient: '@cosmjs/cosmwasm-stargate',
-            SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+            ICosmWasmClient: '__baseClient__',
+            ISigningCosmWasmClient: '__baseClient__',
+            getCosmWasmClient: '__baseClient__',
+            getSigningCosmWasmClient: '__baseClient__',
             IQueryClientProvider: '__contractContextBase__',
             ISigningClientProvider: '__contractContextBase__',
             IMessageComposerProvider: '__contractContextBase__',
@@ -29,8 +31,10 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase {
         }
         const localname = 'contractContextProviders.ts';
         const body = [];
-        context.addUtil('CosmWasmClient');
-        context.addUtil('SigningCosmWasmClient');
+        context.addUtil('ICosmWasmClient');
+        context.addUtil('ISigningCosmWasmClient');
+        context.addUtil('getCosmWasmClient');
+        context.addUtil('getSigningCosmWasmClient');
         context.addUtil('IQueryClientProvider');
         context.addUtil('ISigningClientProvider');
         context.addUtil('IMessageComposerProvider');

package/helpers/baseClient.d.ts

@@ -0,0 +1 @@
+export declare const baseClient = "\nimport { StdFee, Coin } from '@interchainjs/types';\nimport { DirectSigner } from '@interchainjs/cosmos';\nimport { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';\nimport { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';\nimport { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';\nimport { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';\nimport { Chain } from '@chain-registry/v2-types';\n\n// Encoding utility functions\nconst fromUint8Array = <T>(uint8Array: Uint8Array): T => {\n  const text = new TextDecoder().decode(uint8Array);\n  return JSON.parse(text);\n};\n\nconst toUint8Array = (obj: any): Uint8Array => {\n  const text = JSON.stringify(obj);\n  return new TextEncoder().encode(text);\n};\n\n// Chain registry configuration\n// The amount under gasPrice represents gas price per unit\nexport interface ChainConfig {\n  chain?: Chain;\n  gasPrice?: {\n    denom: string;\n    amount: string;\n  };\n}\n\n// Gas fee calculation utilities\nexport const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {\n  try {\n    const feeTokens = chain.fees?.feeTokens;\n    \n    if (feeTokens && feeTokens.length > 0) {\n      const primaryToken = feeTokens[0];\n      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice\n      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;\n      const gasAmountNum = parseInt(gasAmount);\n      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();\n      \n      return {\n        amount: [{\n          denom: primaryToken.denom,\n          amount: feeAmount\n        }],\n        gas: gasAmount\n      };\n    }\n  } catch (error) {\n    console.warn('Failed to calculate gas from chain registry:', error);\n  }\n  \n  // Fallback to default\n  return { amount: [], gas: gasAmount };\n};\n\n// Default gas amount - users can easily change this\nexport let DEFAULT_GAS_AMOUNT = '200000';\n\n// Allow users to set their preferred default gas amount\nexport const setDefaultGasAmount = (gasAmount: string): void => {\n  DEFAULT_GAS_AMOUNT = gasAmount;\n};\n\n// Get current default gas amount\nexport const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;\n\nexport const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {\n  const gasAmount = DEFAULT_GAS_AMOUNT;\n  \n  if (chainConfig?.chain) {\n    return calculateGasFromChain(chainConfig.chain, gasAmount);\n  }\n  \n  if (chainConfig?.gasPrice) {\n    const gasAmountNum = parseInt(gasAmount);\n    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);\n    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();\n    \n    return {\n      amount: [{\n        denom: chainConfig.gasPrice.denom,\n        amount: feeAmount\n      }],\n      gas: gasAmount\n    };\n  }\n  \n  // Fallback: no fee tokens, just gas amount\n  return { amount: [], gas: gasAmount };\n};\n\n// InterchainJS interfaces for CosmWasm clients\nexport interface ICosmWasmClient {\n  queryContractSmart(contractAddr: string, query: any): Promise<any>;\n}\n\nexport interface ISigningCosmWasmClient {\n  execute(\n    sender: string, \n    contractAddress: string, \n    msg: any, \n    fee?: number | StdFee | \"auto\", \n    memo?: string, \n    funds?: Coin[], \n    chainConfig?: ChainConfig\n  ): Promise<any>;\n}\n\nexport interface ISigningClient {\n  signAndBroadcast(\n    signerAddress: string,\n    messages: any[],\n    fee: number | StdFee | \"auto\",\n    memo?: string\n  ): Promise<any>;\n}\n\n// Helper functions to create InterchainJS clients\nexport function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {\n  return {\n    queryContractSmart: async (contractAddr: string, query: any) => {\n      // Create the request object\n      const request: QuerySmartContractStateRequest = {\n        address: contractAddr,\n        queryData: toUint8Array(query)\n      };\n      \n      // Execute the query using InterchainJS\n      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);\n      \n      // Parse and return the result\n      return fromUint8Array(response.data);\n    },\n  };\n}\n\nexport function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {\n  return {\n    execute: async (\n      sender: string, \n      contractAddress: string, \n      msg: any, \n      fee?: number | StdFee | \"auto\", \n      memo?: string, \n      funds?: Coin[], \n      chainConfig?: ChainConfig\n    ) => {\n      // Handle fee conversion\n      let finalFee: StdFee;\n      if (typeof fee === 'number') {\n        finalFee = { amount: [], gas: fee.toString() };\n      } else if (fee === 'auto') {\n        finalFee = getAutoGasFee(chainConfig);\n      } else if (fee) {\n        finalFee = fee;\n      } else {\n        finalFee = getAutoGasFee(chainConfig);\n      }\n\n      // Create the message object\n      const message: MsgExecuteContract = {\n        sender,\n        contract: contractAddress,\n        msg: toUint8Array(msg),\n        funds: funds || []\n      };\n      \n      // Execute the transaction using InterchainJS\n      const result = await executeContract(\n        signingClient as any,\n        sender,\n        message,\n        finalFee,\n        memo || ''\n      );\n      \n      return result;\n    },\n  };\n}\n";

package/helpers/baseClient.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseClient = void 0;
+exports.baseClient = `
+import { StdFee, Coin } from '@interchainjs/types';
+import { DirectSigner } from '@interchainjs/cosmos';
+import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.func';
+import { executeContract } from 'interchainjs/cosmwasm/wasm/v1/tx.rpc.func';
+import { QuerySmartContractStateRequest, QuerySmartContractStateResponse } from 'interchainjs/cosmwasm/wasm/v1/query';
+import { MsgExecuteContract } from 'interchainjs/cosmwasm/wasm/v1/tx';
+import { Chain } from '@chain-registry/v2-types';
+
+// Encoding utility functions
+const fromUint8Array = <T>(uint8Array: Uint8Array): T => {
+  const text = new TextDecoder().decode(uint8Array);
+  return JSON.parse(text);
+};
+
+const toUint8Array = (obj: any): Uint8Array => {
+  const text = JSON.stringify(obj);
+  return new TextEncoder().encode(text);
+};
+
+// Chain registry configuration
+// The amount under gasPrice represents gas price per unit
+export interface ChainConfig {
+  chain?: Chain;
+  gasPrice?: {
+    denom: string;
+    amount: string;
+  };
+}
+
+// Gas fee calculation utilities
+export const calculateGasFromChain = (chain: Chain, gasAmount: string): StdFee => {
+  try {
+    const feeTokens = chain.fees?.feeTokens;
+    
+    if (feeTokens && feeTokens.length > 0) {
+      const primaryToken = feeTokens[0];
+      // v2 chain-registry uses camelCase: averageGasPrice, lowGasPrice, fixedMinGasPrice
+      const gasPrice = primaryToken.averageGasPrice || primaryToken.lowGasPrice || primaryToken.fixedMinGasPrice || 0.025;
+      const gasAmountNum = parseInt(gasAmount);
+      const feeAmount = Math.ceil(gasAmountNum * gasPrice).toString();
+      
+      return {
+        amount: [{
+          denom: primaryToken.denom,
+          amount: feeAmount
+        }],
+        gas: gasAmount
+      };
+    }
+  } catch (error) {
+    console.warn('Failed to calculate gas from chain registry:', error);
+  }
+  
+  // Fallback to default
+  return { amount: [], gas: gasAmount };
+};
+
+// Default gas amount - users can easily change this
+export let DEFAULT_GAS_AMOUNT = '200000';
+
+// Allow users to set their preferred default gas amount
+export const setDefaultGasAmount = (gasAmount: string): void => {
+  DEFAULT_GAS_AMOUNT = gasAmount;
+};
+
+// Get current default gas amount
+export const getDefaultGasAmount = (): string => DEFAULT_GAS_AMOUNT;
+
+export const getAutoGasFee = (chainConfig?: ChainConfig): StdFee => {
+  const gasAmount = DEFAULT_GAS_AMOUNT;
+  
+  if (chainConfig?.chain) {
+    return calculateGasFromChain(chainConfig.chain, gasAmount);
+  }
+  
+  if (chainConfig?.gasPrice) {
+    const gasAmountNum = parseInt(gasAmount);
+    const gasPriceNum = parseFloat(chainConfig.gasPrice.amount);
+    const feeAmount = Math.ceil(gasAmountNum * gasPriceNum).toString();
+    
+    return {
+      amount: [{
+        denom: chainConfig.gasPrice.denom,
+        amount: feeAmount
+      }],
+      gas: gasAmount
+    };
+  }
+  
+  // Fallback: no fee tokens, just gas amount
+  return { amount: [], gas: gasAmount };
+};
+
+// InterchainJS interfaces for CosmWasm clients
+export interface ICosmWasmClient {
+  queryContractSmart(contractAddr: string, query: any): Promise<any>;
+}
+
+export interface ISigningCosmWasmClient {
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<any>;
+}
+
+export interface ISigningClient {
+  signAndBroadcast(
+    signerAddress: string,
+    messages: any[],
+    fee: number | StdFee | "auto",
+    memo?: string
+  ): Promise<any>;
+}
+
+// Helper functions to create InterchainJS clients
+export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
+  return {
+    queryContractSmart: async (contractAddr: string, query: any) => {
+      // Create the request object
+      const request: QuerySmartContractStateRequest = {
+        address: contractAddr,
+        queryData: toUint8Array(query)
+      };
+      
+      // Execute the query using InterchainJS
+      const response: QuerySmartContractStateResponse = await getSmartContractState(rpcEndpoint, request);
+      
+      // Parse and return the result
+      return fromUint8Array(response.data);
+    },
+  };
+}
+
+export function getSigningCosmWasmClient(signingClient: DirectSigner): ISigningCosmWasmClient {
+  return {
+    execute: async (
+      sender: string, 
+      contractAddress: string, 
+      msg: any, 
+      fee?: number | StdFee | "auto", 
+      memo?: string, 
+      funds?: Coin[], 
+      chainConfig?: ChainConfig
+    ) => {
+      // Handle fee conversion
+      let finalFee: StdFee;
+      if (typeof fee === 'number') {
+        finalFee = { amount: [], gas: fee.toString() };
+      } else if (fee === 'auto') {
+        finalFee = getAutoGasFee(chainConfig);
+      } else if (fee) {
+        finalFee = fee;
+      } else {
+        finalFee = getAutoGasFee(chainConfig);
+      }
+
+      // Create the message object
+      const message: MsgExecuteContract = {
+        sender,
+        contract: contractAddress,
+        msg: toUint8Array(msg),
+        funds: funds || []
+      };
+      
+      // Execute the transaction using InterchainJS
+      const result = await executeContract(
+        signingClient as any,
+        sender,
+        message,
+        finalFee,
+        memo || ''
+      );
+      
+      return result;
+    },
+  };
+}
+`;

package/helpers/contractContextBase.d.ts

@@ -1 +1 @@
-export declare const contractContextBase = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: SigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: CosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: CosmWasmClient | undefined,\n    signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+export declare const contractContextBase = "\nimport {\n  ICosmWasmClient,\n  ISigningCosmWasmClient,\n  getCosmWasmClient,\n  getSigningCosmWasmClient,\n} from './baseClient';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: ICosmWasmClient | undefined;\n  signingCosmWasmClient: ISigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n\n  address: string | undefined;\n  cosmWasmClient: ICosmWasmClient | undefined;\n  signingCosmWasmClient: ISigningCosmWasmClient | undefined;\n  TSign?: new (\n    client: ISigningCosmWasmClient,\n    sender: string,\n    contractAddress: string\n  ) => TSign;\n  TQuery?: new (\n    client: ICosmWasmClient,\n    contractAddress: string\n  ) => TQuery;\n  TMsgComposer?: new (\n    sender: string,\n    contractAddress: string\n  ) => TMsgComposer;\n\n  constructor(\n    address: string | undefined,\n    cosmWasmClient: ICosmWasmClient | undefined,\n    signingCosmWasmClient: ISigningCosmWasmClient | undefined,\n    TSign?: new (\n      client: ISigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    TQuery?: new (\n      client: ICosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {\n    this.address = address;\n    this.cosmWasmClient = cosmWasmClient;\n    this.signingCosmWasmClient = signingCosmWasmClient;\n    this.TSign = TSign;\n    this.TQuery = TQuery;\n    this.TMsgComposer = TMsgComposer;\n  }\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";

package/helpers/contractContextBase.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractContextBase = void 0;
 exports.contractContextBase = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -52,15 +54,15 @@ export class ContractBase<
 > {
 
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
   TSign?: new (
-    client: SigningCosmWasmClient,
+    client: ISigningCosmWasmClient,
     sender: string,
     contractAddress: string
   ) => TSign;
   TQuery?: new (
-    client: CosmWasmClient,
+    client: ICosmWasmClient,
     contractAddress: string
   ) => TQuery;
   TMsgComposer?: new (
@@ -70,15 +72,15 @@ export class ContractBase<
 
   constructor(
     address: string | undefined,
-    cosmWasmClient: CosmWasmClient | undefined,
-    signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    cosmWasmClient: ICosmWasmClient | undefined,
+    signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     TMsgComposer?: new (

package/helpers/contractContextBaseShortHandCtor.d.ts

@@ -1 +1 @@
-export declare const contractContextBaseShortHandCtor = "\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: CosmWasmClient | undefined;\n  signingCosmWasmClient: SigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: CosmWasmClient | undefined,\n    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: SigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: CosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";
+export declare const contractContextBaseShortHandCtor = "\nimport {\n  ICosmWasmClient,\n  ISigningCosmWasmClient,\n  getCosmWasmClient,\n  getSigningCosmWasmClient,\n} from './baseClient';\n\nexport interface IContractConstructor {\n  address: string | undefined;\n  cosmWasmClient: ICosmWasmClient | undefined;\n  signingCosmWasmClient: ISigningCosmWasmClient | undefined;\n}\n\nexport const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';\n\nexport const NO_COSMWASW_CLIENT_ERROR_MESSAGE = 'cosmWasmClient not connected';\n\nexport const NO_ADDRESS_ERROR_MESSAGE = \"address doesn't exist\";\n\nexport const NO_SIGNING_CLIENT_ERROR_MESSAGE =\n  'Signing client is not generated. Please check ts-codegen config';\n\nexport const NO_QUERY_CLIENT_ERROR_MESSAGE =\n  'Query client is not generated. Please check ts-codegen config';\n\nexport const NO_MESSAGE_COMPOSER_ERROR_MESSAGE =\n  'Message composer client is not generated. Please check ts-codegen config';\n\n/**\n * a placeholder for non-generated classes\n */\nexport interface IEmptyClient {}\n\nexport interface ISigningClientProvider<T> {\n  getSigningClient(contractAddr: string): T;\n}\n\nexport interface IQueryClientProvider<T> {\n  getQueryClient(contractAddr: string): T;\n}\n\nexport interface IMessageComposerProvider<T> {\n  getMessageComposer(contractAddr: string): T;\n}\n\nexport class ContractBase<\n  TSign = IEmptyClient,\n  TQuery = IEmptyClient,\n  TMsgComposer = IEmptyClient\n> {\n  constructor(\n    protected address: string | undefined,\n    protected cosmWasmClient: ICosmWasmClient | undefined,\n    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,\n    private TSign?: new (\n      client: ISigningCosmWasmClient,\n      sender: string,\n      contractAddress: string\n    ) => TSign,\n    private TQuery?: new (\n      client: ICosmWasmClient,\n      contractAddress: string\n    ) => TQuery,\n    private TMsgComposer?: new (\n      sender: string,\n      contractAddress: string\n    ) => TMsgComposer\n  ) {}\n\n  public getSigningClient(contractAddr: string): TSign {\n    if (!this.signingCosmWasmClient) throw new Error(NO_SINGING_ERROR_MESSAGE);\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TSign) throw new Error(NO_SIGNING_CLIENT_ERROR_MESSAGE);\n    return new this.TSign(\n      this.signingCosmWasmClient,\n      this.address,\n      contractAddr\n    );\n  }\n\n  public getQueryClient(contractAddr: string): TQuery {\n    if (!this.cosmWasmClient) throw new Error(NO_COSMWASW_CLIENT_ERROR_MESSAGE);\n    if (!this.TQuery) throw new Error(NO_QUERY_CLIENT_ERROR_MESSAGE);\n    return new this.TQuery(this.cosmWasmClient, contractAddr);\n  }\n\n  public getMessageComposer(contractAddr: string): TMsgComposer {\n    if (!this.address) throw new Error(NO_ADDRESS_ERROR_MESSAGE);\n    if (!this.TMsgComposer) throw new Error(NO_MESSAGE_COMPOSER_ERROR_MESSAGE);\n    return new this.TMsgComposer(this.address, contractAddr);\n  }\n}\n";

package/helpers/contractContextBaseShortHandCtor.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractContextBaseShortHandCtor = void 0;
 exports.contractContextBaseShortHandCtor = `
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+  getCosmWasmClient,
+  getSigningCosmWasmClient,
+} from './baseClient';
 
 export interface IContractConstructor {
   address: string | undefined;
-  cosmWasmClient: CosmWasmClient | undefined;
-  signingCosmWasmClient: SigningCosmWasmClient | undefined;
+  cosmWasmClient: ICosmWasmClient | undefined;
+  signingCosmWasmClient: ISigningCosmWasmClient | undefined;
 }
 
 export const NO_SINGING_ERROR_MESSAGE = 'signingCosmWasmClient not connected';
@@ -52,15 +54,15 @@ export class ContractBase<
 > {
   constructor(
     protected address: string | undefined,
-    protected cosmWasmClient: CosmWasmClient | undefined,
-    protected signingCosmWasmClient: SigningCosmWasmClient | undefined,
+    protected cosmWasmClient: ICosmWasmClient | undefined,
+    protected signingCosmWasmClient: ISigningCosmWasmClient | undefined,
     private TSign?: new (
-      client: SigningCosmWasmClient,
+      client: ISigningCosmWasmClient,
       sender: string,
       contractAddress: string
     ) => TSign,
     private TQuery?: new (
-      client: CosmWasmClient,
+      client: ICosmWasmClient,
       contractAddress: string
     ) => TQuery,
     private TMsgComposer?: new (

package/helpers/contractsContextTSX.d.ts

@@ -1 +1 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  ICosmWasmClient,\n  ISigningCosmWasmClient,\n} from './baseClient';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<ICosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<ISigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";

package/helpers/contractsContextTSX.js

@@ -4,16 +4,16 @@ exports.contractsContextTSX = void 0;
 exports.contractsContextTSX = `
 import React, { useEffect, useMemo, useRef, useState, useContext } from 'react';
 import {
-  CosmWasmClient,
-  SigningCosmWasmClient,
-} from '@cosmjs/cosmwasm-stargate';
+  ICosmWasmClient,
+  ISigningCosmWasmClient,
+} from './baseClient';
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
 export interface ContractsConfig {
   address: string | undefined;
-  getCosmWasmClient: () => Promise<CosmWasmClient>;
-  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
+  getCosmWasmClient: () => Promise<ICosmWasmClient>;
+  getSigningCosmWasmClient: () => Promise<ISigningCosmWasmClient>;
 }
 
 const ContractsContext = React.createContext<IContractsContext | null>(null);
@@ -25,9 +25,9 @@ export const ContractsProvider = ({
   children: React.ReactNode;
   contractsConfig: ContractsConfig;
 }) => {
-  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();
+  const [cosmWasmClient, setCosmWasmClient] = useState<ICosmWasmClient>();
   const [signingCosmWasmClient, setSigningCosmWasmClient] =
-    useState<SigningCosmWasmClient>();
+    useState<ISigningCosmWasmClient>();
 
   const { address, getCosmWasmClient, getSigningCosmWasmClient } =
     contractsConfig;

package/helpers/create-helpers.js

@@ -20,6 +20,8 @@ const write = (outPath, file, content, varname) => {
 };
 const createHelpers = (input, builderContext) => {
     const files = [];
+    // Always generate baseClient.ts since InterchainJS interfaces are needed by all clients
+    files.push(write(input.outPath, 'baseClient.ts', helpers_1.baseClient));
     if (input.options?.useContractsHook?.enabled &&
         Object.keys(builderContext.providers)?.length) {
         const useShorthandCtor = input.options?.useShorthandCtor;

package/helpers/index.d.ts

@@ -1,3 +1,4 @@
 export * from './contractContextBase';
 export * from './contractContextBaseShortHandCtor';
+export * from './baseClient';
 export * from './contractsContextTSX';

package/helpers/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./contractContextBase"), exports);
 __exportStar(require("./contractContextBaseShortHandCtor"), exports);
+__exportStar(require("./baseClient"), exports);
 __exportStar(require("./contractsContextTSX"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmwasm/ts-codegen",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "@cosmwasm/ts-codegen converts your CosmWasm smart contracts into dev-friendly TypeScript classes so you can focus on shipping code.",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/ts-codegen",
@@ -36,15 +36,18 @@
   "bugs": {
     "url": "https://github.com/hyperweb-io/ts-codegen/issues"
   },
-  "devDependencies": {
-    "@cosmjs/cosmwasm-stargate": "0.32.3"
-  },
   "dependencies": {
     "@babel/generator": "7.24.4",
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
-    "@cosmwasm/ts-codegen-ast": "^1.9.0",
-    "@cosmwasm/ts-codegen-types": "^1.4.0",
+    "@chain-registry/types": "^0.17.1",
+    "@chain-registry/utils": "^1.51.71",
+    "@chain-registry/v2": "^1.71.229",
+    "@cosmwasm/ts-codegen-ast": "^1.9.1",
+    "@cosmwasm/ts-codegen-types": "^1.4.1",
+    "@interchainjs/amino": "1.17.1",
+    "@interchainjs/cosmos": "1.17.1",
+    "@interchainjs/types": "1.17.1",
     "@pyramation/json-schema-to-typescript": " 11.0.4",
     "@types/rimraf": "3.0.2",
     "@types/shelljs": "0.8.15",
@@ -54,6 +57,8 @@
     "fuzzy": "0.1.3",
     "glob": "^10",
     "inquirerer": "0.1.3",
+    "interchainjs": "1.17.1",
+    "minimatch": "^10.0.3",
     "minimist": "1.2.6",
     "mkdirp": "1.0.4",
     "nested-obj": "0.0.1",
@@ -67,5 +72,5 @@
     "smart contracts",
     "codegen"
   ],
-  "gitHead": "bbc6af3d780a810a8bdb8d905ef5413f1ab08d4b"
+  "gitHead": "472007b2c11c211f16e18d4653350bf7a8e16901"
 }

package/plugins/provider-bundle.js

@@ -45,8 +45,10 @@ class ContractsProviderBundlePlugin extends plugin_base_1.BuilderPluginBase {
         this.lifecycle = 'after';
         this.defaultContractName = 'contractContextProviders';
         this.utils = {
-            CosmWasmClient: '@cosmjs/cosmwasm-stargate',
-            SigningCosmWasmClient: '@cosmjs/cosmwasm-stargate',
+            ICosmWasmClient: '__baseClient__',
+            ISigningCosmWasmClient: '__baseClient__',
+            getCosmWasmClient: '__baseClient__',
+            getSigningCosmWasmClient: '__baseClient__',
             IQueryClientProvider: '__contractContextBase__',
             ISigningClientProvider: '__contractContextBase__',
             IMessageComposerProvider: '__contractContextBase__',
@@ -65,8 +67,10 @@ class ContractsProviderBundlePlugin extends plugin_base_1.BuilderPluginBase {
         }
         const localname = 'contractContextProviders.ts';
         const body = [];
-        context.addUtil('CosmWasmClient');
-        context.addUtil('SigningCosmWasmClient');
+        context.addUtil('ICosmWasmClient');
+        context.addUtil('ISigningCosmWasmClient');
+        context.addUtil('getCosmWasmClient');
+        context.addUtil('getSigningCosmWasmClient');
         context.addUtil('IQueryClientProvider');
         context.addUtil('ISigningClientProvider');
         context.addUtil('IMessageComposerProvider');