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 branch 'develop' of github.com:iurimatias/embark-framework into develop

This commit is contained in:
Iuri Matias 2018-01-17 11:24:26 -05:00
parent 32d63514bf 5985e6bea1
commit 7b58a770d9
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boilerplate/config/blockchain.json
View File

@ -17,7 +17,9 @@
"wsOrigins": "http://localhost:8000", "wsOrigins": "http://localhost:8000",
"wsRPC": true, "wsRPC": true,
"wsHost": "localhost", "wsHost": "localhost",
"wsPort": 8546 "wsPort": 8546,
"simulatorMnemonic": "example exile argue silk regular smile grass bomb merge arm assist farm",
"simulatorBlocktime": 0
}, },
"testnet": { "testnet": {
"enabled": true, "enabled": true,

4
demo/config/blockchain.json
View File

@ -17,7 +17,9 @@
"wsOrigins": "http://localhost:8000", "wsOrigins": "http://localhost:8000",
"wsRPC": true, "wsRPC": true,
"wsHost": "localhost", "wsHost": "localhost",
"wsPort": 8546 "wsPort": 8546,
"simulatorMnemonic": "example exile argue silk regular smile grass bomb merge arm assist farm",
"simulatorBlocktime": 0
}, },
"testnet": { "testnet": {
"enabled": true, "enabled": true,

13
lib/cmds/simulator.js
View File

@ -14,9 +14,20 @@ class Simulator {
cmds.push("-e " + (options.defaultBalance || 100)); cmds.push("-e " + (options.defaultBalance || 100));
cmds.push("-l " + (options.gasLimit || 8000000)); cmds.push("-l " + (options.gasLimit || 8000000));
// adding mnemonic only if it is defined in the blockchainConfig or options
let simulatorMnemonic = this.blockchainConfig.simulatorMnemonic || options.simulatorMnemonic;
if (simulatorMnemonic) {
cmds.push("--mnemonic \"" + (simulatorMnemonic) +"\"");
}
// adding blocktime only if it is defined in the blockchainConfig or options
let simulatorBlocktime = this.blockchainConfig.simulatorBlocktime || options.simulatorBlocktime;
if (simulatorBlocktime) {
cmds.push("-b \"" + (simulatorBlocktime) +"\"");
}
shelljs.exec('testrpc ' + cmds.join(' '), {async : true}); shelljs.exec('testrpc ' + cmds.join(' '), {async : true});
} }
} }
module.exports = Simulator; module.exports = Simulator;