@exodus/ethereum-api 8.20.0 → 8.20.1

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.20.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.20.0...@exodus/ethereum-api@8.20.1) (2024-10-25)
+
+
+### Bug Fixes
+
+* remove unconfirmed receive from total balance on evm tokens ([#4338](https://github.com/ExodusMovement/assets/issues/4338)) ([eb5e9af](https://github.com/ExodusMovement/assets/commit/eb5e9afb0cf5b84da6d77d573c77a08a47852b94))
+
+
+
 ## [8.20.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.19.1...@exodus/ethereum-api@8.20.0) (2024-10-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.20.0",
+  "version": "8.20.1",
   "description": "Ethereum Api",
   "type": "module",
   "main": "src/index.js",
@@ -64,5 +64,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "a3826445e762843c0bccc5d9f94ecbb9dfe9648d"
+  "gitHead": "b170fd8817e953f92d4fe38e1686d9e7bdbd92ea"
 }

package/src/gas-estimation.js

@@ -1,5 +1,5 @@
 import { currency2buffer, isEthereumLikeToken } from '@exodus/ethereum-lib'
-import * as ethUtil from '@exodus/ethereumjs-util'
+import { bufferToHex, toBuffer } from '@exodus/ethereumjs-util'
 import BN from 'bn.js'
 
 import { estimateGas, isContractAddressCached } from './eth-like-util.js'
@@ -28,7 +28,7 @@ export async function estimateGasLimit(
     from: fromAddress,
     to: toAddress,
     value: normalizeAmount(amount),
-    data: Buffer.isBuffer(data) ? ethUtil.bufferToHex(data) : data,
+    data: Buffer.isBuffer(data) ? bufferToHex(data) : data,
     gasPrice: normalizeGasPrice(gasPrice),
   }
 
@@ -41,9 +41,7 @@ export async function estimateGasLimit(
 
 export function resolveDefaultTxInput({ asset, toAddress, amount }) {
   return isEthereumLikeToken(asset)
-    ? ethUtil.bufferToHex(
-        asset.contract.transfer.build(toAddress.toLowerCase(), amount.toBaseString())
-      )
+    ? bufferToHex(asset.contract.transfer.build(toAddress.toLowerCase(), amount.toBaseString()))
     : '0x'
 }
 
@@ -64,8 +62,7 @@ export async function fetchGasLimit({
 
   const txInput = providedTxInput || resolveDefaultTxInput({ asset, toAddress, amount })
 
-  const defaultGasLimit = () =>
-    asset.gasLimit + GAS_PER_NON_ZERO_BYTE * ethUtil.toBuffer(txInput).length
+  const defaultGasLimit = () => asset.gasLimit + GAS_PER_NON_ZERO_BYTE * toBuffer(txInput).length
 
   const isContract = await isContractAddressCached({ asset, address: toAddress })
 
@@ -90,7 +87,7 @@ export async function fetchGasLimit({
   // calling forwarder contracts with a bumped gas limit causes 'Out Of Gas' error on chain
   // Since geth v1.9.14 estimateGas will throw if user does not have enough ETH.
   // If gasPrice is set to zero, estimateGas will make the expected estimation.
-  const gasPrice = ethUtil.bufferToHex(currency2buffer(asset.baseAsset.currency.ZERO))
+  const gasPrice = bufferToHex(currency2buffer(asset.baseAsset.currency.ZERO))
 
   try {
     return await estimateGasLimit(
@@ -120,7 +117,7 @@ function normalizeAmount(amount) {
     amount = currency2buffer(amount)
   }
 
-  amount = ethUtil.bufferToHex(amount)
+  amount = bufferToHex(amount)
   while (amount[2] === '0') amount = '0x' + amount.slice(3)
   if (amount === '0x') amount = '0x0'
 

package/src/get-balances.js

@@ -77,7 +77,7 @@ export const getBalancesFactory = ({ monitorType, config = Object.create(null) }
     // Balance from accountState is considered total b/c is fetched from rpc
     if (useAccountStateBalanceOnly || isRpcBalanceAsset(asset) || monitorType === 'no-history') {
       total = getBalanceFromAccountState({ asset, accountState }).sub(unconfirmedSent)
-      spendable = total.sub(staked).sub(unstaking).sub(unstaked).sub(unconfirmedReceived)
+      spendable = total.sub(staked).sub(unstaking).sub(unstaked)
     } else {
       // Balance from txLog does not include staking rewards
       // spendable and total are calculated differently based on staking txs
@@ -87,7 +87,7 @@ export const getBalancesFactory = ({ monitorType, config = Object.create(null) }
         txLog,
         unconfirmedReceived,
       })
-      total = spendable.add(unconfirmedReceived).add(staked).add(unstaking).add(unstaked)
+      total = spendable.add(staked).add(unstaking).add(unstaked)
     }
 
     return {

package/src/optimism-gas/index.js

@@ -1,5 +1,5 @@
 import { createContract, createEthereumJsTx } from '@exodus/ethereum-lib'
-import * as ethUtil from '@exodus/ethereumjs-util'
+import { bufferToHex } from '@exodus/ethereumjs-util'
 import assert from 'minimalistic-assert'
 
 import { fromHexToBigInt } from '../number-utils.js'
@@ -13,7 +13,7 @@ export const estimateL1DataFeeFactory = ({ l1GasOracleAddress, server }) => {
     const serialized = ethjsTx.serialize()
     const callData = gasContract.getL1Fee.build(serialized)
     const buffer = Buffer.from(callData)
-    const data = ethUtil.bufferToHex(buffer)
+    const data = bufferToHex(buffer)
     const hex = await server.ethCall({ to: l1GasOracleAddress, data }, 'latest')
     const l1DataFee = fromHexToBigInt(hex)
     const padFee = l1DataFee / BigInt(4)

package/src/tx-log/monitor-utils/get-fee-amount.js

@@ -7,8 +7,5 @@ export default function getFeeAmount(asset, serverTx) {
   // genesis, coinbase, uncles
   if (!gasPrice) return asset.currency.ZERO
 
-  return asset.currency
-    .baseUnit(gasUsed || gasLimit)
-    .mul(gasPrice)
-    .toDefault()
+  return asset.currency.baseUnit(gasUsed || gasLimit).mul(gasPrice)
 }