@exodus/ethereum-lib 3.3.25 → 3.3.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "3.3.25",
+  "version": "3.3.27",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -18,6 +18,7 @@
     "@exodus/assets": "^8.0.84",
     "@exodus/aurora-meta": "^1.0.3",
     "@exodus/avalanchec-meta": "^1.0.4",
+    "@exodus/basemainnet-meta": "^1.0.2",
     "@exodus/basic-utils": "^0.7.0",
     "@exodus/bip32": "^1.0.0",
     "@exodus/bsc-meta": "^1.0.14",
@@ -36,12 +37,12 @@
     "@exodus/matic-meta": "^1.0.9",
     "@exodus/models": "^8.10.4",
     "@exodus/optimism-meta": "^1.2.6",
-    "@exodus/rootstock-meta": "^1.0.4",
+    "@exodus/rootstock-meta": "^1.0.5",
     "@exodus/solidity-contract": "^1.1.3",
     "base-x": "^3.0.2",
     "lodash": "^4.17.15",
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "a56649d200dc1c153e4785416e9b5ead6d17248f"
+  "gitHead": "954b8bbebc920fcb88c87a949f7496b59e0379f7"
 }

package/src/account-state/index.js

@@ -1,12 +1,21 @@
 import { AccountState } from '@exodus/models'
 
-export default function createEthereumLikeAccountState(asset) {
+import { parseLegacyBalances } from './parse-legacy-balances'
+
+// `assets` are only needed for chains that may need legacy parsing support
+export default function createEthereumLikeAccountState(asset, assets = {}) {
   return class EthereumLikeAccountState extends AccountState {
     static defaults = {
-      cursor: '',
+      startblock: 0,
       clarityCursor: '',
       balance: asset.currency.ZERO,
       tokenBalances: {},
     }
+
+    // legacy -- this should have no effect on Ethereum-like assets that do not have legacy account state
+    static _tokens = Object.values(assets)
+    static _postParse(data) {
+      return { ...data, tokenBalances: parseLegacyBalances(data.tokenBalances, assets) }
+    }
   }
 }

package/src/account-state/parse-legacy-balances.js

@@ -0,0 +1,32 @@
+import { isNumberUnit } from '@exodus/currency'
+import { isNumber, isString } from 'lodash'
+
+function parseBalance({ asset, balance }) {
+  const currency = asset.currency
+  if (isNumberUnit(balance)) {
+    if (balance.unitType.equals(currency)) {
+      return balance
+    } else {
+      throw new Error(
+        `Balance '${balance.toDefaultString()}' is not of currency ${currency.toString()}`
+      )
+    }
+  }
+  if (isString(balance)) {
+    return currency.parse(balance)
+  }
+  if (isNumber(balance)) {
+    return currency.defaultUnit(balance)
+  }
+  throw new Error(`Cannot parse balance '${balance}' of currency ${currency}`)
+}
+
+export const parseLegacyBalances = (tokenBalances, assets) =>
+  Object.fromEntries(
+    Object.entries(tokenBalances || {})
+      .filter(([assetName]) => assets[assetName])
+      .map(([assetName, balance]) => [
+        assetName,
+        parseBalance({ asset: assets[assetName], balance }),
+      ])
+  )

package/src/balances/polygon-balance.js

@@ -1,9 +1,20 @@
 import { get } from 'lodash'
+import assets from '@exodus/ethereum-meta'
+
+const polygon = assets.find(({ name: tokenName }) => tokenName === 'polygon')
 
 export const getPolygonBalances = ({ liquidBalance, accountState }) => {
-  const delegatedBalance = get(accountState, 'staking.polygon.delegatedBalance')
-  const unddelegatedBalance = get(accountState, 'staking.polygon.unclaimedUndelegatedBalance')
-  const totalBalance = liquidBalance.add(delegatedBalance).add(unddelegatedBalance)
+  const delegatedBalance = get(
+    accountState,
+    'staking.polygon.delegatedBalance',
+    polygon.currency.ZERO
+  )
+  const undelegatedBalance = get(
+    accountState,
+    'staking.polygon.unclaimedUndelegatedBalance',
+    polygon.currency.ZERO
+  )
+  const totalBalance = liquidBalance.add(delegatedBalance).add(undelegatedBalance)
   return {
     balance: totalBalance,
     liquidBalance,

package/src/selectors/get-can-accelerate-tx-factory.js

@@ -85,8 +85,8 @@ const calculateTxGasPrice = (tx) => tx.feeAmount.div(tx.data.gasLimit)
 
 export const calculateBumpedGasPrice = ({ baseAsset, tx, currentGasPrice, eip1559Enabled }) => {
   const usedGasPrice = calculateTxGasPrice(tx)
-  let bumpedGasPrice = usedGasPrice.mul(BUMP_RATE)
-  bumpedGasPrice = currentGasPrice.gt(bumpedGasPrice) ? currentGasPrice : bumpedGasPrice
+  const gasPrice = currentGasPrice.gt(usedGasPrice) ? currentGasPrice : usedGasPrice
+  const bumpedGasPrice = gasPrice.mul(BUMP_RATE)
 
   return eip1559Enabled && tx.data?.tipGasPrice
     ? {