Skip to content

Commit 1f93e3c

Browse files
committed
add deprecation warning for mempoolfullrbf
1 parent 4400c97 commit 1f93e3c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ void SetupServerArgs(ArgsManager& argsman)
645645
"is of this size or less (default: %u)",
646646
MAX_OP_RETURN_RELAY),
647647
ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
648-
argsman.AddArg("-mempoolfullrbf", strprintf("Accept transaction replace-by-fee without requiring replaceability signaling (default: %u)", DEFAULT_MEMPOOL_FULL_RBF), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
648+
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);
649649
argsman.AddArg("-permitbaremultisig", strprintf("Relay transactions creating non-P2SH multisig outputs (default: %u)", DEFAULT_PERMIT_BAREMULTISIG), ArgsManager::ALLOW_ANY,
650650
OptionsCategory::NODE_RELAY);
651651
argsman.AddArg("-minrelaytxfee=<amt>", strprintf("Fees (in %s/kvB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)",

src/node/mempool_args.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ util::Result<void> ApplyArgsManOptions(const ArgsManager& argsman, const CChainP
9393
}
9494

9595
mempool_opts.full_rbf = argsman.GetBoolArg("-mempoolfullrbf", mempool_opts.full_rbf);
96+
if (!mempool_opts.full_rbf) {
97+
LogInfo("Warning: mempoolfullrbf=0 set but deprecated and will be removed in a future release\n");
98+
}
9699

97100
mempool_opts.persist_v1_dat = argsman.GetBoolArg("-persistmempoolv1", mempool_opts.persist_v1_dat);
98101

0 commit comments

Comments
 (0)