Merge branch 'master' into i#495CustomGasField

7 files changed, 16 insertions, 27 deletions

diff --git a/app/images/icon-32.png b/app/images/icon-32.png
new file mode 100644
index 000000000..f801ebb6b
--- /dev/null
+++ b/app/images/icon-32.png
diff --git a/app/images/icon-64.png b/app/images/icon-64.png
new file mode 100644
index 000000000..b3019ad65
--- /dev/null
+++ b/app/images/icon-64.png
diff --git a/app/manifest.json b/app/manifest.json
index 0db9b2b83..badeb7cb2 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.13.1",
+  "version": "2.13.3",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
@@ -10,7 +10,7 @@
       "suggested_key": {
         "windows": "Alt+Shift+M",
         "mac": "Alt+Shift+M",
-        "chromeos": "Search+M",
+        "chromeos": "Alt+Shift+M",
         "linux": "Alt+Shift+M"
       }
     }
@@ -55,9 +55,10 @@
     }
   ],
   "permissions": [
-    "notifications",
     "storage",
     "tabs",
+    "clipboardWrite",
+    "clipboardRead",
     "http://localhost:8545/"
   ],
   "web_accessible_resources": [
diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js
index 299998cee..2a985265c 100644
--- a/app/scripts/lib/id-management.js
+++ b/app/scripts/lib/id-management.js
@@ -33,7 +33,7 @@ function IdManagement (opts) {
     // normalize values
 
     txParams.to = ethUtil.addHexPrefix(txParams.to)
-    txParams.from = ethUtil.addHexPrefix(txParams.from)
+    txParams.from = ethUtil.addHexPrefix(txParams.from.toLowerCase())
     txParams.value = ethUtil.addHexPrefix(txParams.value)
     txParams.data = ethUtil.addHexPrefix(txParams.data)
     txParams.gasLimit = ethUtil.addHexPrefix(txParams.gasLimit || txParams.gas)
@@ -58,7 +58,7 @@ function IdManagement (opts) {
 
   this.signMsg = function (address, message) {
     // sign message
-    var privKeyHex = this.exportPrivateKey(address)
+    var privKeyHex = this.exportPrivateKey(address.toLowerCase())
     var privKey = ethUtil.toBuffer(privKeyHex)
     var msgSig = ethUtil.ecsign(new Buffer(message.replace('0x', ''), 'hex'), privKey)
     var rawMsgSig = ethUtil.bufferToHex(concatSig(msgSig.v, msgSig.r, msgSig.s))
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 4f9fa1a7d..bcde333d0 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -33,7 +33,7 @@ function MetamaskInpageProvider (connectionStream) {
   })
   asyncProvider.on('error', console.error.bind(console))
   self.asyncProvider = asyncProvider
-  
+
   self.idMap = {}
   // handle sendAsync requests via asyncProvider
   self.sendAsync = function(payload, cb){
@@ -61,7 +61,7 @@ function MetamaskInpageProvider (connectionStream) {
 
 MetamaskInpageProvider.prototype.send = function (payload) {
   const self = this
-  
+
   let selectedAddress
   let result = null
   switch (payload.method) {
@@ -80,8 +80,8 @@ MetamaskInpageProvider.prototype.send = function (payload) {
 
     // throw not-supported Error
     default:
-      var message = 'The MetaMask Web3 object does not support synchronous methods like ' + payload.method +
-        '. See https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#all-async---think-of-metamask-as-a-light-client for details.'
+      var link = 'https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#dizzy-all-async---think-of-metamask-as-a-light-client'
+      var message = `The MetaMask Web3 object does not support synchronous methods like ${payload.method}. See ${link} for details.`
       throw new Error(message)
 
   }
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 422f46f6d..cd7535232 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -1,5 +1,5 @@
 const extension = require('./extension')
-const height = 500
+const height = 520
 const width = 360
 
 const notifications = {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9e1a885ae..03082013a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -203,26 +203,15 @@ module.exports = class MetamaskController {
 
   newUnsignedTransaction (txParams, onTxDoneCb) {
     const idStore = this.idStore
-    var state = idStore.getState()
 
     let err = this.enforceTxValidations(txParams)
     if (err) return onTxDoneCb(err)
 
-    // It's locked
-    if (!state.isUnlocked) {
-
-      // Allow the environment to define an unlock message.
-      this.opts.unlockAccountMessage()
-      idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, noop)
-
-    // It's unlocked
-    } else {
-      idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
-        if (err) return onTxDoneCb(err)
-        this.sendUpdate()
-        this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb)
-      })
-    }
+    idStore.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {
+      if (err) return onTxDoneCb(err)
+      this.sendUpdate()
+      this.opts.showUnconfirmedTx(txParams, txData, onTxDoneCb)
+    })
   }
 
   enforceTxValidations (txParams) {
@@ -353,4 +342,3 @@ module.exports = class MetamaskController {
   }
 }
 
-function noop () {}