@exodus/ethereum-api 8.20.1 → 8.21.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.21.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.20.1...@exodus/ethereum-api@8.21.0) (2024-10-28)
+
+
+### Features
+
+* introduce exodus/ethereumjs ([#4339](https://github.com/ExodusMovement/assets/issues/4339)) ([e81d577](https://github.com/ExodusMovement/assets/commit/e81d5771c4956a22cfcf434a999310bbb5be81a3))
+
+
+### Bug Fixes
+
+* ETH getBalances with staking info ([#4348](https://github.com/ExodusMovement/assets/issues/4348)) ([19f790c](https://github.com/ExodusMovement/assets/commit/19f790cd6e422307a8c6852d2dd8eca6a16ea95a))
+
+
+
 ## [8.20.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.20.0...@exodus/ethereum-api@8.20.1) (2024-10-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.20.1",
+  "version": "8.21.0",
   "description": "Ethereum Api",
   "type": "module",
   "main": "src/index.js",
@@ -31,7 +31,7 @@
     "@exodus/ethereum-lib": "^5.4.0",
     "@exodus/ethereum-meta": "^2.0.0",
     "@exodus/ethereumholesky-meta": "^2.0.0",
-    "@exodus/ethereumjs-util": "^7.1.0-exodus.7",
+    "@exodus/ethereumjs": "^1.0.0",
     "@exodus/fetch": "^1.3.0",
     "@exodus/models": "^12.0.1",
     "@exodus/simple-retry": "^0.0.6",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "b170fd8817e953f92d4fe38e1686d9e7bdbd92ea"
+  "gitHead": "348e70ac005cfaf08b3336e86a8cbcd845f5170c"
 }

package/src/exodus-eth-server/api-coin-nodes.js

@@ -1,4 +1,4 @@
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import SolidityContract from '@exodus/solidity-contract'
 import EventEmitter from 'events'
 import lodash from 'lodash'

package/src/exodus-eth-server/api.js

@@ -1,5 +1,5 @@
 import { randomUUID } from '@exodus/crypto/randomUUID'
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import fetchival from '@exodus/fetch/experimental/fetchival'
 import { retry } from '@exodus/simple-retry'
 import SolidityContract from '@exodus/solidity-contract'

package/src/exodus-eth-server/clarity.js

@@ -1,4 +1,4 @@
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import SolidityContract from '@exodus/solidity-contract'
 import EventEmitter from 'events'
 import io from 'socket.io-client'

package/src/gas-estimation.js

@@ -1,5 +1,5 @@
 import { currency2buffer, isEthereumLikeToken } from '@exodus/ethereum-lib'
-import { bufferToHex, toBuffer } from '@exodus/ethereumjs-util'
+import { bufferToHex, toBuffer } from '@exodus/ethereumjs/util'
 import BN from 'bn.js'
 
 import { estimateGas, isContractAddressCached } from './eth-like-util.js'

package/src/get-balances.js

@@ -35,11 +35,20 @@ export const getStakingHistoryBalance = ({ asset, txLog }) => {
   let stakingHistoryBalance = asset.currency.ZERO
   for (const tx of txLog) {
     const successfulTx = tx.confirmations && !tx.failed
-    if (successfulTx && tx.data?.txAmount) {
+    const txData = tx.data
+
+    // staking tx must has data value
+    if (!txData) continue
+
+    let { txAmount } = txData
+    if (successfulTx && (txAmount || txData.delegate)) {
       // only staking txs have tx.data.txAmount set
-      // tx.data.txAmount is negative for stake tx type
-      const txAmount = asset.currency.defaultUnit(tx.data.txAmount)
-      stakingHistoryBalance = stakingHistoryBalance.add(txAmount)
+
+      if (txData.delegate && !txAmount) {
+        txAmount = txData.delegate // fix missing txAmount in stakeTx
+      }
+
+      stakingHistoryBalance = stakingHistoryBalance.add(asset.currency.defaultUnit(txAmount))
     }
   }
 

package/src/optimism-gas/index.js

@@ -1,5 +1,5 @@
 import { createContract, createEthereumJsTx } from '@exodus/ethereum-lib'
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 import { fromHexToBigInt } from '../number-utils.js'

package/src/staking/ethereum/api.js

@@ -1,5 +1,5 @@
 import { createContract } from '@exodus/ethereum-lib'
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import { retry } from '@exodus/simple-retry'
 
 import { getServerByName } from '../../exodus-eth-server/index.js'

package/src/staking/matic/api.js

@@ -1,6 +1,6 @@
 import { createContract } from '@exodus/ethereum-lib'
 import ethAssets from '@exodus/ethereum-meta'
-import { bufferToHex } from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs/util'
 import { retry } from '@exodus/simple-retry'
 import BN from 'bn.js'