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

fix(@embark-utils/accountParser): fix privateKey accounts

This commit is contained in:
Jonathan Rainville 2019-05-07 17:28:11 -04:00 committed by Pascal Precht
parent 3dcc339e4d
commit fc02405db2
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/embark-utils/src/accountParser.js
View File

@ -67,11 +67,11 @@ class AccountParser {
return null; return null;
} }
const key = Buffer.from(accountConfig.privateKey.substr(2), 'hex');
if (returnAddress) { if (returnAddress) {
const key = Buffer.from(accountConfig.privateKey.substr(2), 'hex');
return ethereumjsWallet.fromPrivateKey(key).getChecksumAddressString(); return ethereumjsWallet.fromPrivateKey(key).getChecksumAddressString();
} }
return Object.assign(web3.eth.accounts.privateKeyToAccount(key), {hexBalance}); return Object.assign(web3.eth.accounts.privateKeyToAccount(accountConfig.privateKey), {hexBalance});
} else if (Object.hasOwnProperty('privateKey')) { } else if (Object.hasOwnProperty('privateKey')) {
logger.error(__('accounts error: privateKey field is specified but its value is undefined')); logger.error(__('accounts error: privateKey field is specified but its value is undefined'));
} }
@ -109,9 +109,8 @@ class AccountParser {
return null; return null;
} }
key = Buffer.from(key.substr(2), 'hex');
if (returnAddress) { if (returnAddress) {
key = Buffer.from(key.substr(2), 'hex');
return ethereumjsWallet.fromPrivateKey(key).getChecksumAddressString(); return ethereumjsWallet.fromPrivateKey(key).getChecksumAddressString();
} }
return Object.assign(web3.eth.accounts.privateKeyToAccount(key), {hexBalance}); return Object.assign(web3.eth.accounts.privateKeyToAccount(key), {hexBalance});

3
packages/embark/src/lib/modules/blockchain_connector/index.js
View File

@ -167,7 +167,8 @@ class BlockchainConnector {
isDev: this.isDev, isDev: this.isDev,
type: type, type: type,
web3Endpoint: self.web3Endpoint, web3Endpoint: self.web3Endpoint,
events: this.events events: this.events,
fs: this.fs
}; };
this.provider = new Provider(providerOptions); this.provider = new Provider(providerOptions);

5
packages/embark/src/lib/modules/blockchain_connector/provider.js
View File

@ -15,6 +15,7 @@ class Provider {
this.logger = options.logger; this.logger = options.logger;
this.isDev = options.isDev; this.isDev = options.isDev;
this.events = options.events; this.events = options.events;
this.fs = options.fs;
this.nonceCache = {}; this.nonceCache = {};
this.events.setCommandHandler("blockchain:provider:contract:accounts:get", cb => { this.events.setCommandHandler("blockchain:provider:contract:accounts:get", cb => {
@ -70,11 +71,11 @@ class Provider {
self.logger.warn('Error while getting the node\'s accounts.', err.message || err); self.logger.warn('Error while getting the node\'s accounts.', err.message || err);
} }
self.blockchainAccounts = AccountParser.parseAccountsConfig(self.blockchainConfig.accounts, self.web3, self.logger, accounts); self.blockchainAccounts = AccountParser.parseAccountsConfig(self.blockchainConfig.accounts, self.web3, this.fs.dappPath(), self.logger, accounts);
accounts = accounts.concat(self.blockchainAccounts); accounts = accounts.concat(self.blockchainAccounts);
self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, self.logger, accounts); self.accounts = AccountParser.parseAccountsConfig(self.accountsConfig, self.web3, this.fs.dappPath(), self.logger, accounts);
if (!self.accounts.length) { if (!self.accounts.length) {
self.accounts = accounts; self.accounts = accounts;