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

Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc

Browse Source
This commit is contained in:
Gav Wood
2016-12-15 13:51:22 +01:00
parent 69eec105a7 9440c2600f
commit 1ea521ea7d
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ethcore/res/tendermint.json
View File

@@ -19,8 +19,12 @@
},
"genesis": {
"seal": {
"generic": {
"rlp": "f88980b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f843b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
"tendermint": {
"round": "0x0",
"proposal": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"precommits": [
"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
]
}
},
"difficulty": "0x20000",