diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1777,8 +1777,6 @@
// to differentiate the network nodes.
nLocalServices = ServiceFlags(nLocalServices | NODE_BITCOIN_CASH);
- g_enable_bip61 = gArgs.GetBoolArg("-enablebip61", DEFAULT_ENABLE_BIP61);
-
nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
return true;
@@ -1944,7 +1942,9 @@
GetRand(std::numeric_limits<uint64_t>::max())));
CConnman &connman = *g_connman;
- peerLogic.reset(new PeerLogicValidation(&connman, scheduler));
+ peerLogic.reset(new PeerLogicValidation(
+ &connman, scheduler,
+ gArgs.GetBoolArg("-enablebip61", DEFAULT_ENABLE_BIP61)));
RegisterValidationInterface(peerLogic.get());
// sanitize comments per BIP-0014, format user agent and check total size
diff --git a/src/net_processing.h b/src/net_processing.h
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -17,51 +17,14 @@
* memory.
*/
static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
-/** Expiration time for orphan transactions in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
-/** Minimum time between orphan transactions expire time checks in seconds */
-static const int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
/**
* Default number of orphan+recently-replaced txn to keep around for block
* reconstruction.
*/
static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100;
-/**
- * Headers download timeout expressed in microseconds.
- * Timeout = base + per_header * (expected number of headers)
- */
-// 15 minutes
-static constexpr int64_t HEADERS_DOWNLOAD_TIMEOUT_BASE = 15 * 60 * 1000000;
-// 1ms/header
-static constexpr int64_t HEADERS_DOWNLOAD_TIMEOUT_PER_HEADER = 1000;
-/**
- * Protect at least this many outbound peers from disconnection due to
- * slow/behind headers chain.
- */
-static constexpr int32_t MAX_OUTBOUND_PEERS_TO_PROTECT_FROM_DISCONNECT = 4;
-/**
- * Timeout for (unprotected) outbound peers to sync to our chainwork, in
- * seconds.
- */
-// 20 minutes
-static constexpr int64_t CHAIN_SYNC_TIMEOUT = 20 * 60;
-/** How frequently to check for stale tips, in seconds */
-// 10 minutes
-static constexpr int64_t STALE_CHECK_INTERVAL = 10 * 60;
-/**
- * How frequently to check for extra outbound peers and disconnect, in seconds.
- */
-static constexpr int64_t EXTRA_PEER_CHECK_INTERVAL = 45;
-/**
- * Minimum time an outbound-peer-eviction candidate must be connected for, in
- * order to evict, in seconds.
- */
-static constexpr int64_t MINIMUM_CONNECT_TIME = 30;
/** Default for BIP61 (sending reject messages) */
static constexpr bool DEFAULT_ENABLE_BIP61 = true;
-/** Enable BIP61 (sending reject messages) */
-extern bool g_enable_bip61;
class PeerLogicValidation final : public CValidationInterface,
public NetEventsInterface {
@@ -69,7 +32,8 @@
CConnman *const connman;
public:
- explicit PeerLogicValidation(CConnman *connman, CScheduler &scheduler);
+ explicit PeerLogicValidation(CConnman *connman, CScheduler &scheduler,
+ bool enable_bip61);
void
BlockConnected(const std::shared_ptr<const CBlock> &pblock,
@@ -110,6 +74,9 @@
private:
//! Next time to check for stale tip
int64_t m_stale_tip_check_time;
+
+ /** Enable BIP61 (sending reject messages) */
+ const bool m_enable_bip61;
};
struct CNodeStateStats {
@@ -122,6 +89,6 @@
/** Get statistics from node state */
bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats);
/** Increase a node's misbehavior score. */
-void Misbehaving(NodeId nodeid, int howmuch, const std::string &reason);
+void Misbehaving(NodeId nodeid, int howmuch, const std::string &reason = "");
#endif // BITCOIN_NET_PROCESSING_H
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -39,15 +39,52 @@
#error "Bitcoin cannot be compiled without assertions."
#endif
-// Used only to inform the wallet of when we last received a block.
-std::atomic<int64_t> nTimeBestReceived(0);
-bool g_enable_bip61 = DEFAULT_ENABLE_BIP61;
+/** Expiration time for orphan transactions in seconds */
+static constexpr int64_t ORPHAN_TX_EXPIRE_TIME = 20 * 60;
+/** Minimum time between orphan transactions expire time checks in seconds */
+static constexpr int64_t ORPHAN_TX_EXPIRE_INTERVAL = 5 * 60;
+/**
+ * Headers download timeout expressed in microseconds.
+ * Timeout = base + per_header * (expected number of headers)
+ */
+// 15 minutes
+static constexpr int64_t HEADERS_DOWNLOAD_TIMEOUT_BASE = 15 * 60 * 1000000;
+// 1ms/header
+static constexpr int64_t HEADERS_DOWNLOAD_TIMEOUT_PER_HEADER = 1000;
+/**
+ * Protect at least this many outbound peers from disconnection due to
+ * slow/behind headers chain.
+ */
+static constexpr int32_t MAX_OUTBOUND_PEERS_TO_PROTECT_FROM_DISCONNECT = 4;
+/**
+ * Timeout for (unprotected) outbound peers to sync to our chainwork, in
+ * seconds.
+ */
+// 20 minutes
+static constexpr int64_t CHAIN_SYNC_TIMEOUT = 20 * 60;
+/** How frequently to check for stale tips, in seconds */
+// 10 minutes
+static constexpr int64_t STALE_CHECK_INTERVAL = 10 * 60;
+/**
+ * How frequently to check for extra outbound peers and disconnect, in seconds.
+ */
+static constexpr int64_t EXTRA_PEER_CHECK_INTERVAL = 45;
+/**
+ * Minimum time an outbound-peer-eviction candidate must be connected for, in
+ * order to evict, in seconds.
+ */
+static constexpr int64_t MINIMUM_CONNECT_TIME = 30;
+/** SHA256("main address relay")[0:8] */
+static constexpr uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL;
+/// Age after which a stale block will no longer be served if requested as
+/// protection against fingerprinting. Set to one month, denominated in seconds.
+static constexpr int STALE_RELAY_AGE_LIMIT = 30 * 24 * 60 * 60;
+/// Age after which a block is considered historical for purposes of rate
+/// limiting block relay. Set to one week, denominated in seconds.
+static constexpr int HISTORICAL_BLOCK_AGE = 7 * 24 * 60 * 60;
-struct IteratorComparator {
- template <typename I> bool operator()(const I &a, const I &b) {
- return &(*a) < &(*b);
- }
-};
+/// How many non standard orphan do we consider from a node before ignoring it.
+static constexpr uint32_t MAX_NON_STANDARD_ORPHAN_PER_NODE = 5;
struct COrphanTx {
// When modifying, adapt the copy of this definition in tests/DoS_tests.
@@ -58,28 +95,8 @@
static CCriticalSection g_cs_orphans;
std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);
-std::map<COutPoint,
- std::set<std::map<uint256, COrphanTx>::iterator, IteratorComparator>>
- mapOrphanTransactionsByPrev GUARDED_BY(g_cs_orphans);
-void EraseOrphansFor(NodeId peer);
-static size_t vExtraTxnForCompactIt GUARDED_BY(g_cs_orphans) = 0;
-static std::vector<std::pair<uint256, CTransactionRef>>
- vExtraTxnForCompact GUARDED_BY(g_cs_orphans);
-
-// SHA256("main address relay")[0:8]
-static const uint64_t RANDOMIZER_ID_ADDRESS_RELAY = 0x3cac0035b5866b90ULL;
-
-/// Age after which a stale block will no longer be served if requested as
-/// protection against fingerprinting. Set to one month, denominated in seconds.
-static const int STALE_RELAY_AGE_LIMIT = 30 * 24 * 60 * 60;
-
-/// Age after which a block is considered historical for purposes of rate
-/// limiting block relay. Set to one week, denominated in seconds.
-static const int HISTORICAL_BLOCK_AGE = 7 * 24 * 60 * 60;
-
-// How many non standard orphan do we consider from a node before ignoring it.
-static const uint32_t MAX_NON_STANDARD_ORPHAN_PER_NODE = 5;
+void EraseOrphansFor(NodeId peer);
// Internal stuff
namespace {
@@ -154,10 +171,25 @@
*/
std::deque<std::pair<int64_t, MapRelay::iterator>>
vRelayExpiration GUARDED_BY(cs_main);
+
+// Used only to inform the wallet of when we last received a block
+std::atomic<int64_t> nTimeBestReceived(0);
+
+struct IteratorComparator {
+ template <typename I> bool operator()(const I &a, const I &b) const {
+ return &(*a) < &(*b);
+ }
+};
+std::map<COutPoint,
+ std::set<std::map<uint256, COrphanTx>::iterator, IteratorComparator>>
+ mapOrphanTransactionsByPrev GUARDED_BY(g_cs_orphans);
+
+static size_t vExtraTxnForCompactIt GUARDED_BY(g_cs_orphans) = 0;
+static std::vector<std::pair<uint256, CTransactionRef>>
+ vExtraTxnForCompact GUARDED_BY(g_cs_orphans);
} // namespace
namespace {
-
struct CBlockReject {
uint8_t chRejectCode;
std::string strRejectReason;
@@ -959,8 +991,11 @@
}
PeerLogicValidation::PeerLogicValidation(CConnman *connmanIn,
- CScheduler &scheduler)
- : connman(connmanIn), m_stale_tip_check_time(0) {
+ CScheduler &scheduler,
+ bool enable_bip61)
+ : connman(connmanIn), m_stale_tip_check_time(0),
+ m_enable_bip61(enable_bip61) {
+
// Initialize global variables that cannot be constructed at startup.
recentRejects.reset(new CRollingBloomFilter(120000, 0.000001));
@@ -1029,6 +1064,10 @@
most_recent_compact_block GUARDED_BY(cs_most_recent_block);
static uint256 most_recent_block_hash GUARDED_BY(cs_most_recent_block);
+/**
+ * Maintain state about the best-seen block and fast-announce a compact block
+ * to compatible peers.
+ */
void PeerLogicValidation::NewPoWValidBlock(
const CBlockIndex *pindex, const std::shared_ptr<const CBlock> &pblock) {
std::shared_ptr<const CBlockHeaderAndShortTxIDs> pcmpctblock =
@@ -1077,6 +1116,10 @@
});
}
+/**
+ * Update our best height and announce any block hashes which weren't previously
+ * in chainActive to our peers.
+ */
void PeerLogicValidation::UpdatedBlockTip(const CBlockIndex *pindexNew,
const CBlockIndex *pindexFork,
bool fInitialDownload) {
@@ -1115,6 +1158,10 @@
nTimeBestReceived = GetTime();
}
+/**
+ * Handle invalid block rejection and consequent peer banning, maintain which
+ * peers announce compact blocks.
+ */
void PeerLogicValidation::BlockChecked(const CBlock &block,
const CValidationState &state) {
LOCK(cs_main);
@@ -1782,7 +1829,8 @@
static bool ProcessMessage(const Config &config, CNode *pfrom,
const std::string &strCommand, CDataStream &vRecv,
int64_t nTimeReceived, CConnman *connman,
- const std::atomic<bool> &interruptMsgProc) {
+ const std::atomic<bool> &interruptMsgProc,
+ bool enable_bip61) {
const CChainParams &chainparams = config.GetChainParams();
LogPrint(BCLog::NET, "received: %s (%u bytes) peer=%d\n",
SanitizeString(strCommand), vRecv.size(), pfrom->GetId());
@@ -1836,7 +1884,7 @@
else if (strCommand == NetMsgType::VERSION) {
// Each connection can only send one version message
if (pfrom->nVersion != 0) {
- if (g_enable_bip61) {
+ if (enable_bip61) {
connman->PushMessage(
pfrom,
CNetMsgMaker(INIT_PROTO_VERSION)
@@ -1875,7 +1923,7 @@
"(%08x offered, %08x expected); disconnecting\n",
pfrom->GetId(), nServices,
GetDesirableServiceFlags(nServices));
- if (g_enable_bip61) {
+ if (enable_bip61) {
connman->PushMessage(
pfrom,
CNetMsgMaker(INIT_PROTO_VERSION)
@@ -1893,7 +1941,7 @@
LogPrint(BCLog::NET,
"peer=%d using obsolete version %i; disconnecting\n",
pfrom->GetId(), nVersion);
- if (g_enable_bip61) {
+ if (enable_bip61) {
connman->PushMessage(
pfrom,
CNetMsgMaker(INIT_PROTO_VERSION)
@@ -2665,7 +2713,7 @@
tx.GetHash().ToString(), pfrom->GetId(),
FormatStateMessage(state));
// Never send AcceptToMemoryPool's internal codes over P2P.
- if (g_enable_bip61 && state.GetRejectCode() > 0 &&
+ if (enable_bip61 && state.GetRejectCode() > 0 &&
state.GetRejectCode() < REJECT_INTERNAL) {
connman->PushMessage(
pfrom, msgMaker.Make(NetMsgType::REJECT, strCommand,
@@ -2898,7 +2946,7 @@
if (fProcessBLOCKTXN) {
return ProcessMessage(config, pfrom, NetMsgType::BLOCKTXN,
blockTxnMsg, nTimeReceived, connman,
- interruptMsgProc);
+ interruptMsgProc, enable_bip61);
}
if (fRevertToHeaderProcessing) {
@@ -3318,11 +3366,12 @@
return true;
}
-static bool SendRejectsAndCheckIfBanned(CNode *pnode, CConnman *connman) {
+static bool SendRejectsAndCheckIfBanned(CNode *pnode, CConnman *connman,
+ bool enable_bip61) {
AssertLockHeld(cs_main);
CNodeState &state = *State(pnode->GetId());
- if (g_enable_bip61) {
+ if (enable_bip61) {
for (const CBlockReject &reject : state.rejects) {
connman->PushMessage(
pnode,
@@ -3455,15 +3504,16 @@
bool fRet = false;
try {
fRet = ProcessMessage(config, pfrom, strCommand, vRecv, msg.nTime,
- connman, interruptMsgProc);
+ connman, interruptMsgProc, m_enable_bip61);
if (interruptMsgProc) {
return false;
}
+
if (!pfrom->vRecvGetData.empty()) {
fMoreWork = true;
}
} catch (const std::ios_base::failure &e) {
- if (g_enable_bip61) {
+ if (m_enable_bip61) {
connman->PushMessage(
pfrom,
CNetMsgMaker(INIT_PROTO_VERSION)
@@ -3502,7 +3552,7 @@
}
LOCK(cs_main);
- SendRejectsAndCheckIfBanned(pfrom, connman);
+ SendRejectsAndCheckIfBanned(pfrom, connman, m_enable_bip61);
return fMoreWork;
}
@@ -3767,7 +3817,7 @@
return true;
}
- if (SendRejectsAndCheckIfBanned(pto, connman)) {
+ if (SendRejectsAndCheckIfBanned(pto, connman, m_enable_bip61)) {
return true;
}
CNodeState &state = *State(pto->GetId());
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
--- a/src/test/denialofservice_tests.cpp
+++ b/src/test/denialofservice_tests.cpp
@@ -26,6 +26,7 @@
extern bool AddOrphanTx(const CTransactionRef &tx, NodeId peer);
extern void EraseOrphansFor(NodeId peer);
extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);
+
struct COrphanTx {
CTransactionRef tx;
NodeId fromPeer;
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -128,7 +128,8 @@
// Deterministic randomness for tests.
g_connman = std::unique_ptr<CConnman>(new CConnman(config, 0x1337, 0x1337));
connman = g_connman.get();
- peerLogic.reset(new PeerLogicValidation(connman, scheduler));
+ peerLogic.reset(
+ new PeerLogicValidation(connman, scheduler, /*enable_bip61=*/true));
}
TestingSetup::~TestingSetup() {