aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-12-14 09:15:26 +0800
committerGitHub <noreply@github.com>2017-12-14 09:15:26 +0800
commit0935e22d30d14d1185a89904df1271623e17985a (patch)
treea72ff3eae86376ce15d9e9cdfe318d961b9a31f2
parent3ebeec18181e2277b4259215c612cfa94d852be9 (diff)
parent33e6befdaa1c3f969581117b3ad6136ee263e353 (diff)
downloadtangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar.gz
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar.bz2
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar.lz
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar.xz
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.tar.zst
tangerine-wallet-browser-0935e22d30d14d1185a89904df1271623e17985a.zip
Merge pull request #2741 from MetaMask/infura-block-tracker
network - for infura networks use the infura block tracker provider
-rw-r--r--app/scripts/controllers/network.js57
-rw-r--r--package.json3
2 files changed, 52 insertions, 8 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index cee918796..65d58008a 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -1,6 +1,7 @@
const assert = require('assert')
const EventEmitter = require('events')
const createMetamaskProvider = require('web3-provider-engine/zero.js')
+const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider')
const ObservableStore = require('obs-store')
const ComposedStore = require('obs-store/lib/composed')
const extend = require('xtend')
@@ -8,6 +9,7 @@ const EthQuery = require('eth-query')
const createEventEmitterProxy = require('../lib/events-proxy.js')
const RPC_ADDRESS_LIST = require('../config.js').network
const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
+const INFURA_PROVIDER_TYPES = ['ropsten', 'rinkeby', 'kovan', 'mainnet']
module.exports = class NetworkController extends EventEmitter {
@@ -24,8 +26,13 @@ module.exports = class NetworkController extends EventEmitter {
initializeProvider (_providerParams) {
this._baseProviderParams = _providerParams
- const rpcUrl = this.getCurrentRpcAddress()
- this._configureStandardProvider({ rpcUrl })
+ const { type, rpcTarget } = this.providerStore.getState()
+ // map rpcTarget to rpcUrl
+ const opts = {
+ type,
+ rpcUrl: rpcTarget,
+ }
+ this._configureProvider(opts)
this._proxy.on('block', this._logBlock.bind(this))
this._proxy.on('error', this.verifyNetwork.bind(this))
this.ethQuery = new EthQuery(this._proxy)
@@ -83,7 +90,7 @@ module.exports = class NetworkController extends EventEmitter {
const rpcTarget = this.getRpcAddressForType(type)
assert(rpcTarget, `NetworkController - unknown rpc address for type "${type}"`)
this.providerStore.updateState({ type, rpcTarget })
- this._switchNetwork({ rpcUrl: rpcTarget })
+ this._switchNetwork({ type })
}
getProviderConfig () {
@@ -99,14 +106,50 @@ module.exports = class NetworkController extends EventEmitter {
// Private
//
- _switchNetwork (providerParams) {
+ _switchNetwork (opts) {
this.setNetworkState('loading')
- this._configureStandardProvider(providerParams)
+ this._configureProvider(opts)
this.emit('networkDidChange')
}
- _configureStandardProvider (_providerParams) {
- const providerParams = extend(this._baseProviderParams, _providerParams, {
+ _configureProvider (opts) {
+ // type-based rpc endpoints
+ const { type } = opts
+ if (type) {
+ // type-based infura rpc endpoints
+ const isInfura = INFURA_PROVIDER_TYPES.includes(type)
+ opts.rpcUrl = this.getRpcAddressForType(type)
+ if (isInfura) {
+ this._configureInfuraProvider(opts)
+ // other type-based rpc endpoints
+ } else {
+ this._configureStandardProvider(opts)
+ }
+ // url-based rpc endpoints
+ } else {
+ this._configureStandardProvider(opts)
+ }
+ }
+
+ _configureInfuraProvider (opts) {
+ console.log('_configureInfuraProvider', opts)
+ const blockTrackerProvider = createInfuraProvider({
+ network: opts.type,
+ })
+ const providerParams = extend(this._baseProviderParams, {
+ rpcUrl: opts.rpcUrl,
+ engineParams: {
+ pollingInterval: 8000,
+ blockTrackerProvider,
+ },
+ })
+ const provider = createMetamaskProvider(providerParams)
+ this._setProvider(provider)
+ }
+
+ _configureStandardProvider ({ rpcUrl }) {
+ const providerParams = extend(this._baseProviderParams, {
+ rpcUrl,
engineParams: {
pollingInterval: 8000,
},
diff --git a/package.json b/package.json
index ebe298aea..3a7e33b7a 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
"eth-contract-metadata": "^1.1.4",
"eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^1.2.4",
+ "eth-json-rpc-infura": "^1.0.1",
"eth-keyring-controller": "^2.1.2",
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
@@ -152,7 +153,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "^0.20.1",
- "web3-provider-engine": "^13.3.4",
+ "web3-provider-engine": "^13.4.0",
"web3-stream-provider": "^3.0.1",
"xtend": "^4.0.1"
},