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

move getBalance in accountParser

This commit is contained in:
Jonathan Rainville 2018-06-07 10:53:20 -04:00
parent 3d70028cc5
commit bb3e87d85e
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/contracts/accountParser.js
View File

@ -21,10 +21,29 @@ class AccountParser {
return accounts; return accounts;
} }
static getHexBalance(balanceString, web3) {
if (!balanceString) {
return 0xFFFFFFFFFFFFFFFFFF;
}
if (web3.utils.isHexStrict(balanceString)) {
return balanceString;
}
const match = balanceString.match(/([0-9]+) ?([a-zA-Z]*)/);
if (!match[2]) {
return web3.utils.toHex(parseInt(match[1], 10));
}
return web3.utils.toHex(web3.utils.toWei(match[1], match[2]));
}
static getAccount(accountConfig, web3, logger) { static getAccount(accountConfig, web3, logger) {
if (!logger) { if (!logger) {
logger = console; logger = console;
} }
let hexBalance = null;
if (accountConfig.balance) {
hexBalance = AccountParser.getHexBalance(accountConfig.balance, web3);
}
if (accountConfig.privateKey) { if (accountConfig.privateKey) {
if (!accountConfig.privateKey.startsWith('0x')) { if (!accountConfig.privateKey.startsWith('0x')) {
accountConfig.privateKey = '0x' + accountConfig.privateKey; accountConfig.privateKey = '0x' + accountConfig.privateKey;
@ -33,7 +52,7 @@ class AccountParser {
logger.warn(`Private key ending with ${accountConfig.privateKey.substr(accountConfig.privateKey.length - 5)} is not a HEX string`); logger.warn(`Private key ending with ${accountConfig.privateKey.substr(accountConfig.privateKey.length - 5)} is not a HEX string`);
return null; return null;
} }
return web3.eth.accounts.privateKeyToAccount(accountConfig.privateKey); return Object.assign(web3.eth.accounts.privateKeyToAccount(accountConfig.privateKey), {hexBalance});
} }
if (accountConfig.privateKeyFile) { if (accountConfig.privateKeyFile) {
let fileContent = fs.readFileSync(fs.dappPath(accountConfig.privateKeyFile)).toString(); let fileContent = fs.readFileSync(fs.dappPath(accountConfig.privateKeyFile)).toString();
@ -46,7 +65,7 @@ class AccountParser {
logger.warn(`Private key is not a HEX string in file ${accountConfig.privateKeyFile} at index ${index}`); logger.warn(`Private key is not a HEX string in file ${accountConfig.privateKeyFile} at index ${index}`);
return null; return null;
} }
return web3.eth.accounts.privateKeyToAccount(key); return Object.assign(web3.eth.accounts.privateKeyToAccount(key), {hexBalance});
}); });
} }
if (accountConfig.mnemonic) { if (accountConfig.mnemonic) {
@ -59,7 +78,7 @@ class AccountParser {
const accounts = []; const accounts = [];
for (let i = addressIndex; i < addressIndex + numAddresses; i++) { for (let i = addressIndex; i < addressIndex + numAddresses; i++) {
const wallet = hdwallet.derivePath(wallet_hdpath + i).getWallet(); const wallet = hdwallet.derivePath(wallet_hdpath + i).getWallet();
accounts.push(web3.eth.accounts.privateKeyToAccount('0x' + wallet.getPrivateKey().toString('hex'))); accounts.push(Object.assign(web3.eth.accounts.privateKeyToAccount('0x' + wallet.getPrivateKey().toString('hex')), {hexBalance}));
} }
return accounts; return accounts;
} }

20
lib/tests/test.js
View File

@ -61,29 +61,13 @@ class Test {
this.engine.startService("codeGenerator"); this.engine.startService("codeGenerator");
} }
getBalance(balanceString) {
if (!balanceString) {
return 0xFFFFFFFFFFFFFFFFFF;
}
if (this.web3.utils.isHexStrict(balanceString)) {
return balanceString;
}
const match = balanceString.match(/([0-9]+) ?([a-zA-Z]*)/);
if (!match[2]) {
return this.web3.utils.toHex(parseInt(match[1], 10));
}
return this.web3.utils.toHex(this.web3.utils.toWei(match[1], match[2]));
}
initWeb3Provider() { initWeb3Provider() {
if (this.simOptions.node) { if (this.simOptions.node) {
this.web3.setProvider(new this.web3.providers.HttpProvider(this.simOptions.node)); this.web3.setProvider(new this.web3.providers.HttpProvider(this.simOptions.node));
} else { } else {
if (this.simOptions.accounts) { if (this.simOptions.accounts) {
this.simOptions.accounts = this.simOptions.accounts.map((account, index) => { this.simOptions.accounts = this.simOptions.accounts.map((account) => {
const balance = this.getBalance(this.options.deployment.accounts[index].balance); return {balance: account.hexBalance, secretKey: account.privateKey};
return {balance, secretKey: account.privateKey};
}); });
} }
this.sim = getSimulator(); this.sim = getSimulator();