Skip to content

Ability to boot enodes from a list in blockchain.yml, support for solc 1.0 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Oct 2, 2015
Merged

Ability to boot enodes from a list in blockchain.yml, support for solc 1.0 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d4150b9
update to 0.5.0
iurimatias Jul 10, 2015
5e0b457
updated README
iurimatias Jul 10, 2015
8bc4c11
Merge branch 'develop'
iurimatias Jul 15, 2015
c0a716d
Merge branch 'develop'
iurimatias Jul 15, 2015
c5ad69b
Merge branch 'develop'
iurimatias Jul 15, 2015
9b3610c
Merge branch 'develop'
iurimatias Jul 23, 2015
7661e8c
Merge branch 'develop'
iurimatias Jul 30, 2015
ddc134a
Merge branch 'develop'
iurimatias Jul 31, 2015
72dec76
Merge branch 'develop'
iurimatias Aug 2, 2015
4e5b40b
Merge branch 'develop'
iurimatias Aug 4, 2015
2f19b4c
Merge branch 'develop'
iurimatias Aug 5, 2015
e5a18eb
Merge branch 'develop'
iurimatias Aug 6, 2015
87a8fc7
Merge branch 'develop'
iurimatias Sep 5, 2015
6f808cf
ability to create multiple contracts with a single password for testi…
VoR0220 Sep 15, 2015
bc96708
correcting some changes I made in error
VoR0220 Sep 15, 2015
ef97e48
correcting some changes I made in error
VoR0220 Sep 15, 2015
381896c
Merge branch 'develop'
iurimatias Sep 15, 2015
1a4bcd1
support solc version 1.0
VoR0220 Sep 16, 2015
1a147ab
Merge branch 'develop' of https://github.com/iurimatias/embark-framew…
VoR0220 Sep 26, 2015
e084b53
Merge branch 'master' of https://github.com/VoR0220/embark-framework
VoR0220 Oct 1, 2015
b3cec82
added ability to boot nodes via a list
VoR0220 Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions boilerplate/config/blockchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ development:
account:
init: true
password: config/password
num: 1
staging:
rpc_host: localhost
rpc_port: 8101
Expand All @@ -22,6 +23,9 @@ staging:
network_id: 0
max_peers: 4
console: true
bootnodes:
boot: false
enodes: [] #insert enode urls here.
account:
init: false
address:
Expand All @@ -33,6 +37,9 @@ production:
network_id: 1
max_peers: 4
console: true
bootnodes:
boot: false
enodes: []
account:
init: false
address:
6 changes: 6 additions & 0 deletions lib/blockchain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ Blockchain.prototype.run_command = function(address, use_tmp) {
cmd += "--unlock " + address + " ";
}

if (config.bootNodes.init == true){
Copy link
Collaborator

@iurimatias iurimatias Oct 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VoR0220 is this meant to be boot instead of init?

cmd += "--bootnodes ";
for (var i = 0; i < config.bootNodes.enodes.length; i++){
cmd += config.bootNodes.enodes[i] + " ";
}
}
if (config.console_toggle) {
cmd += "console";
}
Expand Down
4 changes: 3 additions & 1 deletion lib/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ Compiler.prototype.compile_solidity = function(contractFile) {
output = result.output;

if (result.code === 1) {
throw new Error(result.output);
if (version == '0.1.1' || version == '0.1.0'){
throw new Error(result.output);
}
}

json = JSON.parse(output).contracts;
Expand Down
4 changes: 3 additions & 1 deletion lib/config/blockchain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ BlockchainConfig.prototype.config = function(env) {
else {
networkId = config.network_id;
}


config = {
rpcHost: config.rpc_host,
Expand All @@ -41,9 +42,10 @@ BlockchainConfig.prototype.config = function(env) {
genesisBlock: config.genesis_block,
datadir: config.datadir,
chains: config.chains,
bootNodes: config.bootnodes,
deployTimeout: config.deploy_timeout || 20,
networkId: networkId,
maxPeers: 4,
maxPeers: config.max_peers || 4,
port: config.port || "30303",
console_toggle: config.console || false,
mine_when_needed: config.mine_when_needed || false,
Expand Down