From ad40e4d2608e0b1e329a6f9af851fbe2cc54e747 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 25 May 2017 12:37:04 -0700
Subject: [PATCH] Remove stream subprovider

Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root.
---
 app/scripts/lib/inpage-provider.js | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index 39196e240..8b8623974 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -1,7 +1,5 @@
 const pipe = require('pump')
-const ProviderEngine = require('web3-provider-engine')
-const FilterSubprovider = require('web3-provider-engine/subproviders/filters')
-const StreamSubprovider = require('web3-provider-engine/subproviders/stream')
+const StreamProvider = require('web3-stream-provider')
 const LocalStorageStore = require('obs-store')
 const ObjectMultiplex = require('./obj-multiplex')
 const createRandomId = require('./random-id')
@@ -29,24 +27,14 @@ function MetamaskInpageProvider (connectionStream) {
   )
 
   // connect to async provider
-  const engine = new ProviderEngine()
-
-  const filterSubprovider = new FilterSubprovider()
-  engine.addProvider(filterSubprovider)
-
-  const streamSubprovider = new StreamSubprovider()
-  engine.addProvider(streamSubprovider)
-
+  const asyncProvider = self.asyncProvider = new StreamProvider()
   pipe(
-    streamSubprovider,
+    asyncProvider,
     multiStream.createStream('provider'),
-    streamSubprovider,
+    asyncProvider,
     (err) => logStreamDisconnectWarning('MetaMask RpcProvider', err)
   )
-
   // start and stop polling to unblock first block lock
-  engine.start()
-  engine.once('latest', () => engine.stop())
 
   self.idMap = {}
   // handle sendAsync requests via asyncProvider
@@ -59,7 +47,7 @@ function MetamaskInpageProvider (connectionStream) {
       return message
     })
     // forward to asyncProvider
-    engine.sendAsync(request, function (err, res) {
+    asyncProvider.sendAsync(request, function (err, res) {
       if (err) return cb(err)
       // transform messages to original ids
       eachJsonMessage(res, (message) => {