src/init.cpp (1)

1150-1167: Harden multi-arg parsing for “-blockfilterindex”

Recognize any empty (-blockfilterindex) or “1” entries in a mixed list as “all types” to avoid spurious “Unknown … value” errors when users combine -blockfilterindex forms.

Locations:

• src/init.cpp around lines 1150–1167

Recommended diff:

     // parse and validate enabled filter types
     std::string blockfilterindex_value = args.GetArg("-blockfilterindex", DEFAULT_BLOCKFILTERINDEX);
     if (blockfilterindex_value == "" || blockfilterindex_value == "1") {
         g_enabled_filter_types = AllBlockFilterTypes();
     } else if (blockfilterindex_value != "0") {
-        std::vector<std::string> names = args.GetArgs("-blockfilterindex");
-        if (names.empty()) {
-            // Use default value when no explicit -blockfilterindex was provided
-            names.push_back(DEFAULT_BLOCKFILTERINDEX);
-        }
-        for (const auto& name : names) {
-            BlockFilterType filter_type;
-            if (!BlockFilterTypeByName(name, filter_type)) {
-                return InitError(strprintf(_("Unknown -blockfilterindex value %s."), name));
-            }
-            g_enabled_filter_types.insert(filter_type);
-        }
+        std::vector<std::string> names = args.GetArgs("-blockfilterindex");
+        if (names.empty()) {
+            // No explicit entries: fall back to the default type
+            names.push_back(DEFAULT_BLOCKFILTERINDEX);
+        }
+        // If any entry is empty or "1", treat as “all types”
+        bool any_all = std::any_of(names.begin(), names.end(),
+            [](const std::string& n){ return n.empty() || n == "1"; });
+        if (any_all) {
+            g_enabled_filter_types = AllBlockFilterTypes();
+        } else {
+            for (const auto& name : names) {
+                BlockFilterType filter_type;
+                if (!BlockFilterTypeByName(name, filter_type)) {
+                    return InitError(strprintf(_("Unknown -blockfilterindex value %s."), name));
+                }
+                g_enabled_filter_types.insert(filter_type);
+            }
+        }
     }

src/init.cpp (2)

1029-1031: Use DEFAULT_BLOCKFILTERINDEX instead of hardcoded "basic" for consistency

Prefer the constant over a literal to avoid divergence if the default is adjusted later.

Apply this diff:

