Default to more reasonable datacarriercost=1 datacarrierfullcount=1

This commit is contained in:
Luke Dashjr 2023-09-05 00:56:34 +00:00
parent 708fbd4e0f
commit 69bcc02d5f
2 changed files with 4 additions and 2 deletions

View File

@ -806,6 +806,8 @@ void InitParameterInteraction(ArgsManager& args)
if (args.GetBoolArg("-corepolicy", DEFAULT_COREPOLICY)) { if (args.GetBoolArg("-corepolicy", DEFAULT_COREPOLICY)) {
args.SoftSetArg("-bytespersigopstrict", "0"); args.SoftSetArg("-bytespersigopstrict", "0");
args.SoftSetArg("-permitbaremultisig", "1"); args.SoftSetArg("-permitbaremultisig", "1");
args.SoftSetArg("-datacarriercost", "0.25");
args.SoftSetArg("-datacarrierfullcount", "0");
args.SoftSetArg("-datacarriersize", "83"); args.SoftSetArg("-datacarriersize", "83");
args.SoftSetArg("-spkreuse", "allow"); args.SoftSetArg("-spkreuse", "allow");

View File

@ -51,7 +51,7 @@ static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP{20};
/** Default for -bytespersigopstrict */ /** Default for -bytespersigopstrict */
static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP_STRICT{20}; static constexpr unsigned int DEFAULT_BYTES_PER_SIGOP_STRICT{20};
/** Default for -datacarriercost (multiplied by WITNESS_SCALE_FACTOR) */ /** 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 */ /** Default for -rejecttokens */
static constexpr bool DEFAULT_REJECT_TOKENS{false}; static constexpr bool DEFAULT_REJECT_TOKENS{false};
/** Default for -permitbarepubkey */ /** Default for -permitbarepubkey */
@ -97,7 +97,7 @@ static const bool DEFAULT_ACCEPT_DATACARRIER = true;
*/ */
static constexpr unsigned int MAX_OP_RETURN_RELAY{42}; static constexpr unsigned int MAX_OP_RETURN_RELAY{42};
/** Default for -datacarrierfullcount */ /** 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 * 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 * ancestor and is no larger than this. Not really any reason to make this