Merge branch 'master' into NewUI-flat

2 files changed, 10 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ba214cce..a82c3e149 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Changed state logs to a file download than a clipboard copy.
 - Fixed a long standing memory leak associated with filters installed by dapps
 - Fix link to support center.
+- Warn users when a dapp proposes a high gas limit (90% of blockGasLimit or higher)
 
 ## 3.10.0 2017-9-11
 
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index a679107c9..18b622925 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -140,6 +140,13 @@ PendingTx.prototype.getGasFee = function () {
   // Gas
   const gas = txParams.gas
   const gasBn = hexToBn(gas)
+  
+  // From latest master
+//   const gasLimit = new BN(parseInt(blockGasLimit))
+//   const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20)
+//   const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20)
+//   const safeGasLimit = safeGasLimitBN.toString(10)
+
   // Gas Price
   const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_BN.toString(16)
   const gasPriceBn = hexToBn(gasPrice)
@@ -248,6 +255,8 @@ PendingTx.prototype.render = function () {
   // const insufficientBalance = balanceBn.lt(maxCost)
   // const buyDisabled = insufficientBalance || !this.state.valid || !isValidAddress || this.state.submitting
   // const showRejectAll = props.unconfTxListLength > 1
+//   const dangerousGasLimit = gasBn.gte(saferGasLimitBN)
+//   const gasLimitSpecified = txMeta.gasLimitSpecified
 
   this.inputs = []