status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #596 from embark-framework/bug_fix/account 

fix account initialization and address use
This commit is contained in:
Jonathan Rainville 2018-07-03 15:03:56 -04:00 committed by GitHub
parent de39180737 ffb3ec544b
commit d184d71cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cmds/blockchain/blockchain.js
View File

@ -204,6 +204,7 @@ Blockchain.prototype.isClientInstalled = function(callback) {
Blockchain.prototype.initChainAndGetAddress = function(callback) { Blockchain.prototype.initChainAndGetAddress = function(callback) {
const self = this; const self = this;
let address = null; let address = null;
const ALREADY_INITIALIZED = 'already';
// ensure datadir exists, bypassing the interactive liabilities prompt. // ensure datadir exists, bypassing the interactive liabilities prompt.
self.datadir = '.embark/' + self.env + '/datadir'; self.datadir = '.embark/' + self.env + '/datadir';
@ -219,14 +220,14 @@ Blockchain.prototype.initChainAndGetAddress = function(callback) {
fs.copy(fs.embarkPath("js"), ".embark/" + self.env + "/js", {overwrite: true}, next); fs.copy(fs.embarkPath("js"), ".embark/" + self.env + "/js", {overwrite: true}, next);
}, },
function listAccounts(next) { function listAccounts(next) {
self.runCommand(self.client.listAccountsCommand(), {}, (err, stdout, stderr) => { self.runCommand(self.client.listAccountsCommand(), {}, (err, stdout, _stderr) => {
if (err || stderr || stdout === undefined || stdout.match(/{(\w+)}/) === null || stdout.indexOf("Fatal") >= 0) { if (err || stdout === undefined || stdout.match(/{(\w+)}/) === null || stdout.indexOf("Fatal") >= 0) {
console.log(__("no accounts found").green); console.log(__("no accounts found").green);
return next(); return next();
} }
console.log(__("already initialized").green); console.log(__("already initialized").green);
address = stdout.match(/{(\w+)}/)[1]; address = stdout.match(/{(\w+)}/)[1];
next(); next(ALREADY_INITIALIZED);
}); });
}, },
function genesisBlock(next) { function genesisBlock(next) {
@ -248,6 +249,9 @@ Blockchain.prototype.initChainAndGetAddress = function(callback) {
}); });
} }
], (err) => { ], (err) => {
if (err === ALREADY_INITIALIZED) {
err = null;
}
callback(err, address); callback(err, address);
}); });
}; };

2
lib/cmds/blockchain/geth_commands.js
View File

@ -197,7 +197,7 @@ class GethCommands {
}, },
function accountToUnlock(callback) { function accountToUnlock(callback) {
let accountAddress = ""; let accountAddress = "";
if(config.hasOwnProperty('address') && config.account.hasOwnProperty('address')) { if(config.account && config.account.address) {
accountAddress = config.account.address; accountAddress = config.account.address;
} else { } else {
accountAddress = address; accountAddress = address;