From 1af3ac63de9be4d30823b51ab790a2306139cdea Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sun, 18 Sep 2016 12:30:23 -0700 Subject: [PATCH] chain: bip147. --- lib/chain/chain.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/chain/chain.js b/lib/chain/chain.js index 9090a265..2eee5a96 100644 --- a/lib/chain/chain.js +++ b/lib/chain/chain.js @@ -544,10 +544,14 @@ Chain.prototype.getDeployments = function getDeployments(block, prev, ancestors, if (err) return next(err); - if (active && self.options.witness) { - state.flags |= constants.flags.VERIFY_WITNESS; - if (!self.state.hasWitness()) - self.logger.warning('Segwit has been activated.'); + if (active) { + // BIP147 + // state.flags |= constants.flags.VERIFY_NULLDUMMY; + if (self.options.witness) { + state.flags |= constants.flags.VERIFY_WITNESS; + if (!self.state.hasWitness()) + self.logger.warning('Segwit has been activated.'); + } } next();