@exodus/web3-ethereum 12.20.0 → 12.21.1

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export { EthereumProvider } from './provider/index.js';
 export { ExodusEthereumWallet } from './wallet-standard/index.js';
 export { registerRPCHandlers } from './rpc-handlers/index.js';
+export type { EVMDeps } from './types.js';

package/lib/rpc-handlers/exposeHandlers.js

@@ -71,22 +71,39 @@ export function exposeHandlers(rpc, deps) {
             throw new UnauthorizedError();
         }
     }
+    // Fee data might be not available in rare cases if the monitors hasn't yet started.
+    // In that case we'll fetch the actual gas price and treat the transaction as legacy (no EIP-1559).
+    async function gracefullyHandleMissingFeeData() {
+        const feeData = await getFeeData();
+        if (feeData) {
+            return feeData;
+        }
+        const gasPrice = (await forwardRequest({
+            method: 'eth_gasPrice',
+        }));
+        return {
+            gasPrice,
+        };
+    }
     async function prepareTransaction(transaction) {
-        const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = await getFeeData();
-        const eip1559Enabled = maxFeePerGas !== undefined && maxPriorityFeePerGas !== undefined;
+        const transactionNeedsGasPrice = !transaction.gasPrice || !transaction.maxFeePerGas;
         const preparedTransaction = { ...transaction };
         preparedTransaction.nonce = await getNonce();
         if (!transaction.value) {
             preparedTransaction.value = '0x0';
         }
-        if (!transaction.gasPrice && !eip1559Enabled) {
-            preparedTransaction.gasPrice = gasPrice;
-        }
-        if (!transaction.maxFeePerGas && eip1559Enabled) {
-            preparedTransaction.maxFeePerGas = maxFeePerGas;
-        }
-        if (!transaction.maxPriorityFeePerGas && eip1559Enabled) {
-            preparedTransaction.maxPriorityFeePerGas = maxPriorityFeePerGas;
+        if (transactionNeedsGasPrice) {
+            const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = await gracefullyHandleMissingFeeData();
+            const eip1559Enabled = maxFeePerGas !== undefined && maxPriorityFeePerGas !== undefined;
+            if (!transaction.gasPrice && !eip1559Enabled) {
+                preparedTransaction.gasPrice = gasPrice;
+            }
+            if (!transaction.maxFeePerGas && eip1559Enabled) {
+                preparedTransaction.maxFeePerGas = maxFeePerGas;
+            }
+            if (!transaction.maxPriorityFeePerGas && eip1559Enabled) {
+                preparedTransaction.maxPriorityFeePerGas = maxPriorityFeePerGas;
+            }
         }
         if (!transaction.data) {
             preparedTransaction.data = '0x';
@@ -132,6 +149,7 @@ export function exposeHandlers(rpc, deps) {
     }
     async function approveAndSignTransaction(transaction) {
         await assertTrusted();
+        await ensureUnlocked();
         const asset = await getAsset(network);
         const preparedTransaction = await prepareTransaction(transaction);
         validateTransaction(preparedTransaction);
@@ -163,6 +181,7 @@ export function exposeHandlers(rpc, deps) {
     }
     async function approveAndSignMessage(message) {
         await assertTrusted();
+        await ensureUnlocked();
         await approve(approveMessage, network, message);
         const walletAccount = await getActiveWalletAccountData();
         const asset = await getAsset(network);
@@ -177,6 +196,7 @@ export function exposeHandlers(rpc, deps) {
     }
     async function approveAndSignTypedData(typedData) {
         await assertTrusted();
+        await ensureUnlocked();
         const parsedTypedData = parseAndValidateTypedData(typedData, { chainId });
         const message = typedDataToMessage(typedData, SignTypedDataVersion.V4);
         await approve(approveMessage, network, message);
@@ -235,6 +255,7 @@ export function exposeHandlers(rpc, deps) {
     approveAndSignMessage(message));
     exposeEvmFunction('eth_signTypedData_v1', async (typedData) => {
         await assertTrusted();
+        await ensureUnlocked();
         const message = typedDataToMessage(typedData, SignTypedDataVersion.V1);
         await approve(approveMessage, network, message);
         const walletAccount = await getActiveWalletAccountData();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "12.20.0",
+  "version": "12.21.1",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -51,5 +51,5 @@
     "@exodus/web3-validation": "^1.38.0",
     "@wallet-standard/base": "^1.0.1"
   },
-  "gitHead": "05698eaa248101096af41b749fd8bee915145650"
+  "gitHead": "077c733bebfb35b62950f9bcc9cfde7dd523cb15"
 }