diff options
| author | langerhans <[email protected]> | 2014-08-04 19:17:20 +0200 |
|---|---|---|
| committer | langerhans <[email protected]> | 2014-08-04 19:17:20 +0200 |
| commit | 7b70a67db0c74086f91a55c468862c891e043db5 (patch) | |
| tree | 77157cff69f3da22948989bfb43094e0109c55d8 /src/main.cpp | |
| parent | Merge pull request #589 from patricklodder/1.8-dev-testnet-retarget (diff) | |
| parent | Check against the right aux block version number (diff) | |
| download | discoin-7b70a67db0c74086f91a55c468862c891e043db5.tar.xz discoin-7b70a67db0c74086f91a55c468862c891e043db5.zip | |
Merge pull request #591 from patricklodder/1.8-version-check-fix
Check against the right aux block version number
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6dbcca8b7..b686545bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2055,9 +2055,10 @@ void static UpdateTip(CBlockIndex *pindexNew) { { int nUpgraded = 0; const CBlockIndex* pindex = chainActive.Tip(); + int nAuxVersion = CBlockHeader::CURRENT_VERSION | (AUXPOW_CHAIN_ID * BLOCK_VERSION_CHAIN_START); for (int i = 0; i < 100 && pindex != NULL; i++) { - if (pindex->nVersion > CBlock::CURRENT_VERSION && pindex->nVersion != BLOCK_VERSION_AUXPOW) + if (pindex->nVersion > CBlock::CURRENT_VERSION && pindex->nVersion != nAuxVersion) ++nUpgraded; pindex = pindex->pprev; } |