diff options
| author | Max K. <[email protected]> | 2015-08-13 18:43:55 +0200 |
|---|---|---|
| committer | Max K. <[email protected]> | 2015-08-13 18:43:55 +0200 |
| commit | 12cde02eea52d90031480a803acdd7d40230e160 (patch) | |
| tree | 8379a5970adb05d53bae0215b3d3ce50a6fec67d /src/main.cpp | |
| parent | Merge pull request #1238 from rnicoll/1.10-block-notify-height (diff) | |
| parent | Update fork detection parameters for Dogecoin block time (diff) | |
| download | discoin-12cde02eea52d90031480a803acdd7d40230e160.tar.xz discoin-12cde02eea52d90031480a803acdd7d40230e160.zip | |
Merge pull request #1229 from rnicoll/1.10-fork-detection
Update fork detection parameters for Dogecoin block time
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8d408a34b..5f8b48067 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1260,12 +1260,12 @@ void CheckForkWarningConditions() if (IsInitialBlockDownload()) return; - // If our best fork is no longer within 72 blocks (+/- 12 hours if no one mines it) + // If our best fork is no longer within 360 blocks (+/- 6 hours if no one mines it) // of our head, drop it - if (pindexBestForkTip && chainActive.Height() - pindexBestForkTip->nHeight >= 72) + if (pindexBestForkTip && chainActive.Height() - pindexBestForkTip->nHeight >= 360) pindexBestForkTip = NULL; - if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(*chainActive.Tip()) * 6))) + if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(*chainActive.Tip()) * 30))) { if (!fLargeWorkForkFound && pindexBestForkBase) { |