Default to more reasonable datacarriercost=1 datacarrierfullcount=1

This commit is contained in:
Luke Dashjr 2023-09-05 00:56:34 +00:00
parent 63b246b956
commit c2bb684b69
3 changed files with 4 additions and 2 deletions

View File

@ -717,6 +717,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("-mempoolreplacement", args.GetBoolArg("-mempoolfullrbf", false) ? "fee,-optin" : "fee,optin"); args.SoftSetArg("-mempoolreplacement", args.GetBoolArg("-mempoolfullrbf", false) ? "fee,-optin" : "fee,optin");

View File

@ -48,7 +48,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 -permitbaremultisig */ /** Default for -permitbaremultisig */
static constexpr bool DEFAULT_PERMIT_BAREMULTISIG{false}; static constexpr bool DEFAULT_PERMIT_BAREMULTISIG{false};
/** The maximum number of witness stack items in a standard P2WSH script */ /** The maximum number of witness stack items in a standard P2WSH script */

View File

@ -38,7 +38,7 @@ public:
*/ */
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};
/** /**
* Mandatory script verification flags that all new blocks must comply with for * Mandatory script verification flags that all new blocks must comply with for