From bccbef0aaa1d066a760e9f1598f6307ca6db22ee Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Tue, 26 Jul 2016 12:05:18 -0700 Subject: [PATCH] chain: minor segnet3 fix. --- lib/bcoin/chain.js | 2 +- lib/bcoin/peer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index 43e92db0..7b24049e 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -640,7 +640,7 @@ Chain.prototype.getDeployments = function getDeployments(block, prev, ancestors, // Only allow version 5 blocks (bip141 - segnet3) // once the majority of blocks are using it. - if (this.network.oldWitness) { + if (this.options.witness && this.network.oldWitness) { if (block.version < 5 && prev.isOutdated(5, ancestors)) return callback(new VerifyError(block, 'obsolete', 'bad-version', 0)); } diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index a2e36b05..7cc4d4b4 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -356,7 +356,7 @@ Peer.prototype._onAck = function _onAck(err) { // Let them know we support segwit (old // segwit3 nodes require this instead // of service bits). - if (this.network.oldWitness) { + if (this.pool.options.witness && this.network.oldWitness) { if (this.version.version >= 70012) this.write(this.framer.haveWitness()); }