@exodus/ethereum-api 7.0.0 → 7.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -29,7 +29,7 @@
     "make-concurrent": "4.0.0",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.1",
-    "socket.io-client": "2.5.0",
+    "socket.io-client": "2.1.1",
     "ws": "^6.1.0"
   },
   "devDependencies": {
@@ -37,6 +37,5 @@
     "@exodus/assets-base": "^8.1.14",
     "@exodus/assets-testing": "file:../../../__testing__",
     "@exodus/models": "^11.0.0"
-  },
-  "gitHead": "1ebfe4c6b2ba3cc49564290a498571e5f3921a5d"
+  }
 }

package/src/staking/ethereum/service.js

@@ -1,4 +1,5 @@
 import { estimateGasLimit, EthereumStaking, getServer } from '@exodus/ethereum-api'
+import { isNumberUnit } from '@exodus/currency'
 import BN from 'bn.js'
 
 const extraGasLimit = 20000 // extra gas Limit to prevent tx failing if something change on pool state (till tx is in mempool)
@@ -10,14 +11,24 @@ export function createEthereumStakingService({
 }) {
   const staking = new EthereumStaking(asset)
 
-  async function delegate({ walletAccount, delegatorAddress, amount } = {}) {
-    const _delegatorAddress = delegatorAddress.toLowerCase()
+  function amountToCurrency({ asset, amount }) {
+    return isNumberUnit(amount) ? amount : asset.currency.parse(amount)
+  }
+
+  async function delegate({ walletAccount, amount } = {}) {
+    const delegatorAddress = (
+      await assetClientInterface.getReceiveAddress({
+        assetName: asset.name,
+        walletAccount,
+      })
+    ).toLowerCase()
+    amount = amountToCurrency({ asset, amount })
 
     const { to, data } = await staking.stake({
       amount,
     })
 
-    const { gasPrice, gasLimit, fee } = await estimateTxFee(_delegatorAddress, to, amount, data)
+    const { gasPrice, gasLimit, fee } = await estimateTxFee(delegatorAddress, to, amount, data)
 
     console.log(
       `delegator address ${delegatorAddress} staking ${amount.toDefaultString({
@@ -38,12 +49,20 @@ export function createEthereumStakingService({
     return txId
   }
 
-  async function undelegate({ walletAccount, delegatorAddress, amount } = {}) {
+  async function undelegate({ walletAccount, amount } = {}) {
     /*
     unstakePending balance (not yet in validator) + unstake balance (in validator)
     1. give priority to unstakePending (based on the amount)
     2. unstake amount in validator.
     */
+    amount = amountToCurrency({ asset, amount })
+
+    const delegatorAddress = (
+      await assetClientInterface.getReceiveAddress({
+        assetName: asset.name,
+        walletAccount,
+      })
+    ).toLowerCase()
 
     const pendingAmount = await staking.pendingBalanceOf(delegatorAddress)
 
@@ -109,8 +128,14 @@ export function createEthereumStakingService({
     return txId
   }
 
-  async function claimUndelegatedBalance({ walletAccount, delegatorAddress } = {}) {
+  async function claimUndelegatedBalance({ walletAccount } = {}) {
     // withdraw withdrawable balance (of a previous unstake)
+    const delegatorAddress = (
+      await assetClientInterface.getReceiveAddress({
+        assetName: asset.name,
+        walletAccount,
+      })
+    ).toLowerCase()
 
     const withdrawRequest = await staking.claimWithdrawRequest({
       address: delegatorAddress,
@@ -131,7 +156,14 @@ export function createEthereumStakingService({
     } else return null // -> no withdrawable balance
   }
 
-  async function estimateDelegateOperation({ delegatorAddress, operation, args }) {
+  async function estimateDelegateOperation({ walletAccount, operation, args }) {
+    const delegatorAddress = (
+      await assetClientInterface.getReceiveAddress({
+        assetName: asset.name,
+        walletAccount,
+      })
+    ).toLowerCase()
+
     const NAMING_MAP = {
       delegate: 'stake',
       undelegate: 'unstake',