aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJohnson Lau <jl2012@xbt.hk>2016-08-31 19:38:23 +0800
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-26 16:50:39 +0200
commit9dfa0c8d90177a12c3a3b1ac59c32727077d6803 (patch)
treee66d2eb4787ec93c5fbcd207ccd1b84dfee42688 /src/main.cpp
parentcef633ce63937eea37048fe07da2488fefb4ec7c (diff)
downloadbitcoin-9dfa0c8d90177a12c3a3b1ac59c32727077d6803.tar.xz
Implement NULLDUMMY softfork
Github-Pull: #8636 Rebased-From: 482f852da65457eb2fbea6b259e7568133fb81c4
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp
index a664bf2de7..c9869d04f9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2399,6 +2399,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;