aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-05-26 09:06:02 +0800
committerkumavis <kumavis@users.noreply.github.com>2016-05-26 09:06:02 +0800
commit2451ddbbb69b4a01bbc56c2ee98a1e4d5ad3854f (patch)
tree368101d204884fd6690e4b7171c63ae21577f856
parent9f8267225221cd025591852bbf0eb719b6dde9ac (diff)
parent092c191c1fac0349b7180f0f035e4b04325e0962 (diff)
downloadtangerine-wallet-browser-2451ddbbb69b4a01bbc56c2ee98a1e4d5ad3854f.tar.gz
tangerine-wallet-browser-2451ddbbb69b4a01bbc56c2ee98a1e4d5ad3854f.tar.zst
tangerine-wallet-browser-2451ddbbb69b4a01bbc56c2ee98a1e4d5ad3854f.zip
Merge pull request #221 from MetaMask/i218
background + notifications - add origin to message signatures
-rw-r--r--app/scripts/background.js2
-rw-r--r--app/scripts/lib/notifications.js1
-rw-r--r--package.json2
3 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 4f537b30a..bfd1fc92b 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -153,7 +153,7 @@ function setupProviderConnection(stream, originDomain){
if (payload.method === 'eth_sendTransaction') {
payload.params[0].origin = originDomain
} else if (payload.method === 'eth_sign') {
- payload.params.push(originDomain)
+ payload.params.push({ origin: originDomain })
}
// handle rpc request
provider.sendAsync(payload, function onPayloadHandled(err, response){
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 5a7ae6c2b..d011d778b 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -68,6 +68,7 @@ function createTxNotification(opts){
function createMsgNotification(opts){
var message = [
+ 'Submitted by '+opts.msgParams.origin,
'to be signed by: '+uiUtils.addressSummary(opts.msgParams.from),
'message:\n'+opts.msgParams.data,
].join('\n')
diff --git a/package.json b/package.json
index c5ec98b11..2e55d0d87 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
"through2": "^2.0.1",
"vreme": "^3.0.2",
"web3": "ethereum/web3.js#0.16.0",
- "web3-provider-engine": "^7.6.5",
+ "web3-provider-engine": "^7.7.0",
"web3-stream-provider": "^2.0.1",
"xtend": "^4.0.1"
},