@cosmwasm/ts-codegen 1.12.1 → 1.13.1

package/esm/plugins/plugin-base.js

@@ -1,6 +1,6 @@
 import generate from '@babel/generator';
 import * as t from '@babel/types';
-import { defaultOptions } from '@cosmwasm/ts-codegen-ast';
+import { defaultOptions, } from '@cosmwasm/ts-codegen-ast';
 import deepmerge from 'deepmerge';
 import { writeFileSync } from 'fs';
 import { sync as mkdirp } from 'mkdirp';
@@ -41,8 +41,9 @@ export class BuilderPluginBase {
         }
         return results.map((result) => {
             const imports = context.getImports(this.utils, result.localname);
+            const nodes = [...imports, ...result.body];
             // @ts-ignore
-            const code = header + generate(t.program([...imports, ...result.body])).code;
+            const code = header + generate(t.program(nodes)).code;
             mkdirp(outPath);
             const filename = join(outPath, result.localname);
             writeFileSync(filename, code);

package/esm/plugins/provider-bundle.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { BuilderPluginBase } from './plugin-base';
 import { GetLocalBaseNameByContractName } from './provider';
@@ -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/esm/plugins/provider.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { BuilderPluginBase } from './plugin-base';
 export const GetLocalNameByContractName = (name) => `${pascal(name)}.provider.ts`;

package/esm/plugins/react-query.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { getMessageProperties, RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { getMessageProperties, RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findExecuteMsg, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
@@ -24,7 +24,8 @@ export class ReactQueryPlugin extends BuilderPluginBase {
         const QueryClient = pascal(`${name}QueryClient`);
         const body = [];
         const clientImports = [];
-        QueryMsg && clientImports.push(QueryClient);
+        if (QueryMsg)
+            clientImports.push(QueryClient);
         // check that there are commands within the exec msg
         const shouldGenerateMutationHooks = ExecuteMsg &&
             options?.version === 'v4' &&
@@ -43,7 +44,7 @@ export class ReactQueryPlugin extends BuilderPluginBase {
                 context,
                 queryMsg: QueryMsg,
                 contractName: name,
-                QueryClient
+                QueryClient,
             }));
         }
         if (shouldGenerateMutationHooks) {
@@ -51,10 +52,10 @@ export class ReactQueryPlugin extends BuilderPluginBase {
                 context,
                 execMsg: ExecuteMsg,
                 contractName: name,
-                ExecuteClient
+                ExecuteClient,
             }));
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -62,8 +63,8 @@ export class ReactQueryPlugin extends BuilderPluginBase {
             {
                 type: 'react-query',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/plugins/recoil.js

@@ -1,5 +1,5 @@
 import * as w from '@cosmwasm/ts-codegen-ast';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findQueryMsg } from '../utils';
 import { BuilderPluginBase } from './plugin-base';
@@ -36,7 +36,7 @@ export class RecoilPlugin extends BuilderPluginBase {
             const selectors = w.createRecoilSelectors(context, name, QueryClient, QueryMsg);
             body.push(...selectors);
         }
-        if (typeHash.hasOwnProperty('Coin')) {
+        if (Object.prototype.hasOwnProperty.call(typeHash, 'Coin')) {
             // @ts-ignore
             delete context.utils.Coin;
         }
@@ -44,8 +44,8 @@ export class RecoilPlugin extends BuilderPluginBase {
             {
                 type: 'recoil',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/plugins/types.js

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { RenderContext } from '@cosmwasm/ts-codegen-ast';
+import { RenderContext, } from '@cosmwasm/ts-codegen-ast';
 import { pascal } from 'case';
 import { findAndParseTypes, findExecuteMsg } from '../utils';
 import { clean } from '../utils/clean';
@@ -31,8 +31,8 @@ export class TypesPlugin extends BuilderPluginBase {
             {
                 type: 'type',
                 localname,
-                body
-            }
+                body,
+            },
         ];
     }
 }

package/esm/ts-codegen.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
+import minimist from 'minimist';
 import { cli } from './cli';
-let argv = require('minimist')(process.argv.slice(2));
+let argv = minimist(process.argv.slice(2));
 (async () => {
     await cli(argv);
 })();

package/esm/utils/clean.js

@@ -21,7 +21,7 @@ export const clean = (obj) => {
     if (obj instanceof Object || typeof obj === 'object') {
         copy = {};
         for (let attr in obj) {
-            if (obj.hasOwnProperty(attr)) {
+            if (Object.prototype.hasOwnProperty.call(obj, attr)) {
                 switch (attr) {
                     case 'leadingComments':
                     case 'trailingComments':

package/esm/utils/cleanse.js

@@ -1,12 +1,16 @@
 import { pascal } from 'case';
-const cleanFor = (str) => {
+export const cleanFor = (str) => {
     /*
           1. look at first char after _for_
           2. ONLY if you find capitals after, modify it
       */
-    while (/_[a-z]+_[A-Z]/.test(str)) {
-        const m = str.match(/(_[a-z]+_)[A-Z]/);
-        str = str.replace(m[1], pascal(m[1]));
+    while (true) {
+        const match = str.match(/(_[a-z]+_)[A-Z]/);
+        if (!match)
+            break;
+        // this replace is unsafe as it replaces the same text but maybe
+        // in a different location than the match
+        str = str.replace(match[1], pascal(match[1]));
     }
     return str;
 };
@@ -46,7 +50,7 @@ export const cleanse = (obj) => {
             }
         }
         for (let attr in obj) {
-            if (obj.hasOwnProperty(attr)) {
+            if (Object.prototype.hasOwnProperty.call(obj, attr)) {
                 if (/_for_/.test(attr)) {
                     // @ts-ignore
                     copy[cleanFor(attr)] = cleanse(obj[attr]);

package/esm/utils/package.js

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
-// need to search due to the dist/ folder and src/, etc. 
+// need to search due to the dist/ folder and src/, etc.
 function findPackageJson(currentDir) {
     const filePath = join(currentDir, 'package.json');
     // Check if package.json exists in the current directory

package/esm/utils/parse.js

@@ -2,18 +2,16 @@ import { parse } from '@babel/parser';
 import babelTraverse from '@babel/traverse';
 export const parser = (codes) => {
     const hash = {};
-    codes.forEach(code => {
-        const plugins = [
-            'typescript',
-        ];
+    codes.forEach((code) => {
+        const plugins = ['typescript'];
         const ast = parse(code, {
             sourceType: 'module',
-            plugins
+            plugins,
         });
         const visitor = visitorFn({
             addType(key, node) {
                 hash[key] = node;
-            }
+            },
         });
         babelTraverse(ast, visitor);
     });
@@ -32,5 +30,5 @@ const visitorFn = (parser) => ({
     },
     TSInterfaceDeclaration(path) {
         parser.addType(path.node.id.name, path.parentPath.node);
-    }
+    },
 });

package/esm/utils/prompt.js

@@ -36,7 +36,7 @@ const transform = (questions) => {
             return {
                 ...q,
                 type: 'autocomplete',
-                source: getFuzzySearch(choices)
+                source: getFuzzySearch(choices),
             };
         }
         else if (q.type === 'fuzzy:objects') {
@@ -45,7 +45,7 @@ const transform = (questions) => {
             return {
                 ...q,
                 type: 'autocomplete',
-                source: getFuzzySearchNames(choices)
+                source: getFuzzySearchNames(choices),
             };
         }
         else {

package/esm/utils/schemas.js

@@ -1,37 +1,50 @@
 import { compile } from '@pyramation/json-schema-to-typescript';
 import { readFileSync } from 'fs';
-import { sync as glob } from 'glob';
+import { globSync as glob } from 'glob';
 import { cleanse } from './cleanse';
 import { parser } from './parse';
-;
-export const readSchemas = async ({ schemaDir, clean = true }) => {
-    const fn = clean ? cleanse : (schema) => schema;
+/**
+ * Takes a schema directory and returns a list of relevant file paths
+ */
+export const findSchemaFiles = async (schemaDir) => {
     const files = glob(schemaDir + '/**/*.json')
-        .filter(file => !file.match(/\/raw\//));
-    const schemas = files
-        .map(file => JSON.parse(readFileSync(file, 'utf-8')));
-    if (schemas.length > 1) {
+        .filter((file) => !file.includes('/raw/')) // raw JSON Schema files that are also included in the main <contract_name>.json
+        .filter((file) => !file.includes('/cw_schema/')) // sub-folder for the new schema format for CosmWasm 3+
+        .sort();
+    return files;
+};
+export const readSchemas = async ({ schemaDir, clean = true, }) => {
+    const fn = clean
+        ? cleanse
+        : (schema) => schema;
+    const files = (await findSchemaFiles(schemaDir)).map((path) => readFileSync(path, 'utf-8'));
+    if (files.length > 1) {
         // legacy
         // TODO add console.warn here
+        console.warn('Found a multiple schema files. This mode will be removed in the next major version. Please migrate the schemas that contain a single <contract_name>.json IDL file (CosmWasm 1.1+).');
+        const schemas = files.map((file) => JSON.parse(file));
         return {
-            schemas: fn(schemas)
+            schemas: fn(schemas),
         };
     }
-    if (schemas.length === 0) {
+    if (files.length === 0) {
         throw new Error('Error [too few files]: requires one schema file per contract');
     }
-    if (schemas.length !== 1) {
+    if (files.length !== 1) {
         throw new Error('Error [too many files]: CosmWasm v1.1 schemas supports one file');
     }
-    const idlObject = schemas[0];
+    const idlObject = JSON.parse(files[0]);
     const { 
     // contract_name,
     // contract_version,
-    idl_version, responses, instantiate, execute, query, migrate, sudo } = idlObject;
+    idl_version, responses, instantiate, execute, query, migrate, sudo, } = idlObject;
     if (typeof idl_version !== 'string') {
         // legacy
+        // fall back to a single JSON Schema file
+        console.warn('Found a single schema file with missing idl_version. This mode will be removed in the next major version. Please migrate the schemas that contain a single <contract_name>.json IDL file (CosmWasm 1.1+).');
+        const schema = JSON.parse(files[0]);
         return {
-            schemas: fn(schemas)
+            schemas: fn([schema]),
         };
     }
     // TODO use contract_name, etc.
@@ -40,23 +53,23 @@ export const readSchemas = async ({ schemaDir, clean = true }) => {
         execute,
         query,
         migrate,
-        sudo
+        sudo,
     };
     return {
         schemas: [
             ...Object.values(fn(idl)).filter(Boolean),
-            ...Object.values(fn({ ...responses })).filter(Boolean)
+            ...Object.values(fn({ ...responses })).filter(Boolean),
         ],
         responses,
-        idlObject
+        idlObject,
     };
 };
 export const findQueryMsg = (schemas) => {
-    const queryMsg = schemas.find(schema => schema.title === 'QueryMsg');
+    const queryMsg = schemas.find((schema) => schema.title === 'QueryMsg');
     return queryMsg;
 };
 export const findExecuteMsg = (schemas) => {
-    const executeMsg = schemas.find(schema => schema.title.startsWith('ExecuteMsg'));
+    const executeMsg = schemas.find((schema) => schema.title.startsWith('ExecuteMsg'));
     return executeMsg;
 };
 export const findAndParseTypes = async (schemas) => {

package/esm/utils/unused.js

@@ -13,8 +13,7 @@ export const unused = {
                 const importName = source.node.value;
                 if (!t.isStringLiteral(source))
                     continue;
-                const key = `${importName}(${source.node.loc &&
-                    source.node.loc.start.line})`;
+                const key = `${importName}(${source.node.loc && source.node.loc.start.line})`;
                 if (!UnRefBindings.has(key)) {
                     UnRefBindings.set(key, binding);
                 }
@@ -42,6 +41,6 @@ export const unused = {
                     binding.path.parentPath.remove();
                 }
             });
-        }
-    }
+        },
+    },
 };

package/file.js

@@ -1,17 +1,21 @@
 #!/usr/bin/env node
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
+const minimist_1 = __importDefault(require("minimist"));
 const cli_1 = require("./cli");
 const prompt_1 = require("./utils/prompt");
-const argv = require('minimist')(process.argv.slice(2));
+const argv = (0, minimist_1.default)(process.argv.slice(2));
 const question = [
     {
         _: true,
         type: 'string',
         name: 'file',
-        message: 'file'
-    }
+        message: 'file',
+    },
 ];
 (async () => {
     const { file } = await (0, prompt_1.prompt)(question, argv);

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";