Skip to content

Commit 8bbe257

Browse files
committed
MOVEONLY: Move datacarrier defaults to policy.h
1 parent 7a172c7 commit 8bbe257

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/policy/policy.h

+7
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ static constexpr unsigned int DEFAULT_ANCESTOR_SIZE_LIMIT_KVB{101};
6363
static constexpr unsigned int DEFAULT_DESCENDANT_LIMIT{25};
6464
/** Default for -limitdescendantsize, maximum kilobytes of in-mempool descendants */
6565
static constexpr unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT_KVB{101};
66+
/** Default for -datacarrier */
67+
static const bool DEFAULT_ACCEPT_DATACARRIER = true;
68+
/**
69+
* Default setting for -datacarriersize. 80 bytes of data, +1 for OP_RETURN,
70+
* +2 for the pushdata opcodes.
71+
*/
72+
static const unsigned int MAX_OP_RETURN_RELAY = 83;
6673
/**
6774
* An extra transaction can be added to a package, as long as it only has one
6875
* ancestor and is no larger than this. Not really any reason to make this

src/script/standard.h

-8
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,8 @@
1616
#include <string>
1717
#include <variant>
1818

19-
static const bool DEFAULT_ACCEPT_DATACARRIER = true;
20-
2119
class CScript;
2220

23-
/**
24-
* Default setting for -datacarriersize. 80 bytes of data, +1 for OP_RETURN,
25-
* +2 for the pushdata opcodes.
26-
*/
27-
static const unsigned int MAX_OP_RETURN_RELAY = 83;
28-
2921
enum class TxoutType {
3022
NONSTANDARD,
3123
// 'standard' transaction types:

0 commit comments

Comments
 (0)