Fixed header existence conditions
This commit is contained in:
parent
2c37e05ff7
commit
05c6cd7739
@ -252,9 +252,9 @@ BlockService.prototype._resetTip = function(callback) {
|
|||||||
return callback(err);
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_block) {
|
if (!_block) {
|
||||||
log.debug('Block Service: block: ' + header.hash + ' was not found, proceeding to older blocks.');
|
log.debug('Block Service: block: ' + header.hash + ' was not found, proceeding to older blocks.');
|
||||||
}
|
}
|
||||||
|
|
||||||
block = _block;
|
block = _block;
|
||||||
header = headers.getIndex(--height);
|
header = headers.getIndex(--height);
|
||||||
@ -721,16 +721,18 @@ BlockService.prototype._findLatestValidBlockHeader = function(callback) {
|
|||||||
// if some joker mines a block using an orphan block as its prev block, then the effect of this will be
|
// if some joker mines a block using an orphan block as its prev block, then the effect of this will be
|
||||||
// us detecting a reorg, but not actually reorging anything
|
// us detecting a reorg, but not actually reorging anything
|
||||||
// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
|
// FLOSight Error Correction from RanchiMall 17th May 2021. removed the unhandled assert and replaced by looging of error
|
||||||
|
if (typeof header !== 'undefined') {
|
||||||
if (header == false) {
|
if (header == false) {
|
||||||
log.error('Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
|
log.error('Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// assert(header, 'Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
|
// assert(header, 'Block Service: we could not locate any of our recent block hashes in the header service ' + 'index. Perhaps our header service sync\'ed to the wrong chain?');
|
||||||
if (typeof header.height !== 'undefined') {
|
if (typeof header.height !== 'undefined') {
|
||||||
if (header.height > self._tip.height) {
|
if (header.height > self._tip.height) {
|
||||||
log.error('Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
|
log.error('Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
|
||||||
}
|
}
|
||||||
// assert(header.height <= self._tip.height, 'Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
|
// assert(header.height <= self._tip.height, 'Block Service: we found a common ancestor header whose ' + 'height was greater than our current tip. This should be impossible.');
|
||||||
}
|
}
|
||||||
callback(null, header);
|
callback(null, header);
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user