|
|
@ -26,8 +26,6 @@ |
|
|
|
#include "validationinterface.h" |
|
|
|
#include "validationinterface.h" |
|
|
|
|
|
|
|
|
|
|
|
#include <algorithm> |
|
|
|
#include <algorithm> |
|
|
|
#include <boost/thread.hpp> |
|
|
|
|
|
|
|
#include <boost/tuple/tuple.hpp> |
|
|
|
|
|
|
|
#include <queue> |
|
|
|
#include <queue> |
|
|
|
#include <utility> |
|
|
|
#include <utility> |
|
|
|
|
|
|
|
|
|
|
@ -46,17 +44,6 @@ uint64_t nLastBlockTx = 0; |
|
|
|
uint64_t nLastBlockSize = 0; |
|
|
|
uint64_t nLastBlockSize = 0; |
|
|
|
uint64_t nLastBlockWeight = 0; |
|
|
|
uint64_t nLastBlockWeight = 0; |
|
|
|
|
|
|
|
|
|
|
|
class ScoreCompare |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
public: |
|
|
|
|
|
|
|
ScoreCompare() {} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool operator()(const CTxMemPool::txiter a, const CTxMemPool::txiter b) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
return CompareTxMemPoolEntryByScore()(*b,*a); // Convert to less than
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev) |
|
|
|
int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int64_t nOldTime = pblock->nTime; |
|
|
|
int64_t nOldTime = pblock->nTime; |
|
|
|