net, init: Support taproot filters

rustaceanrob · rustaceanrob · commit 7528e6e972b0 · 2026-01-16T10:05:41.000Z
diff --git a/src/init.cpp b/src/init.cpp
@@ -977,7 +977,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
 
     // Signal NODE_COMPACT_FILTERS if peerblockfilters and basic filters index are both enabled.
     if (args.GetBoolArg("-peerblockfilters", DEFAULT_PEERBLOCKFILTERS)) {
-        if (!g_enabled_filter_types.contains(BlockFilterType::BASIC)) {
+        if (!g_enabled_filter_types.contains(BlockFilterType::BASIC) && !g_enabled_filter_types.contains(BlockFilterType::TAPROOT)) {
             return InitError(_("Cannot set -peerblockfilters without -blockfilterindex."));
         }
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -3237,7 +3237,7 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,
                                                 BlockFilterIndex*& filter_index)
 {
     const bool supported_filter_type =
-        (filter_type == BlockFilterType::BASIC &&
+        ((filter_type == BlockFilterType::BASIC || filter_type == BlockFilterType::TAPROOT) &&
          (peer.m_our_services & NODE_COMPACT_FILTERS));
     if (!supported_filter_type) {
         LogDebug(BCLog::NET, "peer requested unsupported block filter type: %d, %s\n",

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)`
`977`	`977`
`978`	`978`	`// Signal NODE_COMPACT_FILTERS if peerblockfilters and basic filters index are both enabled.`
`979`	`979`	`if (args.GetBoolArg("-peerblockfilters", DEFAULT_PEERBLOCKFILTERS)) {`
`980`		`- if (!g_enabled_filter_types.contains(BlockFilterType::BASIC)) {`
	`980`	`+ if (!g_enabled_filter_types.contains(BlockFilterType::BASIC) && !g_enabled_filter_types.contains(BlockFilterType::TAPROOT)) {`
`981`	`981`	`return InitError(_("Cannot set -peerblockfilters without -blockfilterindex."));`
`982`	`982`	`}`
`983`	`983`
Original file line number	Diff line number	Diff line change
`@@ -3237,7 +3237,7 @@ bool PeerManagerImpl::PrepareBlockFilterRequest(CNode& node, Peer& peer,`
`3237`	`3237`	`BlockFilterIndex*& filter_index)`
`3238`	`3238`	`{`
`3239`	`3239`	`const bool supported_filter_type =`
`3240`		`- (filter_type == BlockFilterType::BASIC &&`
	`3240`	`+ ((filter_type == BlockFilterType::BASIC \|\| filter_type == BlockFilterType::TAPROOT) &&`
`3241`	`3241`	`(peer.m_our_services & NODE_COMPACT_FILTERS));`
`3242`	`3242`	`if (!supported_filter_type) {`
`3243`	`3243`	`LogDebug(BCLog::NET, "peer requested unsupported block filter type: %d, %s\n",`