diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-10-01 19:53:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-10-01 21:28:45 +0200 |
| commit | cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8 (patch) | |
| tree | 391ecd1cf9ea432a1558ae2e70d9a1fbb91d5dd3 /src/policy/policy.cpp | |
| parent | Merge pull request #6732 (diff) | |
| parent | Accept any sequence of PUSHDATAs in OP_RETURN outputs (diff) | |
| download | discoin-cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8.tar.xz discoin-cd78c2a421ae5aa1773c8fb84dadc2c61a01e5e8.zip | |
Merge pull request #6424
da894ab Accept any sequence of PUSHDATAs in OP_RETURN outputs (Peter Todd)
5d8709c Add IsPushOnly(const_iterator pc) (Peter Todd)
6a07eb6 Make TX_SCRIPTHASH clear vSolutionsRet first (Peter Todd)
Diffstat (limited to 'src/policy/policy.cpp')
| -rw-r--r-- | src/policy/policy.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 169fef4af..4c96fbf5a 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -49,7 +49,9 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType) return false; if (m < 1 || m > n) return false; - } + } else if (whichType == TX_NULL_DATA && + (!GetBoolArg("-datacarrier", true) || scriptPubKey.size() > nMaxDatacarrierBytes)) + return false; return whichType != TX_NONSTANDARD; } |