GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a79bca2f1f into merged_master (Bitcoin PR #19069)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:01 +00:00
commit e92d54175b
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/validation.cpp
View file

@ -317,7 +317,7 @@ bool CheckSequenceLocks(const CTxMemPool& pool, const CTransaction& tx, int flag
prevheights[txinIndex] = coin.nHeight;
}
}
lockPair = CalculateSequenceLocks(tx, flags, &prevheights, index);
lockPair = CalculateSequenceLocks(tx, flags, prevheights, index);
if (lp) {
lp->height = lockPair.first;
lp->time = lockPair.second;
@ -2347,7 +2347,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
}
}
if (!SequenceLocks(tx, nLockTimeFlags, &prevheights, *pindex)) {
if (!SequenceLocks(tx, nLockTimeFlags, prevheights, *pindex)) {
LogPrintf("ERROR: %s: contains a non-BIP68-final transaction\n", __func__);
return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-txns-nonfinal");
}