From a9fdaf9fec268e26b931c5eb8d628ccf046839a5 Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 4 Apr 2014 08:03:11 -0700 Subject: [PATCH] 32bit compatible (removed DGW v1) --- src/checkpoints.cpp | 2 + src/main.cpp | 99 ++++----------------------------------------- 2 files changed, 10 insertions(+), 91 deletions(-) diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 0a3ab6e515..214f29fbae 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -40,6 +40,8 @@ namespace Checkpoints ( 9918, uint256("0x00000000213e229f332c0ffbe34defdaa9e74de87f2d8d1f01af8d121c3c170b")) ( 16912, uint256("0x00000000075c0d10371d55a60634da70f197548dbbfa4123e12abfcbc5738af9")) ( 23912, uint256("0x0000000000335eac6703f3b1732ec8b2f89c3ba3a7889e5767b090556bb9a276")) + ( 35457, uint256("0x0000000000b0ae211be59b048df14820475ad0dd53b9ff83b010f71a77342d9f")) + ( 45479, uint256("0x000000000063d411655d590590e16960f15ceea4257122ac430c6fbe39fbf02d")) ; static const CCheckpointData data = { &mapCheckpoints, diff --git a/src/main.cpp b/src/main.cpp index e49c3e8ade..1830ac3e07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1272,80 +1272,6 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const CBloc } unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockHeader *pblock) { - /* current difficulty formula, darkcoin - DarkGravity, written by Evan Duffield - evan@darkcoin.io */ - const CBlockIndex *BlockLastSolved = pindexLast; - const CBlockIndex *BlockReading = pindexLast; - const CBlockHeader *BlockCreating = pblock; - BlockCreating = BlockCreating; - int64 nBlockTimeAverage = 0; - int64 nBlockTimeAveragePrev = 0; - int64 nBlockTimeCount = 0; - int64 nBlockTimeSum2 = 0; - int64 nBlockTimeCount2 = 0; - int64 LastBlockTime = 0; - int64 PastBlocksMin = 14; - int64 PastBlocksMax = 140; - int64 CountBlocks = 0; - CBigNum PastDifficultyAverage; - CBigNum PastDifficultyAveragePrev; - - if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || BlockLastSolved->nHeight < PastBlocksMin) { return bnProofOfWorkLimit.GetCompact(); } - - for (unsigned int i = 1; BlockReading && BlockReading->nHeight > 0; i++) { - if (PastBlocksMax > 0 && i > PastBlocksMax) { break; } - CountBlocks++; - - if(CountBlocks <= PastBlocksMin) { - if (CountBlocks == 1) { PastDifficultyAverage.SetCompact(BlockReading->nBits); } - else { PastDifficultyAverage = ((CBigNum().SetCompact(BlockReading->nBits) - PastDifficultyAveragePrev) / CountBlocks) + PastDifficultyAveragePrev; } - PastDifficultyAveragePrev = PastDifficultyAverage; - } - - if(LastBlockTime > 0){ - int64 Diff = (LastBlockTime - BlockReading->GetBlockTime()); - if(Diff < 0) Diff = 0; - if(nBlockTimeCount <= PastBlocksMin) { - nBlockTimeCount++; - - if (nBlockTimeCount == 1) { nBlockTimeAverage = Diff; } - else { nBlockTimeAverage = ((Diff - nBlockTimeAveragePrev) / nBlockTimeCount) + nBlockTimeAveragePrev; } - nBlockTimeAveragePrev = nBlockTimeAverage; - } - nBlockTimeCount2++; - nBlockTimeSum2 += Diff; - } - LastBlockTime = BlockReading->GetBlockTime(); - - if (BlockReading->pprev == NULL) { assert(BlockReading); break; } - BlockReading = BlockReading->pprev; - } - - CBigNum bnNew(PastDifficultyAverage); - if (nBlockTimeCount != 0 && nBlockTimeCount2 != 0) { - double SmartAverage = (((nBlockTimeAverage)*0.7)+((nBlockTimeSum2 / nBlockTimeCount2)*0.3)); - if(SmartAverage < 1) SmartAverage = 1; - double Shift = nTargetSpacing/SmartAverage; - - int64 nActualTimespan = (CountBlocks*nTargetSpacing)/Shift; - int64 nTargetTimespan = (CountBlocks*nTargetSpacing); - if (nActualTimespan < nTargetTimespan/3) - nActualTimespan = nTargetTimespan/3; - if (nActualTimespan > nTargetTimespan*3) - nActualTimespan = nTargetTimespan*3; - - // Retarget - bnNew *= nActualTimespan; - bnNew /= nTargetTimespan; - } - - if (bnNew > bnProofOfWorkLimit){ - bnNew = bnProofOfWorkLimit; - } - - return bnNew.GetCompact(); -} - -unsigned int static DarkGravityWave2(const CBlockIndex* pindexLast, const CBlockHeader *pblock) { /* current difficulty formula, darkcoin - DarkGravity v2, written by Evan Duffield - evan@darkcoin.io */ const CBlockIndex *BlockLastSolved = pindexLast; const CBlockIndex *BlockReading = pindexLast; @@ -1438,20 +1364,17 @@ unsigned int static GetNextWorkRequired(const CBlockIndex* pindexLast, const CBl { int DiffMode = 1; if (fTestNet) { - if (pindexLast->nHeight+1 >= 15) { DiffMode = 4; } - else if (pindexLast->nHeight+1 >= 5) { DiffMode = 3; } + if (pindexLast->nHeight+1 >= 5) { DiffMode = 3; } } else { - if (pindexLast->nHeight+1 >= 45000) { DiffMode = 4; } - else if (pindexLast->nHeight+1 >= 34140) { DiffMode = 3; } - else if (pindexLast->nHeight+1 >= 15200) { DiffMode = 2; } + if (pindexLast->nHeight+1 >= 34140) { DiffMode = 3; } + else if (pindexLast->nHeight+1 >= 15200) { DiffMode = 2; } } if (DiffMode == 1) { return GetNextWorkRequired_V1(pindexLast, pblock); } else if (DiffMode == 2) { return GetNextWorkRequired_V2(pindexLast, pblock); } else if (DiffMode == 3) { return DarkGravityWave(pindexLast, pblock); } - else if (DiffMode == 4) { return DarkGravityWave2(pindexLast, pblock); } - return DarkGravityWave2(pindexLast, pblock); + return DarkGravityWave(pindexLast, pblock); } @@ -2447,23 +2370,17 @@ bool CBlock::AcceptBlock(CValidationState &state, CDiskBlockPos *dbp) nHeight = pindexPrev->nHeight+1; - // Check proof of work - /* + // Check proof of work if(nHeight >= 34140 && nHeight <= 45000){ unsigned int nBitsNext = GetNextWorkRequired(pindexPrev, this); - unsigned int a = 0; - if(nBits > nBitsNext) a = nBits - nBitsNext; - else if (nBits < nBitsNext) a = nBitsNext - nBits; - printf(" !--- %u %u, %u \n", nBits, nBitsNext, a); double n1 = ConvertBitsToDouble(nBits); double n2 = ConvertBitsToDouble(nBitsNext); - printf(" !--- %f %f, %f \n", n1, n2, n1-n2); - if (abs(n1-n2) > 5) + if (abs(n1-n2) > n1*0.2) return state.DoS(100, error("AcceptBlock() : incorrect proof of work (DGW pre-fork)")); - } else {*/ + } else { if (nBits != GetNextWorkRequired(pindexPrev, this)) return state.DoS(100, error("AcceptBlock() : incorrect proof of work")); - //} + } // Prevent blocks from too far in the future