fix: sort indexes in GetLastBaseBlockHash

UdjinM6 · PastaPastaPasta · commit 1f16cf4f7644 · 2025-04-01T09:17:52.000-05:00
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
@@ -112,9 +112,6 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
             }
             baseBlockIndexes.push_back(blockIndex);
         }
-        std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(), [](const CBlockIndex* a, const CBlockIndex* b) {
-            return a->nHeight < b->nHeight;
-        });
     }
 
     const CBlockIndex* tipBlockIndex = chainman.ActiveChain().Tip();
@@ -331,6 +328,9 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
 uint256 GetLastBaseBlockHash(Span<const CBlockIndex*> baseBlockIndexes, const CBlockIndex* blockIndex)
 {
     uint256 hash;
+    std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(), [](const CBlockIndex* a, const CBlockIndex* b) {
+        return a->nHeight < b->nHeight;
+    });
     for (const auto baseBlock : baseBlockIndexes) {
         if (baseBlock->nHeight >= blockIndex->nHeight)
             break;

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,6 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan`
`112`	`112`	`}`
`113`	`113`	`baseBlockIndexes.push_back(blockIndex);`
`114`	`114`	`}`
`115`		`- std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(), [](const CBlockIndex* a, const CBlockIndex* b) {`
`116`		`- return a->nHeight < b->nHeight;`
`117`		`- });`
`118`	`115`	`}`
`119`	`116`
`120`	`117`	`const CBlockIndex* tipBlockIndex = chainman.ActiveChain().Tip();`
`@@ -331,6 +328,9 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan`
`331`	`328`	`uint256 GetLastBaseBlockHash(Span<const CBlockIndex> baseBlockIndexes, const CBlockIndex blockIndex)`
`332`	`329`	`{`
`333`	`330`	`uint256 hash;`
	`331`	`+ std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(), [](const CBlockIndex* a, const CBlockIndex* b) {`
	`332`	`+ return a->nHeight < b->nHeight;`
	`333`	`+ });`
`334`	`334`	`for (const auto baseBlock : baseBlockIndexes) {`
`335`	`335`	`if (baseBlock->nHeight >= blockIndex->nHeight)`
`336`	`336`	`break;`