From e1e3b8137f67f83b15126c0f009fca69f84fcc91 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 6 Mar 2024 04:02:06 +0000 Subject: [PATCH] Default policy: Set acceptnonstddatacarrier=0 (corepolicy resets to 1) --- src/init.cpp | 1 + src/kernel/mempool_options.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index d8dc4e8bec..a3376767cf 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -804,6 +804,7 @@ static bool AppInitServers(NodeContext& node) void InitParameterInteraction(ArgsManager& args) { if (args.GetBoolArg("-corepolicy", DEFAULT_COREPOLICY)) { + args.SoftSetArg("-acceptnonstddatacarrier", "1"); args.SoftSetArg("-bytespersigopstrict", "0"); args.SoftSetArg("-permitbarepubkey", "1"); args.SoftSetArg("-permitbaremultisig", "1"); diff --git a/src/kernel/mempool_options.h b/src/kernel/mempool_options.h index 23313b224d..26bd29818a 100644 --- a/src/kernel/mempool_options.h +++ b/src/kernel/mempool_options.h @@ -33,7 +33,7 @@ static constexpr TRUCPolicy DEFAULT_MEMPOOL_TRUC_POLICY{TRUCPolicy::Enforce}; /** Whether to fall back to legacy V1 serialization when writing mempool.dat */ static constexpr bool DEFAULT_PERSIST_V1_DAT{false}; /** Default for -acceptnonstddatacarrier */ -static constexpr bool DEFAULT_ACCEPT_NON_STD_DATACARRIER{true}; +static constexpr bool DEFAULT_ACCEPT_NON_STD_DATACARRIER{false}; /** Default for -acceptnonstdtxn */ static constexpr bool DEFAULT_ACCEPT_NON_STD_TXN{false};