diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2014-02-21 04:06:12 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2014-06-26 14:31:06 +0000 |
| commit | e44fea55ea73f46bc9460597c7001e77acb58db7 (patch) | |
| tree | b470e05a4d86f60fd11cd2240f5d1d5990230d6c /src/script.cpp | |
| parent | 343feecf562a39e7d898ece2fd745fcb9d4c90e9 (diff) | |
| download | bitcoin-e44fea55ea73f46bc9460597c7001e77acb58db7.tar.xz | |
Add an option to allow users to disable relaying/mining data carrier transactions
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 c83d26885a..bc4705abe7 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)); } |