Merge branch 'master' into mascara

3 files changed, 11 insertions, 5 deletions

diff --git a/app/scripts/lib/extension.js b/app/scripts/lib/extension.js
index 4b670490f..6f8b5d800 100644
--- a/app/scripts/lib/extension.js
+++ b/app/scripts/lib/extension.js
@@ -11,4 +11,7 @@
  */
 
 const Extension = require('./extension-instance')
-module.exports = new Extension()
+const instance = new Extension()
+window.METAMASK_EXTENSION = instance
+module.exports = instance
+
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 3db1ac6b5..0ec01f3a7 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -22,10 +22,12 @@ function show () {
       extension.windows.create({
         url: 'notification.html',
         type: 'popup',
-        focused: true,
         width,
         height,
       })
+      .catch((reason) => {
+        log.error('failed to create poupup', reason)
+      })
     }
   })
 }
diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 72df53631..e8e23f8b5 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -63,14 +63,15 @@ 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) {