@exodus/ethereum-lib 2.19.3 → 2.20.0

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "2.19.3",
+  "version": "2.20.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
+  "files": [
+    "src",
+    "!src/**/__tests__"
+  ],
   "author": "Exodus Movement, Inc.",
   "license": "UNLICENSED",
   "homepage": "https://github.com/ExodusMovement/ethereum#readme",
@@ -24,5 +28,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "079d56fb0055573854a0a4b4bca145ffd83de883"
+  "gitHead": "57fae619663ea5193c733bd089c9031447f0d025"
 }

package/src/fee-data/avalanchec.js

@@ -5,6 +5,7 @@ export default new FeeData(
     // https://snowtrace.io/chart/gasprice
     // https://stats.avax.network/dashboard/c-chain-activity/
     gasPrice: '225 nAVAX',
+    baseFeePerGas: '100 nAVAX',
     max: '1000 nAVAX',
     min: '25 nAVAX',
     fuelThreshold: '20000 nAVAX',

package/src/fee-data/ethereum.js

@@ -3,6 +3,7 @@ import { FeeData } from '@exodus/asset-lib'
 export default new FeeData(
   {
     gasPrice: '75 Gwei',
+    baseFeePerGas: '50 Gwei',
     max: '250 Gwei',
     min: '1 Gwei',
     fuelThreshold: '0.025 ETH',

package/src/fee-data/polygon.js

@@ -4,6 +4,7 @@ export default new FeeData(
   {
     // https://polygonscan.com/chart/gasprice
     gasPrice: '5 Gwei',
+    baseFeePerGas: '100 Gwei',
     max: '300 Gwei',
     min: '40 Gwei',
     fuelThreshold: '2500000 Gwei',

package/src/monitor-utils/get-all-log-items-by-asset.js

@@ -12,10 +12,7 @@ export default function getAllLogItemsByAsset({
   assets,
 }) {
   const allAssets = [asset, ...tokensByAddress.values()]
-  const logItemsByAsset = allAssets.reduce((allItems, asset) => {
-    allItems[asset.name] = []
-    return allItems
-  }, {})
+  const logItemsByAsset = Object.fromEntries(allAssets.map((asset) => [asset.name, []]))
 
   allTransactionsFromServer.forEach((serverTx) => {
     const logItemsByAssetForServerTx = getLogItemsFromServerTx({

package/src/monitor-utils/get-derive-transactions-to-check.js

@@ -3,11 +3,13 @@ import getSenderNonceKey from './get-sender-nonce-key'
 
 const UNCONFIRMED_TX_LIMIT = ms('5m')
 
+const mapToObject = (map) => Object.fromEntries([...map.entries()]) // only for string keys
+
 export default function getDeriveTransactionsToCheck({ getTxLog }) {
   return async ({ assetName: _assetName, walletAccount, tokens, ourWalletAddress }) => {
-    const pendingTransactionsToCheck = {}
-    const pendingTransactionsGroupedByAddressAndNonce = {}
-    const simulatedTransactions = {}
+    const pendingTransactionsToCheck = new Map()
+    const pendingTransactionsGroupedByAddressAndNonce = new Map()
+    const simulatedTransactions = new Map()
     const now = Date.now()
 
     for (const assetName of [_assetName, ...tokens.map(({ name }) => name)]) {
@@ -15,33 +17,35 @@ export default function getDeriveTransactionsToCheck({ getTxLog }) {
       for (const tx of txSet) {
         // ERC20 sends have an entry in ETH and one in the ERC20 log so we just want the ETH one
         if (
-          !pendingTransactionsToCheck[tx.txId] &&
+          !pendingTransactionsToCheck.has(tx.txId) &&
           tx.pending &&
           now - tx.date.getTime() > UNCONFIRMED_TX_LIMIT
         ) {
-          pendingTransactionsToCheck[tx.txId] = { tx, assetName }
+          pendingTransactionsToCheck.set(tx.txId, { tx, assetName })
         }
-        if (tx.meta.simulated) simulatedTransactions[tx.txId] = tx
+        if (tx.meta.simulated) simulatedTransactions.set(tx.txId, tx)
 
         const senderNonceKey = getSenderNonceKey(tx, ourWalletAddress)
         if (
           tx.pending &&
-          !pendingTransactionsGroupedByAddressAndNonce[senderNonceKey] &&
+          !pendingTransactionsGroupedByAddressAndNonce.has(senderNonceKey) &&
           !tx.dropped
         ) {
-          pendingTransactionsGroupedByAddressAndNonce[senderNonceKey] = {
+          pendingTransactionsGroupedByAddressAndNonce.set(senderNonceKey, {
             tx,
             replaced: false,
             assetName,
-          }
+          })
         }
       }
     }
 
     return {
-      pendingTransactionsToCheck,
-      pendingTransactionsGroupedByAddressAndNonce,
-      simulatedTransactions,
+      pendingTransactionsToCheck: mapToObject(pendingTransactionsToCheck),
+      pendingTransactionsGroupedByAddressAndNonce: mapToObject(
+        pendingTransactionsGroupedByAddressAndNonce
+      ),
+      simulatedTransactions: mapToObject(simulatedTransactions),
     }
   }
 }

package/src/monitor-utils/get-log-items-from-server-tx.js

@@ -37,7 +37,7 @@ export default function getLogItemsFromServerTx({
     dropped: false,
   }
 
-  const logItemsForServerTx = {}
+  const logItemsForServerTxEntries = []
 
   {
     const sendingTransferPresent = ethereumTransfers.some(({ from }) => from === ourWalletAddress)
@@ -51,28 +51,30 @@ export default function getLogItemsFromServerTx({
         sendingTransferPresent,
         receivingTransferPresent,
       })
-      logItemsForServerTx[asset.name] = {
-        ...logItemCommonProperties,
-        coinAmount,
-        coinName: asset.name,
-        data: {
-          data: serverTx.data || '0x',
-          nonce,
-          gasLimit,
+      logItemsForServerTxEntries.push([
+        asset.name,
+        {
+          ...logItemCommonProperties,
+          coinAmount,
+          coinName: asset.name,
+          data: {
+            data: serverTx.data || '0x',
+            nonce,
+            gasLimit,
+          },
+          from: ourWalletWasSender ? [] : [serverTx.from],
+          to: ourWalletWasSender ? toAddress : undefined,
+          selfSend,
+          tokens: getNamesOfTokensTransferredByServerTx({
+            asset,
+            tokensByAddress,
+            serverTx,
+            ourWalletAddress,
+          }),
         },
-        from: ourWalletWasSender ? [] : [serverTx.from],
-        to: ourWalletWasSender ? toAddress : undefined,
-        selfSend,
-        tokens: getNamesOfTokensTransferredByServerTx({
-          asset,
-          tokensByAddress,
-          serverTx,
-          ourWalletAddress,
-        }),
-      }
+      ])
     }
   }
-
   // handle erc20
   Object.entries(tokenTransfersByTokenName).forEach(([tokenName, tokenTransfers]) => {
     const sendingTransferPresent = tokenTransfers.some(({ from }) => from === ourWalletAddress)
@@ -103,18 +105,21 @@ export default function getLogItemsFromServerTx({
       receivingTransferPresent,
     })
 
-    logItemsForServerTx[tokenName] = {
-      ...logItemCommonProperties,
-      coinAmount,
-      coinName: tokenName,
-      data: { nonce, gasLimit },
-      from: isConsideredSent ? [] : tokenFromAddresses,
-      to: isConsideredSent ? tokenTransferToAddress : undefined,
-      selfSend,
-    }
+    logItemsForServerTxEntries.push([
+      tokenName,
+      {
+        ...logItemCommonProperties,
+        coinAmount,
+        coinName: tokenName,
+        data: { nonce, gasLimit },
+        from: isConsideredSent ? [] : tokenFromAddresses,
+        to: isConsideredSent ? tokenTransferToAddress : undefined,
+        selfSend,
+      },
+    ])
   })
 
-  return logItemsForServerTx
+  return Object.fromEntries(logItemsForServerTxEntries)
 }
 
 const tryFindExternalRecipient = (transfers, ourWalletAddress) =>