@exodus/ethereum-api 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/ethereum-lib": "^2.0.0",
+    "@exodus/ethereum-lib": "^2.0.2",
     "@exodus/simple-retry": "^0.0.6",
     "fetchival": "0.3.3",
     "lodash": "^4.17.11",
@@ -20,5 +20,5 @@
     "url-join": "4.0.0",
     "ws": "6.1.0"
   },
-  "gitHead": "cc2ade686dff7693c028ca9d6796ada2a0eed6f1"
+  "gitHead": "d87cca0e0050afde0621e4090010d6a185eeab9b"
 }

package/src/gas-estimation.js

@@ -5,34 +5,28 @@ import { estimateGas, isContract as _isContract } from './eth-like-util'
 
 const EXTRA_PERCENTAGE = 20
 
+// Starting with geth v1.9.14, if gasPrice is set for eth_estimateGas call, the call allowance will
+// be calculated with account's balance divided by gasPrice. If user's balance is too low,
+// the gasEstimation will fail. If gasPrice is set to '0x0', the account's balance is not
+// used to estimate gas.
 export async function estimateGasLimit(
   asset: Object,
   fromAddress: string,
   toAddress: string,
   amount: Buffer | Object,
   data: Buffer | string,
-  gasPrice: string,
-  extraPercentage: number = EXTRA_PERCENTAGE
+  gasPrice?: string = '0x',
+  extraPercentage?: number = EXTRA_PERCENTAGE
 ): number {
-  if (!Buffer.isBuffer(amount)) {
-    amount = currency2buffer(amount)
-  }
-
-  amount = ethUtil.bufferToHex(amount)
-  while (amount[2] === '0') amount = '0x' + amount.slice(3)
-  if (amount === '0x') amount = '0x0'
-
-  while (gasPrice[2] === '0') gasPrice = '0x' + gasPrice.slice(3)
-  if (gasPrice === '0x') gasPrice = '0x0'
-
-  const estimatedGas = await estimateGas({
-    asset,
+  const opts = {
     from: fromAddress,
     to: toAddress,
-    value: amount,
+    value: normalizeAmount(amount),
     data: Buffer.isBuffer(data) ? ethUtil.bufferToHex(data) : data,
-    gasPrice,
-  })
+    gasPrice: normalizeGasPrice(gasPrice),
+  }
+
+  const estimatedGas = await estimateGas({ asset, ...opts })
   return new BN(estimatedGas.slice(2), 16)
     .imuln(100 + extraPercentage)
     .idivn(100)
@@ -97,3 +91,21 @@ export async function fetchGasLimit({
 
   return isToken ? asset.gasLimit : asset.contractGasLimit
 }
+
+function normalizeAmount(amount) {
+  if (!Buffer.isBuffer(amount)) {
+    amount = currency2buffer(amount)
+  }
+
+  amount = ethUtil.bufferToHex(amount)
+  while (amount[2] === '0') amount = '0x' + amount.slice(3)
+  if (amount === '0x') amount = '0x0'
+
+  return amount
+}
+
+function normalizeGasPrice(gasPrice) {
+  while (gasPrice[2] === '0') gasPrice = '0x' + gasPrice.slice(3)
+  if (gasPrice === '0x') gasPrice = '0x0'
+  return gasPrice
+}