diff options
| author | Pieter Wuille <[email protected]> | 2015-11-28 22:12:33 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2015-11-28 22:15:23 +0100 |
| commit | 8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe (patch) | |
| tree | be57e0918417600e4a758f02338f479946bb2721 /src/script | |
| parent | Merge pull request #6942 (diff) | |
| parent | [qt] Move GUI related HelpMessage() part downstream (diff) | |
| download | discoin-8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe.tar.xz discoin-8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe.zip | |
Merge pull request #6961
fa41d4c [qt] Move GUI related HelpMessage() part downstream (MarcoFalke)
faf93f3 [trivial] Reuse translation and cleanup DEFAULT_* values (MarcoFalke)
3307bdb Bugfix: Omit wallet-related options from -help when wallet is not supported (Luke Dashjr)
b966aa8 Constrain constant values to a single location in code (Luke Dashjr)
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/standard.cpp | 1 | ||||
| -rw-r--r-- | src/script/standard.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index bfef8afa1..4863b9639 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -16,6 +16,7 @@ using namespace std; typedef vector<unsigned char> valtype; +bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER; unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY; CScriptID::CScriptID(const CScript& in) : uint160(Hash160(in.begin(), in.end())) {} diff --git a/src/script/standard.h b/src/script/standard.h index ae1bbecca..2b9fbe78d 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -13,6 +13,8 @@ #include <stdint.h> +static const bool DEFAULT_ACCEPT_DATACARRIER = true; + class CKeyID; class CScript; @@ -26,6 +28,7 @@ public: }; static const unsigned int MAX_OP_RETURN_RELAY = 83; //! bytes (+1 for OP_RETURN, +2 for the pushdata opcodes) +extern bool fAcceptDatacarrier; extern unsigned nMaxDatacarrierBytes; /** |