diff --git a/src/net_processing.h b/src/net_processing.h index a0cbe92289d..837e3086173 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -17,9 +17,10 @@ class ChainstateManager; /** Whether transaction reconciliation protocol should be enabled by default. */ static constexpr bool DEFAULT_TXRECONCILIATION_ENABLE{false}; /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ -static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; -/** Default number of orphan+recently-replaced txn to keep around for block reconstruction */ -static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100; +static const uint32_t DEFAULT_MAX_ORPHAN_TRANSACTIONS{100}; +/** Default number of non-mempool transactions to keep around for block reconstruction. Includes + orphan, replaced, and rejected transactions. */ +static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100}; static const bool DEFAULT_PEERBLOOMFILTERS = false; static const bool DEFAULT_PEERBLOCKFILTERS = false; /** Threshold for marking a node to be discouraged, e.g. disconnected and added to the discouragement filter. */ @@ -46,11 +47,16 @@ class PeerManager : public CValidationInterface, public NetEventsInterface { public: struct Options { - /** Whether this node is running in -blocksonly mode */ + //! Whether this node is running in -blocksonly mode bool ignore_incoming_txs{DEFAULT_BLOCKSONLY}; + //! Whether transaction reconciliation protocol is enabled bool reconcile_txs{DEFAULT_TXRECONCILIATION_ENABLE}; + //! Maximum number of orphan transactions kept in memory uint32_t max_orphan_txs{DEFAULT_MAX_ORPHAN_TRANSACTIONS}; - size_t max_extra_txs{DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN}; + //! Number of non-mempool transactions to keep around for block reconstruction. Includes + //! orphan, replaced, and rejected transactions. + uint32_t max_extra_txs{DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN}; + //! Whether all P2P messages are captured to disk bool capture_messages{false}; }; diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index e0dcf21c33f..b0ae2663651 100644 --- a/src/node/peerman_args.cpp +++ b/src/node/peerman_args.cpp @@ -3,6 +3,9 @@ #include #include +#include +#include + namespace node { void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& options) @@ -10,11 +13,11 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio if (auto value{argsman.GetBoolArg("-txreconciliation")}) options.reconcile_txs = *value; if (auto value{argsman.GetIntArg("-maxorphantx")}) { - options.max_orphan_txs = uint32_t(std::max(int64_t{0}, *value)); + options.max_orphan_txs = uint32_t((std::clamp(*value, 0, std::numeric_limits::max()))); } if (auto value{argsman.GetIntArg("-blockreconstructionextratxn")}) { - options.max_extra_txs = size_t(std::max(int64_t{0}, *value)); + options.max_extra_txs = uint32_t((std::clamp(*value, 0, std::numeric_limits::max()))); } if (auto value{argsman.GetBoolArg("-capturemessages")}) options.capture_messages = *value;