From c5432da567b9953c1294e0bf598a0310127bf808 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Sat, 20 May 2017 20:37:47 -0700
Subject: [PATCH] Add new streaming subprovider but getting a loop

Regarding #1458

Uses a new streaming subprovider architecture on an experimental branch of StreamProvider:
https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider
---
 app/scripts/lib/inpage-provider.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js
index e5e398e24..88d81cca5 100644
--- a/app/scripts/lib/inpage-provider.js
+++ b/app/scripts/lib/inpage-provider.js
@@ -1,5 +1,6 @@
 const pipe = require('pump')
-const StreamProvider = require('web3-stream-provider')
+const StreamSubprovider = require('web3-stream-provider/stream-subprovider')
+const ProviderEngine = require('web3-provider-engine')
 const LocalStorageStore = require('obs-store')
 const ObjectMultiplex = require('./obj-multiplex')
 const createRandomId = require('./random-id')
@@ -27,14 +28,21 @@ function MetamaskInpageProvider (connectionStream) {
   )
 
   // connect to async provider
-  const asyncProvider = self.asyncProvider = new StreamProvider()
+  const engine = self.asyncProvider = new ProviderEngine()
+
+  const stream = self.stream = new StreamSubprovider()
+  engine.addProvider(stream)
+
   pipe(
-    asyncProvider,
+    stream,
     multiStream.createStream('provider'),
-    asyncProvider,
+    stream,
     (err) => logStreamDisconnectWarning('MetaMask RpcProvider', err)
   )
 
+  // start polling
+  engine.start()
+
   self.idMap = {}
   // handle sendAsync requests via asyncProvider
   self.sendAsync = function (payload, cb) {
@@ -46,7 +54,9 @@ function MetamaskInpageProvider (connectionStream) {
       return message
     })
     // forward to asyncProvider
-    asyncProvider.sendAsync(request, function (err, res) {
+    console.log('sending async to engine', request)
+    engine.sendAsync(request, function (err, res) {
+      console.log('send async returned !!', err, res)
       if (err) return cb(err)
       // transform messages to original ids
       eachJsonMessage(res, (message) => {