From 69bcc02d5f4e1799b414736bff6b140ae7d0aa9b Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 5 Sep 2023 00:56:34 +0000 Subject: [PATCH] Default to more reasonable datacarriercost=1 datacarrierfullcount=1 --- src/init.cpp | 2 ++ src/policy/policy.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index f6f72eb89a..4d72151e50 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -806,6 +806,8 @@ void InitParameterInteraction(ArgsManager& args) if (args.GetBoolArg("-corepolicy", DEFAULT_COREPOLICY)) { args.SoftSetArg("-bytespersigopstrict", "0"); args.SoftSetArg("-permitbaremultisig", "1"); + args.SoftSetArg("-datacarriercost", "0.25"); + args.SoftSetArg("-datacarrierfullcount", "0"); args.SoftSetArg("-datacarriersize", "83"); args.SoftSetArg("-spkreuse", "allow"); diff --git a/src/policy/policy.h b/src/policy/policy.h index c369875fef..9c5ee9f05c 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -51,7 +51,7 @@ static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP{20}; /** Default for -bytespersigopstrict */ static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP_STRICT{20}; /** Default for -datacarriercost (multiplied by WITNESS_SCALE_FACTOR) */ -static constexpr unsigned int DEFAULT_WEIGHT_PER_DATA_BYTE{1}; +static constexpr unsigned int DEFAULT_WEIGHT_PER_DATA_BYTE{4}; /** Default for -rejecttokens */ static constexpr bool DEFAULT_REJECT_TOKENS{false}; /** Default for -permitbarepubkey */ @@ -97,7 +97,7 @@ static const bool DEFAULT_ACCEPT_DATACARRIER = true; */ static constexpr unsigned int MAX_OP_RETURN_RELAY{42}; /** Default for -datacarrierfullcount */ -static constexpr bool DEFAULT_DATACARRIER_FULLCOUNT{false}; +static constexpr bool DEFAULT_DATACARRIER_FULLCOUNT{true}; /** * An extra transaction can be added to a package, as long as it only has one * ancestor and is no larger than this. Not really any reason to make this