diff options
| author | Johnson Lau <[email protected]> | 2016-10-16 23:53:16 +0800 |
|---|---|---|
| committer | Johnson Lau <[email protected]> | 2016-10-16 23:53:35 +0800 |
| commit | 3ade2f64cfe43ab53e4869ffc35d5fd23201e1c1 (patch) | |
| tree | 78eff29685321a56c9456c5d457c4c079aa7ddb9 /src/main.cpp | |
| parent | Merge #8915: Add copyright/patent issues to possible NACK reasons (diff) | |
| download | discoin-3ade2f64cfe43ab53e4869ffc35d5fd23201e1c1.tar.xz discoin-3ade2f64cfe43ab53e4869ffc35d5fd23201e1c1.zip | |
Add standard limits for P2WSH with tests
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index c92a38be9..020378b5d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2009-2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1273,6 +1273,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C if (fRequireStandard && !AreInputsStandard(tx, view)) return state.Invalid(false, REJECT_NONSTANDARD, "bad-txns-nonstandard-inputs"); + // Check for non-standard witness in P2WSH + if (!tx.wit.IsNull() && fRequireStandard && !IsWitnessStandard(tx, view)) + return state.DoS(0, false, REJECT_NONSTANDARD, "bad-witness-nonstandard", true); + int64_t nSigOpsCost = GetTransactionSigOpCost(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS); CAmount nValueOut = tx.GetValueOut(); |