diff options
| author | Andrew Chow <github@achow101.com> | 2023-08-09 05:05:22 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-08-14 17:38:27 -0400 |
| commit | 8bbe257bac751859a272ddf52dc0328c1b5a1ede (patch) | |
| tree | 117b7b05237fbe6a57f955e700f79478fbb6df68 | |
| parent | 7a172c76d2361fc3cdf6345590e26c79a7821672 (diff) | |
| download | bitcoin-8bbe257bac751859a272ddf52dc0328c1b5a1ede.tar.xz | |
MOVEONLY: Move datacarrier defaults to policy.h
| -rw-r--r-- | src/policy/policy.h | 7 | ||||
| -rw-r--r-- | 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 657ee8b32d..79e6725e73 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 097ab92652..53987ed244 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -16,16 +16,8 @@ #include <string> #include <variant> -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: |