@exodus/ethereum-api 8.21.2 → 8.21.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.21.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.21.2...@exodus/ethereum-api@8.21.3) (2024-11-27)
+
+
+### Bug Fixes
+
+
+* fix: handling JSON RPC responses in Clarity V2 (#4587)
+
+* fix: improve nonce calculation for EVMs and fix drop txs in no history (#4583)
+
+
+
 ## [8.21.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.21.1...@exodus/ethereum-api@8.21.2) (2024-11-15)
 
 **Note:** Version bump only for package @exodus/ethereum-api

package/README.md

@@ -0,0 +1,3 @@
+# @exodus/ethereum-api
+
+Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Ethereum and EVM-based blockchains. See [Asset Packages](../../docs/asset-packages.md) for more detail on this package's role.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.21.2",
-  "description": "Ethereum Api",
+  "version": "8.21.3",
+  "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",
   "files": [
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "95e353cbf4ee280916760a1196b72e74889e475d"
+  "gitHead": "391020017026fc2d06ff3d7f164a5c91a6922c3f"
 }

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

@@ -108,7 +108,9 @@ export default class ClarityServerV2 extends ClarityServer {
       fetchOptions.body = JSON.stringify(body)
     }
 
-    return fetchJson(url, fetchOptions)
+    const response = await fetchJson(url, fetchOptions)
+
+    return this.handleJsonRPCResponse(response)
   }
 
   async sendRawTransaction(...params) {

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

@@ -86,6 +86,18 @@ export default class ClarityServer extends EventEmitter {
     }
   }
 
+  // See https://www.jsonrpc.org/specification#response_object for details.
+  handleJsonRPCResponse(response) {
+    const result = response?.result
+    const error = response?.error
+    if (error || result === undefined) {
+      const message = error?.message || error?.code || 'no result'
+      throw new Error(`Bad rpc response: ${message}`)
+    }
+
+    return result
+  }
+
   async getAllTransactions(params) {
     const transactions = { pending: [], confirmed: [] }
     const cursor = await this.getTransactions({
@@ -176,14 +188,8 @@ export default class ClarityServer extends EventEmitter {
 
   async sendRequest(request) {
     const response = await this.sendRpcRequest(request)
-    const result = response?.result
-    const error = response?.error
-    if (error || result === undefined) {
-      const message = error?.message || error?.code || 'no result'
-      throw new Error(`Bad rpc response: ${message}`)
-    }
 
-    return result
+    return this.handleJsonRPCResponse(response)
   }
 
   async isContract(address) {

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

@@ -137,12 +137,13 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
     for (const { tx, assetName } of pendingTransactions) {
       const txFromNode = pendingTxsFromNode[tx.txId]
-      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT && txFromNode?.blockHash == null) {
+      const isConfirmed = Boolean(txFromNode?.blockHash)
+      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT && !isConfirmed) {
         txsToRemove.push({
           tx,
           assetSource: { asset: assetName, walletAccount },
         })
-      } else if (txFromNode?.blockHash !== null) {
+      } else if (isConfirmed) {
         txsToUpdate.push({
           tx: { ...tx, confirmations: 1 },
           assetSource: { asset: assetName, walletAccount },

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

@@ -0,0 +1,18 @@
+import { getNonce } from '../eth-like-util.js'
+
+export const resolveNonce = async ({ asset, fromAddress, providedNonce, txLog, triedNonce }) => {
+  const nonceFromNode = asset.baseAsset?.api?.features?.noHistory
+    ? await getNonce({ asset: asset.baseAsset, address: fromAddress, tag: 'latest' }) // maybe 'pending' to unconfirmed txs
+    : 0
+
+  const nonceFromLog = [...txLog]
+    .filter((tx) => tx.sent && !tx.dropped && tx.data.nonce != null)
+    .reduce((nonce, tx) => Math.max(tx.data.nonce + 1, nonce), 0)
+
+  return Math.max(
+    nonceFromNode,
+    nonceFromLog,
+    providedNonce ?? 0,
+    triedNonce === undefined ? 0 : triedNonce + 1
+  )
+}

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

@@ -4,9 +4,10 @@ import { calculateBumpedGasPrice, isEthereumLikeToken, normalizeTxId } from '@ex
 import assert from 'minimalistic-assert'
 
 import * as ErrorWrapper from '../error-wrapper.js'
-import { getNonce, transactionExists } from '../eth-like-util.js'
+import { transactionExists } from '../eth-like-util.js'
 import { getNftArguments } from '../nft-utils.js'
 import getFeeInfo from './get-fee-info.js'
+import { resolveNonce } from './nonce-utils.js'
 
 const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
   assert(assetClientInterface, 'assetClientInterface is required')
@@ -21,7 +22,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
     shouldLog = true,
     keepTxInput,
     txInput,
-    nonce: _nonce,
+    nonce: providedNonce,
     bumpTxId,
     customFee,
     isSendAll,
@@ -56,17 +57,18 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       amount = asset.baseAsset.currency.ZERO
     }
 
-    let nonceParam = _nonce
+    let bumpNonce
 
     let eip1559Enabled = feeData.eip1559Enabled
 
+    const baseAssetTxLog = await assetClientInterface.getTxLog({
+      assetName: baseAsset.name,
+      walletAccount,
+    })
+
     // `replacedTx` is always an ETH/ETC transaction (not a token)
     let replacedTx, replacedTokenTx
     if (bumpTxId) {
-      const baseAssetTxLog = await assetClientInterface.getTxLog({
-        assetName: baseAsset.name,
-        walletAccount,
-      })
       replacedTx = baseAssetTxLog.get(bumpTxId)
       if (!replacedTx || !replacedTx.pending) {
         throw new Error(`Cannot bump transaction ${bumpTxId}: not found or confirmed`)
@@ -98,21 +100,25 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       feeOpts.gasPrice = bumpedGasPrice
       feeOpts.tipGasPrice = bumpedTipGasPrice
       eip1559Enabled = feeData.eip1559Enabled && feeOpts.tipGasPrice
-      nonceParam = replacedTx.data.nonce
+      bumpNonce = replacedTx.data.nonce
       txInput = replacedTokenTx ? null : replacedTx.data.data || '0x'
       feeAmount = feeOpts.gasPrice.mul(feeOpts.gasLimit)
-      if (nonceParam === undefined) {
+      if (bumpNonce === undefined) {
         throw new Error(`Cannot bump transaction ${bumpTxId}: data object seems to be corrupted`)
       }
     }
 
+    const resolvedNonce =
+      bumpNonce ??
+      (await resolveNonce({ asset, fromAddress, providedNonce, txLog: baseAssetTxLog }))
+
     const createTxParams = {
       assetClientInterface,
       asset,
       walletAccount,
       toAddress: contractAddress || address,
       amount,
-      nonce: nonceParam,
+      nonce: resolvedNonce,
       fromAddress,
       eip1559Enabled,
       customFee,
@@ -157,8 +163,13 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       } else if (nonceTooLowErr) {
         console.info('trying to send again...') // inject logger factory from platform
         // let's try to fix the nonce issue
-
-        nonce = await getNonce({ asset: baseAsset, address: fromAddress })
+        nonce = await resolveNonce({
+          asset,
+          fromAddress,
+          providedNonce,
+          txLog: baseAssetTxLog,
+          triedNonce: nonce,
+        })
         ;({ txId, rawTx } = await createTx({ ...createTxParams, nonce }))
 
         try {
@@ -247,7 +258,7 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
       })
     }
 
-    return { txId }
+    return { txId, nonce }
   }
 }
 
@@ -268,6 +279,10 @@ const createTx = async ({
   feeOpts,
   createUnsignedTx,
 }) => {
+  assert(
+    nonce !== undefined && typeof nonce === 'number',
+    'Nonce must be provided when creating a tx'
+  )
   const isToken = isEthereumLikeToken(asset)
 
   if (txInput && isToken && !keepTxInput)
@@ -309,21 +324,6 @@ const createTx = async ({
     // gasLimit = customGasLimit
   }
 
-  if (asset.baseAsset?.api?.hasFeature?.('noHistory')) {
-    nonce = await getNonce({ asset: asset.baseAsset, address: fromAddress })
-  }
-
-  if (nonce === undefined) {
-    // Calculate latest nonce from base asset's TX log
-    const baseAssetTxLog = await assetClientInterface.getTxLog({
-      assetName: asset.baseAsset.name,
-      walletAccount,
-    })
-    nonce = [...baseAssetTxLog]
-      .filter((tx) => tx.sent && !tx.dropped && tx.data.nonce != null)
-      .reduce((nonce, tx) => Math.max(tx.data.nonce + 1, nonce), 0)
-  }
-
   const unsignedTx = await createUnsignedTx({
     asset,
     walletAccount,