diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-26 17:31:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-26 17:31:12 +0200 |
| commit | 236ae8665efadf7b4456c0a9fbf204a5cb4ce9f4 (patch) | |
| tree | 7bdb5593dabb61f87322af48abc01caa465a93d6 /src/script.cpp | |
| parent | Merge pull request #4392 (diff) | |
| parent | Add an option to allow users to disable relaying/mining data carrier transact... (diff) | |
| download | discoin-236ae8665efadf7b4456c0a9fbf204a5cb4ce9f4.tar.xz discoin-236ae8665efadf7b4456c0a9fbf204a5cb4ce9f4.zip | |
Merge pull request #3715
e44fea5 Add an option to allow users to disable relaying/mining data carrier transactions (Luke Dashjr)
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script.cpp b/src/script.cpp index c83d26885..bc4705abe 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1208,7 +1208,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi mTemplates.insert(make_pair(TX_MULTISIG, CScript() << OP_SMALLINTEGER << OP_PUBKEYS << OP_SMALLINTEGER << OP_CHECKMULTISIG)); // Empty, provably prunable, data-carrying output - mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN << OP_SMALLDATA)); + if (GetBoolArg("-datacarrier", true)) + mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN << OP_SMALLDATA)); mTemplates.insert(make_pair(TX_NULL_DATA, CScript() << OP_RETURN)); } |