embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in en.json

This commit is contained in:
Jonathan Rainville 2018-05-22 15:45:21 -04:00
parent c6b555af4e
commit 2062f9032c
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/core/engine.js
View File

@ -251,6 +251,13 @@ class Engine {
contractsManager: this.contractsManager, contractsManager: this.contractsManager,
onlyCompile: options.onlyCompile onlyCompile: options.onlyCompile
}); });
if (!options.web3) {
// Web3 object might have been modified
self.events.once('engine-ready', () => {
self.deployManager.web3 = self.web3;
});
}
this.events.on('file-event', function (fileType) { this.events.on('file-event', function (fileType) {
clearTimeout(self.fileTimeout); clearTimeout(self.fileTimeout);
@ -323,7 +330,17 @@ class Engine {
}); });
} }
stopWeb3Service() {
this.servicesMonitor.stopCheck('Ethereum');
if (this.provider) {
this.provider.stop();
}
this.web3 = null;
}
startBlockchainNode() { startBlockchainNode() {
self.isRunningBlockchain = true;
this.blockchainProcess = new ProcessLauncher({ this.blockchainProcess = new ProcessLauncher({
modulePath: utils.joinPath(__dirname, '../cmds/blockchain/blockchainProcess.js'), modulePath: utils.joinPath(__dirname, '../cmds/blockchain/blockchainProcess.js'),
logger: this.logger, logger: this.logger,
@ -340,6 +357,12 @@ class Engine {
locale: this.locale locale: this.locale
} }
}); });
// TODO use event from process to know when node is ready
setTimeout(() => {
// Wait a couple seconds for process to start
this.startService("web3");
}, 2000);
} }
libraryManagerService(_options) { libraryManagerService(_options) {

3
lib/i18n/locales/en.json
View File

@ -117,5 +117,6 @@
"finished building DApp and deploying to": "finished building DApp and deploying to", "finished building DApp and deploying to": "finished building DApp and deploying to",
"Type": "Type", "Type": "Type",
"to see the list of available commands": "to see the list of available commands", "to see the list of available commands": "to see the list of available commands",
"instantiated js-ipfs object configured to the current environment (available if ipfs is enabled)": "instantiated js-ipfs object configured to the current environment (available if ipfs is enabled)" "instantiated js-ipfs object configured to the current environment (available if ipfs is enabled)": "instantiated js-ipfs object configured to the current environment (available if ipfs is enabled)",
"reset done!": "reset done!"
} }

8
lib/index.js
View File

@ -151,7 +151,7 @@ class Embark {
engine.logger.info(__("Ready").underline); engine.logger.info(__("Ready").underline);
engine.events.emit("status", __("Ready").green); engine.events.emit("status", __("Ready").green);
}); });
engine.events.on('engine-ready', function () { engine.events.once('engine-ready', function () {
engine.deployManager.deployContracts(function (err) { engine.deployManager.deployContracts(function (err) {
engine.startService("fileWatcher"); engine.startService("fileWatcher");
if (options.runWebserver) { if (options.runWebserver) {
@ -217,8 +217,10 @@ class Embark {
callback(); callback();
}, },
function deploy(callback) { function deploy(callback) {
engine.deployManager.deployContracts(function (err) { engine.events.once('engine-ready', function () {
callback(err); engine.deployManager.deployContracts(function (err) {
callback(err);
});
}); });
} }
], function (err, _result) { ], function (err, _result) {