fix getLocks and wallet zapping.
This commit is contained in:
parent
debf082fb5
commit
32e94429d3
@ -2036,7 +2036,7 @@ Chain.prototype.getLocks = function getLocks(tx, flags, entry, callback) {
|
|||||||
return next();
|
return next();
|
||||||
|
|
||||||
coinHeight = input.coin.height === -1
|
coinHeight = input.coin.height === -1
|
||||||
? self.chain.tip + 1
|
? self.height + 1
|
||||||
: input.coin.height;
|
: input.coin.height;
|
||||||
|
|
||||||
if ((input.sequence & typeFlag) === 0) {
|
if ((input.sequence & typeFlag) === 0) {
|
||||||
|
|||||||
@ -1794,6 +1794,8 @@ TXPool.prototype.zap = function zap(address, now, age, callback, force) {
|
|||||||
return callback(err);
|
return callback(err);
|
||||||
|
|
||||||
utils.forEachSerial(txs, function(tx, next) {
|
utils.forEachSerial(txs, function(tx, next) {
|
||||||
|
if (tx.ts !== 0)
|
||||||
|
return next();
|
||||||
self.lazyRemove(tx, next);
|
self.lazyRemove(tx, next);
|
||||||
}, callback);
|
}, callback);
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user