@exodus/ethereum-api 8.41.0 → 8.42.1

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.42.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.42.0...@exodus/ethereum-api@8.42.1) (2025-07-11)
+
+**Note:** Version bump only for package @exodus/ethereum-api
+
+
+
+
+
+## [8.42.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.41.0...@exodus/ethereum-api@8.42.0) (2025-07-10)
+
+
+### Features
+
+
+* feat: rig `getNonce` to evm asset api (#6047)
+
+
+
 ## [8.41.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.40.1...@exodus/ethereum-api@8.41.0) (2025-07-01)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.41.0",
+  "version": "8.42.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",
@@ -63,5 +63,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "1077a752b60e0b25961613fd007596ab3368188e"
+  "gitHead": "439848922f4e7a525c4e2373c99daefd89da402b"
 }

package/src/allowance/index.js

@@ -1,3 +1,8 @@
+import { isNumberUnit } from '@exodus/currency'
+import { buffer2currency, createUnsignedTxFactory } from '@exodus/ethereum-lib'
+import { bufferToInt } from '@exodus/ethereumjs/util'
+import assert from 'minimalistic-assert'
+
 import { getServer } from '../exodus-eth-server/index.js'
 import { fetchGasLimit } from '../gas-estimation.js'
 import { ALLOWANCE_TX_TIMEOUT, APPROVAL_GAS_LIMIT, ZERO_ALLOWANCE_ASSETS } from './constants.js'
