Merge branch 'master' into i675-LoadingBuy

4 files changed, 10 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63e59617f..d77308838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Current Master
 
+## 2.13.0 2016-09-18
+
+- Add Parity compatibility, fixing Geth dependency issues.
 - Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz
 too help visualize transactions and to where they are going.
 - Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient
diff --git a/app/manifest.json b/app/manifest.json
index daf9ef94a..1af4d76d2 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "MetaMask",
   "short_name": "Metamask",
-  "version": "2.12.1",
+  "version": "2.13.0",
   "manifest_version": 2,
   "author": "https://metamask.io",
   "description": "Ethereum Browser Extension",
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 06337be1c..2b10c8c35 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -75,6 +75,10 @@ module.exports = class MetamaskController {
   }
 
   onRpcRequest (stream, originDomain, request) {
+
+    /* Commented out for Parity compliance
+     * Parity does not permit additional keys, like `origin`,
+     * and Infura is not currently filtering this key out.
     var payloads = Array.isArray(request) ? request : [request]
     payloads.forEach(function (payload) {
       // Append origin to rpc payload
@@ -86,6 +90,7 @@ module.exports = class MetamaskController {
         payload.params.push({ origin: originDomain })
       }
     })
+    */
 
     // handle rpc request
     this.provider.sendAsync(request, function onPayloadHandled (err, response) {
diff --git a/package.json b/package.json
index fc88162ed..a05c01ba2 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "through2": "^2.0.1",
     "vreme": "^3.0.2",
     "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
-    "web3-provider-engine": "^8.0.5",
+    "web3-provider-engine": "^8.0.6",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },