m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge branch 'master' of github.com:MetaMask/metamask-plugin into AutoLint

Browse Source
This commit is contained in:
Dan Finlay 2016-06-21 14:12:48 -07:00
commit 3c01969fe3
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scripts/background.js
View File

@ -148,7 +148,10 @@ function setupPublicConfig (stream) {
}
function setupProviderConnection (stream, originDomain) {
stream.on('data', function onRpcRequest (payload) {
// decorate all payloads with origin domain
stream.on('data', function onRpcRequest (request) {
var payloads = Array.isArray(request) ? request : [request]
payloads.forEach(function (payload) {
// Append origin to rpc payload
payload.origin = originDomain
// Append origin to signature request
@ -157,12 +160,13 @@ function setupProviderConnection (stream, originDomain) {
} else if (payload.method === 'eth_sign') {
payload.params.push({ origin: originDomain })
}
})
// handle rpc request
provider.sendAsync(payload, function onPayloadHandled (err, response) {
provider.sendAsync(request, function onPayloadHandled (err, response) {
if (err) {
return logger(err)
}
logger(null, payload, response)
logger(null, request, response)
try {
stream.write(response)
} catch (err) {