@exodus/ethereum-api 6.3.27 → 6.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.27",
+  "version": "6.3.29",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^3.3.41",
+    "@exodus/ethereum-lib": "^3.3.42",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
@@ -33,5 +33,6 @@
   },
   "devDependencies": {
     "@exodus/models": "^8.10.4"
-  }
+  },
+  "gitHead": "01457e8fa6da6b468680885d4e086699842e2ee0"
 }

package/src/staking/ethereum/api.js

@@ -142,9 +142,10 @@ export class EthereumStaking {
     }
   }
 
+  /* Unstake funds that are staked into the validator. Once unstaked they need to be claimed (once ready to withdraw) */
   async unstake({ address, amount, allowedInterchangeNum = 0, source = '2' }) {
     const amountWei = amount.toBaseString()
-    const balance = await this.autocompoundBalanceOf(address)
+    const balance = await this.autocompoundBalanceOf(address) // amount staked into the validator (active balance)
 
     if (balance.gte(amount)) {
       return {

package/src/staking/ethereum/service.js

@@ -1,7 +1,7 @@
 import { estimateGasLimit, EthereumStaking, getServer } from '@exodus/ethereum-api'
 import BN from 'bn.js'
 
-const delegateGas = 500000 // approx gas limits
+const extraGasLimit = 150000 // extra gas Limit to prevent tx failing if something change on pool state (till tx is in mempool)
 
 export function createEthereumStakingService({
   asset,
@@ -143,30 +143,25 @@ export function createEthereumStakingService({
       return
     }
 
-    const { amount, data } = await delegateOperation(args)
-    const { fee } = await estimateTxFee(delegatorAddress, staking.poolAddress, amount, data)
+    let amount, data, fee
+    try {
+      ;({ amount, data } = await delegateOperation(args))
+      ;({ fee } = await estimateTxFee(delegatorAddress, staking.poolAddress, amount, data))
+    } catch (e) {
+      // If the operation is to unstake and failed retry with unstakePending
+      if (operation === 'undelegate') {
+        ;({ amount, data } = await staking.unstakePending(args))
+        ;({ fee } = await estimateTxFee(delegatorAddress, staking.poolAddress, amount, data))
+      } else {
+        throw e
+      }
+    }
 
     return fee
   }
 
-  async function estimateUndelegateTxFee() {
-    const gasPrice = parseInt(await getServer(asset).gasPrice(), 16)
-
-    const gasLimit = delegateGas
-    const fee = new BN(gasLimit).mul(new BN(gasPrice))
-    return {
-      gasLimit,
-      gasPrice: asset.currency.baseUnit(gasPrice),
-      fee: asset.currency.baseUnit(fee.toString()),
-    }
-  }
-
   async function estimateTxFee(from, to, amount, txInput, gasPrice = '0x0') {
     amount = amount || asset.currency.ZERO
-    if (amount.isZero) {
-      // unstaking txs
-      return estimateUndelegateTxFee() // otherwise server estimateGasLimit will throw "execution reverted"
-    }
 
     const gasLimit = await estimateGasLimit(
       asset,
@@ -182,7 +177,7 @@ export function createEthereumStakingService({
     }
 
     gasPrice = parseInt(gasPrice, 16)
-    const fee = new BN(gasPrice).mul(new BN(gasLimit))
+    const fee = new BN(gasPrice).mul(new BN(gasLimit + extraGasLimit))
 
     return {
       gasLimit,

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

@@ -12,6 +12,7 @@ export const stakingProviderClientFactory = (defaultStakingUrl = DEFAULT_STAKING
 
   const assetValidators = {
     polygon: '0x3f4ce357b9d61d3b904492b8b5abc69c6c693720',
+    ethereum: '0xd523794c879d9ec028960a231f866758e405be34',
   }
 
   const setStakingUrl = (newStakingUrl) => {
@@ -26,21 +27,21 @@ export const stakingProviderClientFactory = (defaultStakingUrl = DEFAULT_STAKING
 
   const notifyActionFactory = ({ type }) => {
     assert(type, '"type" is required')
-    return async ({ asset, txId, delegator, amount, error }) => {
-      assert(asset, '"asset" must be provided')
-      assert(assetValidators[asset], '"invalid" asset')
+    return async ({ asset: assetName, txId, delegator, amount, error }) => {
+      assert(assetName, '"asset" must be provided')
+      assert(assetValidators[assetName], '"invalid" asset')
       assert(txId, '"txId" is required')
       assert(delegator, '"delegator" is required')
       assert(amount, '"amount" is required')
 
       const stakingData = {
-        asset,
+        asset: assetName,
         data: {
           delegator,
           actions: [
             {
               type,
-              validator: assetValidators[asset],
+              validator: assetValidators[assetName],
               amount,
               txId,
             },