From 07a4c3a46531493c73fcc18fb1cc813c355354b5 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Wed, 24 Feb 2016 02:37:38 -0800 Subject: [PATCH] misc fixes. --- lib/bcoin/pool.js | 12 ++++++++++++ lib/bcoin/tx.js | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bcoin/pool.js b/lib/bcoin/pool.js index bcdf75a7..edd593b9 100644 --- a/lib/bcoin/pool.js +++ b/lib/bcoin/pool.js @@ -428,6 +428,8 @@ Pool.prototype._addLoader = function _addLoader() { }); peer.on('merkleblock', function(block) { + if (!self.options.spv) + return; if (!self.syncing) return; // If the peer sent us a block that was added @@ -444,6 +446,8 @@ Pool.prototype._addLoader = function _addLoader() { }); peer.on('block', function(block) { + if (self.options.spv) + return; if (!self.syncing) return; // If the peer sent us a block that was added @@ -898,10 +902,14 @@ Pool.prototype._addLeech = function _addLeech(socket) { }); peer.on('merkleblock', function(block) { + if (!self.options.spv) + return; self._handleBlock(block, peer); }); peer.on('block', function(block) { + if (self.options.spv) + return; self._handleBlock(block, peer); }); @@ -978,10 +986,14 @@ Pool.prototype._addPeer = function _addPeer() { }); peer.on('merkleblock', function(block) { + if (!self.options.spv) + return; self._handleBlock(block, peer); }); peer.on('block', function(block) { + if (self.options.spv) + return; self._handleBlock(block, peer); }); diff --git a/lib/bcoin/tx.js b/lib/bcoin/tx.js index 5ac1f6cb..8c2c8c4c 100644 --- a/lib/bcoin/tx.js +++ b/lib/bcoin/tx.js @@ -75,7 +75,7 @@ function TX(data, block) { } TX.prototype.setBlock = function setBlock(block) { - this.network = block.network; + this.network = true; this.relayedBy = block.relayedBy; this.ts = block.ts; this.block = block.hash('hex');