Merge pull request #1329 from ethcore/softforktrigger

Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
parent 0e9ffff8ea 3aaf938add
commit 7c94b1495e
27 changed files with 26965 additions and 50 deletions
--- a/rpc/src/v1/tests/eth.rs
+++ b/rpc/src/v1/tests/eth.rs
@@ -183,7 +183,8 @@ const TRANSACTION_COUNT_SPEC: &'static [u8] = br#"{
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0xffffffffffffffff"
+				"frontierCompatibilityModeLimit": "0xffffffffffffffff",
+				"daoRescueSoftFork": false
 			}
 		}
 	},