Merge 0903ce8dbc into merged_master (Bitcoin PR bitcoin/bitcoin#30592)

This commit is contained in:
ivanlele 2026-04-02 15:05:13 +00:00
commit 83750eb16f
No known key found for this signature in database
13 changed files with 21 additions and 243 deletions

View file

@ -653,7 +653,6 @@ void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)
"is of this size or less (default: %u)",
MAX_OP_RETURN_RELAY),
ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
argsman.AddArg("-mempoolfullrbf", strprintf("(DEPRECATED) Accept transaction replace-by-fee without requiring replaceability signaling (default: %u)", DEFAULT_MEMPOOL_FULL_RBF), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
argsman.AddArg("-permitbaremultisig", strprintf("Relay transactions creating non-P2SH multisig outputs (default: %u)", DEFAULT_PERMIT_BAREMULTISIG), ArgsManager::ALLOW_ANY,
OptionsCategory::NODE_RELAY);
argsman.AddArg("-minrelaytxfee=<amt>", strprintf("Fees (in %s/kvB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)",