Merge branch 'master' into rotating-key

Conflicts: ethcore/src/account_provider/mod.rs rpc/src/v1/types/mod.rs.in
2016-12-09 07:37:34 +00:00
parent dcb7e1e638 83f791fa5d
commit 93230dd4c2
342 changed files with 10048 additions and 4061 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"
 			}
 		},