@@ -27,8 +32,80 @@ export async function isSpendingApprovalRequired({
   return tokenAmount.gt(allowance)
 }
 
+export const buildApproveTx = async ({
+  spenderAddress,
+  asset,
+  feeData,
+  fromAddress,
+  approveAmount = asset.currency.ZERO,
+  gasLimit,
+  txInput,
+  nonce,
+  walletAccount,
+}) => {
+  assert(asset, 'expected asset')
+  assert(feeData, 'expected feeData')
+  assert(isNumberUnit(approveAmount), 'expected approveAmount')
+  assert(typeof spenderAddress === 'string', 'expected spenderAddress')
+  assert(walletAccount, 'expected walletAccount')
+
+  const { baseAsset } = asset
+  const chainId = baseAsset.chainId
+  assert(typeof chainId === 'number', 'expected chainId')
+
+  const createUnsignedTx = createUnsignedTxFactory({ chainId })
+
+  const toAddress = asset.contract.address
+  assert(typeof toAddress === 'string', 'expected contract address')
+
+  if (!txInput) txInput = asset.contract.approve.build(spenderAddress, approveAmount.toBaseString())
+
+  if (typeof nonce !== 'number')
+    nonce = await baseAsset.getNonce({ asset, fromAddress, walletAccount })
+
+  if (!gasLimit)
+    gasLimit = await fetchGasLimit({
+      asset: baseAsset,
+      amount: baseAsset.currency.ZERO,
+      toAddress,
+      txInput,
+      feeData,
+      isContract: true,
+      fromAddress,
+    })
+
+  return createUnsignedTx({
+    asset,
+    address: toAddress,
+    amount: baseAsset.currency.ZERO,
+    nonce,
+    txInput,
+    gasLimit,
+    gasPrice: feeData.gasPrice,
+    tipGasPrice: feeData.tipGasPrice,
+    fromAddress,
+    eip1559Enabled: feeData.eip1559Enabled,
+  })
+}
+
+const getLegacyApproveTxFromUnsignedTx = ({ baseAsset, unsignedTx }) => ({
+  asset: baseAsset.name,
+  receiver: {
+    address: unsignedTx.txData.to,
+    amount: buffer2currency({ asset: baseAsset, value: unsignedTx.txData.value }),
+  },
+  txInput: unsignedTx.txData.data,
+  gasPrice: buffer2currency({ asset: baseAsset, value: unsignedTx.txData.gasPrice }),
+  tipGasPrice: unsignedTx.txData.tipGasPrice
+    ? buffer2currency({ asset: baseAsset, value: unsignedTx.txData.tipGasPrice })
+    : undefined,
+  gasLimit: bufferToInt(unsignedTx.txData.gasLimit),
+  fromAddress: unsignedTx.txMeta.fromAddress,
+})
+
+// @deprecated use buildApproveTx instead
 export const createApprove =
-  ({ sendTx }) =>
+  ({ assetClientInterface, sendTx }) =>
   async ({
     spenderAddress,
     asset,
@@ -36,45 +113,41 @@ export const createApprove =
     fromAddress,
     approveAmount,
     gasLimit,
-    txInput: preTxInput,
-    ...rest
+    txInput,
+    nonce,
+    walletAccount,
+    ...extras
   }) => {
-    const baseAsset = asset.baseAsset
-    const txInput =
-      preTxInput ?? asset.contract.approve.build(spenderAddress, approveAmount.toBaseString())
-
-    const toAddress = asset.contract.address
-    const gasLimitOptions = {
-      asset: baseAsset,
-      amount: baseAsset.currency.ZERO,
-      toAddress,
-      txInput,
+    const unsignedTx = await buildApproveTx({
+      spenderAddress,
+      asset,
       feeData,
-      isContract: true,
       fromAddress,
-    }
-
-    gasLimit = gasLimit || (await fetchGasLimit(gasLimitOptions))
-
-    const txData = await sendTx({
-      asset: baseAsset.name,
-      receiver: {
-        address: toAddress,
-        amount: baseAsset.currency.ZERO,
-      },
-      txInput,
-      gasPrice: feeData.gasPrice,
+      approveAmount,
       gasLimit,
-      silent: true,
-      fromAddress,
-      ...rest,
+      txInput,
+      nonce,
+      walletAccount,
     })
 
-    if (!txData || !txData.txId) {
-      throw new Error(`Failed to approve ${asset.displayTicker} - ${spenderAddress}`)
+    if (!assetClientInterface) {
+      const approveTx = getLegacyApproveTxFromUnsignedTx({ baseAsset: asset.baseAsset, unsignedTx })
+      const txData = await sendTx({ walletAccount, ...approveTx, silent: true, ...extras })
+
+      if (!txData || !txData.txId)
+        throw new Error(`Failed to approve ${asset.displayTicker} - ${spenderAddress}`)
+
+      return txData
     }
 
-    return txData
+    const { txId, rawTx } = await assetClientInterface.signTransaction({
+      assetName: asset.baseAsset.name,
+      unsignedTx,
+      walletAccount,
+    })
+
+    await asset.baseAsset.api.broadcastTx(rawTx.toString('hex'))
+    return { txId }
   }
 
 const createSendApprovalAndWatchConfirmation =

package/src/create-asset-utils.js

@@ -6,6 +6,7 @@ import { createEthereumHooks } from './hooks/index.js'
 import { ClarityMonitor } from './tx-log/clarity-monitor.js'
 import { EthereumMonitor } from './tx-log/ethereum-monitor.js'
 import { EthereumNoHistoryMonitor } from './tx-log/ethereum-no-history-monitor.js'
+import { resolveNonce } from './tx-send/nonce-utils.js'
 
 // Determines the appropriate `monitorType`, `serverUrl` and `monitorInterval`
 // to use for a given config.
@@ -151,3 +152,33 @@ export const createHistoryMonitorFactory = ({
     return monitor
   }
 }
+
+export const getNonceFactory = ({ assetClientInterface, useAbsoluteBalanceAndNonce }) => {
+  assert(assetClientInterface, 'expected assetClientInterface')
+  assert(typeof useAbsoluteBalanceAndNonce === 'boolean', 'expected useAbsoluteBalanceAndNonce')
+
+  const getNonce = async ({ asset, fromAddress, walletAccount }) => {
+    assert(asset, 'expected asset')
+    assert(typeof fromAddress === 'string', 'expected fromAddress')
+    assert(walletAccount, 'expected walletAccount')
+
+    const txLog = await assetClientInterface.getTxLog({
+      assetName: asset.baseAsset.name,
+      walletAccount,
+    })
+
+    return resolveNonce({
+      asset,
+      fromAddress,
+      txLog,
+      // For assets where we'll fall back to querying the coin node, we
+      // search for pending transactions. For base assets with history,
+      // we'll fall back to the `TxLog` since this also has a knowledge
+      // of which transactions are currently in pending.
+      tag: 'pending',
+      useAbsoluteNonce: useAbsoluteBalanceAndNonce,
+    })
+  }
+
+  return { getNonce }
+}

package/src/create-asset.js

@@ -1,5 +1,4 @@
 import { connectAssetsList } from '@exodus/assets'
-import { pick } from '@exodus/basic-utils'
 import bip44Constants from '@exodus/bip44-constants/by-ticker.js'
 import {
   createEthereumLikeAccountState,
@@ -24,6 +23,7 @@ import { addressHasHistoryFactory } from './address-has-history.js'
 import {
   createHistoryMonitorFactory,
   createTransactionPrivacyFactory,
+  getNonceFactory,
   resolveMonitorSettings,
 } from './create-asset-utils.js'
 import { createTokenFactory } from './create-token-factory.js'
@@ -237,6 +237,8 @@ export const createAssetFactory = ({
       ? getL1GetFeeFactory({ asset, originalGetFee })
       : originalGetFee
 
+    const { getNonce } = getNonceFactory({ assetClientInterface, useAbsoluteBalanceAndNonce })
+
     const api = {
       addressHasHistory,
       broadcastTx: (...args) => server.sendRawTransaction(...args),
@@ -280,7 +282,6 @@ export const createAssetFactory = ({
 
     const fullAsset = {
       ...asset,
-      ...pick(config, ['accountReserve']),
       gasLimit,
       contractGasLimit,
       bip44,
@@ -293,6 +294,7 @@ export const createAssetFactory = ({
       broadcastPrivateBundle,
       broadcastPrivateTx,
       forceGasLimitEstimation,
+      getNonce,
       privacyServer,
       server,
       ...(erc20FuelBuffer && { erc20FuelBuffer }),

package/src/index.js

@@ -61,6 +61,7 @@ export {
   isZeroAllowanceAsset,
   getSpendingAllowance,
   isSpendingApprovalRequired,
+  buildApproveTx,
   createApprove,
   createApproveSpendingTokens,
   APPROVAL_GAS_LIMIT,

package/src/tx-send/tx-send.js

@@ -204,17 +204,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx, useAbsoluteBala
     const resolvedNonce =
       providedNonce ??
       bumpNonce ??
-      (await resolveNonce({
-        asset,
-        fromAddress,
-        txLog: baseAssetTxLog,
-        // For assets where we'll fall back to querying the coin node, we
-        // search for pending transactions. For base assets with history,
-        // we'll fall back to the `TxLog` since this also has a knowledge
-        // of which transactions are currently in pending.
-        tag: 'pending',
-        useAbsoluteNonce: useAbsoluteBalanceAndNonce,
-      }))
+      (await asset.baseAsset.getNonce({ asset, fromAddress, walletAccount }))
 
     const createTxParams = {
       assetClientInterface,