@exodus/ethereum-api 8.4.2 → 8.6.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.5.0...@exodus/ethereum-api@8.6.0) (2024-06-18)
+
+
+### Features
+
+* add tokenAssetType to base asset ([#2298](https://github.com/ExodusMovement/assets/issues/2298)) ([80c9dc8](https://github.com/ExodusMovement/assets/commit/80c9dc8a4d2a8614f84b66d2c9649cdf19601443))
+
+
+### Bug Fixes
+
+* add handling 400 error code for eth like  ([#2592](https://github.com/ExodusMovement/assets/issues/2592)) ([ac1121d](https://github.com/ExodusMovement/assets/commit/ac1121dab0cc451cfeeb8001915b11fc0bbe00a0))
+* send fromAddress when approving tokens ([#2600](https://github.com/ExodusMovement/assets/issues/2600)) ([25a08ff](https://github.com/ExodusMovement/assets/commit/25a08ff08ca02405fc39d5590c60b025e98e703a))
+
+
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.4.2",
+  "version": "8.6.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": "af504da8c4e9f5105c30b97b3e08e4e96f1e8fd4"
+  "gitHead": "1c873218d5be9cebd41509a7d88c4b003c09d353"
 }

package/src/allowance/index.js

@@ -33,6 +33,7 @@ export const createApprove =
     spenderAddress,
     asset,
     feeData,
+    fromAddress,
     approveAmount,
     gasLimit,
     txInput: preTxInput,
@@ -50,6 +51,7 @@ export const createApprove =
       txInput,
       feeData,
       isContract: true,
+      fromAddress,
     }
 
     gasLimit = gasLimit || (await fetchGasLimit(gasLimitOptions))
@@ -64,6 +66,7 @@ export const createApprove =
       gasPrice: feeData.gasPrice,
       gasLimit,
       silent: true,
+      fromAddress,
       ...rest,
     })
 

package/src/create-asset.js

@@ -58,7 +58,6 @@ export const createAssetFactory = ({
   nfts = false,
   serverUrl,
   stakingConfiguration = {},
-  tokenType,
   useEip1191ChainIdChecksum = false,
 }) => {
   assert(assetsList, 'assetsList is required')

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

@@ -29,7 +29,7 @@ export function create(defaultURL, ensAssetName) {
       )
     } catch (err) {
       let nerr = err
-      if (err.response && err.response.status === 500) {
+      if (err.response && (err.response.status === 500 || err.response.status === 400)) {
         try {
           const data = await err.response.json()
           const msg = data.error.replace(/^RPC error \(code: -\d+\): /, '')

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

@@ -1,6 +1,9 @@
 import {
+  // eslint-disable-next-line import/no-deprecated
   DEFAULT_SERVER_URLS,
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_ASSETS,
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_MONITOR_TYPES,
 } from '@exodus/ethereum-lib'
 
@@ -27,8 +30,11 @@ export function createEvmServer({ assetName, serverUrl, monitorType }) {
 
 // @Deprecated
 const serverMap = Object.fromEntries(
+  // eslint-disable-next-line import/no-deprecated
   ETHEREUM_LIKE_ASSETS.map((assetName) => {
+    // eslint-disable-next-line import/no-deprecated
     const monitorType = ETHEREUM_LIKE_MONITOR_TYPES[assetName]
+    // eslint-disable-next-line import/no-deprecated
     const serverUrl = DEFAULT_SERVER_URLS[assetName]
     return [assetName, createEvmServer({ assetName, serverUrl, monitorType })]
   })

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)

package/src/staking/ethereum/service.js

@@ -11,10 +11,9 @@ export function createEthereumStakingService({
   asset,
   assetClientInterface,
   createAndBroadcastTX,
-  getTelemetryId,
 }) {
   const staking = new EthereumStaking(asset)
-  const stakingProvider = stakingProviderClientFactory({ getTelemetryId })
+  const stakingProvider = stakingProviderClientFactory()
 
   function amountToCurrency({ asset, amount }) {
     return isNumberUnit(amount) ? amount : asset.currency.parse(amount)

package/src/staking/matic/service.js

@@ -5,14 +5,10 @@ import { MaticStakingApi } from './api'
 import { stakingProviderClientFactory } from '../staking-provider-client'
 import { isNumberUnit } from '@exodus/currency'
 
-export function createPolygonStakingService({
-  assetClientInterface,
-  createAndBroadcastTX,
-  getTelemetryId,
-}) {
+export function createPolygonStakingService({ assetClientInterface, createAndBroadcastTX }) {
   const stakingApi = new MaticStakingApi()
   const assetName = 'ethereum'
-  const stakingProvider = stakingProviderClientFactory({ getTelemetryId })
+  const stakingProvider = stakingProviderClientFactory()
 
   async function getStakeAssets() {
     const { polygon: asset, ethereum: feeAsset } = await assetClientInterface.getAssetsForNetwork({

package/src/staking/staking-provider-client.js

@@ -6,7 +6,7 @@ const DEFAULT_STAKING_URL = 'https://staking.a.exodus.io'
 const HTTP_POST_TIMEOUT = ms('30s')
 
 export const stakingProviderClientFactory = (
-  { defaultStakingUrl = DEFAULT_STAKING_URL, getTelemetryId } = Object.create(null)
+  { defaultStakingUrl = DEFAULT_STAKING_URL } = Object.create(null)
 ) => {
   assert(defaultStakingUrl, '"defaultStakingUrl" must be provided')
 
@@ -22,11 +22,8 @@ export const stakingProviderClientFactory = (
   }
 
   const stakingRequest = async ({ asset, data }) => {
-    const headers = {}
-    if (typeof getTelemetryId === 'function') headers.telemetryId = await getTelemetryId()
     return fetchival(stakingUrl, {
       timeout: HTTP_POST_TIMEOUT,
-      headers,
     })(asset)('stake').post(data)
   }
 

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

@@ -1,4 +1,5 @@
 import { getServer } from '../exodus-eth-server'
+// eslint-disable-next-line import/no-deprecated
 import { DEFAULT_SERVER_URLS } from '@exodus/ethereum-lib'
 import { Tx } from '@exodus/models'
 
@@ -31,6 +32,7 @@ export class EthereumNoHistoryMonitor extends BaseMonitor {
 
   setServer(config) {
     if (!config?.server) {
+      // eslint-disable-next-line import/no-deprecated
       this.server.setURI(DEFAULT_SERVER_URLS[this.asset.name])
       return
     }