@exodus/ethereum-api 8.18.2 → 8.19.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.19.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.18.3...@exodus/ethereum-api@8.19.0) (2024-09-26)
+
+
+### Features
+
+* allow enable and disable custom tokens/nfts per wallet ([#4014](https://github.com/ExodusMovement/assets/issues/4014)) ([9c9864d](https://github.com/ExodusMovement/assets/commit/9c9864d4bfae5b4711704ba3442f1e7dc8231795))
+* enable evm fee monitor clarity/magnifier ([#3954](https://github.com/ExodusMovement/assets/issues/3954)) ([2f64696](https://github.com/ExodusMovement/assets/commit/2f646966889b44b67fafd4f86f51f95d084fa1e2))
+
+
+
+## [8.18.3](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.18.2...@exodus/ethereum-api@8.18.3) (2024-09-17)
+
+
+### Bug Fixes
+
+* **staking:** ETH unstake event ([#3552](https://github.com/ExodusMovement/assets/issues/3552)) ([116fa18](https://github.com/ExodusMovement/assets/commit/116fa18dd2d29e549e0aae30e8e849203f013a75))
+
+
+
 ## [8.18.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-api@8.18.1...@exodus/ethereum-api@8.18.2) (2024-09-17)
 
 **Note:** Version bump only for package @exodus/ethereum-api

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "8.18.2",
+  "version": "8.19.0",
   "description": "Ethereum Api",
   "type": "module",
   "main": "src/index.js",
@@ -65,5 +65,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "ddeb04e25e5cb7dda81cc453c292e3aa6bfa25a1"
+  "gitHead": "5ed11ccb5d6268dad10582ffd1df7aeae6993f09"
 }

package/src/create-asset.js

@@ -45,7 +45,7 @@ export const createAssetFactory = ({
   confirmationsNumber,
   customBip44,
   customCreateGetKeyIdentifier,
-  customTokens = true,
+  customTokens: defaultCustomTokens = true,
   erc20FuelBuffer,
   feeData,
   feeMonitorInterval,
@@ -55,7 +55,7 @@ export const createAssetFactory = ({
   l1GasOracleAddress, // l1 extra fee for base and optostakingConfiguration = {},
   monitorInterval,
   monitorType = 'magnifier',
-  nfts = false,
+  nfts: defaultNfts = false,
   serverUrl,
   stakingConfiguration = {},
   useEip1191ChainIdChecksum = false,
@@ -80,13 +80,15 @@ export const createAssetFactory = ({
       config = {
         allowMetaMaskCompat: false,
         supportsStaking: false,
+        nfts: defaultNfts,
+        customTokens: defaultCustomTokens,
       },
       overrideCallback = ({ asset }) => asset,
     } = Object.create(null)
   ) => {
     const assets = connectAssetsList(assetsList)
 
-    const { allowMetaMaskCompat, supportsStaking } = config
+    const { allowMetaMaskCompat, supportsStaking, nfts, customTokens } = config
 
     const asset = assets[base.name]
 
@@ -121,11 +123,16 @@ export const createAssetFactory = ({
 
     const addressHasHistory = addressHasHistoryFactory({ server })
 
-    const feeMonitor = monitorType === 'no-history'
+    const isWebSocket = monitorType !== 'no-history'
+
+    const resolvedFeeMonitorInterval =
+      config.feeMonitorInterval ||
+      feeMonitorInterval ||
+      (isWebSocket ? null : DEFAULT_FEE_MONITOR_INTERVAL) // null means do not start the timer
 
     const createFeeMonitor = serverBasedFeeMonitorFactoryFactory({
       assetName: base.name,
-      interval: config.feeMonitorInterval || feeMonitorInterval || DEFAULT_FEE_MONITOR_INTERVAL,
+      interval: resolvedFeeMonitorInterval,
       eip1559Enabled: feeData.eip1559Enabled, // this is not updated via remote config. Should it be?
       server,
     })
@@ -133,7 +140,7 @@ export const createAssetFactory = ({
     const features = {
       accountState: true,
       customTokens,
-      feeMonitor,
+      feeMonitor: true,
       feesApi: true,
       isMaxFeeAsset,
       isTestnet,

package/src/server-based-fee-monitor.js

@@ -1,5 +1,4 @@
 import { FeeMonitor } from '@exodus/asset-lib'
-import { DEFAULT_FEE_MONITOR_INTERVAL } from '@exodus/ethereum-lib'
 import assert from 'minimalistic-assert'
 
 import { fromHexToString } from './number-utils.js'
@@ -20,7 +19,7 @@ import { fromHexToString } from './number-utils.js'
 
 export const serverBasedFeeMonitorFactoryFactory = ({
   assetName,
-  interval = DEFAULT_FEE_MONITOR_INTERVAL,
+  interval,
   eip1559Enabled,
   server,
 }) => {

package/src/staking/ethereum/service.js

@@ -83,14 +83,7 @@ export function createEthereumStakingService({
       amount: inactiveAmountToUnstake,
     })
 
-    let feeData
-    try {
-      // could revert and break the whole fee calculation
-      feeData = await estimateTxFee(delegatorAddress, to, null, data)
-    } catch {
-      console.warn('ETH unstake pending estimation reverted')
-      return Object.create(null)
-    }
+    const feeData = await estimateTxFee(delegatorAddress, to, null, data)
 
     return { to, txData: data, ...feeData }
   }
@@ -98,7 +91,10 @@ export function createEthereumStakingService({
   async function getUndelegateData({ delegatorAddress, resquestedAmount, pendingAmount }) {
     const canUnstake = resquestedAmount.gt(pendingAmount)
 
-    if (!canUnstake) return Object.create(null)
+    if (!canUnstake) {
+      console.warn('UnstakePending covered requested unstake. Nothing to unstake from validator')
+      return Object.create(null)
+    }
 
     const activeAmountToUnstake = resquestedAmount.sub(pendingAmount)
     const { to, data } = await staking.unstake({
@@ -124,12 +120,24 @@ export function createEthereumStakingService({
     const delegatorAddress = address.toLowerCase()
     const pendingAmount = await staking.pendingBalanceOf(delegatorAddress)
 
-    const { fee: undelegatePendingFee = asset.currency.ZERO } = await getUndelegatePendingData({
-      delegatorAddress,
-      resquestedAmount,
-      pendingAmount,
-      minAmount,
-    })
+    let undelegatePendingFee = asset.currency.ZERO
+
+    if (pendingAmount.isPositive) {
+      try {
+        // try to estimate unstakePending
+        const { fee } = await getUndelegatePendingData({
+          delegatorAddress,
+          resquestedAmount,
+          pendingAmount,
+          minAmount,
+        })
+        undelegatePendingFee = fee
+      } catch (err) {
+        // useful to debug fee calculation
+        console.warn('ETH unstake pending estimation failed, continuing with unstake', err)
+      }
+    }
+
     const { fee: undelegateFee = asset.currency.ZERO } = await getUndelegateData({
       delegatorAddress,
       resquestedAmount,
@@ -173,6 +181,7 @@ export function createEthereumStakingService({
       txId = await prepareAndSendTx({
         asset,
         walletAccount,
+        waitForConfirmation: true, // wait for tx confirmation in the client
         ...undelegatePendingData,
       })
     }
@@ -184,16 +193,16 @@ export function createEthereumStakingService({
       pendingAmount,
     })
 
-    if (!undelegateData) return txId
-
-    txId = await prepareAndSendTx({
-      asset,
-      walletAccount,
-      ...undelegateData,
-    })
+    if (undelegateData.fee) {
+      txId = await prepareAndSendTx({
+        asset,
+        walletAccount,
+        ...undelegateData,
+      })
+    }
 
     // Testnet assets do not support delegations tracking
-    if (asset.name === 'ethereum')
+    if (txId && asset.name === 'ethereum')
       await stakingProvider.notifyUnstaking({
         txId,
         asset: asset.name,
@@ -297,9 +306,17 @@ export function createEthereumStakingService({
   }
 
   async function prepareAndSendTx(
-    { asset, walletAccount, to, amount, txData: txInput, gasPrice, gasLimit, fee } = Object.create(
-      null
-    )
+    {
+      asset,
+      walletAccount,
+      to,
+      amount,
+      txData: txInput,
+      gasPrice,
+      gasLimit,
+      fee,
+      waitForConfirmation = false,
+    } = Object.create(null)
   ) {
     const sendTxArgs = {
       asset,
@@ -322,6 +339,7 @@ export function createEthereumStakingService({
         gasLimit,
         feeAmount: fee,
       },
+      waitForConfirmation,
     }
 
     console.log('sending staking tx:', sendTxArgs)