Skip to content

Commit 2c0de11

Browse files
committed
Default policy: Set mempooltruc=accept (corepolicy resets to enforce)
1 parent b399472 commit 2c0de11

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/init.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ void SetupServerArgs(ArgsManager& argsman)
696696
argsman.AddArg("-maxscriptsize", strprintf("Maximum size of scripts we relay and mine, in bytes (default: %s)", DEFAULT_SCRIPT_SIZE_POLICY_LIMIT), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
697697
argsman.AddArg("-mempoolfullrbf", strprintf("Accept transaction replace-by-fee without requiring replaceability signaling (default: %u)", (DEFAULT_MEMPOOL_RBF_POLICY == RBFPolicy::Always)), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
698698
argsman.AddArg("-mempoolreplacement", strprintf("Set to 0 to disable RBF entirely, \"fee,optin\" to honour RBF opt-out signal, or \"fee,-optin\" to always RBF aka full RBF (default: %s)", "fee,-optin"), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
699-
argsman.AddArg("-mempooltruc", strprintf("Behaviour for transactions requesting TRUC limits: \"reject\" the transactions entirely, \"accept\" them just like any other, or \"enforce\" to impose their requested restrictions (default: %s)", "enforce"), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
699+
argsman.AddArg("-mempooltruc", strprintf("Behaviour for transactions requesting TRUC limits: \"reject\" the transactions entirely, \"accept\" them just like any other, or \"enforce\" to impose their requested restrictions (default: %s)", "accept"), ArgsManager::ALLOW_ANY, OptionsCategory::NODE_RELAY);
700700
argsman.AddArg("-permitbarepubkey", strprintf("Relay legacy pubkey outputs (default: %u)", DEFAULT_PERMIT_BAREPUBKEY), ArgsManager::ALLOW_ANY,
701701
OptionsCategory::NODE_RELAY);
702702
argsman.AddArg("-permitbaremultisig", strprintf("Relay transactions creating non-P2SH multisig outputs (default: %u)", DEFAULT_PERMIT_BAREMULTISIG), ArgsManager::ALLOW_ANY,
@@ -813,6 +813,7 @@ void InitParameterInteraction(ArgsManager& args)
813813
args.SoftSetArg("-datacarrierfullcount", "0");
814814
args.SoftSetArg("-datacarriersize", "83");
815815
args.SoftSetArg("-maxscriptsize", strprintf("%s", std::numeric_limits<unsigned int>::max()));
816+
args.SoftSetArg("-mempooltruc", "enforce");
816817
args.SoftSetArg("-spkreuse", "allow");
817818
args.SoftSetArg("-blockprioritysize", "0");
818819
args.SoftSetArg("-blockmaxsize", "4000000");

src/kernel/mempool_options.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336};
2929
/** Default for -mempoolreplacement; must update docs in init.cpp manually */
3030
static constexpr RBFPolicy DEFAULT_MEMPOOL_RBF_POLICY{RBFPolicy::Always};
3131
/** Default for -mempooltruc; must update docs in init.cpp manually */
32-
static constexpr TRUCPolicy DEFAULT_MEMPOOL_TRUC_POLICY{TRUCPolicy::Enforce};
32+
static constexpr TRUCPolicy DEFAULT_MEMPOOL_TRUC_POLICY{TRUCPolicy::Accept};
3333
/** Whether to fall back to legacy V1 serialization when writing mempool.dat */
3434
static constexpr bool DEFAULT_PERSIST_V1_DAT{false};
3535
/** Default for -acceptnonstddatacarrier */

src/test/util/txmempool.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ CTxMemPool::Options MemPoolOptionsForTest(const NodeContext& node)
2323
// Default to always checking mempool regardless of
2424
// chainparams.DefaultConsistencyChecks for tests
2525
.check_ratio = 1,
26+
.truc_policy = TRUCPolicy::Enforce,
2627
.signals = node.validation_signals.get(),
2728
};
2829
const auto result{ApplyArgsManOptions(*node.args, ::Params(), mempool_opts)};

0 commit comments

Comments
 (0)