This commit is contained in:
Christopher Jeffrey 2016-05-06 02:00:26 -07:00
parent 4d937e642a
commit 198aee6560
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD

View File

@ -487,7 +487,7 @@ Chain.prototype._verify = function _verify(block, prev, callback) {
return callback(err);
height = prev.height + 1;
medianTime = prev.getMedianTime();
medianTime = prev.getMedianTime(ancestors);
// Ensure the timestamp is correct
if (block.ts <= medianTime) {
@ -840,7 +840,8 @@ Chain.prototype._checkInputs = function _checkInputs(block, prev, state, callbac
}
}
self.checkLocks(tx, state.lockFlags, entry, function(err, valid) {
// Verify sequence locks.
self.checkLocks(tx, state.lockFlags, prev, function(err, valid) {
if (err)
return next(err);
@ -889,7 +890,7 @@ Chain.prototype._checkInputs = function _checkInputs(block, prev, state, callbac
if (!verified) {
assert(!historical, 'BUG: Invalid inputs in historical data!');
return next(new VerifyError(block,
return callback(new VerifyError(block,
'invalid',
'mandatory-script-verify-flag-failed',
100));