From b654eb9b1f37cd3757e4614bb048884ab89d2986 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 11:52:57 -0700
Subject: wrap block tracker in events proxy

---
 app/scripts/controllers/network.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'app/scripts/controllers')

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 0a3e5e26b..6daedbb67 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -4,6 +4,7 @@ const ObservableStore = require('obs-store')
 const ComposedStore = require('obs-store/lib/composed')
 const extend = require('xtend')
 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']
 
@@ -31,16 +32,8 @@ module.exports = class NetworkController extends EventEmitter {
   initializeProvider (opts, providerContructor = MetaMaskProvider) {
     this.providerInit = opts
     this._provider = providerContructor(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
-        return value
-      },
-    })
+    this._proxy = createEventEmitterProxy(this._provider)
+    this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker)
     this.provider.on('block', this._logBlock.bind(this))
     this.provider.on('error', this.verifyNetwork.bind(this))
     this.ethQuery = new EthQuery(this.provider)
@@ -55,11 +48,12 @@ module.exports = class NetworkController extends EventEmitter {
 
     this._provider.removeAllListeners()
     this._provider.stop()
-    this.provider = MetaMaskProvider(newInit)
+    this._provider = MetaMaskProvider(newInit)
     // apply the listners created by other controllers
-    Object.keys(this._providerListeners).forEach((key) => {
-      this._providerListeners[key].forEach((handler) => this._provider.addListener(key, handler))
-    })
+    const blockTrackerHandlers = this.provider._blockTracker.proxyEventHandlers
+    this.provider.setTarget(this._provider)
+
+    this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker, blockTrackerHandlers)
     this.emit('networkDidChange')
   }
 
-- 
cgit v1.2.3


From 2ed8d579daa4d33c38891ac77d1415fcd237a187 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 13:37:13 -0700
Subject: listen for the blocke event on the block tracker instead of rawBlock
 on the provider

---
 app/scripts/controllers/network.js      | 1 -
 app/scripts/controllers/transactions.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/scripts/controllers')

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 6daedbb67..00bdca2c3 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -52,7 +52,6 @@ module.exports = class NetworkController extends EventEmitter {
     // apply the listners created by other controllers
     const blockTrackerHandlers = this.provider._blockTracker.proxyEventHandlers
     this.provider.setTarget(this._provider)
-
     this.provider._blockTracker = createEventEmitterProxy(this._provider._blockTracker, blockTrackerHandlers)
     this.emit('networkDidChange')
   }
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index fb3be6073..4e52a3c14 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -70,7 +70,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.pendingTxTracker.on('txFailed', this.setTxStatusFailed.bind(this))
     this.pendingTxTracker.on('txConfirmed', this.setTxStatusConfirmed.bind(this))
 
-    this.blockTracker.on('rawBlock', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
+    this.blockTracker.on('block', this.pendingTxTracker.checkForTxInBlock.bind(this.pendingTxTracker))
     // this is a little messy but until ethstore has been either
     // removed or redone this is to guard against the race condition
     // where ethStore hasent been populated by the results yet
-- 
cgit v1.2.3


From 9d1cb0f76dce203299200940f21e868f6a5efef3 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 26 Sep 2017 13:56:09 -0700
Subject: network contoller - clean up unused code

---
 app/scripts/controllers/network.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'app/scripts/controllers')

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 00bdca2c3..dc9978043 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -114,10 +114,4 @@ module.exports = class NetworkController extends EventEmitter {
     log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
     this.verifyNetwork()
   }
-
-  _on (event, handler) {
-    if (!this._providerListeners[event]) this._providerListeners[event] = []
-    this._providerListeners[event].push(handler)
-    this._provider.on(event, handler)
-  }
 }
-- 
cgit v1.2.3