@exodus/ethereum-api 8.4.0 → 8.4.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.4.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.4.0...@exodus/ethereum-api@8.4.1) (2024-06-13)
+
+
+### Bug Fixes
+
+* **ethereum:** validate unconfirmed txs before dropping them ([#2550](https://github.com/ExodusMovement/assets/issues/2550)) ([5b6b5c8](https://github.com/ExodusMovement/assets/commit/5b6b5c8469c492413a27ebe45a59ad82732fc233))
+* evm tx-send security hardening ([#2543](https://github.com/ExodusMovement/assets/issues/2543)) ([3b476ce](https://github.com/ExodusMovement/assets/commit/3b476ce383a18db0337f86cd9f271ad34b9dbb4d))
+
+
+
 ## [8.4.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.3.2...@exodus/ethereum-api@8.4.0) (2024-06-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.4.0",
+  "version": "8.4.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "e33a20671ce835d88a11a5a8dc97e494ba04341f"
+  "gitHead": "fca8781b6cb3e3e3148df5885e4f60ddd6746623"
 }

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

@@ -75,14 +75,13 @@ export class EthereumMonitor extends BaseMonitor {
       assetSource: { walletAccount },
     } = params
 
-    const updateTx = (tx, asset, { error, remove }) => {
+    const updateTx = (tx, asset, { isTxConfirmed, remove }) => {
       if (remove) {
         txsToRemove.push({ tx, assetSource: { asset, walletAccount } })
       } else {
         params.logItemsByAsset[asset].push({
           ...tx,
-          dropped: true,
-          error,
+          ...(isTxConfirmed ? { confirmations: 1 } : { dropped: true, error: 'Dropped' }),
         })
       }
 
@@ -97,11 +96,11 @@ export class EthereumMonitor extends BaseMonitor {
         } else if (tokenTxSet && tokenTxSet.has(tx.txId)) {
           params.logItemsByAsset[assetName].push({
             ...tokenTxSet.get(tx.txId),
-            error,
-            dropped: true,
+            ...(isTxConfirmed ? { confirmations: 1 } : { dropped: true, error: 'Dropped' }),
           })
         }
       })
+
       return Promise.all(promises)
     }
 
@@ -115,8 +114,17 @@ export class EthereumMonitor extends BaseMonitor {
     }
 
     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 {
+        // 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 response = await this.server.getTransactionByHash(tx.txId)
+        const isTxConfirmed = response?.result?.blockNumber !== null
+        this.logger.warn(`tx ${tx.txId} confirmed: ${isTxConfirmed}`)
+        await updateTx(tx, assetName, { isTxConfirmed })
+      }
     }
 
     return {

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

@@ -162,7 +162,9 @@ const txSendFactory = ({ assetClientInterface, createUnsignedTx }) => {
                 gasLimit,
                 replacedTxId: bumpTxId,
                 nonce,
-                ...(tipGasPrice ? { tipGasPrice: tipGasPrice.toBaseString() } : {}),
+                ...(tipGasPrice
+                  ? { tipGasPrice: tipGasPrice.toBaseString() }
+                  : Object.create(null)),
               }
             : { gasLimit, replacedTxId: bumpTxId, nonce },
         },