@exodus/ethereum-api 8.25.2 → 8.26.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.26.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.26.0...@exodus/ethereum-api@8.26.1) (2025-01-22)
+
+
+### Bug Fixes
+
+
+* fix: remove additional derive data needed for tick (#4878)
+
+* fix: unstaked, unstaking balances (#4874)
+
+
+
+## [8.26.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.25.2...@exodus/ethereum-api@8.26.0) (2025-01-15)
+
+
+### Features
+
+
+* feat: ETH internal send and sent in txLog (#4858)
+
+
+
 ## [8.25.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.25.1...@exodus/ethereum-api@8.25.2) (2025-01-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.25.2",
+  "version": "8.26.1",
   "description": "Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Ethereum and EVM-based blockchains",
   "type": "module",
   "main": "src/index.js",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "4047b725fd2d9000e809e72074a82650f69c120f"
+  "gitHead": "c02457a2ad2142debd460a2b2263e84a2d8748a8"
 }

package/src/get-balances.js

@@ -17,14 +17,13 @@ const getStaking = ({ accountState, asset }) => {
   )
 }
 
-const getUnstaking = ({ accountState, asset }) => {
-  return accountState?.staking?.[asset.name]?.undelegatedBalance || asset.currency.ZERO
-}
-
-const getUnstaked = ({ accountState, asset }) => {
+const getUnclaimedUndelegatedBalance = ({ accountState, asset }) => {
   return accountState?.staking?.[asset.name]?.unclaimedUndelegatedBalance || asset.currency.ZERO
 }
 
+const getCanClaimUndelegatedBalance = ({ accountState, asset }) =>
+  accountState?.staking?.[asset.name]?.canClaimUndelegatedBalance || false
+
 /**
  * Calculates amount received in staking txs from txLog
  * Staking txs are counted based in the amount received in the tx (tx.coinAmount)
@@ -84,8 +83,13 @@ export const getBalancesFactory = ({ monitorType, config = Object.create(null) }
 
     const staked = getStaked({ asset, accountState })
     const staking = getStaking({ asset, accountState })
-    const unstaking = getUnstaking({ asset, accountState })
-    const unstaked = getUnstaked({ asset, accountState })
+
+    const canClaimUndelegatedBalance = getCanClaimUndelegatedBalance({ accountState, asset })
+
+    const unclaimedUndelegatedBalance = getUnclaimedUndelegatedBalance({ asset, accountState })
+
+    const unstaking = canClaimUndelegatedBalance ? asset.currency.ZERO : unclaimedUndelegatedBalance
+    const unstaked = canClaimUndelegatedBalance ? unclaimedUndelegatedBalance : asset.currency.ZERO
 
     let total
     let spendable

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

@@ -3,15 +3,12 @@ import { getAssetAddresses, isRpcBalanceAsset } from '@exodus/ethereum-lib'
 import lodash from 'lodash'
 
 import { fromHexToString } from '../number-utils.js'
-import {
-  filterEffects,
-  getDeriveDataNeededForTick,
-  getLogItemsFromServerTx,
-} from './clarity-utils/index.js'
+import { filterEffects, getLogItemsFromServerTx } from './clarity-utils/index.js'
 import {
   checkPendingTransactions,
   excludeUnchangedTokenBalances,
   getAllLogItemsByAsset,
+  getDeriveDataNeededForTick,
   getDeriveTransactionsToCheck,
 } from './monitor-utils/index.js'
 
@@ -176,19 +173,6 @@ export class ClarityMonitor extends BaseMonitor {
     }
   }
 
-  async deriveDataNeededForTick({ assetName, walletAccount }) {
-    const receiveAddress = await this.aci.getReceiveAddress({
-      assetName,
-      walletAccount,
-      useCache: true,
-    })
-    const currentAccountState = await this.aci.getAccountState({ assetName, walletAccount })
-    return {
-      ourWalletAddress: receiveAddress.toLowerCase(),
-      currentAccountState,
-    }
-  }
-
   async getNewAccountState({ tokens, currentTokenBalances, ourWalletAddress }) {
     const asset = this.asset
     const newAccountState = {}

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

@@ -58,6 +58,18 @@ export default function getLogItemsFromServerTx({
         sendingTransferPresent,
         receivingTransferPresent,
       })
+      let sent
+      if (sendingTransferPresent) {
+        sent = internalTransfers
+          .map(({ from, to, value }) => {
+            if (from === ourWalletAddress) {
+              const amount = asset.currency.baseUnit(value).toDefaultString({ unit: true })
+              return { address: to, amount }
+            }
+          })
+          .filter(Boolean)
+      }
+
       logItemsForServerTxEntries.push([
         asset.name,
         {
@@ -69,6 +81,7 @@ export default function getLogItemsFromServerTx({
             nonce,
             gasLimit,
             ...methodId,
+            ...(sent?.length > 0 ? { sent } : undefined),
           },
           ...(ourWalletWasSender
             ? { from: [], to: toAddress, feeAmount, feeCoinName: asset.feeAsset.name }

package/src/tx-log/clarity-utils/index.js

@@ -1,3 +1,2 @@
-export { default as getDeriveDataNeededForTick } from './get-derive-data-needed-for-tick.js'
 export { default as getLogItemsFromServerTx } from './get-log-items-from-server-tx.js'
 export { default as filterEffects } from './filter-effects.js'

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

@@ -56,6 +56,18 @@ export default function getLogItemsFromServerTx({
         sendingTransferPresent,
         receivingTransferPresent,
       })
+      let sent
+      if (sendingTransferPresent) {
+        sent = serverTx.internal
+          .map(({ from, to, value }) => {
+            if (from === ourWalletAddress) {
+              const amount = asset.currency.baseUnit(value).toDefaultString({ unit: true })
+              return { address: to, amount }
+            }
+          })
+          .filter(Boolean)
+      }
+
       logItemsForServerTxEntries.push([
         asset.name,
         {
@@ -67,6 +79,7 @@ export default function getLogItemsFromServerTx({
             nonce,
             gasLimit,
             ...methodId,
+            ...(sent?.length > 0 ? { sent } : undefined),
           },
           ...(ourWalletWasSender
             ? { from: [], to: toAddress, feeAmount, feeCoinName: asset.feeAsset.name }

package/src/tx-log/clarity-utils/get-derive-data-needed-for-tick.js

@@ -1,12 +0,0 @@
-// A super-selector that returns all the current data needed for a tick of the ETH monitor.
-
-export default function getDeriveDataNeededForTick(aci) {
-  return async function ({ assetName, walletAccount }) {
-    const receiveAddress = await aci.getReceiveAddress({ assetName, walletAccount, useCache: true })
-    const currentAccountState = await aci.getAccountState({ assetName, walletAccount })
-    return {
-      ourWalletAddress: receiveAddress.toLowerCase(),
-      currentAccountState,
-    }
-  }
-}