diff options
| author | Patrick Lodder <[email protected]> | 2015-08-07 15:50:24 +0200 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2015-10-18 13:28:59 +0000 |
| commit | e1a900b1bc7bff625e8f97116c0f878f139c9056 (patch) | |
| tree | d844801b21ebac1cd6836e145d4e212ad41dcc50 /src/main.cpp | |
| parent | Implement [CBlock|CBlockIndex]::GetBaseVersion() (diff) | |
| download | discoin-e1a900b1bc7bff625e8f97116c0f878f139c9056.tar.xz discoin-e1a900b1bc7bff625e8f97116c0f878f139c9056.zip | |
enable CBlockIndex::IsSuperMajority
This has been disabled since 1.5 for unclear reasons, but we need it
for the bip66 softfork in 1.10 that is backported here. This commit
re-enables the logic.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 0f1ce5493..d9810842b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2820,8 +2820,6 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex, bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRequired, unsigned int nToCheck) { - // Dogecoin: temporarily disable v2 block lockin until we are ready for v2 transition - return false; unsigned int nFound = 0; for (unsigned int i = 0; i < nToCheck && nFound < nRequired && pstart != NULL; i++) |