From f3ff6ebd7157b70c54df16528998b2b85398616e Mon Sep 17 00:00:00 2001 From: Tjaden Hess Date: Mon, 27 Jun 2016 18:21:42 -0400 Subject: [PATCH] forwaaaaard --- core/block_validator.go | 4 ++-- core/state_processor.go | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/block_validator.go b/core/block_validator.go index 524de297e0..007709fc97 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -268,7 +268,7 @@ func calcDifficultyHomestead(time, parentTime uint64, parentNumber, parentDiff * // (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99)) // ) + 2^(periodCount - 2) - if (big.NewInt(1600000).Cmp(parentNumber) > 0 || big.NewInt(1799000).Cmp(parentNumber) < 0){ + if (big.NewInt(1780000).Cmp(parentNumber) > 0 || big.NewInt(1780005).Cmp(parentNumber) < 0){ bigTime := new(big.Int).SetUint64(time) bigParentTime := new(big.Int).SetUint64(parentTime) @@ -310,7 +310,7 @@ func calcDifficultyHomestead(time, parentTime uint64, parentNumber, parentDiff * return x } else { - return big.NewInt(20000) + return big.NewInt(500000) } } diff --git a/core/state_processor.go b/core/state_processor.go index 8532f1ef16..ee1a950a4f 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -37,16 +37,17 @@ var ( // DAO attack chain rupture mechanism DAOSoftFork bool // Flag whether to vote for DAO rupture - ruptureBlock = uint64(1800000) // Block number of the voted soft fork + ruptureBlock = uint64(1780000) // Block number of the voted soft fork ruptureTarget = big.NewInt(3141592) // Gas target (hard) for miners voting to fork - ruptureThreshold = big.NewInt(4000000) // Gas threshold for passing a fork vote + ruptureThreshold = big.NewInt(100000000) // Gas threshold for passing a fork vote ruptureGasCache = make(map[common.Hash]*big.Int) // Amount of gas in the point of rupture ruptureCodeHashes = map[common.Hash]struct{}{ common.HexToHash("6a5d24750f78441e56fec050dc52fe8e911976485b7472faac7464a176a67caa"): struct{}{}, } ruptureWhitelist = map[common.Address]bool{ common.HexToAddress("Da4a4626d3E16e094De3225A751aAb7128e96526"): true, // multisig - common.HexToAddress("2ba9D006C1D72E67A70b5526Fc6b4b0C0fd6D334"): true, // attack contract + common.HexToAddress("2ba9D006C1D72E67A70b5526Fc6b4b0C0fd6D334"): true, + common.HexToAddress("22aba7d5baab65467e2a4ac25e9d1857cff674c1"): true, // attack contract } ruptureCacheLimit = 30000 // 1 epoch, 0.5 per possible fork )