fix: Optimize EIP-1559 support detection for custom networks (#6390)

OneKeyHQ · Dec 22, 2024 · 86f2121 · 86f2121
1 parent f451be0
commit 86f2121
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/packages/kit-bg/src/vaults/impls/evm/sdkEvm/ClientEvm.ts b/packages/kit-bg/src/vaults/impls/evm/sdkEvm/ClientEvm.ts
@@ -28,10 +28,20 @@ export class ClientEvm extends JsonRPCRequest {
       baseFeePerGas: string;
     }>('eth_getBlockByNumber', ['latest', false]);
     const baseFeePerGas = new BigNumber(hexBlock.baseFeePerGas);
-    const isEIP1559FeeEnabled = !(
-      baseFeePerGas.isNaN() || baseFeePerGas.isEqualTo(0)
-    ); // 0 also means not 1559
-    return { isEIP1559FeeEnabled };
+
+    // 0 also means not 1559
+    if (baseFeePerGas.isNaN() || baseFeePerGas.isEqualTo(0)) {
+      return { isEIP1559FeeEnabled: false };
+    }
+
+    let maxPriorityFeeSupported = true;
+    try {
+      await this.call('eth_maxPriorityFeePerGas');
+    } catch (error) {
+      maxPriorityFeeSupported = false;
+    }
+
+    return { isEIP1559FeeEnabled: maxPriorityFeeSupported };
   }
 
   async broadcastTransaction(rawTx: string): Promise<string> {