@exodus/ethereum-api 8.53.3 → 8.53.4

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.53.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.53.3...@exodus/ethereum-api@8.53.4) (2025-10-06)
+
+**Note:** Version bump only for package @exodus/ethereum-api
+
+
+
+
+
 ## [8.53.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.53.2...@exodus/ethereum-api@8.53.3) (2025-10-02)
 
 **Note:** Version bump only for package @exodus/ethereum-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.53.3",
+  "version": "8.53.4",
   "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",
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "f6ea2714c95f2e7ec71ffecdc589726b7974511e"
+  "gitHead": "ec39e0d836ef4a4b3d9669273724407cf6dedd5d"
 }

package/src/tx-log/get-optimistic-txlog-effects.js

@@ -1,5 +1,6 @@
-import { isNumberUnit } from '@exodus/currency'
-import { isEthereumLikeToken } from '@exodus/ethereum-lib'
+import NumberUnit from '@exodus/currency'
+import { isEthereumLikeToken, parseUnsignedTx } from '@exodus/ethereum-lib'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 // Returns the most competitively priced pending
@@ -30,38 +31,50 @@ export const getHighestIncentivePendingTxByNonce = async ({
 
 export const getOptimisticTxLogEffects = async ({
   asset,
-  amount = asset.currency.ZERO,
   assetClientInterface,
   confirmations = 0,
-  feeAmount,
   fromAddress,
-  gasLimit,
-  nonce,
   txId,
-  toAddress,
-  tipGasPrice: maybeTipGasPrice,
+  unsignedTx,
   walletAccount,
-  methodId,
 }) => {
-  assert(isNumberUnit(amount), 'expected NumberUnit amount')
   assert(asset, 'expected asset')
   assert(assetClientInterface, 'expected assetClientInterface')
   assert(Number.isInteger(confirmations), 'expected integer confirmations')
-  assert(isNumberUnit(feeAmount), 'expected feeAmount')
   assert(typeof fromAddress === 'string', 'expected string fromAddress')
-  assert(Number.isInteger(gasLimit), 'expected integer gasLimit')
-  assert(Number.isInteger(nonce), 'expected integer nonce')
-  assert(typeof toAddress === 'string', 'expected string toAddress')
   assert(txId, 'expected txId')
+  assert(unsignedTx, 'expected unsignedTx')
   assert(walletAccount, 'expected walletAccount')
 
-  if (maybeTipGasPrice) assert(isNumberUnit(maybeTipGasPrice), 'expected NumberUnit tipGasPrice')
+  // this converts an transactionBuffer to values we can use when creating the tx logs
+  const parsedTx = parseUnsignedTx({ asset, unsignedTx })
 
-  const baseAsset = asset.baseAsset
+  const { nonce } = parsedTx
+  assert(Number.isInteger(nonce), 'expected integer nonce')
+
+  const amount = parsedTx.amount || asset.currency.ZERO
+  assert(amount instanceof NumberUnit, 'expected NumberUnit amount')
+
+  const feeAmount = parsedTx.fee
+  assert(feeAmount instanceof NumberUnit, 'expected feeAmount')
+
+  const maybeTipGasPrice = parsedTx.tipGasPrice
+  if (maybeTipGasPrice) {
+    assert(maybeTipGasPrice instanceof NumberUnit, 'expected NumberUnit tipGasPrice')
+  }
+
+  const gasLimit = parsedTx.gasLimit
+  assert(Number.isInteger(gasLimit), 'expected integer gasLimit')
+
+  const toAddress = parsedTx.to
+  assert(typeof toAddress === 'string', 'expected string toAddress')
+
+  const data = parsedTx.data
+  const methodId = data ? bufferToHex(data).slice(0, 10) : undefined
 
-  // TODO: This is incorrect for token transfers.
   const selfSend = fromAddress.toLowerCase() === toAddress.toLowerCase()
 
+  const baseAsset = asset.baseAsset
   assert(asset.feeAsset.name === baseAsset.name, 'inconsistent feeAsset')
 
   const maybeTxToReplace = await getHighestIncentivePendingTxByNonce({
@@ -128,5 +141,5 @@ export const getOptimisticTxLogEffects = async ({
     },
   ].filter(Boolean)
 
-  return { optimisticTxLogEffects }
+  return { optimisticTxLogEffects, nonce }
 }

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

@@ -1,5 +1,4 @@
 import { normalizeTxId, parseUnsignedTx, updateNonce } from '@exodus/ethereum-lib'
-import { bufferToHex } from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 import * as ErrorWrapper from '../error-wrapper.js'
@@ -40,17 +39,8 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
 
     const { unsignedTx } = await resolveUnsignedTx()
 
-    // this converts an transactionBuffer to values we can use when creating the tx logs
     const parsedTx = parseUnsignedTx({ asset, unsignedTx })
-
-    let nonce = parsedTx.nonce
-
-    const tipGasPrice = parsedTx.tipGasPrice
-    const feeAmount = parsedTx.fee
-    const gasLimit = parsedTx.gasLimit
-    const amount = parsedTx.amount
     const toAddress = parsedTx.to
-    const data = parsedTx.data
 
     // unknown data from buffer...
     const fromAddress = unsignedTx.txMeta.fromAddress
@@ -66,18 +56,8 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
       walletAccount,
     })
 
-    const isPrivate = Boolean(legacyParams?.options?.isPrivate)
-
-    if (isPrivate && typeof baseAsset.broadcastPrivateTx !== 'function') {
-      throw new Error(
-        `unable to send private transaction - private mempools are not enabled for ${baseAsset.name}`
-      )
-    }
-
-    const broadcastTx = isPrivate ? baseAsset.broadcastPrivateTx : baseAsset.api.broadcastTx
-
     try {
-      await broadcastTx(rawTx.toString('hex'))
+      await baseAsset.api.broadcastTx(rawTx.toString('hex'))
     } catch (err) {
       const nonceTooLowErr = err.message.match(/nonce (is |)too low/i)
       const insufficientFundsErr = err.message.match(/insufficient funds/i)
@@ -112,7 +92,7 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
           asset,
           fromAddress,
           walletAccount,
-          triedNonce: nonce,
+          triedNonce: parsedTx.nonce,
           forceFromNode: true,
         })
 
@@ -121,8 +101,6 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
           transactionBuffer: unsignedTx.txData.transactionBuffer,
           newNonce,
         })
-
-        nonce = newNonce
         ;({ txId, rawTx } = await signTx({ asset, unsignedTx, walletAccount }))
 
         try {
@@ -143,24 +121,23 @@ const txSendFactory = ({ assetClientInterface, createTx }) => {
             hint: 'retry:broadcastTx',
           })
         }
+      } else {
+        // If none of the above apply, terminate with a general error.
+        throw new ErrorWrapper.EthLikeError({
+          message: err.message,
+          reason: ErrorWrapper.reasons.broadcastTxFailed,
+          hint: 'broadcastTx',
+        })
       }
     }
 
-    const methodId = data ? bufferToHex(data).slice(0, 10) : undefined
-
-    const { optimisticTxLogEffects } = await getOptimisticTxLogEffects({
-      amount,
+    const { nonce, optimisticTxLogEffects } = await getOptimisticTxLogEffects({
       asset,
       assetClientInterface,
-      feeAmount,
       fromAddress,
-      gasLimit,
-      nonce,
       txId,
-      toAddress,
-      tipGasPrice,
+      unsignedTx,
       walletAccount,
-      methodId,
     })
 
     // NOTE: `optimisticTxLogEffects` **must** be written sequentially.