RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix getOrphanRoot and usage.

Browse Source
This commit is contained in:
Christopher Jeffrey 2015-12-18 17:31:45 -08:00
parent d1f8e9b5ff
commit 7cabdcfda5
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bcoin/chain.js
View File

@ -387,6 +387,8 @@ Chain.prototype.hasBlock = function hasBlock(hash) {
if (Array.isArray(hash)) if (Array.isArray(hash))
hash = utils.toHex(hash); hash = utils.toHex(hash);
else if (hash.hash)
hash = hash.hash('hex');
return this.index.bloom.test(hash, 'hex'); return this.index.bloom.test(hash, 'hex');
}; };
@ -397,6 +399,8 @@ Chain.prototype.hasOrphan = function hasOrphan(hash) {
if (Array.isArray(hash)) if (Array.isArray(hash))
hash = utils.toHex(hash); hash = utils.toHex(hash);
else if (hash.hash)
hash = hash.hash('hex');
return !!this.orphan.bmap[hash]; return !!this.orphan.bmap[hash];
}; };
@ -531,15 +535,17 @@ Chain.prototype.locatorHashes = function(index) {
Chain.prototype.getOrphanRoot = function getOrphanRoot(hash) { Chain.prototype.getOrphanRoot = function getOrphanRoot(hash) {
var self = this; var self = this;
if (typeof hash !== 'string') { if (Array.isArray(hash))
hash = utils.toHex(hash);
else if (hash.hash)
hash = hash.hash('hex'); hash = hash.hash('hex');
}
var orphans = this.orphan.bmap;
var orphanRoot = hash; var orphanRoot = hash;
while (orphans[orphanRoot.prevBlock])
orphanRoot = orphans[orphanRoot.prevBlock]; while (this.orphan.bmap[hash]) {
orphanRoot = hash;
hash = this.orphan.bmap[hash].prevBlock;
}
return orphanRoot; return orphanRoot;
}; };

7
lib/bcoin/pool.js
View File

@ -357,14 +357,15 @@ Pool.prototype._addPeer = function _addPeer(backoff) {
var len = self.chain.index.hashes.length; var len = self.chain.index.hashes.length;
var hash = block.hash('hex'); var hash = block.hash('hex');
if (!self.chain.hasBlock(block.prevBlock))
peer.loadBlocks(self.chain.locatorHashes(), self.chain.getOrphanRoot(block));
self._response(block); self._response(block);
var err = self.chain.add(block); var err = self.chain.add(block);
if (err) if (err)
self.emit('chain-error', err, peer); self.emit('chain-error', err, peer);
if (self.chain.hasOrphan(block))
peer.loadBlocks(self.chain.locatorHashes(), self.chain.getOrphanRoot(block));
self.emit('_block', block, peer); self.emit('_block', block, peer);
if (self.chain.index.hashes.length === len) if (self.chain.index.hashes.length === len)