Merge branch 'master' into tos

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Current Master
 
+## 2.13.3 2016-10-4
+
+- Fix bug where log queries were filtered out.
 - Decreased vault confirmation button font size to help some Linux users who could not see it.
 - Made popup a little taller because it would sometimes cut off buttons.
 - Add legal information to relevant pages.

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.13.2",
+  "version": "2.13.3",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",

app/scripts/lib/id-management.js

@@ -26,7 +26,7 @@ function IdManagement (opts) {
   this.signTx = function (txParams) {
     // 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)
@@ -51,7 +51,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))

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 +
+      var link = 'https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#dizzy-all-async---think-of-metamask-as-a-light-client'
-        '. See https://github.com/MetaMask/faq/blob/master/DEVELOPERS.md#all-async---think-of-metamask-as-a-light-client for details.'
+      var message = `The MetaMask Web3 object does not support synchronous methods like ${payload.method}. See ${link} for details.`
       throw new Error(message)
 
   }

development/announcer.js

@@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt
 
 var log = changelog.split(version)[1].split('##')[0].trim()
 
-let msg = `**MetaMask ${version}** now published to the Chrome Store! It should be available over the next hour!\n${log}`
+let msg = `*MetaMask ${version}* now published to the Chrome Store! It should be available over the next hour!\n${log}`
 
 console.log(msg)

docs/extension_description/en.txt

@@ -0,0 +1,8 @@
+MetaMask is an extension for accessing Ethereum enabled distributed applications, or "Dapps" in your normal browser!
+
+The extension injects the Ethereum web3 API into every website's javascript context, so that dapps can read from the blockchain.
+
+MetaMask also lets the user create and manage their own identities, so when a Dapp wants to perform a transaction and write to the blockchain, the user gets a secure interface to review the transaction, before approving or rejecting it.
+
+Because it adds functionality to the normal browser context, MetaMask requires the permission to read and write to any webpage. You can always "view the source" of MetaMask the way you do any extension, or view the source code on Github:
+https://github.com/MetaMask/metamask-plugin

package.json

@@ -82,7 +82,7 @@
     "through2": "^2.0.1",
     "vreme": "^3.0.2",
     "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
-    "web3-provider-engine": "^8.1.0",
+    "web3-provider-engine": "^8.1.5",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },