fix(gossip): publish beacon topics with fork digest

Author: perfogic

crates/rpc/beacon/src/handlers/pool.rs

@@ -4,6 +4,7 @@ use actix_web::{
     HttpResponse, Responder, get, post,
     web::{Data, Json, Query},
 };
+use alloy_primitives::aliases::B32;
 use ream_api_types_beacon::{
     query::AttestationQuery,
     request::SyncCommitteeRequestItem,
@@ -18,7 +19,7 @@ use ream_consensus_beacon::{
     single_attestation::SingleAttestation, voluntary_exit::SignedVoluntaryExit,
 };
 use ream_consensus_misc::{
-    constants::beacon::{DOMAIN_SYNC_COMMITTEE, SYNC_COMMITTEE_SIZE},
+    constants::beacon::{DOMAIN_SYNC_COMMITTEE, FULU_FORK_EPOCH, SYNC_COMMITTEE_SIZE},
     misc::{compute_epoch_at_slot, compute_signing_root},
 };
 use ream_network_manager::{
@@ -48,6 +49,10 @@ use tracing::warn;
 
 use crate::handlers::state::get_state_from_id;
 
+fn gossip_fork_digest(state: &BeaconState) -> B32 {
+    beacon_network_spec().fork_digest(FULU_FORK_EPOCH, state.genesis_validators_root)
+}
+
 /// GET /eth/v1/beacon/pool/bls_to_execution_changes
 #[get("/beacon/pool/bls_to_execution_changes")]
 pub async fn get_bls_to_execution_changes(
@@ -92,7 +97,7 @@ pub async fn post_bls_to_execution_changes(
         .p2p_sender
         .send_gossip(GossipMessage {
             topic: GossipTopic {
-                fork: beacon_state.fork.current_version,
+                fork: gossip_fork_digest(&beacon_state),
                 kind: GossipTopicKind::BlsToExecutionChange,
             },
             data: signed_bls_to_execution_change.as_ssz_bytes(),
@@ -145,7 +150,7 @@ pub async fn post_voluntary_exits(
         .p2p_sender
         .send_gossip(GossipMessage {
             topic: GossipTopic {
-                fork: beacon_state.fork.current_version,
+                fork: gossip_fork_digest(&beacon_state),
                 kind: GossipTopicKind::VoluntaryExit,
             },
             data: signed_voluntary_exit.as_ssz_bytes(),
@@ -195,7 +200,7 @@ pub async fn post_attester_slashings(
         })?;
     network_manager.p2p_sender.send_gossip(GossipMessage {
         topic: GossipTopic {
-            fork: beacon_state.fork.current_version,
+            fork: gossip_fork_digest(&beacon_state),
             kind: GossipTopicKind::AttesterSlashing,
         },
         data: attester_slashing.as_ssz_bytes(),
@@ -248,7 +253,7 @@ pub async fn post_proposer_slashings(
     network_manager.p2p_sender.send_gossip(GossipMessage {
         topic: {
             GossipTopic {
-                fork: beacon_state.fork.current_version,
+                fork: gossip_fork_digest(&beacon_state),
                 kind: GossipTopicKind::ProposerSlashing,
             }
         },
@@ -339,7 +344,7 @@ pub async fn post_attestations(
 
         p2p_sender.send_gossip(GossipMessage {
             topic: GossipTopic {
-                fork: beacon_state.fork.current_version,
+                fork: gossip_fork_digest(&beacon_state),
                 kind: GossipTopicKind::BeaconAttestation(subnet_id),
             },
             data: single_attestation.as_ssz_bytes(),
@@ -489,7 +494,7 @@ pub async fn post_sync_committees(
                 .insert_sync_committee_message(sync_message.clone(), subcommittee_index);
             p2p_sender.send_gossip(GossipMessage {
                 topic: GossipTopic {
-                    fork: beacon_network_spec().fork_digest(epoch, state.genesis_validators_root),
+                    fork: gossip_fork_digest(&state),
                     kind: GossipTopicKind::SyncCommittee(subcommittee_index),
                 },
                 data: sync_message.as_ssz_bytes(),

crates/rpc/beacon/src/handlers/validator.rs

@@ -38,7 +38,7 @@ use ream_consensus_misc::{
     checkpoint::Checkpoint,
     constants::beacon::{
         DOMAIN_AGGREGATE_AND_PROOF, DOMAIN_BEACON_ATTESTER, DOMAIN_RANDAO, DOMAIN_SYNC_COMMITTEE,
-        MAX_COMMITTEES_PER_SLOT, PROPOSER_REWARD_QUOTIENT, SLOTS_PER_EPOCH,
+        FULU_FORK_EPOCH, MAX_COMMITTEES_PER_SLOT, PROPOSER_REWARD_QUOTIENT, SLOTS_PER_EPOCH,
         SYNC_COMMITTEE_PROPOSER_REWARD_QUOTIENT, WHISTLEBLOWER_REWARD_QUOTIENT,
     },
     deposit::Deposit,
@@ -60,6 +60,7 @@ use ream_execution_rpc_types::{
 };
 use ream_fork_choice_beacon::store::Store;
 use ream_network_manager::gossipsub::validate::sync_committee_contribution_and_proof::get_sync_subcommittee_pubkeys;
+use ream_network_spec::networks::beacon_network_spec;
 use ream_operation_pool::OperationPool;
 use ream_p2p::{
     gossipsub::beacon::topics::{GossipTopic, GossipTopicKind},
@@ -98,6 +99,10 @@ use super::state::get_state_from_id;
 const ELECTRA_COMMITTEE_INDEX: u64 = 0;
 const MAX_VALIDATOR_COUNT: usize = 100;
 
+fn gossip_fork_digest(state: &BeaconState) -> B32 {
+    beacon_network_spec().fork_digest(FULU_FORK_EPOCH, state.genesis_validators_root)
+}
+
 fn build_validator_balances(
     validators: &[(Validator, u64)],
     filter_ids: Option<&Vec<ValidatorID>>,
@@ -834,7 +839,7 @@ pub async fn post_beacon_committee_subscriptions(
         let subnet_id =
             compute_subnet_for_attestation(sub.committees_at_slot, sub.slot, sub.committee_index);
 
-        let fork = state.fork.current_version;
+        let fork = gossip_fork_digest(&state);
 
         subnets.insert((subnet_id, fork));
     }
@@ -937,7 +942,7 @@ pub async fn post_sync_committee_subscriptions(
             )));
         }
 
-        let fork = state.fork.current_version;
+        let fork = gossip_fork_digest(&state);
         for subnet_id in validator_subnets {
             subnets_to_subscribe.insert((subnet_id, fork));
         }