@keplr-wallet/background 0.13.35 → 0.13.36

package/src/tx-executor/utils/evm.spec.ts

@@ -0,0 +1,62 @@
+import { EVMInfo } from "@keplr-wallet/types";
+import { getTxExecutionDiagnostics } from "./diagnostics";
+import { fillUnsignedEVMTx } from "./evm";
+import { fetchWithRetry } from "./fetch";
+
+jest.mock("./fetch", () => ({
+  fetchWithRetry: jest.fn(),
+}));
+
+const mockFetchWithRetry = fetchWithRetry as jest.MockedFunction<
+  typeof fetchWithRetry
+>;
+
+describe("fillUnsignedEVMTx", () => {
+  beforeEach(() => {
+    mockFetchWithRetry.mockReset();
+  });
+
+  it("keeps eth_estimateGas optional and adds diagnostics only at final gas failure", async () => {
+    mockFetchWithRetry.mockResolvedValue({
+      data: [
+        { id: 1, result: "0x1" },
+        { id: 2, result: { baseFeePerGas: "0x1" } },
+        { id: 3, result: {} },
+        {
+          id: 4,
+          error: {
+            code: -32000,
+            message:
+              "execution reverted: ERC20: transfer amount exceeds allowance",
+          },
+        },
+        { id: 5, result: "0x1" },
+        { id: 6, result: "0x1" },
+      ],
+    } as any);
+
+    try {
+      await fillUnsignedEVMTx(
+        "extension",
+        { rpc: "https://example.invalid" } as EVMInfo,
+        "0xsender",
+        {
+          to: "0xrouter",
+          value: "0x0",
+          data: "0x",
+        }
+      );
+      throw new Error("Expected fillUnsignedEVMTx to fail");
+    } catch (e) {
+      expect((e as Error).message).toBe(
+        "Failed to estimate gas to fill unsigned transaction"
+      );
+      expect(getTxExecutionDiagnostics(e)).toEqual({
+        gas_estimate_context: "background_fill_unsigned_tx",
+        gas_estimate_error_category: "allowance_insufficient",
+        failed_tx_has_required_erc20_approval: false,
+        failed_tx_has_native_value: false,
+      });
+    }
+  });
+});

package/src/tx-executor/utils/evm.ts

@@ -4,6 +4,10 @@ import { Dec } from "@keplr-wallet/unit";
 import { BackgroundTxFeeType, EVMBackgroundTxFeeType } from "../types";
 import { JsonRpcResponse } from "@keplr-wallet/types";
 import { fetchWithRetry } from "./fetch";
+import {
+  createGasEstimateDiagnostics,
+  TxExecutionDiagnosticsError,
+} from "./diagnostics";
 
 const ETH_FEE_HISTORY_REWARD_PERCENTILES = [20, 40, 60];
 const ETH_FEE_SETTINGS_BY_FEE_TYPE: Record<
@@ -189,6 +193,9 @@ export async function fillUnsignedEVMTx(
       ? Math.max(Number(tx.nonce), parseInt(nonceHex, 16))
       : parseInt(nonceHex, 16);
 
+  const estimateGasResponse = hasProvidedGasLimit
+    ? undefined
+    : rpcResponses.find((r) => r.id === ESTIMATE_GAS_ID);
   const gasLimitHex = hasProvidedGasLimit
     ? undefined
     : getResult<string>(ESTIMATE_GAS_ID, true);
@@ -203,7 +210,17 @@ export async function fillUnsignedEVMTx(
       GAS_ADJUSTMENT_DEN;
     finalGasLimit = `0x${adjustedGas.toString(16)}`;
   } else {
-    throw new Error("Failed to estimate gas to fill unsigned transaction");
+    throw new TxExecutionDiagnosticsError(
+      "Failed to estimate gas to fill unsigned transaction",
+      createGasEstimateDiagnostics(
+        new Error(
+          estimateGasResponse?.error?.message ??
+            "Missing eth_estimateGas result"
+        ),
+        "background_fill_unsigned_tx",
+        tx as UnsignedTransaction & { requiredErc20Approvals?: unknown[] }
+      )
+    );
   }
 
   // Legacy chain detection: baseFeePerGas missing or zero