Merge dashpay#6625: fix: adjust quorum rotation data results in some edge cases, add tests

PastaPastaPasta · PastaPastaPasta · commit 9d1498cd79bf · 2025-04-14T12:34:49.000-05:00
8b9a728 chore: drop redundant debug logging in tests (UdjinM6) 4f57afa chore: fix clang format (UdjinM6) 275ed8e test: a few trivial checks for `quorum rotationinfo` RPC (UdjinM6) 9c98f99 fix: off-by-one: do not ignore the base block which matches the requested block (UdjinM6) 422a695 fix: default to genesis block as the last base block (UdjinM6) Pull request description: ## Issue being fixed or feature implemented Before this PR you could get `baseBlockHash` as all 0s for some cases. Also, a known `baseBlockHash` that matched the `cycleHash` was ignored which means that results included quorum changes from an older known `baseBlockHash` till the `cycleHash`(which is the same as the `baseBlockHash` in question) i.e. these changes were already known to the requester. ## What was done? Pls see individual commits ## How Has This Been Tested? Run tests ## Breaking Changes n/a, results should simply be a bit more meaningful and compact ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 8b9a728 Tree-SHA512: 88e5463ca0a40e3decb5cfcab948d7be2febc3583f7a24d455a5a93eb730e34c25246a1384fcfeea887a91348651e6250e226afa02b73f4403d8d10624a84d55
diff --git a/src/llmq/snapshot.cpp b/src/llmq/snapshot.cpp
@@ -392,14 +392,14 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
 uint256 GetLastBaseBlockHash(Span<const CBlockIndex*> baseBlockIndexes, const CBlockIndex* blockIndex,
                              bool use_legacy_construction)
 {
-    uint256 hash;
     if (!use_legacy_construction) {
         std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(),
                   [](const CBlockIndex* a, const CBlockIndex* b) { return a->nHeight < b->nHeight; });
     }
+    // default to genesis block
+    uint256 hash{Params().GenesisBlock().GetHash()};
     for (const auto baseBlock : baseBlockIndexes) {
-        if (baseBlock->nHeight >= blockIndex->nHeight)
-            break;
+        if (baseBlock->nHeight > blockIndex->nHeight) break;
         hash = baseBlock->GetBlockHash();
     }
     return hash;
diff --git a/test/functional/feature_llmq_rotation.py b/test/functional/feature_llmq_rotation.py
@@ -231,6 +231,22 @@ def run_test(self):
         self.wait_until(lambda: self.nodes[0].getbestblockhash() == new_quorum_blockhash)
         assert_equal(self.nodes[0].quorum("list", llmq_type), new_quorum_list)
 
+        self.log.info("Test 'quorum rotationinfo' RPC")
+        genesis_blockhash = self.nodes[0].getblockhash(0)
+        block_count = self.nodes[0].getblockcount()
+        hmc_base_blockhash = self.nodes[0].getblockhash(block_count - (block_count % 24) - 24 - 8)
+        best_block_hash = self.nodes[0].getbestblockhash()
+        rpc_qr_info = self.nodes[0].quorum("rotationinfo", best_block_hash, False, hmc_base_blockhash)
+        assert_equal(rpc_qr_info["mnListDiffTip"]["blockHash"], best_block_hash)
+        assert_equal(rpc_qr_info["mnListDiffTip"]["baseBlockHash"], rpc_qr_info["mnListDiffH"]["blockHash"])
+        assert_equal(rpc_qr_info["mnListDiffH"]["baseBlockHash"], rpc_qr_info["mnListDiffAtHMinusC"]["blockHash"])
+        assert_equal(rpc_qr_info["mnListDiffAtHMinusC"]["blockHash"], hmc_base_blockhash)
+        assert_equal(rpc_qr_info["mnListDiffAtHMinusC"]["baseBlockHash"], hmc_base_blockhash)
+        assert_equal(rpc_qr_info["mnListDiffAtHMinusC"]["newQuorums"], [])
+        assert_equal(rpc_qr_info["mnListDiffAtHMinusC"]["deletedQuorums"], [])
+        assert_equal(rpc_qr_info["mnListDiffAtHMinus2C"]["baseBlockHash"], rpc_qr_info["mnListDiffAtHMinus3C"]["blockHash"])
+        assert_equal(rpc_qr_info["mnListDiffAtHMinus3C"]["baseBlockHash"], genesis_blockhash)
+
     def test_getmnlistdiff_quorums(self, baseBlockHash, blockHash, baseQuorumList, expectedDeleted, expectedNew, testQuorumsCLSigs = True):
         d = self.test_getmnlistdiff_base(baseBlockHash, blockHash, testQuorumsCLSigs)
 

Original file line number	Diff line number	Diff line change
`@@ -392,14 +392,14 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan`
`392`	`392`	`uint256 GetLastBaseBlockHash(Span<const CBlockIndex> baseBlockIndexes, const CBlockIndex blockIndex,`
`393`	`393`	`bool use_legacy_construction)`
`394`	`394`	`{`
`395`		`- uint256 hash;`
`396`	`395`	`if (!use_legacy_construction) {`
`397`	`396`	`std::sort(baseBlockIndexes.begin(), baseBlockIndexes.end(),`
`398`	`397`	`[](const CBlockIndex* a, const CBlockIndex* b) { return a->nHeight < b->nHeight; });`
`399`	`398`	`}`
	`399`	`+ // default to genesis block`
	`400`	`+ uint256 hash{Params().GenesisBlock().GetHash()};`
`400`	`401`	`for (const auto baseBlock : baseBlockIndexes) {`
`401`		`- if (baseBlock->nHeight >= blockIndex->nHeight)`
`402`		`- break;`
	`402`	`+ if (baseBlock->nHeight > blockIndex->nHeight) break;`
`403`	`403`	`hash = baseBlock->GetBlockHash();`
`404`	`404`	`}`
`405`	`405`	`return hash;`