From 8bbe257bac751859a272ddf52dc0328c1b5a1ede Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Wed, 9 Aug 2023 05:05:22 -0400 Subject: [PATCH] MOVEONLY: Move datacarrier defaults to policy.h --- src/policy/policy.h | 7 +++++++ src/script/standard.h | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/policy/policy.h b/src/policy/policy.h index 657ee8b32df..79e6725e73f 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -63,6 +63,13 @@ static constexpr unsigned int DEFAULT_ANCESTOR_SIZE_LIMIT_KVB{101}; static constexpr unsigned int DEFAULT_DESCENDANT_LIMIT{25}; /** Default for -limitdescendantsize, maximum kilobytes of in-mempool descendants */ static constexpr unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT_KVB{101}; +/** Default for -datacarrier */ +static const bool DEFAULT_ACCEPT_DATACARRIER = true; +/** + * Default setting for -datacarriersize. 80 bytes of data, +1 for OP_RETURN, + * +2 for the pushdata opcodes. + */ +static const unsigned int MAX_OP_RETURN_RELAY = 83; /** * 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 diff --git a/src/script/standard.h b/src/script/standard.h index 097ab926522..53987ed2443 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -16,16 +16,8 @@ #include #include -static const bool DEFAULT_ACCEPT_DATACARRIER = true; - class CScript; -/** - * Default setting for -datacarriersize. 80 bytes of data, +1 for OP_RETURN, - * +2 for the pushdata opcodes. - */ -static const unsigned int MAX_OP_RETURN_RELAY = 83; - enum class TxoutType { NONSTANDARD, // 'standard' transaction types: