fix: handle simulation error

onbloc · Jan 13, 2025 · 0ef73ae · 0ef73ae
1 parent 1a40447
commit 0ef73ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/adena-extension/src/common/provider/gno/gno-provider.ts b/packages/adena-extension/src/common/provider/gno/gno-provider.ts
@@ -168,7 +168,7 @@ export class GnoProvider extends GnoJSONRPCProvider {
 
     const simulateResult = parseProto(responseValue, ResponseDeliverTx.decode);
     if (simulateResult.responseBase?.error) {
-      console.warn('Failed to estimate gas', simulateResult.responseBase.error);
+      throw new Error(`Failed to estimate gas: ${simulateResult.responseBase.error.typeUrl}`);
     }
 
     return simulateResult.gasUsed.toInt();

diff --git a/packages/adena-extension/src/hooks/wallet/transaction-gas/use-get-estimate-gas.ts b/packages/adena-extension/src/hooks/wallet/transaction-gas/use-get-estimate-gas.ts
@@ -1,4 +1,5 @@
 import { GasToken } from '@common/constants/token.constant';
+import { DEFAULT_GAS_FEE } from '@common/constants/tx.constant';
 import { Tx } from '@gnolang/tm2-js-client';
 import { useAdenaContext, useWalletContext } from '@hooks/use-context';
 import { useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
@@ -25,7 +26,8 @@ function makeSimulateTx(document: Document, gasAmount: string): Tx {
 function makeTokenAmountWithDecimals(amount: string | number, decimals: number): string {
   return BigNumber(amount)
     .shiftedBy(decimals * -1)
-    .toFixed(decimals, BigNumber.ROUND_DOWN);
+    .toFixed(decimals, BigNumber.ROUND_DOWN)
+    .replace(/\.?0+$/, '');
 }
 
 export const useGetEstimateGas = (
@@ -48,7 +50,7 @@ export const useGetEstimateGas = (
       );
 
       const estimatedGasAmounts = await Promise.all(
-        simulateTxs.map((tx) => transactionGasService.estimateGas(tx).catch(() => 0)),
+        simulateTxs.map((tx) => transactionGasService.estimateGas(tx).catch(() => DEFAULT_GAS_FEE)),
       );
 
       return gasPriceTiers.map((tier, index) => {