Combine datacarrier globals into one

1 files changed, 6 insertions, 5 deletions

diff --git a/src/script/standard.h b/src/script/standard.h
index 448fdff010..c1c4cf4a39 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -13,6 +13,7 @@
 #include <util/hash_type.h>
 
 #include <map>
+#include <optional>
 #include <string>
 #include <variant>
 
@@ -33,7 +34,7 @@ public:
 };
 
 /**
- * Default setting for nMaxDatacarrierBytes. 80 bytes of data, +1 for OP_RETURN,
+ * 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;
@@ -41,11 +42,11 @@ static const unsigned int MAX_OP_RETURN_RELAY = 83;
 /**
  * A data carrying output is an unspendable output containing data. The script
  * type is designated as TxoutType::NULL_DATA.
+ *
+ * Maximum size of TxoutType::NULL_DATA scripts that this node considers standard.
+ * If nullopt, any size is nonstandard.
  */
-extern bool fAcceptDatacarrier;
-
-/** Maximum size of TxoutType::NULL_DATA scripts that this node considers standard. */
-extern unsigned nMaxDatacarrierBytes;
+extern std::optional<unsigned> g_max_datacarrier_bytes;
 
 /**
  * Mandatory script verification flags that all new blocks must comply with for