Merge remote-tracking branch 'origin/master' into check-updates

2016-12-05 07:09:42 -08:00
parent 459babb1a8 e6ed49b2c9
commit afe4cc6a05
114 changed files with 282 additions and 328 deletions
--- a/ethcore/res/authority_round.json
+++ b/ethcore/res/authority_round.json
@@ -21,8 +21,7 @@
 	"genesis": {
 		"seal": {
 			"generic": {
-				"fields": 2,
-				"rlp": "0x200"
+				"rlp": "0xc28080"
 			}
 		},
 		"difficulty": "0x20000",
--- a/ethcore/res/instant_seal.json
+++ b/ethcore/res/instant_seal.json
@@ -12,7 +12,6 @@
 	"genesis": {
 		"seal": {
 			"generic": {
-				"fields": 0,
 				"rlp": "0x0"
 			}
 		},