@exodus/ethereum-api 8.64.0 → 8.64.2

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.64.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.64.1...@exodus/ethereum-api@8.64.2) (2026-01-23)
+
+**Note:** Version bump only for package @exodus/ethereum-api
+
+
+
+
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.64.0",
+  "version": "8.64.2",
   "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",
@@ -67,5 +67,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "11f40d9da07e1e70a4e07f94defa3042c6fb21cc"
+  "gitHead": "d6aa274a62e489f5dd27e11088c56b3a64903779"
 }

package/src/create-asset-utils.js

@@ -1,7 +1,7 @@
 import assert from 'minimalistic-assert'
 import ms from 'ms'
 
-import { createEvmServer, ValidMonitorTypes } from './exodus-eth-server/index.js'
+import { createEvmServer, createWsGateway, ValidMonitorTypes } from './exodus-eth-server/index.js'
 import { createEthereumHooks } from './hooks/index.js'
 import { ClarityMonitor } from './tx-log/clarity-monitor.js'
 import { ClarityMonitorV2 } from './tx-log/clarity-monitor-v2.js'
@@ -18,6 +18,7 @@ export const resolveMonitorSettings = (
     defaultMonitorInterval,
     defaultMonitorType,
     defaultServerUrl,
+    defaultWsGatewayUri,
   } = Object.create(null)
 ) => {
   assert(asset, 'expected asset')
@@ -27,9 +28,17 @@ export const resolveMonitorSettings = (
   )
   assert(defaultServerUrl, `expected default serverUrl for ${asset.name}`)
 
+  // NOTE: When trying to enable `clarity-v3` as an asset
+  //       default config, there must exist a default
+  //       gateway definition.
+  if (defaultMonitorType === 'clarity-v3') {
+    assert(defaultWsGatewayUri, 'expected defaultWsGatewayUri')
+  }
+
   const overrideMonitorType = configWithOverrides?.monitorType
   const overrideServerUrl = configWithOverrides?.serverUrl
   const overrideMonitorInterval = configWithOverrides?.monitorInterval
+  const overrideWsGatewayUri = configWithOverrides?.wsGatewayUri
 
   const defaultResolution = {
     // NOTE: Regardless of the `monitorType`, the `monitorInterval`
@@ -37,13 +46,18 @@ export const resolveMonitorSettings = (
     monitorInterval: overrideMonitorInterval ?? defaultMonitorInterval,
     monitorType: defaultMonitorType,
     serverUrl: defaultServerUrl,
+    wsGatewayUri: defaultWsGatewayUri,
+  }
+
+  const fallbackWithWarning = (msg) => {
+    console.log([msg, `Falling back to ${defaultMonitorType}<${defaultServerUrl}>.`].join(' '))
+    return defaultResolution
   }
 
   if (!overrideMonitorType && overrideServerUrl) {
-    console.warn(
-      `Received an \`overrideServerUrl\`, but not the \`monitorType\` for ${asset.name}. Falling back to ${defaultMonitorType}<${defaultServerUrl}>.`
+    return fallbackWithWarning(
+      `Received an \`overrideServerUrl\`, but not the \`monitorType\` for ${asset.name}.`
     )
-    return defaultResolution
   }
 
   // If we don't attempt to override the `monitorType`, we resort
@@ -51,14 +65,24 @@ export const resolveMonitorSettings = (
   if (!overrideMonitorType) return defaultResolution
 
   if (!ValidMonitorTypes.includes(overrideMonitorType)) {
-    console.warn(
-      `"${overrideMonitorType}" is not a valid \`MonitorType\`. Falling back to ${defaultMonitorType}<${defaultServerUrl}>.`
+    return fallbackWithWarning(`"${overrideMonitorType}" is not a valid \`MonitorType\`.`)
+  }
+
+  const wsGatewayUri = overrideWsGatewayUri || defaultWsGatewayUri
+
+  if (overrideMonitorType === 'clarity-v3' && !wsGatewayUri) {
+    return fallbackWithWarning(
+      "Attempted to use 'clarity-v3' without a defining a supporting wsGatewayUri."
     )
-    return defaultResolution
   }
 
   // Permit the `monitorType` and `serverUrl` to be overrided.
-  return { ...defaultResolution, monitorType: overrideMonitorType, serverUrl: overrideServerUrl }
+  return {
+    ...defaultResolution,
+    monitorType: overrideMonitorType,
+    serverUrl: overrideServerUrl,
+    wsGatewayUri,
+  }
 }
 
 export const stringifyPrivateTx = (tx) => {
@@ -116,6 +140,7 @@ export const createHistoryMonitorFactory = ({
   server,
   stakingAssetNames,
   rpcBalanceAssetNames,
+  wsGatewayUri,
 }) => {
   assert(assetName, 'expected assetName')
   assert(assetClientInterface, 'expected assetClientInterface')
@@ -142,6 +167,7 @@ export const createHistoryMonitorFactory = ({
           interval: ms(monitorInterval || '5m'),
           server,
           rpcBalanceAssetNames,
+          wsGatewayClient: createWsGateway({ uri: wsGatewayUri }),
           ...args,
         })
         break

package/src/create-asset.js

@@ -71,6 +71,7 @@ export const createAssetFactory = ({
   useAbsoluteBalanceAndNonce = false,
   delisted = false,
   privacyRpcUrl: defaultPrivacyRpcUrl,
+  wsGatewayUri: defaultWsGatewayUri,
 }) => {
   assert(assetsList, 'assetsList is required')
   assert(providedFeeData || feeDataConfig, 'feeData or feeDataConfig is required')
@@ -118,12 +119,13 @@ export const createAssetFactory = ({
 
     const asset = assets[base.name]
 
-    const { monitorType, serverUrl, monitorInterval } = resolveMonitorSettings({
+    const { monitorType, serverUrl, monitorInterval, wsGatewayUri } = resolveMonitorSettings({
       asset,
       configWithOverrides,
       defaultMonitorInterval,
       defaultMonitorType,
       defaultServerUrl,
+      defaultWsGatewayUri,
     })
 
     if (overrideUseAbsoluteBalanceAndNonce !== undefined) {
@@ -220,6 +222,7 @@ export const createAssetFactory = ({
       server,
       stakingAssetNames,
       rpcBalanceAssetNames,
+      wsGatewayUri,
     })
 
     const defaultAddressPath = 'm/0/0'

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/exodus-eth-server/index.js

@@ -12,6 +12,7 @@ import { create } from './api.js'
 import ApiCoinNodesServer from './api-coin-nodes.js'
 import ClarityServer from './clarity.js'
 import ClarityServerV2 from './clarity-v2.js'
+import WsGateway from './ws-gateway.js'
 
 export const ValidMonitorTypes = ['no-history', 'clarity', 'clarity-v2', 'clarity-v3', 'magnifier']
 
@@ -34,6 +35,39 @@ export function createEvmServer({ assetName, serverUrl, monitorType }) {
   }
 }
 
+const gatewayUriToWsGateway = Object.create(null)
+
+export const createWsGateway = ({ uri } = Object.create(null)) => {
+  assert(typeof uri === 'string', 'expected string uri')
+
+  uri = new URL(uri).toString()
+
+  const wsGateway = gatewayUriToWsGateway[uri]
+  if (wsGateway) return wsGateway
+
+  // NOTE: We disable the ability to `setServer` on the
+  //       `WsGateway`, since we assume a mapping between
+  //       `gatewayUri -> WsGateway`.
+  //
+  //       This is a safe modification since a `WsGateway`
+  //       monitor isn't rigged up to the same life cycle
+  //       as other servers.
+  class FrozenWsGateway extends WsGateway {
+    constructor() {
+      super({ uri })
+    }
+
+    setServer() {
+      assert(false, 'setServer is disabled')
+    }
+  }
+
+  const frozenWsGateway = new FrozenWsGateway()
+  gatewayUriToWsGateway[uri] = frozenWsGateway
+
+  return frozenWsGateway
+}
+
 // @Deprecated
 const serverMap = Object.fromEntries(
   // eslint-disable-next-line @exodus/import/no-deprecated

package/src/exodus-eth-server/ws-gateway.js

@@ -26,15 +26,21 @@ const parseSubscriptionKey = (subscriptionKey) => {
  * @property {string} address
  */
 
-class WsGateway extends EventEmitter {
+export default class WsGateway extends EventEmitter {
   #socket = null
   // Dedup subscriptions to reduce workload on server and resubscribe after closing
   #subscriptions = new Set()
   #reconnectionTimeoutId = null
-  #defaultUri = 'wss://ws-gateway-clarity.a.exodus.io'
   #uri = null
   #logger = createConsoleLogger(`@exodus/ws-gateway`)
 
+  constructor({ uri }) {
+    super()
+    assert(typeof uri === 'string', 'expected string uri')
+
+    this.#uri = uri
+  }
+
   _handlers = {
     message: ({ target, data }) => {
       if (target !== this.#socket) return
@@ -77,7 +83,7 @@ class WsGateway extends EventEmitter {
   }
 
   setServer(uri) {
-    this.#uri = uri || this.#uri || this.#defaultUri
+    this.#uri = uri || this.#uri
   }
 
   start() {
@@ -266,8 +272,3 @@ class WsGateway extends EventEmitter {
     this.#socket = null
   }
 }
-
-const wsGateway = new WsGateway()
-const createWsGateway = () => wsGateway
-
-export { createWsGateway, WsGateway }

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

@@ -1,8 +1,9 @@
 import { BaseMonitor } from '@exodus/asset-lib'
 import { getAssetAddresses } from '@exodus/ethereum-lib'
 import lodash from 'lodash'
+import assert from 'minimalistic-assert'
 
-import { createWsGateway } from '../exodus-eth-server/ws-gateway.js'
+import WsGateway from '../exodus-eth-server/ws-gateway.js'
 import { executeEthLikeFeeMonitorUpdate } from '../fee-utils.js'
 import { fromHexToString } from '../number-utils.js'
 import { filterEffects, getLogItemsFromServerTx } from './clarity-utils/index.js'
@@ -13,6 +14,7 @@ import {
   getCurrentEIP7702Delegation,
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
+  verifyRpcPendingTxStatusBatch,
 } from './monitor-utils/index.js'
 
 const { isEmpty } = lodash
@@ -22,14 +24,10 @@ export class ClarityMonitorV2 extends BaseMonitor {
   #walletAccountByAddress = new Map()
   #walletAccountInfo = new Map()
   #rpcBalanceAssetNames = []
-  constructor({
-    server,
-    wsGatewayClient = createWsGateway(),
-    rpcBalanceAssetNames,
-    config,
-    ...args
-  } = {}) {
+  constructor({ server, wsGatewayClient, rpcBalanceAssetNames, config, ...args } = {}) {
     super(args)
+    assert(wsGatewayClient instanceof WsGateway, 'expected WsGateway wsGatewayClient')
+
     this.config = { GAS_PRICE_FROM_WEBSOCKET: true, ...config }
     this.server = server
     this.#wsClient = wsGatewayClient
@@ -47,8 +45,6 @@ export class ClarityMonitorV2 extends BaseMonitor {
   setServer(config) {
     const uri = config?.server || this.server.defaultUri
 
-    this.#wsClient.setServer(config.wsGatewayUrl?.v1)
-
     this.#wsClient.on('connected', () => this.subscribeAllWalletAccounts())
     this.#wsClient.start()
 
@@ -127,9 +123,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 }

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

@@ -13,6 +13,7 @@ import {
   getCurrentEIP7702Delegation,
   getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
+  verifyRpcPendingTxStatusBatch,
 } from './monitor-utils/index.js'
 
 const { isEmpty } = lodash
@@ -111,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 }

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

@@ -135,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 },

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

@@ -6,4 +6,5 @@ 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
+}