@exodus/ethereum-api 0.2.7 → 0.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/ethereum-lib": "^0.2.4",
+    "@exodus/ethereum-lib": "^0.2.10",
     "fetchival": "0.3.3",
     "lodash": "^4.17.11",
     "make-concurrent": "4.0.0",
@@ -19,5 +19,5 @@
     "url-join": "4.0.0",
     "ws": "6.1.0"
   },
-  "gitHead": "7b2e88a73e28ff83bafb6ba4695f3c24ecd20d21"
+  "gitHead": "13e2cc907ccda7585b96ae34d8745874406185bc"
 }

package/src/gas-estimation.js

@@ -0,0 +1,99 @@
+import BN from 'bn.js'
+import * as ethUtil from 'ethereumjs-util'
+import { currency2buffer, isEthereumToken, getBaseAsset } from '@exodus/ethereum-lib'
+import { estimateGas, isContract as _isContract } from './with-fallback'
+
+const EXTRA_PERCENTAGE = 20
+
+export async function estimateGasLimit(
+  asset: Object,
+  fromAddress: string,
+  toAddress: string,
+  amount: Buffer | Object,
+  data: Buffer | string,
+  gasPrice: string,
+  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,
+    from: fromAddress,
+    to: toAddress,
+    value: amount,
+    data: Buffer.isBuffer(data) ? ethUtil.bufferToHex(data) : data,
+    gasPrice,
+  })
+  return new BN(estimatedGas.slice(2), 16)
+    .imuln(100 + extraPercentage)
+    .idivn(100)
+    .toNumber()
+}
+
+export async function fetchGasLimit({
+  asset,
+  fromAddress,
+  toAddress,
+  txInput = '0x',
+  amount,
+  feeData,
+  bip70,
+  isContract,
+  throwOnError = true,
+  extraPercentage,
+}) {
+  const isToken = isEthereumToken(asset)
+  if (isToken) {
+    txInput = ethUtil.bufferToHex(asset.contract.transfer.build(toAddress, currency2buffer(amount)))
+    amount = getBaseAsset(asset).currency.ZERO
+    toAddress = asset.contract.addresses.current
+  } else if (!isContract) {
+    if (isContract === undefined) isContract = await _isContract(asset.name, toAddress)
+    if (!isContract) return asset.gasLimit
+  }
+
+  if (!amount) {
+    amount = asset.currency.ZERO
+  }
+
+  let gasPrice = ethUtil.bufferToHex(currency2buffer(feeData.gasPrice))
+
+  if (bip70 && bip70.bitpay) {
+    if (bip70.bitpay.data) {
+      txInput = bip70.bitpay.data
+    }
+
+    if (bip70.bitpay.gasPrice) {
+      const bitPayGasPrice = ethUtil.bufferToHex(currency2buffer(bip70.bitpay.gasPrice))
+      if (new ethUtil.BN(bitPayGasPrice).gt(new ethUtil.BN(gasPrice))) {
+        gasPrice = bitPayGasPrice
+      }
+    }
+  }
+
+  try {
+    return await estimateGasLimit(
+      asset,
+      fromAddress,
+      toAddress,
+      amount,
+      txInput,
+      gasPrice,
+      extraPercentage
+    )
+  } catch (err) {
+    if (throwOnError) throw err
+    console.log('fetchGasLimit error', err)
+  }
+
+  return isToken ? asset.gasLimit : asset.contractGasLimit
+}

package/src/index.js

@@ -4,5 +4,6 @@ import * as etcWithFallback from './etc-with-fallback'
 
 export * from './with-fallback'
 export * from './fee-monitor'
+export * from './gas-estimation'
 export * from './exodus-eth-server'
 export { etherscan, ethWithFallback, etcWithFallback }

package/src/with-fallback.js

@@ -48,9 +48,9 @@ export async function estimateGas({ asset, ...args }) {
   return _estimateGas(args)
 }
 
-const fetchEthereumBalance = async (address, contractAddress = 'value') => {
+const fetchEthereumBalance = async (address, balanceField = 'value') => {
   const balances = await ethServer.getBalance(address)
-  return get(balances, ['confirmed', contractAddress], '0')
+  return get(balances, ['confirmed', balanceField], '0')
 }
 
 const fetchEthereumClassicBalance = async (address) => {