From 23c18d507283fa712ad21af6a46dadc660c359f4 Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 24 Sep 2026 21:55:57 -0500 Subject: [PATCH 1/5] fix: refuse to start a masternode with settings that silently skip its duties A masternode only signs InstantSend locks for transactions that enter its own mempool, and is PoSe-checked only on DKG participation. Settings that shrink what it accepts or serves therefore let it stay paid while doing less work. On mainnet 31 masternodes currently run -blocksonly=1, never sign InstantSend, and cause about a fifth of all 2 s InstantSend recovery stalls. Masternode mode now fails at startup with -blocksonly, an explicit -peerblockfilters=0, a non-zero -maxuploadtarget, or any transaction relay policy stricter than the default (fee floors, data carrier, bare multisig, ancestor/descendant limits). The relay policy check is skipped on regtest, where tests use a stricter policy to create mempool inconsistencies. Co-Authored-By: Claude Opus 5.5 (1M context) --- ...-notes-mn-reject-service-degrading-args.md | 20 ++++++ src/Makefile.test.include | 1 + src/init.cpp | 27 ++++++++ src/node/mempool_args.cpp | 27 ++++++++ src/node/mempool_args.h | 8 +++ src/test/masternode_params_tests.cpp | 67 +++++++++++++++++++ test/functional/feature_masternode_params.py | 51 +++++++------- .../feature_masternode_params_devnet.py | 42 ++++++++++++ test/functional/test_runner.py | 1 + test/util/data/non-backported.txt | 1 + 10 files changed, 217 insertions(+), 28 deletions(-) create mode 100644 doc/release-notes-mn-reject-service-degrading-args.md create mode 100644 src/test/masternode_params_tests.cpp create mode 100755 test/functional/feature_masternode_params_devnet.py diff --git a/doc/release-notes-mn-reject-service-degrading-args.md b/doc/release-notes-mn-reject-service-degrading-args.md new file mode 100644 index 000000000000..e802171d4e7c --- /dev/null +++ b/doc/release-notes-mn-reject-service-degrading-args.md @@ -0,0 +1,20 @@ +Masternode configuration +------------------------ + +A masternode now refuses to start with settings that let it stay paid while silently skipping +part of its work. Masternodes started with any of the following will exit with an error at +startup and must remove or restore the setting: + +* `-blocksonly=1`: the node rejects all transactions, so it never signs InstantSend locks and + never relays recovered signatures. +* `-peerblockfilters=0`: the node stops serving BIP157 compact block filters. +* A non-zero `-maxuploadtarget`: once the daily budget minus the block relay reserve is used up, + the node refuses filtered blocks, historical blocks and BIP35 `mempool` requests while still + advertising bloom filter support. A cap that never triggers is the same as no cap. +* A transaction relay policy stricter than the default (a raised `-minrelaytxfee`, + `-incrementalrelayfee` or `-dustrelayfee`, `-datacarrier=0` or a lowered `-datacarriersize`, + `-permitbaremultisig=0`, or lowered `-limitancestorcount`, `-limitancestorsize`, + `-limitdescendantcount`, `-limitdescendantsize`). A masternode only signs InstantSend locks + for transactions that enter its own mempool, so a stricter policy makes it skip signing, for + example for asset lock transactions when data carrier outputs are disabled. This check does + not apply on regtest. diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 2b9a81623b0f..90a0ed75ed64 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -155,6 +155,7 @@ BITCOIN_TESTS =\ test/llmq_utils_tests.cpp \ test/logging_tests.cpp \ test/quorum_proofs_tests.cpp \ + test/masternode_params_tests.cpp \ test/masternode_payments_tests.cpp \ test/dbwrapper_tests.cpp \ test/validation_tests.cpp \ diff --git a/src/init.cpp b/src/init.cpp index 7dd9849ec950..9cf345e1774c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -1409,6 +1410,32 @@ bool AppInitParameterInteraction(const ArgsManager& args) if (args.GetBoolArg("-disablegovernance", !DEFAULT_GOVERNANCE_ENABLE)) { return InitError(_("You can not disable governance validation on a masternode.")); } + if (args.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) { + return InitError(Untranslated("Masternode must relay transactions, set -blocksonly=0")); + } + if (!args.GetBoolArg("-peerblockfilters", DEFAULT_PEERBLOCKFILTERS)) { + return InitError(Untranslated("Masternode must serve compact block filters, set -peerblockfilters=1")); + } + // Once the daily budget minus a reserve of up to one max-size block per 10 minutes is used + // up, the node refuses filtered blocks, historical blocks and BIP35 mempool requests while + // still advertising NODE_BLOOM. A cap that never triggers is equivalent to no cap. + if (ParseByteUnits(args.GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET), ByteUnit::M).value_or(0) != 0) { + return InitError(Untranslated("Masternode must serve blocks and SPV clients without an upload limit, set " + "-maxuploadtarget=0")); + } + kernel::MemPoolOptions mempool_opts{}; + if (const auto error{ApplyArgsManOptions(args, chainparams, mempool_opts)}) { + return InitError(*error); + } + // Regression tests deliberately give individual masternodes a stricter policy to create + // mempool inconsistencies (see feature_llmq_is_retroactive.py). + if (const auto stricter{GetStricterThanDefaultRelayPolicy(mempool_opts)}; + !stricter.empty() && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { + return InitError( + strprintf(Untranslated("Masternode must not use a stricter transaction relay policy than the default, " + "which would make it skip InstantSend signing. Remove or restore: %s"), + Join(stricter, ", "))); + } } if (args.GetBoolArg("-disablegovernance", !DEFAULT_GOVERNANCE_ENABLE)) { diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp index 1de9a0cd5690..5d4cf9c5ea0d 100644 --- a/src/node/mempool_args.cpp +++ b/src/node/mempool_args.cpp @@ -100,3 +100,30 @@ std::optional ApplyArgsManOptions(const ArgsManager& argsman, con return std::nullopt; } + +std::vector GetStricterThanDefaultRelayPolicy(const MemPoolOptions& mempool_opts) +{ + const MemPoolOptions defaults{}; + std::vector stricter; + // -incrementalrelayfee also raises the minimum relay fee unless -minrelaytxfee is set explicitly. + if (mempool_opts.incremental_relay_feerate > defaults.incremental_relay_feerate) { + stricter.emplace_back("-incrementalrelayfee"); + } else if (mempool_opts.min_relay_feerate > defaults.min_relay_feerate) { + stricter.emplace_back("-minrelaytxfee"); + } + if (mempool_opts.dust_relay_feerate > defaults.dust_relay_feerate) stricter.emplace_back("-dustrelayfee"); + if (mempool_opts.max_datacarrier_bytes.value_or(0) < defaults.max_datacarrier_bytes.value_or(0)) { + stricter.emplace_back("-datacarrier/-datacarriersize"); + } + if (!mempool_opts.permit_bare_multisig && defaults.permit_bare_multisig) + stricter.emplace_back("-permitbaremultisig"); + if (mempool_opts.limits.ancestor_count < defaults.limits.ancestor_count) + stricter.emplace_back("-limitancestorcount"); + if (mempool_opts.limits.ancestor_size_vbytes < defaults.limits.ancestor_size_vbytes) + stricter.emplace_back("-limitancestorsize"); + if (mempool_opts.limits.descendant_count < defaults.limits.descendant_count) + stricter.emplace_back("-limitdescendantcount"); + if (mempool_opts.limits.descendant_size_vbytes < defaults.limits.descendant_size_vbytes) + stricter.emplace_back("-limitdescendantsize"); + return stricter; +} diff --git a/src/node/mempool_args.h b/src/node/mempool_args.h index 52d8b4f26554..14dc493ed6d5 100644 --- a/src/node/mempool_args.h +++ b/src/node/mempool_args.h @@ -6,6 +6,8 @@ #define BITCOIN_NODE_MEMPOOL_ARGS_H #include +#include +#include class ArgsManager; class CChainParams; @@ -23,5 +25,11 @@ struct MemPoolOptions; */ [[nodiscard]] std::optional ApplyArgsManOptions(const ArgsManager& argsman, const CChainParams& chainparams, kernel::MemPoolOptions& mempool_opts); +/** + * Names of the relay policy options in \p mempool_opts that reject transactions the network + * default policy accepts. A masternode only signs InstantSend locks for transactions that enter + * its own mempool, so any of these makes it silently skip signing work. + */ +[[nodiscard]] std::vector GetStricterThanDefaultRelayPolicy(const kernel::MemPoolOptions& mempool_opts); #endif // BITCOIN_NODE_MEMPOOL_ARGS_H diff --git a/src/test/masternode_params_tests.cpp b/src/test/masternode_params_tests.cpp new file mode 100644 index 000000000000..952cb2a23c94 --- /dev/null +++ b/src/test/masternode_params_tests.cpp @@ -0,0 +1,67 @@ +// Copyright (c) 2026 The Dash Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include +#include +#include +#include + +#include + +#include + +#include +#include + +BOOST_FIXTURE_TEST_SUITE(masternode_params_tests, BasicTestingSetup) + +static std::vector StricterFor(const std::vector& args) +{ + ArgsManager argsman; + std::vector argv{"dashd"}; + for (const auto& arg : args) argv.push_back(arg.c_str()); + std::string error; + argsman.AddArg("-minrelaytxfee", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-incrementalrelayfee", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-dustrelayfee", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-datacarrier", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-datacarriersize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-permitbaremultisig", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-limitancestorcount", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-limitancestorsize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-limitdescendantcount", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-limitdescendantsize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + BOOST_REQUIRE(argsman.ParseParameters(argv.size(), argv.data(), error)); + kernel::MemPoolOptions opts{}; + BOOST_REQUIRE(!ApplyArgsManOptions(argsman, Params(), opts)); + return GetStricterThanDefaultRelayPolicy(opts); +} + +BOOST_AUTO_TEST_CASE(default_relay_policy_is_not_stricter) +{ + BOOST_CHECK(StricterFor({}).empty()); +} + +BOOST_AUTO_TEST_CASE(looser_relay_policy_is_not_stricter) +{ + BOOST_CHECK(StricterFor({"-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160"}).empty()); +} + +BOOST_AUTO_TEST_CASE(each_stricter_relay_option_is_reported) +{ + using V = std::vector; + BOOST_CHECK(StricterFor({"-minrelaytxfee=0.001"}) == V{"-minrelaytxfee"}); + BOOST_CHECK(StricterFor({"-incrementalrelayfee=0.001"}) == V{"-incrementalrelayfee"}); + BOOST_CHECK(StricterFor({"-dustrelayfee=0.001"}) == V{"-dustrelayfee"}); + BOOST_CHECK(StricterFor({"-datacarrier=0"}) == V{"-datacarrier/-datacarriersize"}); + // An asset lock carries a two-byte OP_RETURN, which a smaller limit makes nonstandard. + BOOST_CHECK(StricterFor({"-datacarriersize=1"}) == V{"-datacarrier/-datacarriersize"}); + BOOST_CHECK(StricterFor({"-permitbaremultisig=0"}) == V{"-permitbaremultisig"}); + BOOST_CHECK(StricterFor({"-limitancestorcount=5"}) == V{"-limitancestorcount"}); + BOOST_CHECK(StricterFor({"-limitancestorsize=50"}) == V{"-limitancestorsize"}); + BOOST_CHECK(StricterFor({"-limitdescendantcount=5"}) == V{"-limitdescendantcount"}); + BOOST_CHECK(StricterFor({"-limitdescendantsize=50"}) == V{"-limitdescendantsize"}); +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/test/functional/feature_masternode_params.py b/test/functional/feature_masternode_params.py index e53e1fcb18d2..1e6400bdadf3 100755 --- a/test/functional/feature_masternode_params.py +++ b/test/functional/feature_masternode_params.py @@ -5,7 +5,9 @@ """Test masternode parameter interactions. This test verifies that certain parameters are automatically enabled -when a node is configured as a masternode via -masternodeblsprivkey. +when a node is configured as a masternode via -masternodeblsprivkey, and +that a masternode refuses to start with settings that make it silently +skip its duties (transaction relay, InstantSend signing, SPV serving). """ from test_framework.test_framework import BitcoinTestFramework @@ -58,37 +60,30 @@ def run_test(self): # The actual filter enabling might require the node to be fully synced assert node1.getblockcount() >= 0 # Basic check that node is running - self.log.info("Test that masternode can explicitly disable blockfilters") - # Restart masternode with explicit disable - self.restart_node(1, extra_args=[ - f"-masternodeblsprivkey={bls_key}", - "-peerblockfilters=0", - "-blockfilterindex=0" - ]) - node1 = self.nodes[1] - - # Should not have COMPACT_FILTERS service - services = int(node1.getnetworkinfo()['localservices'], 16) - assert services & NODE_COMPACT_FILTERS == 0 - - # Should not have blockfilterindex - index_info = node1.getindexinfo() - assert BASIC_FILTER_INDEX not in index_info - self.log.info("Test that masternode parameter interaction is logged") - # Stop the node first so we can check the startup logs self.stop_node(1) - - # Check debug log for parameter interaction messages during startup if self.is_wallet_compiled(): with self.nodes[1].assert_debug_log(["parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1"]): - self.start_node(1, extra_args=[ - f"-masternodeblsprivkey={bls_key}", - "-peerblockfilters=0", - "-blockfilterindex=0" - ]) - # Note: The peerblockfilters and blockfilterindex messages won't be in the log - # when explicitly disabled, only when auto-enabled + self.start_node(1, extra_args=[f"-masternodeblsprivkey={bls_key}"]) + self.stop_node(1) + + self.log.info("Test that masternode refuses settings that silently skip its duties") + mn_arg = f"-masternodeblsprivkey={bls_key}" + for extra_args, expected_msg in [ + (["-blocksonly"], "Error: Masternode must relay transactions, set -blocksonly=0"), + (["-peerblockfilters=0"], "Error: Masternode must serve compact block filters, set -peerblockfilters=1"), + (["-maxuploadtarget=500M"], "Error: Masternode must serve blocks and SPV clients without an upload limit, set -maxuploadtarget=0"), + ]: + self.nodes[1].assert_start_raises_init_error(extra_args=[mn_arg] + extra_args, expected_msg=expected_msg) + + # The stricter-relay-policy check only applies to chains with public masternodes; regtest + # masternodes may use it to create mempool inconsistencies (feature_llmq_is_retroactive.py). + self.log.info("Test that a stricter relay policy is allowed on regtest masternodes") + self.start_node(1, extra_args=[mn_arg, "-minrelaytxfee=0.001", "-datacarrier=0", "-limitancestorcount=5"]) + self.stop_node(1) + + self.log.info("Test that a regular node may still use these settings") + self.start_node(1, extra_args=["-blocksonly", "-peerblockfilters=0", "-maxuploadtarget=500M", "-datacarrier=0", "-minrelaytxfee=0.001"]) if __name__ == '__main__': diff --git a/test/functional/feature_masternode_params_devnet.py b/test/functional/feature_masternode_params_devnet.py new file mode 100755 index 000000000000..374a303e71cc --- /dev/null +++ b/test/functional/feature_masternode_params_devnet.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +# Copyright (c) 2026 The Dash Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +"""Test that a masternode refuses a stricter-than-default relay policy outside regtest. + +Regtest exempts masternodes from this check (see feature_llmq_is_retroactive.py), so it is +exercised on devnet here. +""" + +from test_framework.test_framework import BitcoinTestFramework + + +class MasternodeParamsDevnetTest(BitcoinTestFramework): + def set_test_params(self): + self.setup_clean_chain = True + self.chain = "devnet" + self.num_nodes = 1 + + def run_test(self): + bls_key = self.nodes[0].bls('generate')['secret'] + self.stop_node(0) + mn_args = [f"-masternodeblsprivkey={bls_key}", "-listen=1"] + relay_policy_msg = ("Error: Masternode must not use a stricter transaction relay policy than the default, " + "which would make it skip InstantSend signing. Remove or restore: ") + for extra_args, flags in [ + (["-datacarrier=0"], "-datacarrier/-datacarriersize"), + (["-minrelaytxfee=0.001"], "-minrelaytxfee"), + (["-incrementalrelayfee=0.001"], "-incrementalrelayfee"), + (["-dustrelayfee=0.001", "-permitbaremultisig=0"], "-dustrelayfee, -permitbaremultisig"), + (["-limitancestorcount=5", "-limitdescendantsize=50"], "-limitancestorcount, -limitdescendantsize"), + ]: + self.log.info(f"Test that a masternode refuses {' '.join(extra_args)}") + self.nodes[0].assert_start_raises_init_error(extra_args=mn_args + extra_args, + expected_msg=relay_policy_msg + flags) + + self.log.info("Test that a looser relay policy is still allowed") + self.start_node(0, extra_args=mn_args + ["-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160"]) + + +if __name__ == '__main__': + MasternodeParamsDevnetTest().main() diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index c0a224b1cdde..919d68679b47 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -132,6 +132,7 @@ 'feature_dip4_coinbasemerkleroots.py', # NOTE: needs dash_hash to pass 'feature_mnehf.py', # NOTE: needs dash_hash to pass 'feature_masternode_params.py', # NOTE: needs dash_hash to pass + 'feature_masternode_params_devnet.py', # NOTE: needs dash_hash to pass 'feature_governance.py --descriptors', 'feature_governance_cl.py --descriptors', 'rpc_verifyislock.py', diff --git a/test/util/data/non-backported.txt b/test/util/data/non-backported.txt index ebfe4d3a62c5..9b4c7e20023d 100644 --- a/test/util/data/non-backported.txt +++ b/test/util/data/non-backported.txt @@ -89,6 +89,7 @@ src/test/evo*.cpp src/test/fuzz/dkg_message_framing.cpp src/test/llmq*.cpp src/test/quorum_proofs_tests.cpp +src/test/masternode_params_tests.cpp src/test/masternode_payments_tests.cpp src/test/spork_tests.cpp src/test/unordered_lru_cache_tests.cpp From b42f43a8e78ab91499346b35fb8e82f04b98be60 Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 25 Sep 2026 11:16:57 -0500 Subject: [PATCH 2/5] fix: also refuse a reduced -maxmempool or raised -bytespersigop on a masternode A smaller mempool evicts transactions a default-sized one keeps once it fills and raises its dynamic fee floor, and a higher -bytespersigop inflates the virtual size used for relay fee and package limit checks. Either rejects transactions the default policy accepts, so the masternode skips signing their InstantSend locks. -bytespersigop is a global rather than a MemPoolOptions field, so it is checked next to the helper in init. Co-Authored-By: Claude Opus 5.5 (1M context) --- src/init.cpp | 5 +++-- src/node/mempool_args.cpp | 2 ++ src/test/masternode_params_tests.cpp | 5 ++++- test/functional/feature_masternode_params_devnet.py | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 9cf345e1774c..1befdfacd233 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1429,8 +1429,9 @@ bool AppInitParameterInteraction(const ArgsManager& args) } // Regression tests deliberately give individual masternodes a stricter policy to create // mempool inconsistencies (see feature_llmq_is_retroactive.py). - if (const auto stricter{GetStricterThanDefaultRelayPolicy(mempool_opts)}; - !stricter.empty() && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { + auto stricter{GetStricterThanDefaultRelayPolicy(mempool_opts)}; + if (nBytesPerSigOp > DEFAULT_BYTES_PER_SIGOP) stricter.emplace_back("-bytespersigop"); + if (!stricter.empty() && chainparams.NetworkIDString() != CBaseChainParams::REGTEST) { return InitError( strprintf(Untranslated("Masternode must not use a stricter transaction relay policy than the default, " "which would make it skip InstantSend signing. Remove or restore: %s"), diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp index 5d4cf9c5ea0d..483f8833f986 100644 --- a/src/node/mempool_args.cpp +++ b/src/node/mempool_args.cpp @@ -125,5 +125,7 @@ std::vector GetStricterThanDefaultRelayPolicy(const MemPoolOptions& stricter.emplace_back("-limitdescendantcount"); if (mempool_opts.limits.descendant_size_vbytes < defaults.limits.descendant_size_vbytes) stricter.emplace_back("-limitdescendantsize"); + // A full smaller mempool evicts transactions a default-sized one keeps and raises its fee floor. + if (mempool_opts.max_size_bytes < defaults.max_size_bytes) stricter.emplace_back("-maxmempool"); return stricter; } diff --git a/src/test/masternode_params_tests.cpp b/src/test/masternode_params_tests.cpp index 952cb2a23c94..c1932744603c 100644 --- a/src/test/masternode_params_tests.cpp +++ b/src/test/masternode_params_tests.cpp @@ -32,6 +32,7 @@ static std::vector StricterFor(const std::vector& args argsman.AddArg("-limitancestorsize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-limitdescendantcount", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-limitdescendantsize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-maxmempool", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); BOOST_REQUIRE(argsman.ParseParameters(argv.size(), argv.data(), error)); kernel::MemPoolOptions opts{}; BOOST_REQUIRE(!ApplyArgsManOptions(argsman, Params(), opts)); @@ -45,7 +46,8 @@ BOOST_AUTO_TEST_CASE(default_relay_policy_is_not_stricter) BOOST_AUTO_TEST_CASE(looser_relay_policy_is_not_stricter) { - BOOST_CHECK(StricterFor({"-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160"}).empty()); + BOOST_CHECK( + StricterFor({"-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160", "-maxmempool=301"}).empty()); } BOOST_AUTO_TEST_CASE(each_stricter_relay_option_is_reported) @@ -62,6 +64,7 @@ BOOST_AUTO_TEST_CASE(each_stricter_relay_option_is_reported) BOOST_CHECK(StricterFor({"-limitancestorsize=50"}) == V{"-limitancestorsize"}); BOOST_CHECK(StricterFor({"-limitdescendantcount=5"}) == V{"-limitdescendantcount"}); BOOST_CHECK(StricterFor({"-limitdescendantsize=50"}) == V{"-limitdescendantsize"}); + BOOST_CHECK(StricterFor({"-maxmempool=299"}) == V{"-maxmempool"}); } BOOST_AUTO_TEST_SUITE_END() diff --git a/test/functional/feature_masternode_params_devnet.py b/test/functional/feature_masternode_params_devnet.py index 374a303e71cc..8b4fc144e2c3 100755 --- a/test/functional/feature_masternode_params_devnet.py +++ b/test/functional/feature_masternode_params_devnet.py @@ -29,13 +29,16 @@ def run_test(self): (["-incrementalrelayfee=0.001"], "-incrementalrelayfee"), (["-dustrelayfee=0.001", "-permitbaremultisig=0"], "-dustrelayfee, -permitbaremultisig"), (["-limitancestorcount=5", "-limitdescendantsize=50"], "-limitancestorcount, -limitdescendantsize"), + (["-maxmempool=299"], "-maxmempool"), + (["-bytespersigop=21"], "-bytespersigop"), ]: self.log.info(f"Test that a masternode refuses {' '.join(extra_args)}") self.nodes[0].assert_start_raises_init_error(extra_args=mn_args + extra_args, expected_msg=relay_policy_msg + flags) self.log.info("Test that a looser relay policy is still allowed") - self.start_node(0, extra_args=mn_args + ["-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160"]) + self.start_node(0, extra_args=mn_args + ["-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160", + "-maxmempool=301", "-bytespersigop=19"]) if __name__ == '__main__': From cac35f86e8a759cfe9fda1b3d19845d9005a93ef Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 25 Sep 2026 11:16:57 -0500 Subject: [PATCH 3/5] test: replace the masternode blockfilter opt-out scenario in place The masternode refusal checks now sit where the removed explicit -peerblockfilters=0 scenario was, and the parameter interaction log check keeps its original shape, so the diff against the old test is minimal. Co-Authored-By: Claude Opus 5.5 (1M context) --- test/functional/feature_masternode_params.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test/functional/feature_masternode_params.py b/test/functional/feature_masternode_params.py index 1e6400bdadf3..a674a902e849 100755 --- a/test/functional/feature_masternode_params.py +++ b/test/functional/feature_masternode_params.py @@ -60,14 +60,8 @@ def run_test(self): # The actual filter enabling might require the node to be fully synced assert node1.getblockcount() >= 0 # Basic check that node is running - self.log.info("Test that masternode parameter interaction is logged") - self.stop_node(1) - if self.is_wallet_compiled(): - with self.nodes[1].assert_debug_log(["parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1"]): - self.start_node(1, extra_args=[f"-masternodeblsprivkey={bls_key}"]) - self.stop_node(1) - self.log.info("Test that masternode refuses settings that silently skip its duties") + self.stop_node(1) mn_arg = f"-masternodeblsprivkey={bls_key}" for extra_args, expected_msg in [ (["-blocksonly"], "Error: Masternode must relay transactions, set -blocksonly=0"), @@ -80,8 +74,17 @@ def run_test(self): # masternodes may use it to create mempool inconsistencies (feature_llmq_is_retroactive.py). self.log.info("Test that a stricter relay policy is allowed on regtest masternodes") self.start_node(1, extra_args=[mn_arg, "-minrelaytxfee=0.001", "-datacarrier=0", "-limitancestorcount=5"]) + + self.log.info("Test that masternode parameter interaction is logged") + # Stop the node first so we can check the startup logs self.stop_node(1) + # Check debug log for parameter interaction messages during startup + if self.is_wallet_compiled(): + with self.nodes[1].assert_debug_log(["parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1"]): + self.start_node(1, extra_args=[mn_arg]) + self.stop_node(1) + self.log.info("Test that a regular node may still use these settings") self.start_node(1, extra_args=["-blocksonly", "-peerblockfilters=0", "-maxuploadtarget=500M", "-datacarrier=0", "-minrelaytxfee=0.001"]) From 67e68507d4d6c59cd3cb3e4c30839e2fa1001cf3 Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 25 Sep 2026 11:16:57 -0500 Subject: [PATCH 4/5] doc: name the masternode settings release note after its PR and list only the requirements Co-Authored-By: Claude Opus 5.5 (1M context) --- doc/release-notes-7754.md | 15 ++++++++++++++ ...-notes-mn-reject-service-degrading-args.md | 20 ------------------- 2 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 doc/release-notes-7754.md delete mode 100644 doc/release-notes-mn-reject-service-degrading-args.md diff --git a/doc/release-notes-7754.md b/doc/release-notes-7754.md new file mode 100644 index 000000000000..d656ca7ef322 --- /dev/null +++ b/doc/release-notes-7754.md @@ -0,0 +1,15 @@ +Masternode configuration +------------------------ + +A masternode (`-masternodeblsprivkey`) now refuses to start unless: + +* `-blocksonly=0` +* `-peerblockfilters=1` +* `-maxuploadtarget=0` +* `-minrelaytxfee`, `-incrementalrelayfee`, `-dustrelayfee` and `-bytespersigop` are not above + their defaults +* `-datacarrier=1`, `-datacarriersize` is not below its default and `-permitbaremultisig=1` +* `-limitancestorcount`, `-limitancestorsize`, `-limitdescendantcount`, `-limitdescendantsize` + and `-maxmempool` are not below their defaults + +The relay policy checks do not apply on regtest. diff --git a/doc/release-notes-mn-reject-service-degrading-args.md b/doc/release-notes-mn-reject-service-degrading-args.md deleted file mode 100644 index e802171d4e7c..000000000000 --- a/doc/release-notes-mn-reject-service-degrading-args.md +++ /dev/null @@ -1,20 +0,0 @@ -Masternode configuration ------------------------- - -A masternode now refuses to start with settings that let it stay paid while silently skipping -part of its work. Masternodes started with any of the following will exit with an error at -startup and must remove or restore the setting: - -* `-blocksonly=1`: the node rejects all transactions, so it never signs InstantSend locks and - never relays recovered signatures. -* `-peerblockfilters=0`: the node stops serving BIP157 compact block filters. -* A non-zero `-maxuploadtarget`: once the daily budget minus the block relay reserve is used up, - the node refuses filtered blocks, historical blocks and BIP35 `mempool` requests while still - advertising bloom filter support. A cap that never triggers is the same as no cap. -* A transaction relay policy stricter than the default (a raised `-minrelaytxfee`, - `-incrementalrelayfee` or `-dustrelayfee`, `-datacarrier=0` or a lowered `-datacarriersize`, - `-permitbaremultisig=0`, or lowered `-limitancestorcount`, `-limitancestorsize`, - `-limitdescendantcount`, `-limitdescendantsize`). A masternode only signs InstantSend locks - for transactions that enter its own mempool, so a stricter policy makes it skip signing, for - example for asset lock transactions when data carrier outputs are disabled. This check does - not apply on regtest. From 5c3a3e0b7ddfc01a5103ec7e8dc52b7ed950510a Mon Sep 17 00:00:00 2001 From: pasta Date: Fri, 25 Sep 2026 15:20:25 -0500 Subject: [PATCH 5/5] fix: also refuse a shortened -mempoolexpiry on a masternode A shorter expiry drops transactions a default node keeps, and a negative one removes every newly accepted transaction before the InstantSend signer is notified. Co-Authored-By: Claude Opus 5.5 (1M context) --- doc/release-notes-7754.md | 4 ++-- src/node/mempool_args.cpp | 1 + src/test/masternode_params_tests.cpp | 8 ++++++-- test/functional/feature_masternode_params_devnet.py | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/release-notes-7754.md b/doc/release-notes-7754.md index d656ca7ef322..1d4b4b496da3 100644 --- a/doc/release-notes-7754.md +++ b/doc/release-notes-7754.md @@ -9,7 +9,7 @@ A masternode (`-masternodeblsprivkey`) now refuses to start unless: * `-minrelaytxfee`, `-incrementalrelayfee`, `-dustrelayfee` and `-bytespersigop` are not above their defaults * `-datacarrier=1`, `-datacarriersize` is not below its default and `-permitbaremultisig=1` -* `-limitancestorcount`, `-limitancestorsize`, `-limitdescendantcount`, `-limitdescendantsize` - and `-maxmempool` are not below their defaults +* `-limitancestorcount`, `-limitancestorsize`, `-limitdescendantcount`, `-limitdescendantsize`, + `-maxmempool` and `-mempoolexpiry` are not below their defaults The relay policy checks do not apply on regtest. diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp index 483f8833f986..9ca62165227b 100644 --- a/src/node/mempool_args.cpp +++ b/src/node/mempool_args.cpp @@ -127,5 +127,6 @@ std::vector GetStricterThanDefaultRelayPolicy(const MemPoolOptions& stricter.emplace_back("-limitdescendantsize"); // A full smaller mempool evicts transactions a default-sized one keeps and raises its fee floor. if (mempool_opts.max_size_bytes < defaults.max_size_bytes) stricter.emplace_back("-maxmempool"); + if (mempool_opts.expiry < defaults.expiry) stricter.emplace_back("-mempoolexpiry"); return stricter; } diff --git a/src/test/masternode_params_tests.cpp b/src/test/masternode_params_tests.cpp index c1932744603c..f3ba661a6d51 100644 --- a/src/test/masternode_params_tests.cpp +++ b/src/test/masternode_params_tests.cpp @@ -33,6 +33,7 @@ static std::vector StricterFor(const std::vector& args argsman.AddArg("-limitdescendantcount", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-limitdescendantsize", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); argsman.AddArg("-maxmempool", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); + argsman.AddArg("-mempoolexpiry", "", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS); BOOST_REQUIRE(argsman.ParseParameters(argv.size(), argv.data(), error)); kernel::MemPoolOptions opts{}; BOOST_REQUIRE(!ApplyArgsManOptions(argsman, Params(), opts)); @@ -46,8 +47,9 @@ BOOST_AUTO_TEST_CASE(default_relay_policy_is_not_stricter) BOOST_AUTO_TEST_CASE(looser_relay_policy_is_not_stricter) { - BOOST_CHECK( - StricterFor({"-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160", "-maxmempool=301"}).empty()); + BOOST_CHECK(StricterFor({"-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160", + "-maxmempool=301", "-mempoolexpiry=337"}) + .empty()); } BOOST_AUTO_TEST_CASE(each_stricter_relay_option_is_reported) @@ -65,6 +67,8 @@ BOOST_AUTO_TEST_CASE(each_stricter_relay_option_is_reported) BOOST_CHECK(StricterFor({"-limitdescendantcount=5"}) == V{"-limitdescendantcount"}); BOOST_CHECK(StricterFor({"-limitdescendantsize=50"}) == V{"-limitdescendantsize"}); BOOST_CHECK(StricterFor({"-maxmempool=299"}) == V{"-maxmempool"}); + BOOST_CHECK(StricterFor({"-mempoolexpiry=335"}) == V{"-mempoolexpiry"}); + BOOST_CHECK(StricterFor({"-mempoolexpiry=-1"}) == V{"-mempoolexpiry"}); } BOOST_AUTO_TEST_SUITE_END() diff --git a/test/functional/feature_masternode_params_devnet.py b/test/functional/feature_masternode_params_devnet.py index 8b4fc144e2c3..5ec019798a1a 100755 --- a/test/functional/feature_masternode_params_devnet.py +++ b/test/functional/feature_masternode_params_devnet.py @@ -31,6 +31,7 @@ def run_test(self): (["-limitancestorcount=5", "-limitdescendantsize=50"], "-limitancestorcount, -limitdescendantsize"), (["-maxmempool=299"], "-maxmempool"), (["-bytespersigop=21"], "-bytespersigop"), + (["-mempoolexpiry=335"], "-mempoolexpiry"), ]: self.log.info(f"Test that a masternode refuses {' '.join(extra_args)}") self.nodes[0].assert_start_raises_init_error(extra_args=mn_args + extra_args, @@ -38,7 +39,7 @@ def run_test(self): self.log.info("Test that a looser relay policy is still allowed") self.start_node(0, extra_args=mn_args + ["-minrelaytxfee=0.000001", "-limitancestorcount=50", "-datacarriersize=160", - "-maxmempool=301", "-bytespersigop=19"]) + "-maxmempool=301", "-bytespersigop=19", "-mempoolexpiry=337"]) if __name__ == '__main__':