Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add activation code for the new DAA.
Summary: This adds the activation of the new DAA in ABC.

Test Plan: Tested activation large scale with bitprim.

Reviewers: freetrader, schancel, #bitcoin_abc

Reviewed By: schancel, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D628
  • Loading branch information
deadalnix committed Oct 30, 2017
1 parent be51cf2 commit 18dc8bb
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/pow.cpp
Expand Up @@ -10,6 +10,7 @@
#include "chain.h"
#include "primitives/block.h"
#include "uint256.h"
#include "util.h"

/**
* Compute the next required proof of work using the legacy Bitcoin difficulty
Expand Down Expand Up @@ -97,6 +98,11 @@ uint32_t GetNextWorkRequired(const CBlockIndex *pindexPrev,
return pindexPrev->nBits;
}

if (pindexPrev->GetMedianTimePast() >=
GetArg("-newdaaactivationtime", params.cashHardForkActivationTime)) {
return GetNextCashWorkRequired(pindexPrev, pblock, params);
}

return GetNextEDAWorkRequired(pindexPrev, pblock, params);
}

Expand Down

0 comments on commit 18dc8bb

Please sign in to comment.