@exodus/ethereum-api 8.18.2 → 8.18.3

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.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.18.3",
   "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": "a5069848e89037f899ba2a96c3661ccbd2b66290"
 }

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)