grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'consistent-id' into check-updates

Browse Source
This commit is contained in:
Gav Wood
2016-12-09 23:12:36 +01:00
parent c82754874c 5f1fcf95e0
commit edd5e76050
18 changed files with 317 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ethcore/res/authority_round.json
View File

@@ -4,7 +4,8 @@
"AuthorityRound": {
"params": {
"gasLimitBoundDivisor": "0x0400",
"stepDuration": "1",
"stepDuration": 1,
"startStep": 2,
"authorities" : [
"0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e",
"0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1"