Wrap the provider in a proxy

2 files changed, 57 insertions, 80 deletions

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 82eabb573..97c2ccbc2 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -3,21 +3,29 @@ const MetaMaskProvider = require('web3-provider-engine/zero.js')
 const ObservableStore = require('obs-store')
 const extend = require('xtend')
 const EthQuery = require('eth-query')
-const MetamaskConfig = require('../config.js')
-
-const TESTNET_RPC = MetamaskConfig.network.testnet
-const MAINNET_RPC = MetamaskConfig.network.mainnet
-const MORDEN_RPC = MetamaskConfig.network.morden
-const KOVAN_RPC = MetamaskConfig.network.kovan
-const RINKEBY_RPC = MetamaskConfig.network.rinkeby
+const RPC_ADDRESS_LIST = require('../config.js').network
 
 module.exports = class NetworkController extends EventEmitter {
   constructor (providerOpts) {
     super()
     this.networkStore = new ObservableStore({ network: 'loading' })
-    providerOpts.provider.rpcTarget = this.getRpcAddressForType(providerOpts.provider.type)
+    providerOpts.provider.rpcTarget = this.getRpcAddressForType(providerOpts.provider.type, providerOpts.provider)
     this.providerStore = new ObservableStore(providerOpts)
-    this._claimed = 0
+    this.store = new ObservableStore(extend(this.networkStore.getState(), this.providerStore.getState()))
+
+    this._providerListners = {}
+
+    this.networkStore.subscribe((state) => this.store.updateState(state))
+    this.providerStore.subscribe((state) => this.store.updateState(state))
+    this.on('networkSwitch', this.lookupNetwork)
+  }
+
+  get provider () {
+    return this._proxy
+  }
+
+  set provider (provider) {
+    this._provider = provider
   }
 
   getState () {
@@ -29,28 +37,35 @@ module.exports = class NetworkController extends EventEmitter {
 
   initializeProvider (opts) {
     this.providerConfig = opts
-    this.provider = MetaMaskProvider(opts)
+    this._provider = MetaMaskProvider(opts)
+    this._proxy = new Proxy(this._provider, {
+      get: (obj, name) => {
+        if (name === 'on') return this._on.bind(this)
+        return this._provider[name]
+      },
+      set: (obj, name, value) => {
+        this._provider[name] = value
+      },
+    })
+    this.provider.on('block', this._logBlock.bind(this))
+    this.provider.on('error', this.verifyNetwork.bind(this))
     this.ethQuery = new EthQuery(this.provider)
     this.lookupNetwork()
-    return Promise.resolve(this.provider)
+    return this.provider
   }
+
   switchNetwork (providerConfig) {
-    delete this.provider
-    delete this.ethQuery
     const newConfig = extend(this.providerConfig, providerConfig)
     this.providerConfig = newConfig
+
     this.provider = MetaMaskProvider(newConfig)
-    this.ethQuery = new EthQuery(this.provider)
-    this.emit('networkSwitch', {
-      provider: this.provider,
-      ethQuery: this.ethQuery,
-    }, this.claim.bind(this))
+    // apply the listners created by other controllers
+    Object.keys(this._providerListners).forEach((key) => {
+      this._providerListners[key].forEach((handler) => this._provider.addListener(key, handler))
+    })
+    this.emit('networkSwitch', this.provider)
   }
 
-  subscribe (cb) {
-    this.networkStore.subscribe(cb)
-    this.providerStore.subscribe(cb)
-  }
 
   verifyNetwork () {
   // Check network when restoring connectivity:
@@ -74,7 +89,6 @@ module.exports = class NetworkController extends EventEmitter {
 
     this.ethQuery.sendAsync({ method: 'net_version' }, (err, network) => {
       if (err) return this.setNetworkState('loading')
-
       log.info('web3.getNetwork returned ' + network)
       this.setNetworkState(network)
     })
@@ -102,51 +116,27 @@ module.exports = class NetworkController extends EventEmitter {
     this.switchNetwork({
       rpcUrl: rpcTarget,
     })
-    this.once('claimed', () => {
-      this.providerStore.updateState({provider: {type, rpcTarget}})
-      console.log('CLAIMED')
-      this.lookupNetwork()
-    })
-
-  }
-
-  useEtherscanProvider () {
-    this.setProviderType('etherscan')
+    this.providerStore.updateState({provider: {type, rpcTarget}})
   }
 
   getProvider () {
     return this.providerStore.getState().provider
   }
 
-  getRpcAddressForType (type) {
-    const provider = this.getProvider()
-    switch (type) {
-
-      case 'mainnet':
-        return MAINNET_RPC
-
-      case 'testnet':
-        return TESTNET_RPC
-
-      case 'morden':
-        return MORDEN_RPC
-
-      case 'kovan':
-        return KOVAN_RPC
-
-      case 'rinkeby':
-        return RINKEBY_RPC
+  getRpcAddressForType (type, provider = this.getProvider()) {
+    console.log(`#getRpcAddressForType: ${type}`)
+    if (type in RPC_ADDRESS_LIST) return RPC_ADDRESS_LIST[type]
+    return provider && provider.rpcTarget ? provider.rpcTarget : RPC_ADDRESS_LIST['rinkeby']
+  }
 
-      default:
-        return provider && provider.rpcTarget ? provider.rpcTarget : TESTNET_RPC
-    }
+  _logBlock (block) {
+    log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
+    this.verifyNetwork()
   }
 
-  claim () {
-    this._claimed += 1
-    if (this._claimed === this.listenerCount('networkSwitch')) {
-      this.emit('claimed')
-      this._claimed = 0
-    }
+  _on (event, handler) {
+    if (!this._providerListners[event]) this._providerListners[event] = []
+    this._providerListners[event].push(handler)
+    this._provider.on(event, handler)
   }
 }
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index cfeeab6e6..b9bea2f1c 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -4,7 +4,6 @@ const extend = require('xtend')
 const Semaphore = require('semaphore')
 const ObservableStore = require('obs-store')
 const ethUtil = require('ethereumjs-util')
-const EthQuery = require('eth-query')
 const TxProviderUtil = require('../lib/tx-utils')
 const createId = require('../lib/random-id')
 
@@ -18,11 +17,13 @@ module.exports = class TransactionManager extends EventEmitter {
     this.networkStore = opts.networkStore || new ObservableStore({})
     this.preferencesStore = opts.preferencesStore || new ObservableStore({})
     this.txHistoryLimit = opts.txHistoryLimit
-    this.setupProviderAndEthQuery({
-      provider: opts.provider,
-      blockTracker: opts.blockTracker,
-      ethQuery: opts.ethQuery,
-    })
+    this.provider = opts.provider
+    this.blockTracker = opts.blockTracker
+    this.query = opts.ethQuery
+    this.txProviderUtils = new TxProviderUtil(this.query)
+    this.networkStore.subscribe((_) => this.blockTracker.on('block', this.checkForTxInBlock.bind(this)))
+    this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
+
     this.signEthTx = opts.signTransaction
     this.nonceLock = Semaphore(1)
 
@@ -41,20 +42,6 @@ module.exports = class TransactionManager extends EventEmitter {
     return this.networkStore.getState().network
   }
 
-  setupProviderAndEthQuery ({provider, blockTracker, ethQuery}) {
-    if (this.provider) {
-      delete this.provider
-      delete this.blockTracker
-      delete this.query
-      delete this.txProviderUtils
-    }
-    this.provider = provider
-    this.query = ethQuery
-    this.txProviderUtils = new TxProviderUtil(ethQuery)
-    blockTracker ? this.blockTracker = blockTracker : this.blockTracker = provider
-    this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
-  }
-
   getSelectedAddress () {
     return this.preferencesStore.getState().selectedAddress
   }