1 files changed, 40 insertions, 35 deletions

diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index c6814c05f..149d93102 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -1,5 +1,4 @@
 const async = require('async')
-const EthQuery = require('eth-query')
 const ethUtil = require('ethereumjs-util')
 const Transaction = require('ethereumjs-tx')
 const normalize = require('eth-sig-util').normalize
@@ -7,53 +6,55 @@ const BN = ethUtil.BN
 
 /*
 tx-utils are utility methods for Transaction manager
-its passed a provider and that is passed to ethquery
+its passed ethquery
 and used to do things like calculate gas of a tx.
 */
 
 module.exports = class txProviderUtils {
-  constructor (provider) {
-    this.provider = provider
-    this.query = new EthQuery(provider)
+
+  constructor (ethQuery) {
+    this.query = ethQuery
   }
 
-  analyzeGasUsage (txData, cb) {
+  analyzeGasUsage (txMeta, cb) {
     var self = this
     this.query.getBlockByNumber('latest', true, (err, block) => {
       if (err) return cb(err)
       async.waterfall([
-        self.estimateTxGas.bind(self, txData, block.gasLimit),
-        self.setTxGas.bind(self, txData, block.gasLimit),
+        self.estimateTxGas.bind(self, txMeta, block.gasLimit),
+        self.setTxGas.bind(self, txMeta, block.gasLimit),
       ], cb)
     })
   }
 
-  estimateTxGas (txData, blockGasLimitHex, cb) {
-    const txParams = txData.txParams
+  estimateTxGas (txMeta, blockGasLimitHex, cb) {
+    const txParams = txMeta.txParams
     // check if gasLimit is already specified
-    txData.gasLimitSpecified = Boolean(txParams.gas)
+    txMeta.gasLimitSpecified = Boolean(txParams.gas)
     // if not, fallback to block gasLimit
-    if (!txData.gasLimitSpecified) {
-      txParams.gas = blockGasLimitHex
+    if (!txMeta.gasLimitSpecified) {
+      const blockGasLimitBN = hexToBn(blockGasLimitHex)
+      const saferGasLimitBN = BnMultiplyByFraction(blockGasLimitBN, 19, 20)
+      txParams.gas = bnToHex(saferGasLimitBN)
     }
     // run tx, see if it will OOG
     this.query.estimateGas(txParams, cb)
   }
 
-  setTxGas (txData, blockGasLimitHex, estimatedGasHex, cb) {
-    txData.estimatedGas = estimatedGasHex
-    const txParams = txData.txParams
+  setTxGas (txMeta, blockGasLimitHex, estimatedGasHex, cb) {
+    txMeta.estimatedGas = estimatedGasHex
+    const txParams = txMeta.txParams
 
     // if gasLimit was specified and doesnt OOG,
     // use original specified amount
-    if (txData.gasLimitSpecified) {
-      txData.estimatedGas = txParams.gas
+    if (txMeta.gasLimitSpecified) {
+      txMeta.estimatedGas = txParams.gas
       cb()
       return
     }
     // if gasLimit not originally specified,
     // try adding an additional gas buffer to our estimation for safety
-    const recommendedGasHex = this.addGasBuffer(txData.estimatedGas, blockGasLimitHex)
+    const recommendedGasHex = this.addGasBuffer(txMeta.estimatedGas, blockGasLimitHex)
     txParams.gas = recommendedGasHex
     cb()
     return
@@ -62,25 +63,26 @@ module.exports = class txProviderUtils {
   addGasBuffer (initialGasLimitHex, blockGasLimitHex) {
     const initialGasLimitBn = hexToBn(initialGasLimitHex)
     const blockGasLimitBn = hexToBn(blockGasLimitHex)
+    const upperGasLimitBn = blockGasLimitBn.muln(0.9)
     const bufferedGasLimitBn = initialGasLimitBn.muln(1.5)
-    
+
     // if initialGasLimit is above blockGasLimit, dont modify it
-    if (initialGasLimitBn.gt(blockGasLimitBn)) return bnToHex(initialGasLimitBn)
+    if (initialGasLimitBn.gt(upperGasLimitBn)) return bnToHex(initialGasLimitBn)
     // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
-    if (bufferedGasLimitBn.lt(blockGasLimitBn)) return bnToHex(bufferedGasLimitBn)
+    if (bufferedGasLimitBn.lt(upperGasLimitBn)) return bnToHex(bufferedGasLimitBn)
     // otherwise use blockGasLimit
-    return bnToHex(blockGasLimitBn)
+    return bnToHex(upperGasLimitBn)
   }
 
   fillInTxParams (txParams, cb) {
-    let fromAddress = txParams.from
-    let reqs = {}
+    const fromAddress = txParams.from
+    const reqs = {}
 
     if (isUndef(txParams.gas)) reqs.gas = (cb) => this.query.estimateGas(txParams, cb)
     if (isUndef(txParams.gasPrice)) reqs.gasPrice = (cb) => this.query.gasPrice(cb)
     if (isUndef(txParams.nonce)) reqs.nonce = (cb) => this.query.getTransactionCount(fromAddress, 'pending', cb)
 
-    async.parallel(reqs, function(err, result) {
+    async.parallel(reqs, function (err, result) {
       if (err) return cb(err)
       // write results to txParams obj
       Object.assign(txParams, result)
@@ -90,16 +92,13 @@ module.exports = class txProviderUtils {
 
   // builds ethTx from txParams object
   buildEthTxFromParams (txParams) {
-    // apply gas multiplyer
-    let gasPrice = hexToBn(txParams.gasPrice)
-    // multiply and divide by 100 so as to add percision to integer mul
-    txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
     // normalize values
     txParams.to = normalize(txParams.to)
     txParams.from = normalize(txParams.from)
     txParams.value = normalize(txParams.value)
     txParams.data = normalize(txParams.data)
-    txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
+    txParams.gas = normalize(txParams.gas || txParams.gasLimit)
+    txParams.gasPrice = normalize(txParams.gasPrice)
     txParams.nonce = normalize(txParams.nonce)
     // build ethTx
     log.info(`Prepared tx for signing: ${JSON.stringify(txParams)}`)
@@ -124,14 +123,20 @@ module.exports = class txProviderUtils {
 
 // util
 
-function isUndef(value) {
+function isUndef (value) {
   return value === undefined
 }
 
-function bnToHex(inputBn) {
+function bnToHex (inputBn) {
   return ethUtil.addHexPrefix(inputBn.toString(16))
 }
 
-function hexToBn(inputHex) {
+function hexToBn (inputHex) {
   return new BN(ethUtil.stripHexPrefix(inputHex), 16)
-}
\ No newline at end of file
+}
+
+function BnMultiplyByFraction (targetBN, numerator, denominator) {
+  const numBN = new BN(numerator)
+  const denomBN = new BN(denominator)
+  return targetBN.mul(numBN).div(denomBN)
+}