Merge pull request #302 from MetaMask/batch-payload-origin

background - batch rpc fix for origin domain
feature/default_network_editable
Dan Finlay 9 years ago committed by GitHub
commit bb7788373d
  1. 11
      app/scripts/background.js

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

Loading…
Cancel
Save