@exodus/ethereum-api 8.4.1 → 8.5.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.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.4.2...@exodus/ethereum-api@8.5.0) (2024-06-17)
+
+
+### Features
+
+* balance-utils for getBalances ([#2585](https://github.com/ExodusMovement/assets/issues/2585)) ([ee1aaa6](https://github.com/ExodusMovement/assets/commit/ee1aaa6c669bfdbbc6f3053167b678b98b5ef70d))
+
+
+
+## [8.4.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.4.1...@exodus/ethereum-api@8.4.2) (2024-06-14)
+
+
+### Bug Fixes
+
+* **ethereum:** duplicate 'confirmationsNumber' argument in createAsset() ([#2569](https://github.com/ExodusMovement/assets/issues/2569)) ([7472fe5](https://github.com/ExodusMovement/assets/commit/7472fe5476839f879bad4fc82a9085d84d6868e9))
+
+
+
 ## [8.4.1](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.4.0...@exodus/ethereum-api@8.4.1) (2024-06-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.4.1",
+  "version": "8.5.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -20,7 +20,7 @@
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^4.1.0",
+    "@exodus/asset-lib": "^4.2.0",
     "@exodus/assets": "^9.1.1",
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip44-constants": "^195.0.0",
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "fca8781b6cb3e3e3148df5885e4f60ddd6746623"
+  "gitHead": "7f584775d566248fa9633086baee1064edbe8ef0"
 }

package/src/create-asset.js

@@ -40,27 +40,26 @@ import { createWeb3API } from './web3'
 import getFeeAsyncFactory from './get-fee-async'
 
 export const createAssetFactory = ({
-  assetsList,
-  feeData,
   AccountState: CustomAccountState,
-  monitorInterval,
-  nfts = false,
-  useEip1191ChainIdChecksum = false,
-  customTokens = true,
-  isTestnet = false,
-  isMaxFeeAsset = false,
-  erc20FuelBuffer,
-  fuelThreshold,
+  assetsList,
+  confirmationsNumber,
   customBip44,
   customCreateGetKeyIdentifier,
+  customTokens = true,
+  erc20FuelBuffer,
+  feeData,
   feeMonitorInterval,
+  fuelThreshold,
+  isMaxFeeAsset = false,
+  isTestnet = false,
   l1GasOracleAddress, // l1 extra fee for base and optostakingConfiguration = {},
-  serverUrl,
-  confirmationsNumber,
+  monitorInterval,
   monitorType = 'magnifier',
-  tokenType,
-  confirmationNumber,
+  nfts = false,
+  serverUrl,
   stakingConfiguration = {},
+  tokenType,
+  useEip1191ChainIdChecksum = false,
 }) => {
   assert(assetsList, 'assetsList is required')
   assert(feeData, 'feeData is required')
@@ -216,7 +215,7 @@ export const createAssetFactory = ({
       features,
       getBalances,
       getBalanceForAddress: createGetBalanceForAddress({ asset, server }),
-      getConfirmationsNumber: () => confirmationNumber,
+      getConfirmationsNumber: () => confirmationsNumber,
       getDefaultAddressPath: () => defaultAddressPath,
       getFeeAsync: getFeeAsyncFactory({ assetClientInterface, gasLimit, createUnsignedTx }),
       getFee,

package/src/get-balances.js

@@ -1,19 +1,12 @@
 import { isRpcBalanceAsset } from '@exodus/ethereum-lib'
 
 import { get } from 'lodash'
-
-const getBalanceFromAccountState = ({ asset, accountState }) => {
-  const isBase = asset.name === asset.baseAsset.name
-  return get(
-    accountState,
-    isBase ? ['balance'] : ['tokenBalances', asset.name],
-    asset.currency.ZERO
-  )
-}
-
-const getBalanceFromTxLog = ({ txLog, asset }) => {
-  return txLog.size > 0 ? txLog.getMutations().slice(-1)[0].balance : asset.currency.ZERO
-}
+import {
+  getBalanceFromAccountState,
+  getBalanceFromTxLog,
+  getUnconfirmedReceivedBalance,
+  getUnconfirmedSentBalance,
+} from '@exodus/asset-lib'
 
 const getStaked = ({ accountState, asset }) => {
   return get(accountState, ['staking', asset.name, 'delegatedBalance']) || asset.currency.ZERO
@@ -29,35 +22,6 @@ const getUnstaked = ({ accountState, asset }) => {
   )
 }
 
-const getUnconfirmedSentBalanceFromTxLog = ({ asset, txLog }) => {
-  let result = asset.currency.ZERO
-
-  for (const tx of txLog) {
-    const isUnconfirmed = !tx.failed && tx.pending
-
-    if (isUnconfirmed && tx.sent) {
-      result = result.add(tx.coinAmount.abs())
-      if (tx.feeAmount && tx.coinAmount.unitType.equals(tx.feeAmount.unitType)) {
-        result = result.add(tx.feeAmount.abs())
-      }
-    }
-  }
-
-  return result
-}
-
-const getUnconfirmedReceivedBalanceFromTxLog = ({ asset, txLog }) => {
-  let result = asset.currency.ZERO
-  for (const tx of txLog) {
-    const isUnconfirmed = !tx.failed && tx.pending
-    if (isUnconfirmed && !tx.sent) {
-      result = result.add(tx.coinAmount.abs())
-    }
-  }
-
-  return result
-}
-
 /**
  * Api method to return the balance based on either account state balances or tx history.
  *
@@ -67,8 +31,8 @@ const getUnconfirmedReceivedBalanceFromTxLog = ({ asset, txLog }) => {
  * @returns {{balance}|null} an object with the balance or null if the balance is unknown
  */
 export const getBalances = ({ asset, txLog, accountState }) => {
-  const unconfirmedReceived = getUnconfirmedReceivedBalanceFromTxLog({ asset, txLog })
-  const unconfirmedSent = getUnconfirmedSentBalanceFromTxLog({ asset, txLog })
+  const unconfirmedReceived = getUnconfirmedReceivedBalance({ asset, txLog })
+  const unconfirmedSent = getUnconfirmedSentBalance({ asset, txLog })
 
   // balance from txLog / rpc is considered to be total
   const balanceWithoutUnconfirmedSent = isRpcBalanceAsset(asset)