diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2016-07-22 11:09:45 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-26 14:25:38 +0200 |
| commit | 4f7f531af6e1c40ee24817b375f0c444da516cd0 (patch) | |
| tree | 6d38b04667397e68c830ed299b813d9d86753a8e /src | |
| parent | f84ee3dab66831383e58c7de3fabc306754633db (diff) | |
| download | bitcoin-4f7f531af6e1c40ee24817b375f0c444da516cd0.tar.xz | |
qa: Add test for standardness of segwit v0 outputs
Github-Pull: #8381
Rebased-From: c59c434b7d1211c13f7904b9bc675e16910a1c0a
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 de3996bb4a..57df1f0b19 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; |