2013-07-31 15:43:35 +02:00
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
2015-12-13 14:51:43 +01:00
|
|
|
// Copyright (c) 2009-2015 The Bitcoin Core developers
|
2016-12-20 14:26:45 +01:00
|
|
|
// Copyright (c) 2014-2017 The Dash Core developers
|
2014-12-13 05:09:33 +01:00
|
|
|
// Distributed under the MIT software license, see the accompanying
|
2013-07-31 15:43:35 +02:00
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "miner.h"
|
2013-04-13 07:13:08 +02:00
|
|
|
|
2014-10-23 02:05:11 +02:00
|
|
|
#include "amount.h"
|
2015-07-05 14:17:46 +02:00
|
|
|
#include "chain.h"
|
2015-04-10 18:42:50 +02:00
|
|
|
#include "chainparams.h"
|
2015-07-05 14:17:46 +02:00
|
|
|
#include "coins.h"
|
2015-01-24 15:29:29 +01:00
|
|
|
#include "consensus/consensus.h"
|
2015-11-17 17:35:44 +01:00
|
|
|
#include "consensus/merkle.h"
|
2015-01-24 15:57:12 +01:00
|
|
|
#include "consensus/validation.h"
|
2014-04-27 23:34:02 +02:00
|
|
|
#include "hash.h"
|
2017-08-09 02:19:06 +02:00
|
|
|
#include "validation.h"
|
2013-04-13 07:13:08 +02:00
|
|
|
#include "net.h"
|
2015-06-24 07:25:30 +02:00
|
|
|
#include "policy/policy.h"
|
2014-03-10 16:46:53 +01:00
|
|
|
#include "pow.h"
|
2015-04-10 18:42:50 +02:00
|
|
|
#include "primitives/transaction.h"
|
2015-07-05 14:17:46 +02:00
|
|
|
#include "script/standard.h"
|
2014-10-22 01:31:01 +02:00
|
|
|
#include "timedata.h"
|
2015-07-05 14:17:46 +02:00
|
|
|
#include "txmempool.h"
|
Split up util.cpp/h
Split up util.cpp/h into:
- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)
The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).
Breaks dependency of sha256.cpp on all the things pulled in by util.
2014-08-21 16:11:09 +02:00
|
|
|
#include "util.h"
|
|
|
|
#include "utilmoneystr.h"
|
2015-04-16 21:58:09 +02:00
|
|
|
#include "masternode-payments.h"
|
2017-01-01 11:18:33 +01:00
|
|
|
#include "masternode-sync.h"
|
2015-04-10 12:49:01 +02:00
|
|
|
#include "validationinterface.h"
|
2014-12-12 12:44:25 +01:00
|
|
|
|
Split up util.cpp/h
Split up util.cpp/h into:
- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)
The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).
Breaks dependency of sha256.cpp on all the things pulled in by util.
2014-08-21 16:11:09 +02:00
|
|
|
#include <boost/thread.hpp>
|
2014-10-21 06:33:06 +02:00
|
|
|
#include <boost/tuple/tuple.hpp>
|
2015-11-03 16:35:39 +01:00
|
|
|
#include <queue>
|
Split up util.cpp/h
Split up util.cpp/h into:
- string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach)
- money utilities (parsesmoney, formatmoney)
- time utilities (gettime*, sleep, format date):
- and the rest (logging, argument parsing, config file parsing)
The latter is basically the environment and OS handling,
and is stripped of all utility functions, so we may want to
rename it to something else than util.cpp/h for clarity (Matt suggested
osinterface).
Breaks dependency of sha256.cpp on all the things pulled in by util.
2014-08-21 16:11:09 +02:00
|
|
|
|
2014-06-16 16:30:38 +02:00
|
|
|
using namespace std;
|
2014-04-26 19:26:34 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
2015-04-03 00:51:08 +02:00
|
|
|
// DashMiner
|
2013-07-31 15:43:35 +02:00
|
|
|
//
|
|
|
|
|
2014-04-10 20:14:18 +02:00
|
|
|
//
|
|
|
|
// Unconfirmed transactions in the memory pool often depend on other
|
|
|
|
// transactions in the memory pool. When we select transactions from the
|
|
|
|
// pool, we select by highest priority or fee rate, so we might consider
|
|
|
|
// transactions that depend on transactions that aren't yet in the block.
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2013-04-13 07:13:08 +02:00
|
|
|
uint64_t nLastBlockTx = 0;
|
|
|
|
uint64_t nLastBlockSize = 0;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2015-11-03 16:35:39 +01:00
|
|
|
class ScoreCompare
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
|
|
|
public:
|
2015-11-03 16:35:39 +01:00
|
|
|
ScoreCompare() {}
|
2014-05-10 14:47:16 +02:00
|
|
|
|
2015-11-03 16:35:39 +01:00
|
|
|
bool operator()(const CTxMemPool::txiter a, const CTxMemPool::txiter b)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2015-11-03 16:35:39 +01:00
|
|
|
return CompareTxMemPoolEntryByScore()(*b,*a); // Convert to less than
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-05-22 23:49:50 +02:00
|
|
|
int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
|
2014-10-22 01:31:01 +02:00
|
|
|
{
|
2015-05-22 23:49:50 +02:00
|
|
|
int64_t nOldTime = pblock->nTime;
|
|
|
|
int64_t nNewTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
|
|
|
|
|
|
|
|
if (nOldTime < nNewTime)
|
|
|
|
pblock->nTime = nNewTime;
|
2014-10-22 01:31:01 +02:00
|
|
|
|
|
|
|
// Updating time can change work required on testnet:
|
2015-04-10 18:42:50 +02:00
|
|
|
if (consensusParams.fPowAllowMinDifficultyBlocks)
|
|
|
|
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, consensusParams);
|
2015-05-22 23:49:50 +02:00
|
|
|
|
|
|
|
return nNewTime - nOldTime;
|
2014-10-22 01:31:01 +02:00
|
|
|
}
|
|
|
|
|
2015-04-17 14:19:52 +02:00
|
|
|
CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& scriptPubKeyIn)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
|
|
|
// Create new block
|
2016-04-28 13:40:20 +02:00
|
|
|
std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
|
2013-07-31 15:43:35 +02:00
|
|
|
if(!pblocktemplate.get())
|
|
|
|
return NULL;
|
|
|
|
CBlock *pblock = &pblocktemplate->block; // pointer for convenience
|
|
|
|
|
|
|
|
// Create coinbase tx
|
2014-06-07 13:53:27 +02:00
|
|
|
CMutableTransaction txNew;
|
2013-07-31 15:43:35 +02:00
|
|
|
txNew.vin.resize(1);
|
|
|
|
txNew.vin[0].prevout.SetNull();
|
|
|
|
txNew.vout.resize(1);
|
2013-08-24 06:33:46 +02:00
|
|
|
txNew.vout[0].scriptPubKey = scriptPubKeyIn;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
|
|
|
// Largest block you're willing to create:
|
2013-11-28 04:03:41 +01:00
|
|
|
unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
|
2015-08-10 23:56:04 +02:00
|
|
|
// Limit to between 1K and MAX_BLOCK_SIZE-1K for sanity:
|
2017-09-11 16:13:30 +02:00
|
|
|
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MaxBlockSize(fDIP0001ActiveAtTip)-1000), nBlockMaxSize));
|
2013-07-31 15:43:35 +02:00
|
|
|
|
|
|
|
// How much of the block should be dedicated to high-priority transactions,
|
|
|
|
// included regardless of the fees they pay
|
|
|
|
unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", DEFAULT_BLOCK_PRIORITY_SIZE);
|
|
|
|
nBlockPrioritySize = std::min(nBlockMaxSize, nBlockPrioritySize);
|
|
|
|
|
|
|
|
// Minimum block size you want to create; block will be filled with free transactions
|
|
|
|
// until there are no more or the block reaches this size:
|
2014-03-10 18:59:12 +01:00
|
|
|
unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE);
|
2013-07-31 15:43:35 +02:00
|
|
|
nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize);
|
|
|
|
|
|
|
|
// Collect memory pool transactions into the block
|
2015-11-03 16:35:39 +01:00
|
|
|
CTxMemPool::setEntries inBlock;
|
|
|
|
CTxMemPool::setEntries waitSet;
|
|
|
|
|
|
|
|
// This vector will be sorted into a priority queue:
|
|
|
|
vector<TxCoinAgePriority> vecPriority;
|
|
|
|
TxCoinAgePriorityCompare pricomparer;
|
|
|
|
std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash> waitPriMap;
|
|
|
|
typedef std::map<CTxMemPool::txiter, double, CTxMemPool::CompareIteratorByHash>::iterator waitPriIter;
|
|
|
|
double actualPriority = -1;
|
|
|
|
|
|
|
|
std::priority_queue<CTxMemPool::txiter, std::vector<CTxMemPool::txiter>, ScoreCompare> clearedTxs;
|
|
|
|
bool fPrintPriority = GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY);
|
|
|
|
uint64_t nBlockSize = 1000;
|
|
|
|
uint64_t nBlockTx = 0;
|
|
|
|
unsigned int nBlockSigOps = 100;
|
|
|
|
int lastFewTxs = 0;
|
2014-04-23 00:46:19 +02:00
|
|
|
CAmount nFees = 0;
|
2014-05-10 14:47:16 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2017-07-20 12:48:30 +02:00
|
|
|
LOCK(cs_main);
|
|
|
|
|
2013-10-10 23:07:44 +02:00
|
|
|
CBlockIndex* pindexPrev = chainActive.Tip();
|
2014-11-20 03:23:20 +01:00
|
|
|
const int nHeight = pindexPrev->nHeight + 1;
|
2015-05-25 06:48:33 +02:00
|
|
|
pblock->nTime = GetAdjustedTime();
|
2015-11-03 18:12:36 +01:00
|
|
|
const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2015-01-12 20:05:20 +01:00
|
|
|
// Add our coinbase tx as first transaction
|
|
|
|
pblock->vtx.push_back(txNew);
|
|
|
|
pblocktemplate->vTxFees.push_back(-1); // updated at end
|
|
|
|
pblocktemplate->vTxSigOps.push_back(-1); // updated at end
|
2016-02-15 05:13:27 +01:00
|
|
|
pblock->nVersion = ComputeBlockVersion(pindexPrev, chainparams.GetConsensus());
|
|
|
|
// -regtest only: allow overriding block.nVersion with
|
|
|
|
// -blockversion=N to test forking scenarios
|
|
|
|
if (chainparams.MineBlocksOnDemand())
|
|
|
|
pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
|
|
|
|
|
2015-11-03 16:35:39 +01:00
|
|
|
int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)
|
|
|
|
? nMedianTimePast
|
|
|
|
: pblock->GetBlockTime();
|
2015-01-12 20:05:20 +01:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
{
|
|
|
|
LOCK(mempool.cs);
|
|
|
|
|
|
|
|
bool fPriorityBlock = nBlockPrioritySize > 0;
|
|
|
|
if (fPriorityBlock) {
|
|
|
|
vecPriority.reserve(mempool.mapTx.size());
|
|
|
|
for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
|
|
|
|
mi != mempool.mapTx.end(); ++mi)
|
|
|
|
{
|
|
|
|
double dPriority = mi->GetPriority(nHeight);
|
|
|
|
CAmount dummy;
|
|
|
|
mempool.ApplyDeltas(mi->GetTx().GetHash(), dPriority, dummy);
|
|
|
|
vecPriority.push_back(TxCoinAgePriority(dPriority, mi));
|
|
|
|
}
|
|
|
|
std::make_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
CTxMemPool::indexed_transaction_set::nth_index<3>::type::iterator mi = mempool.mapTx.get<3>().begin();
|
|
|
|
CTxMemPool::txiter iter;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
while (mi != mempool.mapTx.get<3>().end() || !clearedTxs.empty())
|
|
|
|
{
|
|
|
|
bool priorityTx = false;
|
|
|
|
if (fPriorityBlock && !vecPriority.empty()) { // add a tx from priority queue to fill the blockprioritysize
|
|
|
|
priorityTx = true;
|
|
|
|
iter = vecPriority.front().second;
|
|
|
|
actualPriority = vecPriority.front().first;
|
|
|
|
std::pop_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
|
|
|
|
vecPriority.pop_back();
|
|
|
|
}
|
|
|
|
else if (clearedTxs.empty()) { // add tx with next highest score
|
|
|
|
iter = mempool.mapTx.project<0>(mi);
|
|
|
|
mi++;
|
|
|
|
}
|
|
|
|
else { // try to add a previously postponed child tx
|
|
|
|
iter = clearedTxs.top();
|
|
|
|
clearedTxs.pop();
|
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
if (inBlock.count(iter))
|
|
|
|
continue; // could have been added to the priorityBlock
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
const CTransaction& tx = iter->GetTx();
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
bool fOrphan = false;
|
|
|
|
BOOST_FOREACH(CTxMemPool::txiter parent, mempool.GetMemPoolParents(iter))
|
|
|
|
{
|
|
|
|
if (!inBlock.count(parent)) {
|
|
|
|
fOrphan = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (fOrphan) {
|
|
|
|
if (priorityTx)
|
|
|
|
waitPriMap.insert(std::make_pair(iter,actualPriority));
|
|
|
|
else
|
|
|
|
waitSet.insert(iter);
|
|
|
|
continue;
|
2015-11-03 16:35:39 +01:00
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
unsigned int nTxSize = iter->GetTxSize();
|
|
|
|
if (fPriorityBlock &&
|
|
|
|
(nBlockSize + nTxSize >= nBlockPrioritySize || !AllowFree(actualPriority))) {
|
|
|
|
fPriorityBlock = false;
|
|
|
|
waitPriMap.clear();
|
|
|
|
}
|
|
|
|
if (!priorityTx &&
|
|
|
|
(iter->GetModifiedFee() < ::minRelayTxFee.GetFee(nTxSize) && nBlockSize >= nBlockMinSize)) {
|
2015-11-03 16:35:39 +01:00
|
|
|
break;
|
|
|
|
}
|
2017-07-20 12:48:30 +02:00
|
|
|
if (nBlockSize + nTxSize >= nBlockMaxSize) {
|
|
|
|
if (nBlockSize > nBlockMaxSize - 100 || lastFewTxs > 50) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
// Once we're within 1000 bytes of a full block, only look at 50 more txs
|
|
|
|
// to try to fill the remaining space.
|
|
|
|
if (nBlockSize > nBlockMaxSize - 1000) {
|
|
|
|
lastFewTxs++;
|
|
|
|
}
|
|
|
|
continue;
|
2015-11-03 16:35:39 +01:00
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
if (!IsFinalTx(tx, nHeight, nLockTimeCutoff))
|
|
|
|
continue;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
unsigned int nTxSigOps = iter->GetSigOpCount();
|
2017-09-11 16:13:30 +02:00
|
|
|
unsigned int nMaxBlockSigOps = MaxBlockSigOps(fDIP0001ActiveAtTip);
|
|
|
|
if (nBlockSigOps + nTxSigOps >= nMaxBlockSigOps) {
|
|
|
|
if (nBlockSigOps > nMaxBlockSigOps - 2) {
|
2017-07-20 12:48:30 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
continue;
|
2015-11-03 16:35:39 +01:00
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
CAmount nTxFees = iter->GetFee();
|
|
|
|
// Added
|
|
|
|
pblock->vtx.push_back(tx);
|
|
|
|
pblocktemplate->vTxFees.push_back(nTxFees);
|
|
|
|
pblocktemplate->vTxSigOps.push_back(nTxSigOps);
|
|
|
|
nBlockSize += nTxSize;
|
|
|
|
++nBlockTx;
|
|
|
|
nBlockSigOps += nTxSigOps;
|
|
|
|
nFees += nTxFees;
|
|
|
|
|
|
|
|
if (fPrintPriority)
|
|
|
|
{
|
|
|
|
double dPriority = iter->GetPriority(nHeight);
|
|
|
|
CAmount dummy;
|
|
|
|
mempool.ApplyDeltas(tx.GetHash(), dPriority, dummy);
|
|
|
|
LogPrintf("priority %.1f fee %s txid %s\n",
|
|
|
|
dPriority , CFeeRate(iter->GetModifiedFee(), nTxSize).ToString(), tx.GetHash().ToString());
|
|
|
|
}
|
2015-11-03 16:35:39 +01:00
|
|
|
|
2017-07-20 12:48:30 +02:00
|
|
|
inBlock.insert(iter);
|
|
|
|
|
|
|
|
// Add transactions that depend on this one to the priority queue
|
|
|
|
BOOST_FOREACH(CTxMemPool::txiter child, mempool.GetMemPoolChildren(iter))
|
|
|
|
{
|
|
|
|
if (fPriorityBlock) {
|
|
|
|
waitPriIter wpiter = waitPriMap.find(child);
|
|
|
|
if (wpiter != waitPriMap.end()) {
|
|
|
|
vecPriority.push_back(TxCoinAgePriority(wpiter->second,child));
|
|
|
|
std::push_heap(vecPriority.begin(), vecPriority.end(), pricomparer);
|
|
|
|
waitPriMap.erase(wpiter);
|
|
|
|
}
|
2015-11-03 16:35:39 +01:00
|
|
|
}
|
2017-07-20 12:48:30 +02:00
|
|
|
else {
|
|
|
|
if (waitSet.count(child)) {
|
|
|
|
clearedTxs.push(child);
|
|
|
|
waitSet.erase(child);
|
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-07-20 12:48:30 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
2016-08-28 12:11:36 +02:00
|
|
|
|
|
|
|
// NOTE: unlike in bitcoin, we need to pass PREVIOUS block height here
|
2016-08-22 03:41:40 +02:00
|
|
|
CAmount blockReward = nFees + GetBlockSubsidy(pindexPrev->nBits, pindexPrev->nHeight, Params().GetConsensus());
|
2015-05-30 19:27:51 +02:00
|
|
|
|
2016-08-28 12:11:36 +02:00
|
|
|
// Compute regular coinbase transaction.
|
|
|
|
txNew.vout[0].nValue = blockReward;
|
|
|
|
txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
|
|
|
|
|
2017-02-19 22:02:33 +01:00
|
|
|
// Update coinbase transaction with additional info about masternode and governance payments,
|
2016-08-28 12:11:36 +02:00
|
|
|
// get some info back to pass to getblocktemplate
|
|
|
|
FillBlockPayments(txNew, nHeight, blockReward, pblock->txoutMasternode, pblock->voutSuperblock);
|
|
|
|
// LogPrintf("CreateNewBlock -- nBlockHeight %d blockReward %lld txoutMasternode %s txNew %s",
|
|
|
|
// nHeight, blockReward, pblock->txoutMasternode.ToString(), txNew.ToString());
|
2015-06-18 11:30:27 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
nLastBlockTx = nBlockTx;
|
|
|
|
nLastBlockSize = nBlockSize;
|
2015-11-03 16:35:39 +01:00
|
|
|
LogPrintf("CreateNewBlock(): total size %u txs: %u fees: %ld sigops %d\n", nBlockSize, nBlockTx, nFees, nBlockSigOps);
|
2014-12-09 02:17:57 +01:00
|
|
|
|
2016-08-28 12:11:36 +02:00
|
|
|
// Update block coinbase
|
2014-06-07 13:53:27 +02:00
|
|
|
pblock->vtx[0] = txNew;
|
2013-07-31 15:43:35 +02:00
|
|
|
pblocktemplate->vTxFees[0] = -nFees;
|
|
|
|
|
|
|
|
// Fill in header
|
|
|
|
pblock->hashPrevBlock = pindexPrev->GetBlockHash();
|
2015-04-17 14:19:52 +02:00
|
|
|
UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
|
|
|
|
pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, chainparams.GetConsensus());
|
2013-07-31 15:43:35 +02:00
|
|
|
pblock->nNonce = 0;
|
|
|
|
pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]);
|
|
|
|
|
|
|
|
CValidationState state;
|
2015-11-03 16:35:39 +01:00
|
|
|
if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
|
|
|
|
throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));
|
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return pblocktemplate.release();
|
|
|
|
}
|
|
|
|
|
2015-08-08 18:18:41 +02:00
|
|
|
void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
|
|
|
// Update nExtraNonce
|
|
|
|
static uint256 hashPrevBlock;
|
|
|
|
if (hashPrevBlock != pblock->hashPrevBlock)
|
|
|
|
{
|
|
|
|
nExtraNonce = 0;
|
|
|
|
hashPrevBlock = pblock->hashPrevBlock;
|
|
|
|
}
|
|
|
|
++nExtraNonce;
|
|
|
|
unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2
|
2014-06-07 13:53:27 +02:00
|
|
|
CMutableTransaction txCoinbase(pblock->vtx[0]);
|
|
|
|
txCoinbase.vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce)) + COINBASE_FLAGS;
|
|
|
|
assert(txCoinbase.vin[0].scriptSig.size() <= 100);
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2014-06-07 13:53:27 +02:00
|
|
|
pblock->vtx[0] = txCoinbase;
|
2015-11-17 17:35:44 +01:00
|
|
|
pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
|
2013-12-09 08:55:56 +01:00
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
//
|
|
|
|
// Internal miner
|
|
|
|
//
|
|
|
|
|
2015-04-03 00:51:08 +02:00
|
|
|
// ***TODO*** ScanHash is not yet used in Dash
|
2013-12-09 08:55:56 +01:00
|
|
|
//
|
|
|
|
// ScanHash scans nonces looking for a hash with at least some zero bits.
|
2014-04-27 23:34:02 +02:00
|
|
|
// The nonce is usually preserved between calls, but periodically or if the
|
|
|
|
// nonce is 0xffff0000 or above, the block is rebuilt and nNonce starts over at
|
|
|
|
// zero.
|
2013-12-09 08:55:56 +01:00
|
|
|
//
|
2015-04-03 00:51:08 +02:00
|
|
|
//bool static ScanHash(const CBlockHeader *pblock, uint32_t& nNonce, uint256 *phash)
|
|
|
|
//{
|
|
|
|
// // Write the first 76 bytes of the block header to a double-SHA256 state.
|
|
|
|
// CHash256 hasher;
|
|
|
|
// CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
|
|
|
|
// ss << *pblock;
|
|
|
|
// assert(ss.size() == 80);
|
|
|
|
// hasher.Write((unsigned char*)&ss[0], 76);
|
|
|
|
|
|
|
|
// while (true) {
|
|
|
|
// nNonce++;
|
|
|
|
|
|
|
|
// // Write the last 4 bytes of the block header (the nonce) to a copy of
|
|
|
|
// // the double-SHA256 state, and compute the result.
|
|
|
|
// CHash256(hasher).Write((unsigned char*)&nNonce, 4).Finalize((unsigned char*)phash);
|
|
|
|
|
|
|
|
// // Return the nonce if the hash has at least some zero bits,
|
|
|
|
// // caller will check if it has enough to reach the target
|
|
|
|
// if (((uint16_t*)phash)[15] == 0)
|
|
|
|
// return true;
|
|
|
|
|
|
|
|
// // If nothing found after trying for a while, return -1
|
|
|
|
// if ((nNonce & 0xfff) == 0)
|
2016-02-02 16:28:56 +01:00
|
|
|
// return false;
|
2015-04-03 00:51:08 +02:00
|
|
|
// }
|
|
|
|
//}
|
2013-12-09 08:55:56 +01:00
|
|
|
|
2017-07-28 16:10:10 +02:00
|
|
|
static bool ProcessBlockFound(const CBlock* pblock, const CChainParams& chainparams)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2014-08-20 10:26:27 +02:00
|
|
|
LogPrintf("%s\n", pblock->ToString());
|
2014-01-16 16:15:27 +01:00
|
|
|
LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue));
|
2013-07-31 15:43:35 +02:00
|
|
|
|
|
|
|
// Found a solution
|
|
|
|
{
|
|
|
|
LOCK(cs_main);
|
2013-10-10 23:07:44 +02:00
|
|
|
if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
|
2016-10-22 18:52:14 +02:00
|
|
|
return error("ProcessBlockFound -- generated block is stale");
|
2014-05-07 17:10:35 +02:00
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2015-04-10 12:49:01 +02:00
|
|
|
// Inform about the new block
|
2015-07-01 16:06:49 +02:00
|
|
|
GetMainSignals().BlockFound(pblock->GetHash());
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2014-05-07 17:10:35 +02:00
|
|
|
// Process this block the same as if we had received it from another node
|
2017-08-02 20:35:04 +02:00
|
|
|
if (!ProcessNewBlock(chainparams, pblock, true, NULL, NULL))
|
2016-10-22 18:52:14 +02:00
|
|
|
return error("ProcessBlockFound -- ProcessNewBlock() failed, block not accepted");
|
2014-05-07 17:10:35 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-04-03 00:51:08 +02:00
|
|
|
// ***TODO*** that part changed in bitcoin, we are using a mix with old one here for now
|
Backport Bitcoin PR#8085: p2p: Begin encapsulation (#1537)
* net: move CBanDB and CAddrDB out of net.h/cpp
This will eventually solve a circular dependency
* net: Create CConnman to encapsulate p2p connections
* net: Move socket binding into CConnman
* net: move OpenNetworkConnection into CConnman
* net: move ban and addrman functions into CConnman
* net: Add oneshot functions to CConnman
* net: move added node functions to CConnman
* net: Add most functions needed for vNodes to CConnman
* net: handle nodesignals in CConnman
* net: Pass CConnection to wallet rather than using the global
* net: Add rpc error for missing/disabled p2p functionality
* net: Pass CConnman around as needed
* gui: add NodeID to the peer table
* net: create generic functor accessors and move vNodes to CConnman
* net: move whitelist functions into CConnman
* net: move nLastNodeId to CConnman
* net: move nLocalHostNonce to CConnman
This behavior seems to have been quite racy and broken.
Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
* net: move messageHandlerCondition to CConnman
* net: move send/recv statistics to CConnman
* net: move SendBufferSize/ReceiveFloodSize to CConnman
* net: move nLocalServices/nRelevantServices to CConnman
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
* net: move semOutbound and semMasternodeOutbound to CConnman
* net: SocketSendData returns written size
* net: move max/max-outbound to CConnman
* net: Pass best block known height into CConnman
CConnman then passes the current best height into CNode at creation time.
This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.
This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.
This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
* net: pass CClientUIInterface into CConnman
* net: Drop StartNode/StopNode and use CConnman directly
* net: Introduce CConnection::Options to avoid passing so many params
* net: add nSendBufferMaxSize/nReceiveFloodSize to CConnection::Options
* net: move vNodesDisconnected into CConnman
* Made the ForEachNode* functions in src/net.cpp more pragmatic and self documenting
* Convert ForEachNode* functions to take a templated function argument rather than a std::function to eliminate std::function overhead
* net: move MAX_FEELER_CONNECTIONS into connman
2017-07-21 11:35:19 +02:00
|
|
|
void static BitcoinMiner(const CChainParams& chainparams, CConnman& connman)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner -- started\n");
|
2013-07-31 15:43:35 +02:00
|
|
|
SetThreadPriority(THREAD_PRIORITY_LOWEST);
|
2015-03-19 15:15:08 +01:00
|
|
|
RenameThread("dash-miner");
|
2013-07-31 15:43:35 +02:00
|
|
|
|
|
|
|
unsigned int nExtraNonce = 0;
|
|
|
|
|
2015-07-01 08:32:30 +02:00
|
|
|
boost::shared_ptr<CReserveScript> coinbaseScript;
|
|
|
|
GetMainSignals().ScriptForMining(coinbaseScript);
|
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
try {
|
2015-08-18 09:07:33 +02:00
|
|
|
// Throw an error if no script was provided. This can happen
|
|
|
|
// due to some internal error but also if the keypool is empty.
|
|
|
|
// In the latter case, already the pointer is NULL.
|
|
|
|
if (!coinbaseScript || coinbaseScript->reserveScript.empty())
|
2015-07-01 08:32:30 +02:00
|
|
|
throw std::runtime_error("No coinbase script available (mining requires a wallet)");
|
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
while (true) {
|
2016-05-10 09:41:40 +02:00
|
|
|
if (chainparams.MiningRequiresPeers()) {
|
|
|
|
// Busy-wait for the network to come online so we don't waste time mining
|
|
|
|
// on an obsolete chain. In regtest mode we expect to fly solo.
|
|
|
|
do {
|
Backport Bitcoin PR#8085: p2p: Begin encapsulation (#1537)
* net: move CBanDB and CAddrDB out of net.h/cpp
This will eventually solve a circular dependency
* net: Create CConnman to encapsulate p2p connections
* net: Move socket binding into CConnman
* net: move OpenNetworkConnection into CConnman
* net: move ban and addrman functions into CConnman
* net: Add oneshot functions to CConnman
* net: move added node functions to CConnman
* net: Add most functions needed for vNodes to CConnman
* net: handle nodesignals in CConnman
* net: Pass CConnection to wallet rather than using the global
* net: Add rpc error for missing/disabled p2p functionality
* net: Pass CConnman around as needed
* gui: add NodeID to the peer table
* net: create generic functor accessors and move vNodes to CConnman
* net: move whitelist functions into CConnman
* net: move nLastNodeId to CConnman
* net: move nLocalHostNonce to CConnman
This behavior seems to have been quite racy and broken.
Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
* net: move messageHandlerCondition to CConnman
* net: move send/recv statistics to CConnman
* net: move SendBufferSize/ReceiveFloodSize to CConnman
* net: move nLocalServices/nRelevantServices to CConnman
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
* net: move semOutbound and semMasternodeOutbound to CConnman
* net: SocketSendData returns written size
* net: move max/max-outbound to CConnman
* net: Pass best block known height into CConnman
CConnman then passes the current best height into CNode at creation time.
This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.
This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.
This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
* net: pass CClientUIInterface into CConnman
* net: Drop StartNode/StopNode and use CConnman directly
* net: Introduce CConnection::Options to avoid passing so many params
* net: add nSendBufferMaxSize/nReceiveFloodSize to CConnection::Options
* net: move vNodesDisconnected into CConnman
* Made the ForEachNode* functions in src/net.cpp more pragmatic and self documenting
* Convert ForEachNode* functions to take a templated function argument rather than a std::function to eliminate std::function overhead
* net: move MAX_FEELER_CONNECTIONS into connman
2017-07-21 11:35:19 +02:00
|
|
|
bool fvNodesEmpty = connman.GetNodeCount(CConnman::CONNECTIONS_ALL) == 0;
|
2017-01-01 11:18:33 +01:00
|
|
|
if (!fvNodesEmpty && !IsInitialBlockDownload() && masternodeSync.IsSynced())
|
2016-05-10 09:41:40 +02:00
|
|
|
break;
|
|
|
|
MilliSleep(1000);
|
|
|
|
} while (true);
|
|
|
|
}
|
2016-05-09 21:51:23 +02:00
|
|
|
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
//
|
|
|
|
// Create new block
|
|
|
|
//
|
|
|
|
unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
|
|
|
|
CBlockIndex* pindexPrev = chainActive.Tip();
|
2015-04-03 00:51:08 +02:00
|
|
|
if(!pindexPrev) break;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2016-04-28 13:40:20 +02:00
|
|
|
std::unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlock(chainparams, coinbaseScript->reserveScript));
|
2014-05-10 14:47:16 +02:00
|
|
|
if (!pblocktemplate.get())
|
2014-06-16 14:45:32 +02:00
|
|
|
{
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner -- Keypool ran out, please call keypoolrefill before restarting the mining thread\n");
|
2014-05-10 14:47:16 +02:00
|
|
|
return;
|
2014-06-16 14:45:32 +02:00
|
|
|
}
|
2014-05-10 14:47:16 +02:00
|
|
|
CBlock *pblock = &pblocktemplate->block;
|
|
|
|
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner -- Running miner with %u transactions in block (%u bytes)\n", pblock->vtx.size(),
|
2014-05-10 14:47:16 +02:00
|
|
|
::GetSerializeSize(*pblock, SER_NETWORK, PROTOCOL_VERSION));
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
//
|
|
|
|
// Search
|
|
|
|
//
|
|
|
|
int64_t nStart = GetTime();
|
2015-04-10 07:33:06 +02:00
|
|
|
arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits);
|
2014-12-06 22:56:38 +01:00
|
|
|
while (true)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2015-04-03 00:51:08 +02:00
|
|
|
unsigned int nHashesDone = 0;
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2015-04-03 00:51:08 +02:00
|
|
|
uint256 hash;
|
|
|
|
while (true)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2015-04-03 00:51:08 +02:00
|
|
|
hash = pblock->GetHash();
|
2015-04-10 07:33:06 +02:00
|
|
|
if (UintToArith256(hash) <= hashTarget)
|
2014-05-10 14:47:16 +02:00
|
|
|
{
|
|
|
|
// Found a solution
|
|
|
|
SetThreadPriority(THREAD_PRIORITY_NORMAL);
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner:\n proof-of-work found\n hash: %s\n target: %s\n", hash.GetHex(), hashTarget.GetHex());
|
2017-07-28 16:10:10 +02:00
|
|
|
ProcessBlockFound(pblock, chainparams);
|
2014-05-10 14:47:16 +02:00
|
|
|
SetThreadPriority(THREAD_PRIORITY_LOWEST);
|
2015-07-01 08:32:30 +02:00
|
|
|
coinbaseScript->KeepScript();
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2015-04-03 00:51:08 +02:00
|
|
|
// In regression test mode, stop mining after a block is found. This
|
|
|
|
// allows developers to controllably generate a block on demand.
|
2015-04-10 18:42:50 +02:00
|
|
|
if (chainparams.MineBlocksOnDemand())
|
2014-05-10 14:47:16 +02:00
|
|
|
throw boost::thread_interrupted();
|
2013-07-31 15:43:35 +02:00
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
break;
|
|
|
|
}
|
2015-04-03 00:51:08 +02:00
|
|
|
pblock->nNonce += 1;
|
|
|
|
nHashesDone += 1;
|
|
|
|
if ((pblock->nNonce & 0xFF) == 0)
|
|
|
|
break;
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
|
2014-05-10 14:47:16 +02:00
|
|
|
// Check for stop or if block needs to be rebuilt
|
|
|
|
boost::this_thread::interruption_point();
|
|
|
|
// Regtest mode doesn't require peers
|
Backport Bitcoin PR#8085: p2p: Begin encapsulation (#1537)
* net: move CBanDB and CAddrDB out of net.h/cpp
This will eventually solve a circular dependency
* net: Create CConnman to encapsulate p2p connections
* net: Move socket binding into CConnman
* net: move OpenNetworkConnection into CConnman
* net: move ban and addrman functions into CConnman
* net: Add oneshot functions to CConnman
* net: move added node functions to CConnman
* net: Add most functions needed for vNodes to CConnman
* net: handle nodesignals in CConnman
* net: Pass CConnection to wallet rather than using the global
* net: Add rpc error for missing/disabled p2p functionality
* net: Pass CConnman around as needed
* gui: add NodeID to the peer table
* net: create generic functor accessors and move vNodes to CConnman
* net: move whitelist functions into CConnman
* net: move nLastNodeId to CConnman
* net: move nLocalHostNonce to CConnman
This behavior seems to have been quite racy and broken.
Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
* net: move messageHandlerCondition to CConnman
* net: move send/recv statistics to CConnman
* net: move SendBufferSize/ReceiveFloodSize to CConnman
* net: move nLocalServices/nRelevantServices to CConnman
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
* net: move semOutbound and semMasternodeOutbound to CConnman
* net: SocketSendData returns written size
* net: move max/max-outbound to CConnman
* net: Pass best block known height into CConnman
CConnman then passes the current best height into CNode at creation time.
This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.
This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.
This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
* net: pass CClientUIInterface into CConnman
* net: Drop StartNode/StopNode and use CConnman directly
* net: Introduce CConnection::Options to avoid passing so many params
* net: add nSendBufferMaxSize/nReceiveFloodSize to CConnection::Options
* net: move vNodesDisconnected into CConnman
* Made the ForEachNode* functions in src/net.cpp more pragmatic and self documenting
* Convert ForEachNode* functions to take a templated function argument rather than a std::function to eliminate std::function overhead
* net: move MAX_FEELER_CONNECTIONS into connman
2017-07-21 11:35:19 +02:00
|
|
|
if (connman.GetNodeCount(CConnman::CONNECTIONS_ALL) == 0 && chainparams.MiningRequiresPeers())
|
2014-05-10 14:47:16 +02:00
|
|
|
break;
|
2015-04-03 00:51:08 +02:00
|
|
|
if (pblock->nNonce >= 0xffff0000)
|
2014-05-10 14:47:16 +02:00
|
|
|
break;
|
|
|
|
if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLast && GetTime() - nStart > 60)
|
|
|
|
break;
|
|
|
|
if (pindexPrev != chainActive.Tip())
|
|
|
|
break;
|
|
|
|
|
|
|
|
// Update nTime every few seconds
|
2015-05-22 23:49:50 +02:00
|
|
|
if (UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev) < 0)
|
|
|
|
break; // Recreate the block if the clock has run backwards,
|
|
|
|
// so that we can use the correct time.
|
2015-04-10 18:42:50 +02:00
|
|
|
if (chainparams.GetConsensus().fPowAllowMinDifficultyBlocks)
|
2014-05-10 14:47:16 +02:00
|
|
|
{
|
|
|
|
// Changing pblock->nTime can change work required on testnet:
|
|
|
|
hashTarget.SetCompact(pblock->nBits);
|
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
}
|
2014-05-10 14:47:16 +02:00
|
|
|
}
|
2014-12-07 13:29:06 +01:00
|
|
|
catch (const boost::thread_interrupted&)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner -- terminated\n");
|
2013-07-31 15:43:35 +02:00
|
|
|
throw;
|
|
|
|
}
|
2015-04-29 02:00:50 +02:00
|
|
|
catch (const std::runtime_error &e)
|
|
|
|
{
|
2016-10-22 18:52:14 +02:00
|
|
|
LogPrintf("DashMiner -- runtime error: %s\n", e.what());
|
2015-04-29 02:00:50 +02:00
|
|
|
return;
|
|
|
|
}
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|
|
|
|
|
Backport Bitcoin PR#8085: p2p: Begin encapsulation (#1537)
* net: move CBanDB and CAddrDB out of net.h/cpp
This will eventually solve a circular dependency
* net: Create CConnman to encapsulate p2p connections
* net: Move socket binding into CConnman
* net: move OpenNetworkConnection into CConnman
* net: move ban and addrman functions into CConnman
* net: Add oneshot functions to CConnman
* net: move added node functions to CConnman
* net: Add most functions needed for vNodes to CConnman
* net: handle nodesignals in CConnman
* net: Pass CConnection to wallet rather than using the global
* net: Add rpc error for missing/disabled p2p functionality
* net: Pass CConnman around as needed
* gui: add NodeID to the peer table
* net: create generic functor accessors and move vNodes to CConnman
* net: move whitelist functions into CConnman
* net: move nLastNodeId to CConnman
* net: move nLocalHostNonce to CConnman
This behavior seems to have been quite racy and broken.
Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
* net: move messageHandlerCondition to CConnman
* net: move send/recv statistics to CConnman
* net: move SendBufferSize/ReceiveFloodSize to CConnman
* net: move nLocalServices/nRelevantServices to CConnman
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
* net: move semOutbound and semMasternodeOutbound to CConnman
* net: SocketSendData returns written size
* net: move max/max-outbound to CConnman
* net: Pass best block known height into CConnman
CConnman then passes the current best height into CNode at creation time.
This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.
This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.
This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
* net: pass CClientUIInterface into CConnman
* net: Drop StartNode/StopNode and use CConnman directly
* net: Introduce CConnection::Options to avoid passing so many params
* net: add nSendBufferMaxSize/nReceiveFloodSize to CConnection::Options
* net: move vNodesDisconnected into CConnman
* Made the ForEachNode* functions in src/net.cpp more pragmatic and self documenting
* Convert ForEachNode* functions to take a templated function argument rather than a std::function to eliminate std::function overhead
* net: move MAX_FEELER_CONNECTIONS into connman
2017-07-21 11:35:19 +02:00
|
|
|
void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainparams, CConnman& connman)
|
2013-07-31 15:43:35 +02:00
|
|
|
{
|
|
|
|
static boost::thread_group* minerThreads = NULL;
|
|
|
|
|
2015-07-03 09:13:56 +02:00
|
|
|
if (nThreads < 0)
|
|
|
|
nThreads = GetNumCores();
|
2013-07-31 15:43:35 +02:00
|
|
|
|
|
|
|
if (minerThreads != NULL)
|
|
|
|
{
|
|
|
|
minerThreads->interrupt_all();
|
|
|
|
delete minerThreads;
|
|
|
|
minerThreads = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nThreads == 0 || !fGenerate)
|
|
|
|
return;
|
|
|
|
|
|
|
|
minerThreads = new boost::thread_group();
|
|
|
|
for (int i = 0; i < nThreads; i++)
|
Backport Bitcoin PR#8085: p2p: Begin encapsulation (#1537)
* net: move CBanDB and CAddrDB out of net.h/cpp
This will eventually solve a circular dependency
* net: Create CConnman to encapsulate p2p connections
* net: Move socket binding into CConnman
* net: move OpenNetworkConnection into CConnman
* net: move ban and addrman functions into CConnman
* net: Add oneshot functions to CConnman
* net: move added node functions to CConnman
* net: Add most functions needed for vNodes to CConnman
* net: handle nodesignals in CConnman
* net: Pass CConnection to wallet rather than using the global
* net: Add rpc error for missing/disabled p2p functionality
* net: Pass CConnman around as needed
* gui: add NodeID to the peer table
* net: create generic functor accessors and move vNodes to CConnman
* net: move whitelist functions into CConnman
* net: move nLastNodeId to CConnman
* net: move nLocalHostNonce to CConnman
This behavior seems to have been quite racy and broken.
Move nLocalHostNonce into CNode, and check received nonces against all
non-fully-connected nodes. If there's a match, assume we've connected
to ourself.
* net: move messageHandlerCondition to CConnman
* net: move send/recv statistics to CConnman
* net: move SendBufferSize/ReceiveFloodSize to CConnman
* net: move nLocalServices/nRelevantServices to CConnman
These are in-turn passed to CNode at connection time. This allows us to offer
different services to different peers (or test the effects of doing so).
* net: move semOutbound and semMasternodeOutbound to CConnman
* net: SocketSendData returns written size
* net: move max/max-outbound to CConnman
* net: Pass best block known height into CConnman
CConnman then passes the current best height into CNode at creation time.
This way CConnman/CNode have no dependency on main for height, and the signals
only move in one direction.
This also helps to prevent identity leakage a tiny bit. Before this change, an
attacker could theoretically make 2 connections on different interfaces. They
would connect fully on one, and only establish the initial connection on the
other. Once they receive a new block, they would relay it to your first
connection, and immediately commence the version handshake on the second. Since
the new block height is reflected immediately, they could attempt to learn
whether the two connections were correlated.
This is, of course, incredibly unlikely to work due to the small timings
involved and receipt from other senders. But it doesn't hurt to lock-in
nBestHeight at the time of connection, rather than letting the remote choose
the time.
* net: pass CClientUIInterface into CConnman
* net: Drop StartNode/StopNode and use CConnman directly
* net: Introduce CConnection::Options to avoid passing so many params
* net: add nSendBufferMaxSize/nReceiveFloodSize to CConnection::Options
* net: move vNodesDisconnected into CConnman
* Made the ForEachNode* functions in src/net.cpp more pragmatic and self documenting
* Convert ForEachNode* functions to take a templated function argument rather than a std::function to eliminate std::function overhead
* net: move MAX_FEELER_CONNECTIONS into connman
2017-07-21 11:35:19 +02:00
|
|
|
minerThreads->create_thread(boost::bind(&BitcoinMiner, boost::cref(chainparams), boost::ref(connman)));
|
2013-07-31 15:43:35 +02:00
|
|
|
}
|