-        if (args.SoftSetArg("-blockfilterindex", "basic")) {
-            LogPrintf("%s: parameter interaction: -masternodeblsprivkey set -> setting -blockfilterindex=basic\n", __func__);
+        if (args.SoftSetArg("-blockfilterindex", DEFAULT_BLOCKFILTERINDEX)) {
+            LogPrintf("%s: parameter interaction: -masternodeblsprivkey set -> setting -blockfilterindex=%s\n", __func__, DEFAULT_BLOCKFILTERINDEX);
         }

---

1025-1031: Minor: Soft-setting -peerblockfilters may be redundant now that it defaults to true

With DEFAULT_PEERBLOCKFILTERS flipped to true, this SoftSetBoolArg typically won’t change anything. Keeping it is harmless and documents intent, but consider dropping it to reduce noise, or add a short comment noting it’s a no-op when using defaults.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

src/init.cpp (1)

558-560: Help text addition looks good; minor wording nit

The new guidance is helpful. Minor nit: consider quoting the literal value for clarity (“if is not supplied or if = '1' …”).

Apply this minimal tweak to improve readability:

-                 " If <type> is not supplied or if <type> = 1, indexes for all known types are enabled." +
+                 " If <type> is not supplied or if <type> = '1', indexes for all known types are enabled." +

test/functional/feature_masternode_params.py (2)

12-12: Remove unused import flagged by linters

assert_equal is imported but unused. This triggers Ruff/Flake8 F401.

Apply this diff:

-from test_framework.util import assert_equal

---

58-63: Explicit disable scenario looks good; keep -txindex=1 to satisfy masternode constraints

Even when disabling filters, node1 is still a masternode; keep -txindex=1 to satisfy startup checks.

Apply this diff:

         self.restart_node(1, extra_args=[
             f"-masternodeblsprivkey={bls_key}",
+            "-txindex=1",
             "-peerblockfilters=0",
             "-blockfilterindex=0"
         ])

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.

test/functional/feature_masternode_params.py (4)

41-41: Masternode start may fail without -txindex=1; add required args

Dash masternodes typically require -txindex=1 to start. Include it (keep -peerbloomfilters=1 explicit if you want cross-branch stability).

-        self.restart_node(1, extra_args=[f"-masternodeblsprivkey={bls_key}"])
+        self.restart_node(1, extra_args=[
+            f"-masternodeblsprivkey={bls_key}",
+            "-txindex=1",
+            "-peerbloomfilters=1",
+        ])

---

44-51: Assert behavior, don’t just log: verify service bit and index for masternode

Turn the logs into assertions so the test enforces the intended behavior.

         # Masternode should have peerblockfilters enabled
         services = int(node1.getnetworkinfo()['localservices'], 16)
-        self.log.info(f"Masternode services: {hex(services)}, has COMPACT_FILTERS: {services & NODE_COMPACT_FILTERS != 0}")
+        self.log.info(f"Masternode services: {hex(services)}, has COMPACT_FILTERS: {services & NODE_COMPACT_FILTERS != 0}")
+        assert services & NODE_COMPACT_FILTERS != 0
         
         # Check blockfilterindex
         index_info = node1.getindexinfo()
-        self.log.info(f"Masternode indexes: {list(index_info.keys())}")
+        self.log.info(f"Masternode indexes: {list(index_info.keys())}")
+        assert any(('filter' in k and 'basic' in k) for k in index_info.keys())

---

75-77: Fix debug log path usage (method vs attribute)

debug_log_path is a method in the framework. Call it.

-        with open(node1.debug_log_path, 'r', encoding='utf-8') as f:
+        with open(node1.debug_log_path(), 'r', encoding='utf-8') as f:
             log_content = f.read()
             assert "parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1" in log_content

---

58-63: Include -txindex=1 for the explicit-disable masternode restart as well

Maintain masternode requirements across restarts. Without -txindex=1, startup may fail.

         self.restart_node(1, extra_args=[
             f"-masternodeblsprivkey={bls_key}",
+            "-txindex=1",
             "-peerblockfilters=0",
             "-blockfilterindex=0"
         ])

test/functional/feature_masternode_params.py (4)

52-55: Remove redundant liveness check

Once you assert the service bit and index, the extra "node is running" check is redundant.

-        # For now, just check that the node started successfully with masternode key
-        # The actual filter enabling might require the node to be fully synced
-        assert node1.getblockcount() >= 0  # Basic check that node is running
+        # Node started successfully and exposes compact filter services and index

---

69-72: Make block filter index checks robust and correct the key

"basic filter index" is likely not the exact key. Prefer a robust presence check based on substrings.

         # Should not have blockfilterindex
         index_info = node1.getindexinfo()
-        assert 'basic filter index' not in index_info
+        assert not any(('filter' in k and 'basic' in k) for k in index_info.keys())

---

73-80: Prefer using the built-in assert_debug_log helper

The framework provides a helper to assert log content without manual file IO. It’s cleaner and less brittle. See examples in test/functional/p2p_blocksonly.py or rpc_net.py.

Example:

with node1.assert_debug_log(["parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1"]):
    pass

---

82-83: Add trailing newline at EOF

Minor formatting nit to satisfy some tooling.

-    MasternodeParamsTest().main()
+    MasternodeParamsTest().main()
+

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.

Learnt from: kwvg
PR: dashpay/dash#6666
File: test/functional/rpc_netinfo.py:73-81
Timestamp: 2025-08-10T13:52:46.289Z
Learning: In the Bitcoin/Dash test framework, `self.node.extra_args` contains the original startup arguments for a TestNode and is not modified by `test.restart_node()`. Each restart with new `extra_args` doesn't update the stored `self.node.extra_args`, so copying from it always provides a clean slate without accumulated modifications from previous restarts.

test/functional/feature_masternode_params.py (5)

81-88: Use assert_debug_log helper consistently and add missing auto-enable checks.

The test uses assert_debug_log for one interaction but manually reads logs elsewhere. For consistency and completeness, add checks for the auto-enable log messages.

-        # Check debug log for parameter interaction messages during startup
-        with self.nodes[1].assert_debug_log(["parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1"]):
+        # Check debug log for parameter interaction messages during startup
+        with self.nodes[1].assert_debug_log([
+            "parameter interaction: -masternodeblsprivkey set -> setting -disablewallet=1",
+            "parameter interaction: -masternodeblsprivkey set -> setting -peerblockfilters=1",
+            "parameter interaction: -masternodeblsprivkey set -> setting -blockfilterindex=basic"
+        ]):
             self.start_node(1, extra_args=[
-                f"-masternodeblsprivkey={bls_key}",
-                "-peerblockfilters=0",
-                "-blockfilterindex=0"
+                f"-masternodeblsprivkey={bls_key}",
+                "-txindex=1"
             ])
-        # Note: The peerblockfilters and blockfilterindex messages won't be in the log
-        # when explicitly disabled, only when auto-enabled

---

90-90: Add missing newline at end of file.

The file should end with a newline character.

 
+
 if __name__ == '__main__':
     MasternodeParamsTest().main()
+

---

12-12: Remove unused import.

The assert_equal import is not used in the test and triggers linter errors.

-from test_framework.util import assert_equal

---

44-44: Add required masternode arguments to prevent startup failure.

Based on the PR objectives and past review feedback, masternodes require -txindex=1 to start successfully. The current restart will likely fail without this argument.

-        self.restart_node(1, extra_args=[f"-masternodeblsprivkey={bls_key}"])
+        self.restart_node(1, extra_args=[
+            f"-masternodeblsprivkey={bls_key}",
+            "-txindex=1",
+        ])

---

47-57: Add proper assertions for auto-enabled block filters.

The test should verify that the masternode actually has the expected service flags and block filter index, not just log values and perform a basic liveness check.

-        # Masternode should have peerblockfilters enabled
-        services = int(node1.getnetworkinfo()['localservices'], 16)
-        self.log.info(f"Masternode services: {hex(services)}, has COMPACT_FILTERS: {services & NODE_COMPACT_FILTERS != 0}")
-
-        # Check blockfilterindex
-        index_info = node1.getindexinfo()
-        self.log.info(f"Masternode indexes: {list(index_info.keys())}")
-
-        # For now, just check that the node started successfully with masternode key
-        # The actual filter enabling might require the node to be fully synced
-        assert node1.getblockcount() >= 0  # Basic check that node is running
+        # Masternode should have peerblockfilters enabled
+        services = int(node1.getnetworkinfo()['localservices'], 16)
+        self.log.info(f"Masternode services: {hex(services)}, has COMPACT_FILTERS: {services & NODE_COMPACT_FILTERS != 0}")
+        assert services & NODE_COMPACT_FILTERS != 0
+
+        # Check that a basic block filter index exists
+        index_info = node1.getindexinfo()
+        self.log.info(f"Masternode indexes: {list(index_info.keys())}")
+        assert BASIC_FILTER_INDEX in index_info

test/functional/feature_masternode_params.py (1)

61-65: Include txindex in explicit disable test.

For consistency with the earlier masternode restart, include -txindex=1 in the explicit disable test to ensure the masternode starts properly.

         self.restart_node(1, extra_args=[
             f"-masternodeblsprivkey={bls_key}",
+            "-txindex=1",
             "-peerblockfilters=0",
             "-blockfilterindex=0"
         ])

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.

Learnt from: kwvg
PR: dashpay/dash#6666
File: test/functional/rpc_netinfo.py:73-81
Timestamp: 2025-08-10T13:52:46.289Z
Learning: In the Bitcoin/Dash test framework, `self.node.extra_args` contains the original startup arguments for a TestNode and is not modified by `test.restart_node()`. Each restart with new `extra_args` doesn't update the stored `self.node.extra_args`, so copying from it always provides a clean slate without accumulated modifications from previous restarts.

doc/release-notes-6711.md (1)

7-7: Good call-out on disk usage; prior feedback addressed.

You’ve added the 1GB+ disk space note, which resolves the earlier reviewer’s concern.

doc/release-notes-6711.md (2)

6-7: Minor editorial nit: spacing and sentence flow.

• There appears to be an extra space before “Note” (double space after the previous sentence). Remove it for consistency.
• Optional: split the long paragraph into two sentences (ending after “are automatically enabled.”) to improve readability.

---

9-9: Style nit: punctuation around PR reference.

Consider either removing the parentheses or adding a comma before “if needed,” and placing the PR number at the end without parentheses for consistency with other release notes (if applicable to this repo).

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.