diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 18:09:02 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:29:16 +0200 |
| commit | 66664384a6fec39ecb4d8d06db66a4f193a06e33 (patch) | |
| tree | 7769cc7b287f4202edebae9c5314e8be4509d7e7 /src/script | |
| parent | fad0b4fab849eb5f1f0aa54ebc290f85a473ec91 (diff) | |
| download | bitcoin-66664384a6fec39ecb4d8d06db66a4f193a06e33.tar.xz | |
Remove ::g_max_datacarrier_bytes global
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/standard.cpp | 2 | ||||
| -rw-r--r-- | src/script/standard.h | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 47e9e89c94..6101738061 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -16,8 +16,6 @@ typedef std::vector<unsigned char> valtype; -std::optional<unsigned> g_max_datacarrier_bytes{DEFAULT_ACCEPT_DATACARRIER ? std::optional{MAX_OP_RETURN_RELAY} : std::nullopt}; - CScriptID::CScriptID(const CScript& in) : BaseHash(Hash160(in)) {} CScriptID::CScriptID(const ScriptHash& in) : BaseHash(static_cast<uint160>(in)) {} diff --git a/src/script/standard.h b/src/script/standard.h index c1c4cf4a39..1e6769782a 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -13,7 +13,6 @@ #include <util/hash_type.h> #include <map> -#include <optional> #include <string> #include <variant> @@ -40,15 +39,6 @@ public: 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 std::optional<unsigned> g_max_datacarrier_bytes; - -/** * Mandatory script verification flags that all new blocks must comply with for * them to be valid. (but old blocks may not comply with) Currently just P2SH, * but in the future other flags may be added. |