Skip to content

Commit 4861861

Browse files
UdjinM6PastaPastaPasta
authored andcommitted
fix: disabled or non-enforced chainlocks does not mean you can safely mine non-locked txes
1 parent 33d5161 commit 4861861

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/llmq/chainlocks.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -449,17 +449,7 @@ CChainLocksHandler::BlockTxs::mapped_type CChainLocksHandler::GetBlockTxs(const
449449

450450
bool CChainLocksHandler::IsTxSafeForMining(const CInstantSendManager& isman, const uint256& txid) const
451451
{
452-
if (!isman.RejectConflictingBlocks()) {
453-
return true;
454-
}
455-
if (!isEnabled || !isEnforced) {
456-
return true;
457-
}
458-
459-
if (!isman.IsInstantSendEnabled()) {
460-
return true;
461-
}
462-
if (isman.IsLocked(txid)) {
452+
if (!isman.RejectConflictingBlocks() || !isman.IsInstantSendEnabled() || isman.IsLocked(txid)) {
463453
return true;
464454
}
465455

0 commit comments

Comments
 (0)