diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-24 21:19:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 21:19:45 +0800 |
| commit | e0493457d5a9d280554990b5a29c4fcad69e7d0b (patch) | |
| tree | 8bbdc037c34bad53f6bbe3016737fc05ec0792c6 /core | |
| parent | 848dec3da2dae77ef50ea229cf430ff0171766ed (diff) | |
| parent | 1e3a7d4fab36df9382d023519ef10e3c34bafa3b (diff) | |
| download | dexon-e0493457d5a9d280554990b5a29c4fcad69e7d0b.tar.gz dexon-e0493457d5a9d280554990b5a29c4fcad69e7d0b.tar.zst dexon-e0493457d5a9d280554990b5a29c4fcad69e7d0b.zip | |
Merge pull request #2734 from karalabe/dao-final-block
core: update the DAO soft fork proposal to the final block
Diffstat (limited to 'core')
| -rw-r--r-- | core/state_processor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/state_processor.go b/core/state_processor.go index d17bbd8de..6e8bb0144 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -37,7 +37,7 @@ var ( // DAO attack chain rupture mechanism DAOSoftFork bool // Flag whether to vote for DAO rupture - ruptureBlock = uint64(1775000) // Block number of the voted soft fork + ruptureBlock = uint64(1800000) // 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 ruptureGasCache = make(map[common.Hash]*big.Int) // Amount of gas in the point of rupture |