@exodus/ethereum-api 6.3.16 → 6.3.18-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.3.16",
+  "version": "6.3.18-alpha.0",
   "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.33",
+    "@exodus/ethereum-lib": "^3.3.34",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.3.0-beta.4",
     "@exodus/simple-retry": "^0.0.6",
@@ -33,6 +33,5 @@
   },
   "devDependencies": {
     "@exodus/models": "^8.10.4"
-  },
-  "gitHead": "4a98199d02033b9d822b2065f3725a3bd4a1b83d"
+  }
 }

package/src/staking/ethereum/api.js

@@ -130,19 +130,19 @@ export class EthereumStaking {
 
   // === POOL ===
 
-  async stake({ amount }) {
+  async stake({ amount, source = '2' }) {
     if (amount.gte(this.minAmount)) {
       return {
         to: this.poolAddress,
         amount,
-        data: bufferToHex(this.buildTxData(this.contractPool, 'stake', '0')), // tx data field
+        data: bufferToHex(this.buildTxData(this.contractPool, 'stake', source)), // tx data field
       }
     } else {
       throw new Error(`Min Amount ${this.minAmount}`)
     }
   }
 
-  async unstake({ address, amount, isAllowedInterchange = false, source = '0' }) {
+  async unstake({ address, amount, isAllowedInterchange = false, source = '2' }) {
     const amountWei = amount.toBaseString()
     const balance = await this.autocompoundBalanceOf(address)
 

package/src/staking/ethereum/service.js

@@ -55,9 +55,10 @@ export function createEthereumStakingService({
 
     let txId
     if (!pendingAmount.isZero) {
+      const inactiveAmountToUnstake = pendingAmount.lte(amount) ? pendingAmount : amount
       const { to, data } = await staking.unstakePending({
         address: delegatorAddress,
-        amount,
+        amount: inactiveAmountToUnstake,
       })
 
       let { gasPrice, gasLimit, fee } = await estimateTxFee(
@@ -79,10 +80,10 @@ export function createEthereumStakingService({
 
     // need also to unstake
     if (amount.gt(pendingAmount)) {
-      const amountToUnstake = amount.sub(pendingAmount)
+      const activeAmountToUnstake = amount.sub(pendingAmount)
       const { to, data } = await staking.unstake({
         address: delegatorAddress,
-        amount: amountToUnstake,
+        amount: activeAmountToUnstake,
       })
 
       let { gasPrice, gasLimit, fee } = await estimateTxFee(delegatorAddress, to, null, data)
@@ -258,7 +259,8 @@ export async function getEthereumStakingInfo({ address, asset }) {
   return {
     rewardsBalance,
     isDelegating,
-    delegatedBalance,
+    delegatedBalance, // balance staked into the validator + pending
+    pendingBalance, // balance waiting to be staked
     minDelegateAmount,
     unclaimedUndelegatedBalance,
     canClaimUndelegatedBalance,