fix: make observed_peer_subnets fork-aware

.github/custom/local-testnet/params.yaml

@@ -30,7 +30,7 @@ network:
 
   port_publisher:
     cl:
-      enabled: true
+      enabled: false
 
   # Assertoor can only load from URLs here (for some reason). The placeholder is replaced in the workflow.
   assertoor_params:

.github/workflows/local-testnet.yml

@@ -66,7 +66,9 @@ jobs:
 
       - name: Start Local Testnet with Assertoor
         timeout-minutes: 30
-        run: kurtosis run --verbosity DETAILED --enclave localnet ssv-mini --args-file anchor/.github/custom/local-testnet/params.yaml
+        run: |
+          kurtosis clean -a || true
+          kurtosis run --verbosity DETAILED --enclave localnet ssv-mini --args-file anchor/.github/custom/local-testnet/params.yaml
 
       - name: Await Assertoor Test Result
         id: assertoor_test_result

anchor/network/Cargo.toml

@@ -9,6 +9,7 @@ async-broadcast = { workspace = true }
 async-trait = "0.1.85"
 discv5 = { workspace = true }
 ethereum_ssz = { workspace = true }
+fork = { workspace = true }
 futures = { workspace = true }
 global_config = { workspace = true }
 gossipsub = { workspace = true }

anchor/network/src/network.rs

@@ -276,15 +276,23 @@ impl<R: MessageReceiver> Network<R> {
                 self.handle_gossipsub_message(propagation_source, message_id, message);
             }
             gossipsub::Event::Subscribed { peer_id, topic } => {
-                if let Some(subnet) = topic::parse_subnet_id(&topic) {
-                    self.peer_manager()
-                        .set_peer_subscription(peer_id, subnet, true);
+                if let Some(parsed) = topic::parse_topic(&topic) {
+                    self.peer_manager().set_peer_subscription(
+                        peer_id,
+                        parsed.fork,
+                        parsed.subnet_id,
+                        true,
+                    );
                 }
             }
             gossipsub::Event::Unsubscribed { peer_id, topic } => {
-                if let Some(subnet) = topic::parse_subnet_id(&topic) {
-                    self.peer_manager()
-                        .set_peer_subscription(peer_id, subnet, false);
+                if let Some(parsed) = topic::parse_topic(&topic) {
+                    self.peer_manager().set_peer_subscription(
+                        peer_id,
+                        parsed.fork,
+                        parsed.subnet_id,
+                        false,
+                    );
                 }
             }
             _ => {