refactor simulateGasWithPendingErc20Approval method

Author: piatoss3612

apps/extension/src/pages/ibc-swap/index.tsx

@@ -1362,6 +1362,8 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
                       },
                       {
                         nonceMethod: "pending",
+                        considerRequiredErc20ApprovalsForNonce:
+                          evmTxIndex !== 0 && erc20Approval != null,
                       }
                     );
 

apps/extension/src/pages/main/components/ibc-history-view/index.tsx

@@ -1450,7 +1450,7 @@ const SwapV2HistoryViewItem: FunctionComponent<{
   return (
     <Box
       padding="1.25rem"
-      borderRadius="0.375rem"
+      borderRadius="1.25rem"
       backgroundColor={
         theme.mode === "light" ? ColorPalette.white : ColorPalette["gray-600"]
       }
@@ -1618,7 +1618,7 @@ const SwapV2HistoryViewItem: FunctionComponent<{
               );
             }
 
-            // skip history의 amount에는 [sourceChain의 amount, destinationChain의 expected amount]가 들어있으므로
+            // swap v2 history의 amount에는 [sourceChain의 amount, destinationChain의 expected amount]가 들어있으므로
             // 첫 번째 amount만 사용
             const assets = (() => {
               const amount = history.amount[0];

packages/stores-eth/src/account/base.ts

@@ -265,29 +265,14 @@ export class EthereumAccountBase {
 
     const erc20ApprovalTx = erc20ApprovalTxs[0];
 
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      const keplr = (await this.getKeplr())!;
-
-      const erc20ApprovalGasEstimated = await keplr.ethereum.request<
-        string | undefined
-      >({
-        method: "eth_estimateGas",
-        params: [
-          {
-            from: sender,
-            to: erc20ApprovalTx.to,
-            value: erc20ApprovalTx.value,
-            data: erc20ApprovalTx.data,
-          },
-        ],
-        chainId: this.chainId,
-      });
-
-      if (!erc20ApprovalGasEstimated) {
-        throw new Error("Failed to estimate gas for ERC20 approval");
-      }
+    // First, estimate gas for the ERC20 approval tx itself.
+    // This result is reused whether the bundle simulation with state diff succeeds or falls back.
+    const erc20ApprovalSimResult = await this.simulateGas(
+      sender,
+      erc20ApprovalTx
+    );
 
+    try {
       // State diff tracing for the ERC20 approval transaction
       const approvalStateDiff = await traceCallWithDiff(chainInfo.rpc, {
         from: sender,
@@ -321,16 +306,14 @@ export class EthereumAccountBase {
       return {
         kind: EVMGasSimulateKind.TX_BUNDLE_SIMULATED,
         gasUsed: result.gasUsed,
-        erc20ApprovalGasUsed: parseInt(erc20ApprovalGasEstimated),
+        erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
       };
     } catch (e) {
       console.error("Failed to simulate gas with pending ERC20 approval", e);
 
-      // fallback to simulate only the erc20 approval tx
-      const result = await this.simulateGas(sender, erc20ApprovalTx);
       return {
         kind: EVMGasSimulateKind.APPROVAL_ONLY_SIMULATED,
-        erc20ApprovalGasUsed: result.gasUsed,
+        erc20ApprovalGasUsed: erc20ApprovalSimResult.gasUsed,
       };
     }
   }
@@ -467,6 +450,8 @@ export class EthereumAccountBase {
     unsignedTx: UnsignedEVMTransactionWithErc20Approvals,
     options?: {
       nonceMethod?: "pending" | "latest";
+      // Whether to offset nonce by the number of required ERC20 approvals
+      considerRequiredErc20ApprovalsForNonce?: boolean;
     }
   ) {
     const chainInfo = this.chainGetter.getChain(this.chainId);
@@ -488,7 +473,9 @@ export class EthereumAccountBase {
       ...unsignedTx,
       nonce:
         parseInt(transactionCount) +
-        (unsignedTx.requiredErc20Approvals?.length ?? 0),
+        (options?.considerRequiredErc20ApprovalsForNonce
+          ? unsignedTx.requiredErc20Approvals?.length ?? 0
+          : 0),
     };
 
     const signEthereum = keplr.signEthereum.bind(keplr);