rpc - sync - add support for sync eth_accounts + eth_coinbase

feature/default_network_editable
kumavis 9 years ago
parent 3acb848520
commit b239bacd36
  1. 53
      app/scripts/inpage.js

@ -1,4 +1,5 @@
const Web3 = require('web3') const Web3 = require('web3')
const createPayload = require('web3-provider-engine/util/create-payload')
const StreamProvider = require('./lib/stream-provider.js') const StreamProvider = require('./lib/stream-provider.js')
const LocalMessageDuplexStream = require('./lib/local-message-stream.js') const LocalMessageDuplexStream = require('./lib/local-message-stream.js')
@ -12,21 +13,57 @@ var remoteProvider = new StreamProvider()
remoteProvider.pipe(pluginStream).pipe(remoteProvider) remoteProvider.pipe(pluginStream).pipe(remoteProvider)
// handle synchronous methods remotely // handle synchronous methods remotely
var syncProvider = new Web3.providers.HttpProvider('https://rawtestrpc.metamask.io/')
var unsupportedMethods = ['eth_accounts']
remoteProvider.send = function(payload){
var payloads = Array.isArray(payload) ? payload : [payload] // handle accounts cache
payloads.forEach(function(payload){ var accountsCache = []
if (-1 !== unsupportedMethods.indexOf(payload.method)) { setInterval(populateAccountsCache, 1000)
console.error('MetaMask - Unsupported synchronous call "'+payload.method+'".') function populateAccountsCache(){
remoteProvider.sendAsync(createPayload({
method: 'eth_accounts',
params: [],
note: 'from metamask inpage provider',
}), function(err, response){
if (err) return console.error('MetaMask - Error polling accounts')
// update localStorage
var accounts = response.result
if (accounts.toString() !== accountsCache.toString()) {
accountsCache = accounts
localStorage['MetaMask-Accounts'] = JSON.stringify(accounts)
} }
}) })
}
var syncProvider = new Web3.providers.HttpProvider('https://rawtestrpc.metamask.io/')
// var unsupportedMethods = ['eth_accounts']
remoteProvider.send = function(payload){
var result = null
switch (payload.method) {
case 'eth_accounts':
// read from localStorage
accountsCache = JSON.parse(localStorage['MetaMask-Accounts'] || '[]')
result = accountsCache
break
case 'eth_coinbase':
// read from localStorage
accountsCache = JSON.parse(localStorage['MetaMask-Accounts'] || '[]')
result = accountsCache[0] || '0x0000000000000000000000000000000000000000'
break
// fallback to normal rpc
default:
return syncProvider.send(payload) return syncProvider.send(payload)
} }
// return the result
return {
id: payload.id,
jsonrpc: payload.jsonrpc,
result: result,
}
}
// create web3 // create web3
var web3 = new Web3(remoteProvider) var web3 = new Web3(remoteProvider)

Loading…
Cancel
Save