Merge with master

2017-08-02 17:24:34 +02:00
parent 2e840bc89c 0c7c34e609
commit 01ea968d4f
158 changed files with 14603 additions and 959 deletions
--- a/ethcore/res/constructor.json
+++ b/ethcore/res/constructor.json
@@ -11,7 +11,6 @@
 		"networkID" : "0x2"
 	},
 	"genesis": {
-		"gasLimitBoundDivisor": "0x0400",
 		"seal": {
 			"generic": "0x"
 		},
--- a/ethcore/res/validator_safe_contract.json
+++ b/ethcore/res/validator_safe_contract.json
@@ -3,7 +3,6 @@
 	"engine": {
 		"basicAuthority": {
 			"params": {
-				"gasLimitBoundDivisor": "0x0400",
 				"durationLimit": "0x0d",
 				"validators": {
 					"safeContract": "0x0000000000000000000000000000000000000005"