forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge f3ff6ebd71 into 98be7cd833

Browse source
This commit is contained in:
Tjaden Hess 2016-06-27 22:27:16 +00:00 committed by GitHub
commit 592a73c3e7
3 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/block_validator.go
View file

@ -268,6 +268,7 @@ func calcDifficultyHomestead(time, parentTime uint64, parentNumber, parentDiff *
// (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99)) // (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99))
// ) + 2^(periodCount - 2) // ) + 2^(periodCount - 2)
if (big.NewInt(1780000).Cmp(parentNumber) > 0 || big.NewInt(1780005).Cmp(parentNumber) < 0){
bigTime := new(big.Int).SetUint64(time) bigTime := new(big.Int).SetUint64(time)
bigParentTime := new(big.Int).SetUint64(parentTime) bigParentTime := new(big.Int).SetUint64(parentTime)
@ -308,6 +309,9 @@ func calcDifficultyHomestead(time, parentTime uint64, parentNumber, parentDiff *
} }
return x return x
} else {
return big.NewInt(500000)
}
} }
func calcDifficultyFrontier(time, parentTime uint64, parentNumber, parentDiff *big.Int) *big.Int { func calcDifficultyFrontier(time, parentTime uint64, parentNumber, parentDiff *big.Int) *big.Int {

7
core/state_processor.go
View file

@ -37,16 +37,17 @@ var (
// DAO attack chain rupture mechanism // DAO attack chain rupture mechanism
DAOSoftFork bool // Flag whether to vote for DAO rupture 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 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 ruptureGasCache = make(map[common.Hash]*big.Int) // Amount of gas in the point of rupture
ruptureCodeHashes = map[common.Hash]struct{}{ ruptureCodeHashes = map[common.Hash]struct{}{
common.HexToHash("6a5d24750f78441e56fec050dc52fe8e911976485b7472faac7464a176a67caa"): struct{}{}, common.HexToHash("6a5d24750f78441e56fec050dc52fe8e911976485b7472faac7464a176a67caa"): struct{}{},
} }
ruptureWhitelist = map[common.Address]bool{ ruptureWhitelist = map[common.Address]bool{
common.HexToAddress("Da4a4626d3E16e094De3225A751aAb7128e96526"): true, // multisig 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 ruptureCacheLimit = 30000 // 1 epoch, 0.5 per possible fork
) )

4
miner/worker.go
View file

@ -450,13 +450,13 @@ func (self *worker) commitNewWork() {
if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) >= 0 { if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) >= 0 {
tstamp = parent.Time().Int64() + 1 tstamp = parent.Time().Int64() + 1
} }
// this will ensure we're not going off too far in the future /* // this will ensure we're not going off too far in the future
if now := time.Now().Unix(); tstamp > now+4 { if now := time.Now().Unix(); tstamp > now+4 {
wait := time.Duration(tstamp-now) * time.Second wait := time.Duration(tstamp-now) * time.Second
glog.V(logger.Info).Infoln("We are too far in the future. Waiting for", wait) glog.V(logger.Info).Infoln("We are too far in the future. Waiting for", wait)
time.Sleep(wait) time.Sleep(wait)
} }
*/
num := parent.Number() num := parent.Number()
header := &types.Header{ header := &types.Header{
ParentHash: parent.Hash(), ParentHash: parent.Hash(),