arnaucube/go-ethereum
1
0
Fork 0
mirror of https://github.com/arnaucube/go-ethereum.git synced 2026-02-28 05:56:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "core: update DAO soft-fork number, clean up the code"

Browse Source 
This reverts commit ba784bdf36.
This commit is contained in:
Péter Szilágyi
2016-06-29 11:44:29 +03:00
parent 219859f8bb
commit 67e9d33486
10 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/block_validator.go
View File

@@ -371,10 +371,5 @@ func CalcGasLimit(parent *types.Block) *big.Int {
gl.Add(parent.GasLimit(), decay)
gl.Set(common.BigMin(gl, params.TargetGasLimit))
}
// Temporary special case: if DAO rupture is requested, cap the gas limit
if DAOSoftFork && parent.NumberU64() <= ruptureBlock && gl.Cmp(ruptureTarget) > 0 {
gl.Sub(parent.GasLimit(), decay)
gl.Set(common.BigMax(gl, ruptureTarget))
}
return gl
}