diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-22 10:20:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-22 10:58:00 +0200 |
| commit | 26b370a93700d81ab92b528c3194bd90234b07ce (patch) | |
| tree | 8b2ba1f52f450318d5d87fe5b5c48e7a3326511a /src | |
| parent | 7008e28136b53bd5d5b8723366bde523c76d299b (diff) | |
| parent | 482f852da65457eb2fbea6b259e7568133fb81c4 (diff) | |
| download | bitcoin-26b370a93700d81ab92b528c3194bd90234b07ce.tar.xz | |
Merge #8636: Implement NULLDUMMY softfork (BIP147)
482f852 Implement NULLDUMMY softfork (Johnson Lau)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index e5ddd31d0c..60bda426a6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2388,6 +2388,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin // Start enforcing WITNESS rules using versionbits logic. if (IsWitnessEnabled(pindex->pprev, chainparams.GetConsensus())) { flags |= SCRIPT_VERIFY_WITNESS; + flags |= SCRIPT_VERIFY_NULLDUMMY; } int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1; |