From 01277f601452a4af2ea648ce297c31eee02148ab Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Tue, 19 Jun 2018 10:03:46 -0400
Subject: [PATCH] start web3 service so getGasPrice is available

---
 lib/index.js | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 410c1eb6f..858292ca0 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -6,17 +6,17 @@ require('colors');
 // Override process.chdir so that we have a partial-implementation PWD for Windows
 const realChdir = process.chdir;
 process.chdir = (...args) => {
-    if (!process.env.PWD) {
-        process.env.PWD = process.cwd();
-    }
-    realChdir(...args);
+  if (!process.env.PWD) {
+    process.env.PWD = process.cwd();
+  }
+  realChdir(...args);
 };
 
 let version = require('../package.json').version;
 
 class Embark {
 
-  constructor (options) {
+  constructor(options) {
     this.version = version;
     this.options = options || {};
   }
@@ -52,7 +52,7 @@ class Embark {
     this.context = options.context || [constants.contexts.simulator, constants.contexts.blockchain];
     let Simulator = require('./cmds/simulator.js');
     let simulator = new Simulator({
-      blockchainConfig: this.config.blockchainConfig, 
+      blockchainConfig: this.config.blockchainConfig,
       logger: this.logger
     });
     simulator.run(options);
@@ -129,7 +129,7 @@ class Embark {
         engine.events.on('check:backOnline:Ethereum', function () {
           engine.logger.info(__('Ethereum node detected') + '..');
           engine.config.reloadConfig();
-          engine.events.request('deploy:contracts', function(err) {
+          engine.events.request('deploy:contracts', function (err) {
             if (err) {
               return;
             }
@@ -201,7 +201,7 @@ class Embark {
         callback();
       },
       function deploy(callback) {
-        engine.events.request('deploy:contracts', function(err) {
+        engine.events.request('deploy:contracts', function (err) {
           callback(err);
         });
       },
@@ -227,7 +227,7 @@ class Embark {
   graph(options) {
     this.context = options.context || [constants.contexts.graph];
     options.onlyCompile = true;
-    
+
     const Engine = require('./core/engine.js');
     const engine = new Engine({
       env: options.env,
@@ -239,8 +239,7 @@ class Embark {
     });
     engine.init();
 
-    async.parallel([
-
+    async.waterfall([
       function (callback) {
         let pluginList = engine.plugins.listPlugins();
         if (pluginList.length > 0) {
@@ -251,14 +250,12 @@ class Embark {
         engine.startService("libraryManager");
         engine.startService("pipeline");
         engine.startService("deployment", {onlyCompile: true});
-        
+        engine.startService("web3");
         engine.startService("codeGenerator");
 
-        engine.events.request('deploy:contracts', function(err) {
-          callback(err);
-        });
+        engine.events.request('deploy:contracts', callback);
       }
-    ],  (err, _result) => {
+    ], (err) => {
       if (err) {
         engine.logger.error(err.message);
         engine.logger.info(err.stack);
@@ -320,7 +317,7 @@ class Embark {
         engine.startService("codeGenerator");
         callback();
       },
-      function setupStoragePlugin(callback){
+      function setupStoragePlugin(callback) {
         let pluginList = engine.plugins.listPlugins();
         if (pluginList.length > 0) {
           engine.logger.info(__("loaded plugins") + ": " + pluginList.join(", "));
@@ -344,15 +341,15 @@ class Embark {
       function deploy(callback) {
         engine.events.on('outputDone', function () {
           cmdPlugin.uploadCmds[0].cb()
-          .then((success) => {
-            callback(null, success);
-          })
-          .catch(callback);
+            .then((success) => {
+              callback(null, success);
+            })
+            .catch(callback);
         });
 
-        engine.events.request('deploy:contracts', function(err) {
+        engine.events.request('deploy:contracts', function (err) {
           engine.logger.info(__("finished deploying").underline);
-          if(err){
+          if (err) {
             callback(err);
           }
         });