@exodus/ethereum-api 8.63.0 → 8.64.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.64.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.64.0...@exodus/ethereum-api@8.64.1) (2026-01-21)
+
+
+### Bug Fixes
+
+
+* fix: monitors should check rpc before dropping (#7277)
+
+* fix: prevent transactions from being dropped from no history monitor whilst they are still served at the rpc (#7299)
+
+
+
+## [8.64.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.63.0...@exodus/ethereum-api@8.64.0) (2026-01-14)
+
+
+### Features
+
+
+* feat: EIP delegation status on all monitors (#7193)
+
+
+
 ## [8.63.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.62.4...@exodus/ethereum-api@8.63.0) (2026-01-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.63.0",
+  "version": "8.64.1",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Ethereum and EVM-based blockchains",
   "type": "module",
   "main": "src/index.js",
@@ -29,7 +29,7 @@
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/crypto": "^1.0.0-rc.26",
     "@exodus/currency": "^6.0.1",
-    "@exodus/ethereum-lib": "^5.20.2",
+    "@exodus/ethereum-lib": "^5.21.0",
     "@exodus/ethereum-meta": "^2.9.1",
     "@exodus/ethereumholesky-meta": "^2.0.5",
     "@exodus/ethereumjs": "^1.8.0",
@@ -67,5 +67,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "db8bd0629b287cd2031a12ff2a3fed3fc765bbab"
+  "gitHead": "d828ba4e4dc9f986cfa563653101410e6e81685a"
 }

package/src/create-asset.js

@@ -303,7 +303,7 @@ export const createAssetFactory = ({
       broadcastPrivateBundle,
       broadcastPrivateTx,
       forceGasLimitEstimation,
-      getEIP7702Delegation: (addr) => getEIP7702Delegation({ asset: base, address: addr }),
+      getEIP7702Delegation: (addr) => getEIP7702Delegation({ address: addr, server }),
       getNonce,
       privacyServer,
       server,

package/src/eth-like-util.js

@@ -180,8 +180,7 @@ export const getERC20Params = async ({ asset, address, paramNames = DEFAULT_PARA
   return response
 }
 
-export async function getEIP7702Delegation({ asset, address }) {
-  const server = getServer(asset)
+export async function getEIP7702Delegation({ address, server }) {
   const code = await server.getCode(address)
 
   // No code at all

package/src/exodus-eth-server/clarity-v2.js

@@ -175,11 +175,12 @@ export default class ClarityServerV2 extends ClarityServer {
     const newCursor = Buffer.alloc(8)
     newCursor.writeBigUInt64LE(BigInt(blockNumber), 0)
 
+    // Separate confirmed (has blockNumber) from pending (blockNumber is null)
+    const confirmed = transactions.filter((tx) => tx.blockNumber != null)
+    const pending = transactions.filter((tx) => tx.blockNumber == null)
+
     return {
-      transactions: {
-        confirmed: transactions,
-        pending: [],
-      },
+      transactions: { confirmed, pending },
       cursor: newCursor,
     }
   }

package/src/tx-log/clarity-monitor-v2.js

@@ -10,8 +10,10 @@ import {
   checkPendingTransactions,
   excludeUnchangedTokenBalances,
   getAllLogItemsByAsset,
+  getCurrentEIP7702Delegation,
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
+  verifyRpcPendingTxStatusBatch,
 } from './monitor-utils/index.js'
 
 const { isEmpty } = lodash
@@ -126,9 +128,26 @@ export class ClarityMonitorV2 extends BaseMonitor {
       }
     }
 
+    // Batch verify all pending txs with a single RPC call (skip if refresh)
+    const txIds = Object.keys(pendingTransactionsToCheck)
+    const statuses = params.refresh
+      ? {}
+      : await verifyRpcPendingTxStatusBatch({
+          baseAsset: this.asset,
+          logger: this.logger,
+          txIds,
+        })
+
     for (const { tx, assetName } of Object.values(pendingTransactionsToCheck)) {
-      if (params.refresh) await updateTx(tx, assetName, { remove: true })
-      else await updateTx(tx, assetName, { error: 'Dropped' })
+      if (params.refresh) {
+        await updateTx(tx, assetName, { remove: true })
+      } else {
+        const txStatus = statuses[tx.txId]
+        if (txStatus?.status === 'dropped') {
+          await updateTx(tx, assetName, { error: 'Dropped' })
+        }
+        // status === 'confirmed' or 'pending' - tx is fine, wait for Clarity to confirm
+      }
     }
 
     return { txsToRemove }
@@ -199,6 +218,13 @@ export class ClarityMonitorV2 extends BaseMonitor {
       ourWalletAddress: derivedData.ourWalletAddress,
     })
 
+    const eip7702Delegation = await getCurrentEIP7702Delegation({
+      server: this.server,
+      address: derivedData.ourWalletAddress,
+      currentDelegation: derivedData.currentAccountState?.eip7702Delegation,
+      logger: this.logger,
+    })
+
     const batch = this.aci.createOperationsBatch()
 
     this.aci.removeTxLogBatch({
@@ -218,7 +244,11 @@ export class ClarityMonitorV2 extends BaseMonitor {
       })
     }
 
-    const newData = { ...accountState }
+    // All updates must go through newData (accountState param is only used for mem merging)
+    const newData = {
+      ...accountState,
+      ...(eip7702Delegation && { eip7702Delegation }),
+    }
 
     if (cursor) {
       newData.clarityCursor = cursor

package/src/tx-log/clarity-monitor.js

@@ -10,8 +10,10 @@ import {
   checkPendingTransactions,
   excludeUnchangedTokenBalances,
   getAllLogItemsByAsset,
+  getCurrentEIP7702Delegation,
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
+  verifyRpcPendingTxStatusBatch,
 } from './monitor-utils/index.js'
 
 const { isEmpty } = lodash
@@ -110,9 +112,26 @@ export class ClarityMonitor extends BaseMonitor {
       }
     }
 
+    // Batch verify all pending txs with a single RPC call (skip if refresh)
+    const txIds = Object.keys(pendingTransactionsToCheck)
+    const statuses = params.refresh
+      ? {}
+      : await verifyRpcPendingTxStatusBatch({
+          baseAsset: this.asset,
+          logger: this.logger,
+          txIds,
+        })
+
     for (const { tx, assetName } of Object.values(pendingTransactionsToCheck)) {
-      if (params.refresh) await updateTx(tx, assetName, { remove: true })
-      else await updateTx(tx, assetName, { error: 'Dropped' })
+      if (params.refresh) {
+        await updateTx(tx, assetName, { remove: true })
+      } else {
+        const txStatus = statuses[tx.txId]
+        if (txStatus?.status === 'dropped') {
+          await updateTx(tx, assetName, { error: 'Dropped' })
+        }
+        // status === 'confirmed' or 'pending' - tx is fine, wait for Clarity to confirm
+      }
     }
 
     return { txsToRemove }
@@ -159,6 +178,13 @@ export class ClarityMonitor extends BaseMonitor {
       ourWalletAddress: derivedData.ourWalletAddress,
     })
 
+    const eip7702Delegation = await getCurrentEIP7702Delegation({
+      server: this.server,
+      address: derivedData.ourWalletAddress,
+      currentDelegation: derivedData.currentAccountState?.eip7702Delegation,
+      logger: this.logger,
+    })
+
     const batch = this.aci.createOperationsBatch()
 
     this.aci.removeTxLogBatch({
@@ -178,11 +204,18 @@ export class ClarityMonitor extends BaseMonitor {
       })
     }
 
+    // All updates must go through newData (accountState param is only used for mem merging)
+    const newData = {
+      ...accountState,
+      clarityCursor: response.cursor,
+      ...(eip7702Delegation && { eip7702Delegation }),
+    }
+
     this.aci.updateAccountStateBatch({
       assetName,
       walletAccount,
       accountState,
-      newData: { clarityCursor: response.cursor, ...accountState },
+      newData,
       batch,
     })
 

package/src/tx-log/ethereum-monitor.js

@@ -12,6 +12,7 @@ import {
   getDeriveTransactionsToCheck,
   getHistoryFromServer,
   getLogItemsFromServerTx,
+  verifyRpcPendingTxStatusBatch,
 } from './monitor-utils/index.js'
 import {
   enableWSUpdates,
@@ -118,17 +119,27 @@ export class EthereumMonitor extends BaseMonitor {
       }
     }
 
+    // Batch verify all pending txs with a single RPC call (skip if refresh)
+    const txIds = Object.keys(pendingTransactionsToCheck)
+    const statuses = params.refresh
+      ? {}
+      : await verifyRpcPendingTxStatusBatch({
+          baseAsset: this.asset,
+          logger: this.logger,
+          txIds,
+        })
+
     for (const { tx, assetName } of Object.values(pendingTransactionsToCheck)) {
       if (params.refresh) {
         await updateTx(tx, assetName, { remove: true })
       } else {
-        // FIXME: Fetching unconfirmed txs from node helps to avoid
-        // flagging on-chain confirmed txs as dropped in the wallet.
-        // Once the real bug is found, remove this logic
-        const rpcTx = await this.server.getTransactionByHash(tx.txId)
-        const isTxConfirmed = !!rpcTx?.blockNumber
-        this.logger.info(`tx ${tx.txId} confirmed: ${isTxConfirmed}`)
-        await updateTx(tx, assetName, { isTxConfirmed })
+        const txStatus = statuses[tx.txId]
+        if (txStatus?.status === 'confirmed') {
+          await updateTx(tx, assetName, { isTxConfirmed: true })
+        } else if (txStatus?.status === 'dropped') {
+          await updateTx(tx, assetName, { isTxConfirmed: false })
+        }
+        // status === 'pending' or missing - tx still in mempool, do nothing
       }
     }
 

package/src/tx-log/ethereum-no-history-monitor.js

@@ -7,6 +7,7 @@ import { fromHexToString } from '../number-utils.js'
 import { UNCONFIRMED_TX_LIMIT } from './monitor-utils/get-derive-transactions-to-check.js'
 import {
   excludeUnchangedTokenBalances,
+  getCurrentEIP7702Delegation,
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
 } from './monitor-utils/index.js'
@@ -134,7 +135,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
     for (const { tx, assetName } of pendingTransactions) {
       const txFromNode = pendingTxsFromNode[tx.txId]
       const isConfirmed = Boolean(txFromNode?.blockHash)
-      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT && !isConfirmed) {
+      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT && !txFromNode) {
         txsToRemove.push({
           tx,
           assetSource: { asset: assetName, walletAccount },
@@ -186,7 +187,20 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
       ourWalletAddress,
     })
 
-    await this.updateAccountState({ newData: { ...accountState }, walletAccount })
+    const eip7702Delegation = await getCurrentEIP7702Delegation({
+      server: this.server,
+      address: ourWalletAddress,
+      currentDelegation: currentAccountState?.eip7702Delegation,
+      logger: this.logger,
+    })
+
+    // All updates must go through newData (accountState param is only used for mem merging)
+    const newData = {
+      ...accountState,
+      ...(eip7702Delegation && { eip7702Delegation }),
+    }
+
+    await this.updateAccountState({ accountState, newData, walletAccount })
 
     await this.removeFromTxLog(txsToRemove)
     await this.updateTxLogByAsset({ logItemsByAsset, walletAccount, refresh })

package/src/tx-log/monitor-utils/get-current-eip7702-delegation.js

@@ -0,0 +1,39 @@
+import { getEIP7702Delegation } from '../../eth-like-util.js'
+
+/**
+ * Checks if the address has an EIP-7702 delegation and returns the delegation state.
+ * Returns the new state if changed, or the current state if unchanged.
+ * On error, returns the current state to preserve existing data.
+ *
+ * @param {Object} params
+ * @param {Object} params.server - The server instance to use for getCode
+ * @param {string} params.address - The wallet address to check
+ * @param {Object} [params.currentDelegation] - The current delegation state from accountState
+ * @param {Object} [params.logger] - Optional logger for warnings
+ * @returns {Promise<Object|undefined>} The delegation state to use
+ */
+export async function getCurrentEIP7702Delegation({ server, address, currentDelegation, logger }) {
+  try {
+    const result = await getEIP7702Delegation({ address, server })
+
+    // Return new state if changed
+    if (
+      currentDelegation?.isDelegated !== result.isDelegated ||
+      currentDelegation?.delegatedAddress !== result.delegatedAddress
+    ) {
+      return {
+        isDelegated: result.isDelegated,
+        delegatedAddress: result.delegatedAddress,
+      }
+    }
+  } catch (error) {
+    if (logger) {
+      logger.warn('Failed to check EIP-7702 delegation:', error)
+    }
+  }
+
+  // Return current state if unchanged or on error
+  return currentDelegation
+}
+
+export default getCurrentEIP7702Delegation

package/src/tx-log/monitor-utils/index.js

@@ -5,4 +5,6 @@ export { default as getLogItemsFromServerTx } from './get-log-items-from-server-
 export { default as getHistoryFromServer } from './get-history-from-server.js'
 export { default as checkPendingTransactions } from './check-pending-transactions.js'
 export { default as getDeriveTransactionsToCheck } from './get-derive-transactions-to-check.js'
+export { default as getCurrentEIP7702Delegation } from './get-current-eip7702-delegation.js'
+export { default as verifyRpcPendingTxStatusBatch } from './verify-pending-tx-status-rpc.js'
 export * from './exclude-unchanged-token-balances.js'

package/src/tx-log/monitor-utils/verify-pending-tx-status-rpc.js

@@ -0,0 +1,69 @@
+/**
+ * Determines the status of an RPC transaction response.
+ *
+ * @param {Object|null} rpcTx - The RPC transaction response
+ * @returns {{status: 'confirmed' | 'pending' | 'dropped', blockNumber?: number}}
+ */
+function getTxStatus(rpcTx) {
+  if (rpcTx?.blockNumber) {
+    return { status: 'confirmed', blockNumber: parseInt(rpcTx.blockNumber, 16) }
+  }
+
+  if (rpcTx) {
+    return { status: 'pending' }
+  }
+
+  return { status: 'dropped' }
+}
+
+/**
+ * Batch verify pending transactions against the RPC node before marking them as dropped.
+ *
+ * Any lag in the Clarity indexer can cause confirmed transactions to be incorrectly
+ * flagged as dropped if Clarity hasn't indexed their block yet.
+ * By checking the RPC directly, we avoid this race condition.
+ *
+ * Uses a single batch RPC call for efficiency and graceful error handling.
+ *
+ * @param {Object} params
+ * @param {Object} params.baseAsset - The base asset to get the server from
+ * @param {Object} params.logger - Logger instance for info/debug output
+ * @param {string[]} params.txIds - Array of transaction IDs/hashes to verify
+ * @returns {Promise<Object<string, {status: 'confirmed' | 'pending' | 'dropped', blockNumber?: number}>>}
+ */
+export default async function verifyRpcPendingTxStatusBatch({ baseAsset, logger, txIds }) {
+  if (txIds.length === 0) return {}
+
+  const server = baseAsset.server
+
+  // Build batch request
+  const requests = txIds.map((txId) => server.getTransactionByHashRequest(txId))
+
+  let responses
+  try {
+    responses = await server.sendBatchRequest(requests)
+  } catch (error) {
+    // If batch request fails, skip all drop checks (safe default)
+    logger.warn('Batch RPC request failed, skipping drop checks', error)
+    return {}
+  }
+
+  // Map responses to statuses
+  const results = {}
+  txIds.forEach((txId, idx) => {
+    const rpcTx = responses[idx]
+    const txStatus = getTxStatus(rpcTx)
+    results[txId] = txStatus
+
+    // Log each tx status
+    if (txStatus.status === 'confirmed') {
+      logger.info(`tx ${txId} is confirmed on-chain (block ${txStatus.blockNumber}), skipping drop`)
+    } else if (txStatus.status === 'pending') {
+      logger.info(`tx ${txId} is still in mempool, skipping drop`)
+    } else {
+      logger.info(`tx ${txId} not found on-chain, marking as dropped`)
+    }
+  })
+
+  return results
+}