Merge remote-tracking branch 'parity/master' into bft

2016-11-07 11:34:45 +00:00
parent 214916a414 b3d502ba78
commit ea960f1c27
1245 changed files with 71972 additions and 5008 deletions
--- a/json/src/spec/engine.rs
+++ b/json/src/spec/engine.rs
@@ -66,7 +66,7 @@ mod tests {
 					"durationLimit": "0x0d",
 					"blockReward": "0x4563918244F40000",
 					"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-					"frontierCompatibilityModeLimit" : "0x",
+					"homesteadTransition" : "0x",
 					"daoHardforkTransition": "0xffffffffffffffff",
 					"daoHardforkBeneficiary": "0x0000000000000000000000000000000000000000",
 					"daoHardforkAccounts": []