@exodus/ethereum-api 4.0.3-alpha1 → 4.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "4.0.3-alpha1",
+  "version": "4.0.4",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.26.1-alpha2",
+    "@exodus/ethereum-lib": "^2.26.1",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",

package/src/get-balances.js

@@ -1,4 +1,4 @@
-import { ETHEREUM_LIKE_MONITOR_TYPES, isRpcBalanceAsset } from '@exodus/ethereum-lib'
+import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
 
 const fixBalance = ({ txLog, balance }) => {
   for (const tx of txLog) {
@@ -23,10 +23,7 @@ const fixBalance = ({ txLog, balance }) => {
  * @returns {{balance}|null} an object with the balance or null if the balance is unknown/zero
  */
 export const getBalances = ({ asset, txLog, accountState }) => {
-  if (
-    isRpcBalanceAsset(asset) ||
-    ETHEREUM_LIKE_MONITOR_TYPES[asset.baseAsset.name] === 'no-history'
-  ) {
+  if (isRpcBalanceAsset(asset)) {
     const balance =
       asset.baseAsset.name === asset.name
         ? accountState?.balance

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

@@ -76,24 +76,24 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
   async deriveData({ assetSource, tokens }) {
     const { assetName, walletAccount } = assetSource
 
+    const { ourWalletAddress } = await this.deriveDataNeededForTick({ assetName, walletAccount })
     const {
-      ourWalletAddress,
-      currentAccountState,
-      minimumConfirmations,
-    } = await this.deriveDataNeededForTick({ assetName, walletAccount })
-    const transactionsToCheck = await this.deriveTransactionsToCheck({
+      pendingTransactionsGroupedByAddressAndNonce,
+      pendingTransactionsToCheck,
+    } = await this.deriveTransactionsToCheck({
       assetName,
       walletAccount,
       tokens,
       ourWalletAddress,
     })
 
-    return {
-      ourWalletAddress,
-      currentAccountState,
-      minimumConfirmations,
-      ...transactionsToCheck,
-    }
+    const pendingTransactions = unionBy(
+      Object.values(pendingTransactionsGroupedByAddressAndNonce),
+      Object.values(pendingTransactionsToCheck),
+      'tx.txId'
+    )
+
+    return { ourWalletAddress, pendingTransactions }
   }
 
   async getTransactionsFromNode(transactions) {
@@ -107,37 +107,25 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
     return zipObject(txIds, responses)
   }
 
-  async checkPendingTransactions({
-    pendingTransactionsGroupedByAddressAndNonce,
-    pendingTransactionsToCheck,
-    walletAccount,
-  }) {
+  async checkPendingTransactions({ pendingTransactions, pendingTxsFromNode, walletAccount }) {
     const txsToUpdate = []
     const txsToRemove = []
     const now = Date.now()
 
-    const pendingTransactions = unionBy(
-      Object.values(pendingTransactionsGroupedByAddressAndNonce),
-      Object.values(pendingTransactionsToCheck),
-      'tx.txId'
-    )
-
     if (isEmpty(pendingTransactions))
       return {
         txsToUpdate,
         txsToRemove,
       }
 
-    const txsFromNode = await this.getTransactionsFromNode(pendingTransactions)
-
     for (const { tx, assetName } of pendingTransactions) {
-      const txFromNode = txsFromNode[tx.txId]
-      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT) {
+      const txFromNode = pendingTxsFromNode[tx.txId]
+      if (now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT && txFromNode?.blockHash == null) {
         txsToRemove.push({
           tx,
           assetSource: { asset: assetName, walletAccount },
         })
-      } else if (txFromNode.blockHash !== null) {
+      } else if (txFromNode?.blockHash !== null) {
         txsToUpdate.push({
           tx: { ...tx, confirmations: 1 },
           assetSource: { asset: assetName, walletAccount },
@@ -157,32 +145,30 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
     const assetSource = { assetName: this.asset.name, walletAccount }
 
-    const {
-      ourWalletAddress,
-      pendingTransactionsGroupedByAddressAndNonce,
-      pendingTransactionsToCheck,
-    } = await this.deriveData({
+    const { ourWalletAddress, pendingTransactions } = await this.deriveData({
       assetSource,
       tokens,
     })
 
-    const accountState = await this.getNewAccountState({
-      tokens,
-      ourWalletAddress,
-    })
+    const pendingTxsFromNode = await this.getTransactionsFromNode(pendingTransactions)
 
     const { txsToUpdate, txsToRemove } = await this.checkPendingTransactions({
-      pendingTransactionsGroupedByAddressAndNonce,
-      pendingTransactionsToCheck,
+      pendingTransactions,
+      pendingTxsFromNode,
       walletAccount,
     })
 
     const logItemsByAsset = {}
 
     txsToUpdate.forEach((txToUpdate) => {
-      logItemsByAsset[txToUpdate.assetSource.asset] =
-        logItemsByAsset[txToUpdate.assetSource.asset] || []
-      logItemsByAsset[txToUpdate.assetSource.asset].push(Tx.fromJSON(txToUpdate.tx))
+      const assetName = txToUpdate.assetSource.asset
+      logItemsByAsset[assetName] = logItemsByAsset[assetName] || []
+      logItemsByAsset[assetName].push(Tx.fromJSON(txToUpdate.tx))
+    })
+
+    const accountState = await this.getNewAccountState({
+      tokens,
+      ourWalletAddress,
     })
 
     await this.updateAccountState({ newData: { ...accountState }, walletAccount })