From cf949569aed54c899233ab0a6310d26d548498a3 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 10 Nov 2016 13:42:27 -0800 Subject: [PATCH] pool: do not set witness bit for FILTERED_BLOCK. see #88. --- lib/net/pool.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/net/pool.js b/lib/net/pool.js index c98051c9..12713f6e 100644 --- a/lib/net/pool.js +++ b/lib/net/pool.js @@ -217,14 +217,15 @@ Pool.prototype._initOptions = function _initOptions() { if (this.options.preferredSeed) this.hosts.addSeed(this.options.preferredSeed); - if (this.options.spv) - this.blockType = constants.inv.FILTERED_BLOCK; - if (this.options.witness) { this.blockType |= constants.WITNESS_MASK; this.txType |= constants.WITNESS_MASK; } + // Note: No witness bit for merkleblocks. + if (this.options.spv) + this.blockType = constants.inv.FILTERED_BLOCK; + if (this.options.spv) this.spvFilter = Bloom.fromRate(10000, 0.001, constants.bloom.ALL);