@exodus/ethereum-api 8.9.3 → 8.10.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.10.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.9.4...@exodus/ethereum-api@8.10.0) (2024-07-16)
+
+
+### Features
+
+* expose params to overrideCallback for transaction monitors ([#2790](https://github.com/ExodusMovement/assets/issues/2790)) ([66b85a6](https://github.com/ExodusMovement/assets/commit/66b85a61304bcc1e7b258762b6754243ac6aca90))
+
+
+
+## [8.9.4](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.9.3...@exodus/ethereum-api@8.9.4) (2024-07-09)
+
+
+### Bug Fixes
+
+* **ethereum:** matic staking tx processing ([#2771](https://github.com/ExodusMovement/assets/issues/2771)) ([4caee9f](https://github.com/ExodusMovement/assets/commit/4caee9feb13d0c30d2f995abe2a974838893150d))
+
+
+
 ## [8.9.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.9.2...@exodus/ethereum-api@8.9.3) (2024-07-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.9.3",
+  "version": "8.10.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "719f0e01b420fdaa1722cc8b9df5c2d80763349a"
+  "gitHead": "00b2058d9dd0ed2c596a040a9df43a6ce0d77945"
 }

package/src/create-asset.js

@@ -108,7 +108,10 @@ export const createAssetFactory = ({
       encodePublic: encodePublicFactory({ chainId, useEip1191ChainIdChecksum }),
     }
 
-    const getBalances = getBalancesFactory({ monitorType })
+    const getBalances = getBalancesFactory({
+      monitorType,
+      config,
+    })
 
     const { createToken, getTokens } = createTokenFactory(
       { address, bip44, keys, getBalances },
@@ -262,6 +265,11 @@ export const createAssetFactory = ({
       ...(fuelThreshold && { fuelThreshold: asset.currency.defaultUnit(fuelThreshold) }),
       getEffectiveGasPrice,
     }
-    return overrideCallback({ asset: fullAsset })
+    return overrideCallback({
+      asset: fullAsset,
+      stakingConfiguration,
+      assetClientInterface,
+      monitorInterval,
+    })
   }
 }

package/src/get-balances.js

@@ -64,7 +64,9 @@ const getSpendable = ({ asset, balance, txLog, unconfirmedReceived }) => {
  * @param accountState the account state when the balance is loaded from RPC
  * @returns {{balance}|null} an object with the balance or null if the balance is unknown
  */
-export const getBalancesFactory = ({ monitorType }) => {
+export const getBalancesFactory = ({ monitorType, config = Object.create(null) }) => {
+  const { useAccountStateBalanceOnly } = config
+
   assert(monitorType, 'monitorType is required')
   return ({ asset, txLog, accountState }) => {
     const unconfirmedReceived = getUnconfirmedReceivedBalance({ asset, txLog })
@@ -78,7 +80,7 @@ export const getBalancesFactory = ({ monitorType }) => {
     let spendable
 
     // Balance from accountState is considered total b/c is fetched from rpc
-    if (isRpcBalanceAsset(asset) || monitorType === 'no-history') {
+    if (useAccountStateBalanceOnly || isRpcBalanceAsset(asset) || monitorType === 'no-history') {
       total = getBalanceFromAccountState({ asset, accountState }).sub(unconfirmedSent)
       spendable = total.sub(staked).sub(unstaking).sub(unstaked).sub(unconfirmedReceived)
     } else {

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

@@ -160,7 +160,7 @@ export class ClarityMonitor extends BaseMonitor {
     await this.removeFromTxLog(txsToRemove)
     await this.updateTxLogByAsset({ logItemsByAsset, walletAccount, refresh })
     if (refresh || hasNewTxs) {
-      const unknownTokenAddresses = this._getUnknownTokenAddresses({
+      const unknownTokenAddresses = this.getUnknownTokenAddresses({
         transactions: allTxs,
         tokensByAddress,
       })
@@ -258,7 +258,7 @@ export class ClarityMonitor extends BaseMonitor {
     return Object.fromEntries(entries)
   }
 
-  _getUnknownTokenAddresses({ transactions, tokensByAddress }) {
+  getUnknownTokenAddresses({ transactions, tokensByAddress }) {
     const set = transactions.reduce((acc, txn) => {
       const transfers = filterEffects(txn.effects, 'erc20') || []
       transfers.forEach((transfer) => {

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

@@ -188,7 +188,7 @@ export class EthereumMonitor extends BaseMonitor {
     await this.updateTxLogByAsset({ logItemsByAsset, walletAccount, refresh })
 
     if (refresh || hasNewIndex) {
-      const unknownTokenAddresses = this._getUnknownTokenAddresses({
+      const unknownTokenAddresses = this.getUnknownTokenAddresses({
         transactions: allTransactionsFromServer,
         tokensByAddress,
       })
@@ -264,7 +264,7 @@ export class EthereumMonitor extends BaseMonitor {
     })
   }
 
-  _getUnknownTokenAddresses({ transactions, tokensByAddress }) {
+  getUnknownTokenAddresses({ transactions, tokensByAddress }) {
     const set = transactions.reduce((acc, txn) => {
       const transfers = txn.erc20 || []
       transfers.forEach((transfer) => {

package/src/tx-log-staking-processor/asset-staking-tx-data.js

@@ -4,13 +4,11 @@ import {
   isEthereumUndelegate,
   isEthereumUndelegatePending,
 } from '../staking/ethereum/staking-utils'
-
 import { isPolygonClaimUndelegate, isPolygonDelegate, isPolygonUndelegate } from '../staking/matic'
-
 import {
-  decodePolygonStakingTxInputAmount,
-  decodeEthLikeStakingTxInputAmount,
   calculateRewardsFromStakeTx,
+  decodeEthLikeStakingTxInputAmount,
+  decodePolygonStakingTxInputAmount,
 } from './utils.js'
 
 const getEthereumStakingTxData = ({ tx, currency }) => {
@@ -53,7 +51,11 @@ const getEthereumStakingTxData = ({ tx, currency }) => {
 }
 
 const getPolygonStakingTxData = ({ tx, currency }) => {
-  if (['delegate', 'undelegate', 'claimUndelegate'].some((stakeTx) => tx.data?.[stakeTx])) return
+  if (
+    ['delegate', 'undelegate', 'claimUndelegate'].some((stakeTx) => tx.data?.[stakeTx]) &&
+    tx.coinAmount.isZero
+  )
+    return
 
   const txAmount = tx.coinAmount.toDefaultString()
 

package/src/tx-log-staking-processor/utils.js

@@ -1,7 +1,8 @@
-import { EthereumStaking, isEthereumStakingTx, MaticStakingApi } from '../staking'
 import { asset as ethereum } from '@exodus/ethereum-meta'
 import { asset as ethereumholesky } from '@exodus/ethereumholesky-meta'
 
+import { EthereumStaking, isEthereumStakingTx, MaticStakingApi } from '../staking'
+
 const polygonStakingApi = new MaticStakingApi()
 const ethereumStakingApi = new EthereumStaking(ethereum)
 const ethereumHoleskyStakingApi = new EthereumStaking(ethereumholesky)
@@ -35,7 +36,7 @@ export const calculateRewardsFromStakeTx = ({ tx, currency }) => {
   if (stakeTxContainsReward) {
     const txAmount = stakedAmount.sub(tx.coinAmount.abs()).abs()
     // eslint-disable-next-line @exodus/mutable/no-param-reassign-prop-only -- TODO: Fix this the next time the file is edited.
-    return txAmount.toBaseString()
+    return txAmount.toDefaultString()
   }
 }