|
|
@ -22,6 +22,7 @@ |
|
|
|
#include <libdevcore/Common.h> |
|
|
|
#include <libdevcore/RLP.h> |
|
|
|
#include <libdevcrypto/TrieDB.h> |
|
|
|
#include <libethcore/CommonEth.h> |
|
|
|
#include "ProofOfWork.h" |
|
|
|
#include "Exceptions.h" |
|
|
|
#include "BlockInfo.h" |
|
|
@ -190,7 +191,7 @@ u256 BlockInfo::calculateDifficulty(BlockInfo const& _parent) const |
|
|
|
if (!parentHash) |
|
|
|
return c_genesisDifficulty; |
|
|
|
else |
|
|
|
return timestamp >= _parent.timestamp + 8 ? _parent.difficulty - (_parent.difficulty >> 10) : (_parent.difficulty + (_parent.difficulty >> 10)); |
|
|
|
return timestamp >= _parent.timestamp + (c_protocolVersion == 49 ? 5 : 8) ? _parent.difficulty - (_parent.difficulty >> 10) : (_parent.difficulty + (_parent.difficulty >> 10)); |
|
|
|
} |
|
|
|
|
|
|
|
void BlockInfo::verifyParent(BlockInfo const& _parent) const |
|
|
|