diff --git a/lib/bcoin/chain.js b/lib/bcoin/chain.js index 3f87b4b3..834caed4 100644 --- a/lib/bcoin/chain.js +++ b/lib/bcoin/chain.js @@ -1982,13 +1982,7 @@ Chain.prototype.getOrphanRoot = function getOrphanRoot(hash) { hash = this.orphan.bmap[hash].prevBlock; } - if (!root) - return; - - return { - root: root, - soil: this.orphan.bmap[root].prevBlock - }; + return root; }; /** diff --git a/lib/bcoin/memblock.js b/lib/bcoin/memblock.js index cfa89418..f1747545 100644 --- a/lib/bcoin/memblock.js +++ b/lib/bcoin/memblock.js @@ -135,7 +135,6 @@ MemBlock.prototype.fromRaw = function fromRaw(data) { height = bcoin.script.getCoinbaseHeight(input.script.raw); this.coinbaseHeight = height; - this.txs = []; this.raw = p.data; return this; diff --git a/lib/bcoin/peer.js b/lib/bcoin/peer.js index d8a333fe..465ed0dc 100644 --- a/lib/bcoin/peer.js +++ b/lib/bcoin/peer.js @@ -1741,6 +1741,7 @@ Peer.prototype.reject = function reject(obj, code, reason, score) { Peer.prototype.resolveOrphan = function resolveOrphan(tip, orphan, callback) { var self = this; + var root; callback = utils.ensure(callback); @@ -1750,15 +1751,15 @@ Peer.prototype.resolveOrphan = function resolveOrphan(tip, orphan, callback) { if (err) return callback(err); - orphan = self.chain.getOrphanRoot(orphan); + root = self.chain.getOrphanRoot(orphan); // Was probably resolved. - if (!orphan) { + if (!root) { bcoin.debug('Orphan root was already resolved.'); return callback(); } - self.sendGetBlocks(locator, orphan.root); + self.sendGetBlocks(locator, root); callback(); });