Added gas fee calculation on client level

Author: openhands-agent

__fixtures__/issues/98/out/baseClient.ts

@@ -11,6 +11,7 @@ import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.f
 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 => {
@@ -23,13 +24,95 @@ const toUint8Array = (obj: any): Uint8Array => {
   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[]): Promise<DeliverTxResponse>;
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<DeliverTxResponse>;
 }
 
 export interface ISigningClient {
@@ -62,17 +145,25 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
 
 export function getSigningCosmWasmClient(signingClient: SigningClient): ISigningCosmWasmClient {
   return {
-    execute: async (sender: string, contractAddress: string, msg: any, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => {
+    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 = { amount: [], gas: '200000' }; // default gas for auto
+        finalFee = getAutoGasFee(chainConfig);
       } else if (fee) {
         finalFee = fee;
       } else {
-        finalFee = { amount: [], gas: '200000' }; // default fee
+        finalFee = getAutoGasFee(chainConfig);
       }
 
       // Create the message object
@@ -85,7 +176,7 @@ export function getSigningCosmWasmClient(signingClient: SigningClient): ISigning
 
       // Execute the transaction using InterchainJS
       const result = await executeContract(
-        signingClient,
+        signingClient as any,
         sender,
         message,
         finalFee,

__output__/builder/bundler_test/contracts/baseClient.ts

@@ -11,6 +11,7 @@ import { getSmartContractState } from 'interchainjs/cosmwasm/wasm/v1/query.rpc.f
 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 => {
@@ -23,13 +24,95 @@ const toUint8Array = (obj: any): Uint8Array => {
   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[]): Promise<DeliverTxResponse>;
+  execute(
+    sender: string, 
+    contractAddress: string, 
+    msg: any, 
+    fee?: number | StdFee | "auto", 
+    memo?: string, 
+    funds?: Coin[], 
+    chainConfig?: ChainConfig
+  ): Promise<DeliverTxResponse>;
 }
 
 export interface ISigningClient {
@@ -62,17 +145,25 @@ export function getCosmWasmClient(rpcEndpoint: string): ICosmWasmClient {
 
 export function getSigningCosmWasmClient(signingClient: SigningClient): ISigningCosmWasmClient {
   return {
-    execute: async (sender: string, contractAddress: string, msg: any, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => {
+    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 = { amount: [], gas: '200000' }; // default gas for auto
+        finalFee = getAutoGasFee(chainConfig);
       } else if (fee) {
         finalFee = fee;
       } else {
-        finalFee = { amount: [], gas: '200000' }; // default fee
+        finalFee = getAutoGasFee(chainConfig);
       }
 
       // Create the message object
@@ -85,7 +176,7 @@ export function getSigningCosmWasmClient(signingClient: SigningClient): ISigning
 
       // Execute the transaction using InterchainJS
       const result = await executeContract(
-        signingClient,
+        signingClient as any,
         sender,
         message,
         finalFee,