fix: handle a simulate errors

Author: jinoosss

packages/adena-extension/src/common/provider/gno/gno-provider.ts

@@ -157,7 +157,7 @@ export class GnoProvider extends GnoJSONRPCProvider {
     return response;
   }
 
-  async estimateGas(tx: Tx): Promise<number> {
+  async simulateTx(tx: Tx): Promise<ResponseDeliverTx> {
     const encodedTx = uint8ArrayToBase64(Tx.encode(tx).finish());
     const params = {
       request: newRequest(ABCIEndpoint.ABCI_QUERY, ['.app/simulate', `${encodedTx}`, '0', false]),
@@ -175,12 +175,17 @@ export class GnoProvider extends GnoJSONRPCProvider {
     }
 
     const simulateResult = parseProto(responseValue, ResponseDeliverTx.decode);
-    console.info('simulateResult', simulateResult);
 
     if (simulateResult.responseBase?.error) {
       throw new Error(simulateResult.responseBase.error.typeUrl);
     }
 
-    return simulateResult.gasUsed.toInt();
+    return simulateResult;
+  }
+
+  async estimateGas(tx: Tx): Promise<number> {
+    return this.simulateTx(tx).then((response) => {
+      return response.gasUsed.toInt();
+    });
   }
 }

packages/adena-extension/src/hooks/wallet/transaction-gas/use-get-estimate-gas-price-tiers.ts

@@ -7,7 +7,7 @@ import { GasToken } from '@common/constants/token.constant';
 import { useAdenaContext } from '@hooks/use-context';
 import { useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
 import { NetworkFeeSettingInfo, NetworkFeeSettingType } from '@types';
-import { Document } from 'adena-module';
+import { Document, documentToDefaultTx } from 'adena-module';
 import BigNumber from 'bignumber.js';
 import { useGetGasPriceTier } from './use-get-gas-price';
 
@@ -39,10 +39,27 @@ function makeGasInfoBy(
   };
 }
 
+function modifyDocument(document: Document, gasWanted: number, gasFee: number): Document {
+  return {
+    ...document,
+    fee: {
+      ...document.fee,
+      gas: gasWanted.toString(),
+      amount: [
+        {
+          denom: GasToken.denom,
+          amount: gasFee.toString(),
+        },
+      ],
+    },
+  };
+}
+
 export const useGetEstimateGasPriceTiers = (
   document: Document | null | undefined,
   gasUsed: number | undefined,
   gasAdjustment: string,
+  isSuccessSimulate = true,
   options?: UseQueryOptions<NetworkFeeSettingInfo[] | null, Error>,
 ): UseQueryResult<NetworkFeeSettingInfo[] | null> => {
   const { transactionGasService } = useAdenaContext();
@@ -80,16 +97,30 @@ export const useGetEstimateGasPriceTiers = (
           const { gasWanted: resultGasWanted, gasFee: resultGasFee } = makeGasInfoBy(
             gasUsed,
             adjustedGasPrice,
-            GAS_FEE_SAFETY_MARGIN,
+            isSuccessSimulate ? GAS_FEE_SAFETY_MARGIN : 2,
           );
 
+          const modifiedDocument = modifyDocument(document, resultGasWanted, resultGasFee);
+
+          const isSuccess = await transactionGasService
+            .simulateTx(documentToDefaultTx(modifiedDocument))
+            .then(() => true)
+            .catch((e: Error) => {
+              if (e?.message === '/std.InvalidPubKeyError') {
+                return true;
+              }
+
+              return false;
+            });
+
           return {
             settingType: tier,
             gasInfo: {
               gasFee: resultGasFee,
               gasUsed,
               gasWanted: resultGasWanted,
               gasPrice: adjustedGasPrice,
+              hasError: !isSuccess,
             },
           };
         }),

packages/adena-extension/src/hooks/wallet/use-network-fee.ts

@@ -55,6 +55,7 @@ export const useNetworkFee = (
     document,
     gasInfo?.gasUsed || estimatedGasInfo?.gasUsed,
     gasAdjustment,
+    !estimatedGasInfo?.hasError,
   );
 
   const isLoading = useMemo(() => {
@@ -97,7 +98,7 @@ export const useNetworkFee = (
     }
 
     const current = gasPriceTiers.find((setting) => setting.settingType === currentSettingType);
-    if (current?.gasInfo?.hasError) {
+    if (!current?.gasInfo) {
       return {
         gasFee: 0,
         gasUsed: 0,

packages/adena-extension/src/pages/popup/wallet/approve-transaction-main/index.tsx

@@ -363,7 +363,7 @@ const ApproveTransactionContainer: React.FC = () => {
             WalletResponseFailureType.TRANSACTION_FAILED,
             {
               hash,
-              error: response?.name || response.message || '',
+              error: response?.toString(),
             },
             requestData?.key,
           ),

packages/adena-extension/src/repositories/transaction/transaction-gas.ts

@@ -1,4 +1,5 @@
 import { GnoProvider } from '@common/provider/gno/gno-provider';
+import { ResponseDeliverTx } from '@common/provider/gno/proto/tm2/abci';
 import { makeIndexerRPCRequest } from '@common/utils/fetch-utils';
 import { Tx } from '@gnolang/tm2-js-client';
 import { NetworkMetainfo } from '@types';
@@ -47,6 +48,14 @@ export class TransactionGasRepository implements ITransactionGasRepository {
     return response;
   }
 
+  public async simulateTx(tx: Tx): Promise<ResponseDeliverTx> {
+    if (!this.gnoProvider) {
+      throw new Error('GnoProvider is not initialized');
+    }
+
+    return this.gnoProvider.simulateTx(tx);
+  }
+
   public async estimateGasByTx(tx: Tx): Promise<number> {
     if (!this.gnoProvider) {
       throw new Error('GnoProvider is not initialized');

packages/adena-extension/src/repositories/transaction/types.ts

@@ -1,7 +1,9 @@
+import { ResponseDeliverTx } from '@common/provider/gno/proto/tm2/abci';
 import { Tx } from '@gnolang/tm2-js-client';
 import { TransactionGasResponse } from './response/transaction-gas-response';
 
 export interface ITransactionGasRepository {
   fetchGasPrices: () => Promise<TransactionGasResponse[]>;
+  simulateTx: (tx: Tx) => Promise<ResponseDeliverTx>;
   estimateGasByTx: (tx: Tx) => Promise<number>;
 }

packages/adena-extension/src/services/transaction/transaction-gas.ts

@@ -1,3 +1,4 @@
+import { ResponseDeliverTx } from '@common/provider/gno/proto/tm2/abci';
 import { Tx } from '@gnolang/tm2-js-client';
 import { ITransactionGasRepository } from '@repositories/transaction/types';
 import { GasPriceTierInfo } from '@types';
@@ -21,6 +22,10 @@ export class TransactionGasService implements ITransactionGasService {
     return gasPrice;
   }
 
+  public async simulateTx(tx: Tx): Promise<ResponseDeliverTx> {
+    return this.gasRepository.simulateTx(tx);
+  }
+
   public async estimateGas(tx: Tx): Promise<number> {
     return this.gasRepository.estimateGasByTx(tx);
   }

packages/adena-extension/src/services/transaction/types.ts

@@ -1,7 +1,9 @@
+import { ResponseDeliverTx } from '@common/provider/gno/proto/tm2/abci';
 import { Tx } from '@gnolang/tm2-js-client';
 import { GasPriceTierInfo } from '@types';
 
 export interface ITransactionGasService {
   getGasPrice: (denomination: string) => Promise<GasPriceTierInfo | null>;
+  simulateTx(tx: Tx): Promise<ResponseDeliverTx>;
   estimateGas(tx: Tx): Promise<number>;
 }