aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-09-22 14:28:11 +0800
committerGitHub <noreply@github.com>2016-09-22 14:28:11 +0800
commit9ee95cad35672b5f469b61bc346562318039e976 (patch)
tree84074f0d0b540dfcbe8c729be71484719cc6a2d6 /app
parentae2f0f585fd70986ce71f95b40ed49e9909283f5 (diff)
parent9d5cdbcbe6d44ac3f26c5ae912531a8dd5d5c37d (diff)
downloadtangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar.gz
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar.bz2
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar.lz
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar.xz
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.tar.zst
tangerine-wallet-browser-9ee95cad35672b5f469b61bc346562318039e976.zip
Merge pull request #678 from MetaMask/ParityCompliance
Parity compliance
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json2
-rw-r--r--app/scripts/metamask-controller.js5
2 files changed, 6 insertions, 1 deletions
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) {