Policy: Set default to acceptnonstddatacarrier=1

bitcoinknots · Mar 15, 2024 · 3131106 · 3131106
1 parent 41a825a
commit 3131106
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -736,6 +736,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
@@ -26,7 +26,7 @@ static constexpr unsigned int DEFAULT_MEMPOOL_EXPIRY_HOURS{336};
 /** Default for -mempoolreplacement; must update docs in init.cpp manually */
 static constexpr RBFPolicy DEFAULT_MEMPOOL_RBF_POLICY{RBFPolicy::Always};
 /** 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};