diff --git a/src/init.cpp b/src/init.cpp index 470c91498d0..63244c802ea 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -490,7 +490,6 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc) argsman.AddArg("-allowignoredconf", strprintf("For backwards compatibility, treat an unused %s file in the datadir as a warning, not an error.", BITCOIN_CONF_FILENAME), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-loadblock=", "Imports blocks from external file on startup", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-maxmempool=", strprintf("Keep the transaction memory pool below megabytes (default: %u)", DEFAULT_MAX_MEMPOOL_SIZE_MB), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); - argsman.AddArg("-maxorphantx=", strprintf("Keep at most unconnectable transactions in memory (default: %u)", DEFAULT_MAX_ORPHAN_TRANSACTIONS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-mempoolexpiry=", strprintf("Do not keep transactions in the mempool longer than hours (default: %u)", DEFAULT_MEMPOOL_EXPIRY_HOURS), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-minimumchainwork=", strprintf("Minimum work assumed to exist on a valid chain in hex (default: %s, testnet3: %s, testnet4: %s, signet: %s)", defaultChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnetChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnet4ChainParams->GetConsensus().nMinimumChainWork.GetHex(), signetChainParams->GetConsensus().nMinimumChainWork.GetHex()), ArgsManager::ALLOW_ANY | ArgsManager::DEBUG_ONLY, OptionsCategory::OPTIONS); argsman.AddArg("-par=", strprintf("Set the number of script verification threads (0 = auto, up to %d, <0 = leave that many cores free, default: %d)", diff --git a/src/net_processing.h b/src/net_processing.h index d99674607ff..f1e5640a889 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -36,7 +36,7 @@ class Warnings; /** 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 */ +/** Default maximum number of orphan transactions kept in memory */ 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. */ diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index e94572dbe2d..59dc592d66d 100644 --- a/src/node/peerman_args.cpp +++ b/src/node/peerman_args.cpp @@ -16,10 +16,6 @@ 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::clamp(*value, 0, std::numeric_limits::max()))); - } - if (auto value{argsman.GetIntArg("-blockreconstructionextratxn")}) { options.max_extra_txs = uint32_t((std::clamp(*value, 0, std::numeric_limits::max()))); } diff --git a/src/node/txorphanage.h b/src/node/txorphanage.h index 686c5f5ab3d..ac43cb1d231 100644 --- a/src/node/txorphanage.h +++ b/src/node/txorphanage.h @@ -123,7 +123,7 @@ protected: unsigned int m_total_announcements{0}; /** Map from wtxid to orphan transaction record. Limited by - * -maxorphantx/DEFAULT_MAX_ORPHAN_TRANSACTIONS */ + * DEFAULT_MAX_ORPHAN_TRANSACTIONS */ std::map m_orphans; struct PeerOrphanInfo {