From 2784d0d95353947adbcf01c356f1b74f9e5b73af Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Thu, 11 Jul 2019 19:00:25 -0400
Subject: [PATCH] add basic embarkjs provider registration

---
 packages/embarkjs-connector-web3/index.js | 48 +++++++++++------------
 packages/embarkjs/src/blockchain.js       | 18 ---------
 2 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/packages/embarkjs-connector-web3/index.js b/packages/embarkjs-connector-web3/index.js
index 256f902e0..372281877 100644
--- a/packages/embarkjs-connector-web3/index.js
+++ b/packages/embarkjs-connector-web3/index.js
@@ -1,6 +1,8 @@
 const { dappPath, embarkPath } = require('embark-utils');
 const path = require('path');
 
+// TODO: embarkjs artifacts etc.. will need to be moved here
+
 class EmbarkJSConnectorWeb3 {
   constructor(embark, _options) {
     this.embark = embark;
@@ -8,31 +10,35 @@ class EmbarkJSConnectorWeb3 {
     this.fs = embark.fs;
     this.config = embark.config;
     this.constants = embark.constants;
-    this.registerProvider();
+
+    // this.registerProvider();
+    // TODO: will need to be changed to an action but that requires changes in the blockchain launch process
+    this.events.on("blockchain:ready", this.executeEmbarkJSBlockchain.bind(this));
   }
 
-  async registerProvider() {
-    let blockchainConnectorReady = false;
-    await this.whenRuncodeReady();
+  async executeEmbarkJSBlockchain() {
+    let code = "";
+    const connectorCode = this.fs.readFileSync(path.join(__dirname, 'embarkJSConnectorWeb3.js'), 'utf8');
+    code += connectorCode;
 
-    const web3LocationPromise = this.getWeb3Location();
+    code += "\nEmbarkJS.Blockchain.registerProvider('web3', embarkJSConnectorWeb3);";
+    // code += "\nEmbarkJS.Blockchain.setProvider('web3', {});";
 
-    this.events.setCommandHandler('blockchain:connector:ready', (cb) => {
-      if (blockchainConnectorReady) {
-        return cb();
+    code += "\nEmbarkJS.Blockchain.setProvider('web3', {web3});";
+
+    this.events.request('runcode:eval', code, (err) => {
+      if (err) {
+        return cb(err);
       }
-      this.events.once("blockchain:connector:ready", () => {
-        cb();
-      });
     });
+  }
 
-    web3LocationPromise.then((_web3Location) => {
-      blockchainConnectorReady = true;
-      this.events.emit('blockchain:connector:ready');
-    });
+  // ===============
+  // ===============
+  // ===============
 
-    let web3Location = await web3LocationPromise;
-    web3Location = web3Location.replace(/\\/g, '/');
+  async registerProvider() {
+    let web3Location = (await this.getWeb3Location()).replace(/\\/g, '/');
 
     await this.registerVar('__Web3', require(web3Location));
 
@@ -65,14 +71,6 @@ class EmbarkJSConnectorWeb3 {
     this.embark.addConsoleProviderInit('blockchain', code, shouldInit);
   }
 
-  whenRuncodeReady() {
-    return new Promise((resolve) => {
-      this.events.on('runcode:ready', () => {
-        resolve();
-      });
-    });
-  }
-
   getWeb3Location() {
     return new Promise((resolve, reject) => {
       this.events.request("version:get:web3", (web3Version) => {
diff --git a/packages/embarkjs/src/blockchain.js b/packages/embarkjs/src/blockchain.js
index b552ca6cc..1589b7f5b 100644
--- a/packages/embarkjs/src/blockchain.js
+++ b/packages/embarkjs/src/blockchain.js
@@ -51,24 +51,6 @@ Blockchain.connect = function(options, callback) {
   return connect(options);
 };
 
-Blockchain.connectConsole = function(doneCb) {
-  this.doFirst((cb) => {
-    this.blockchainConnector.getAccounts(async (err, accounts) => {
-      if (accounts) {
-        this.blockchainConnector.setDefaultAccount(accounts[0]);
-      }
-      let _err = err;
-      try {
-        await cb(_err);
-      } catch (e) {
-        _err = e;
-      } finally {
-        doneCb(_err);
-      }
-    });
-  });
-};
-
 Blockchain.doFirst = function(todo) {
   todo((err) => {
     this.done = true;