1 files changed, 12 insertions, 1 deletions
diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 76b311653..8cf304d0b 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -21,19 +21,30 @@ module.exports = class txProviderUtils {
     this.query.getBlockByNumber('latest', true, (err, block) => {
       if (err) return cb(err)
       async.waterfall([
+        self.setBlockGasLimit.bind(self, txMeta, block.gasLimit),
         self.estimateTxGas.bind(self, txMeta, block.gasLimit),
         self.setTxGas.bind(self, txMeta, block.gasLimit),
       ], cb)
     })
   }
 
+  setBlockGasLimit (txMeta, blockGasLimitHex, cb) {
+    const blockGasLimitBN = hexToBn(blockGasLimitHex)
+    const saferGasLimitBN = blockGasLimitBN.muln(0.95)
+    txMeta.blockGasLimit = bnToHex(saferGasLimitBN)
+    cb()
+    return
+  }
+
   estimateTxGas (txMeta, blockGasLimitHex, cb) {
     const txParams = txMeta.txParams
     // check if gasLimit is already specified
     txMeta.gasLimitSpecified = Boolean(txParams.gas)
     // if not, fallback to block gasLimit
     if (!txMeta.gasLimitSpecified) {
-      txParams.gas = blockGasLimitHex
+      const blockGasLimitBN = hexToBn(blockGasLimitHex)
+      const saferGasLimitBN = blockGasLimitBN.muln(0.95)
+      txParams.gas = bnToHex(saferGasLimitBN)
     }
     // run tx, see if it will OOG
     this.query.estimateGas(txParams, cb)