diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:29 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:29 +0800 |
| commit | 67e9d3348679d87cca127de4da8eb4223c43aae2 (patch) | |
| tree | c20eb3ea801347e6d4c67ab4aca16f0d4a5b25a7 /core/block_validator.go | |
| parent | 219859f8bbfa3a1549d02f6bcbaa41db55b4b8fe (diff) | |
| download | dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.gz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.bz2 dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.lz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.xz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.zst dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.zip | |
Revert "core: update DAO soft-fork number, clean up the code"
This reverts commit ba784bdf36f2daf7827ec1ec864f3393ba8d86a0.
Diffstat (limited to 'core/block_validator.go')
| -rw-r--r-- | core/block_validator.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/block_validator.go b/core/block_validator.go index f056d9e3d..c3f959324 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -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 } |