highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ::g_max_datacarrier_bytes global

Browse Source
This commit is contained in:
MacroFake
2022-07-21 18:09:02 +02:00
parent fad0b4fab8
commit 66664384a6
13 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/standard.cpp
View File

@@ -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)) {}

10
src/script/standard.h
View File

@@ -13,7 +13,6 @@
#include <util/hash_type.h>
#include <map>
#include <optional>
#include <string>
#include <variant>
@@ -39,15 +38,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,