aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-19 10:15:19 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-19 10:16:27 +0800
commite197e3808ff70058ccf3eca0d11255e61180373a (patch)
treef13577ed98d668436111077475d908fbce51aace
parentae2f0f585fd70986ce71f95b40ed49e9909283f5 (diff)
downloadtangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar.gz
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar.bz2
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar.lz
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar.xz
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.tar.zst
tangerine-wallet-browser-e197e3808ff70058ccf3eca0d11255e61180373a.zip
Drop origin key from requests for Parity compatibility
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/scripts/metamask-controller.js5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1483b7cc..a66389213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
- 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
+- Change behavior that prevented Parity client compatibility, where we included a request site origin on rpc calls.
## 2.12.1 2016-09-14
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) {