diff options
| author | Suhas Daftuar <[email protected]> | 2016-07-22 11:09:45 -0400 |
|---|---|---|
| committer | Johnson Lau <[email protected]> | 2016-07-23 00:01:02 +0800 |
| commit | c59c434b7d1211c13f7904b9bc675e16910a1c0a (patch) | |
| tree | f5ac045d8d2d967b462b0404da2471def4bc1655 /src | |
| parent | Make witness v0 outputs non-standard before segwit activation (diff) | |
| download | discoin-c59c434b7d1211c13f7904b9bc675e16910a1c0a.tar.xz discoin-c59c434b7d1211c13f7904b9bc675e16910a1c0a.zip | |
qa: Add test for standardness of segwit v0 outputs
Diffstat (limited to 'src')
| -rw-r--r-- | src/policy/policy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index de3996bb4..57df1f0b1 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -49,7 +49,7 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType, const bool w } else if (whichType == TX_NULL_DATA && (!fAcceptDatacarrier || scriptPubKey.size() > nMaxDatacarrierBytes)) return false; - + else if (!witnessEnabled && (whichType == TX_WITNESS_V0_KEYHASH || whichType == TX_WITNESS_V0_SCRIPTHASH)) return false; |