refactor(message_validator): delete the unused received_from plumbing and peer-keyed preference map

anchor/message_receiver/src/manager.rs

@@ -80,7 +80,7 @@ impl<E: types::EthSpec, S: SlotClock + 'static, D: DutiesProvider> MessageReceiv
                 let span = debug_span!("message_receiver", msg=%message_id);
                 let _enter = span.enter();
 
-                let result = receiver.validator.validate(&message.data, &topic_context, Some(propagation_source));
+                let result = receiver.validator.validate(&message.data, &topic_context);
 
                 let mut action = MessageAcceptance::from(&result);
 

anchor/message_validator/src/consensus_message.rs

@@ -608,7 +608,6 @@ mod tests {
                 voluntary_exit_duty_count: expected_duty_count,
                 ..Default::default()
             }),
-            None,
         );
 
         assert_qbft_message_accepted(result, "Expected successful validation");
@@ -659,7 +658,6 @@ mod tests {
                 voluntary_exit_duty_count: 0,
                 ..Default::default()
             }),
-            None,
         );
 
         assert_validation_error(
@@ -717,7 +715,6 @@ mod tests {
                 voluntary_exit_duty_count: 0,
                 ..Default::default()
             }),
-            None,
         );
 
         assert_validation_error(
@@ -772,7 +769,6 @@ mod tests {
                 voluntary_exit_duty_count: 0,
                 ..Default::default()
             }),
-            None,
         );
 
         assert_validation_error(
@@ -2078,7 +2074,6 @@ mod tests {
                 voluntary_exit_duty_count: 0,
                 ..Default::default()
             }),
-            None,
         )
     }
 

anchor/message_validator/src/duty_state.rs

@@ -1,6 +1,5 @@
 use std::collections::{HashMap, HashSet};
 
-use libp2p::PeerId;
 use ssv_types::{
     CommitteeId, Epoch, OperatorId, Slot,
     consensus::{QbftMessage, QbftMessageType},
@@ -96,7 +95,6 @@ impl DutyState {
         &mut self,
         partial_signature_messages: &PartialSignatureMessages,
         signer: &OperatorId,
-        received_from: Option<PeerId>,
     ) -> Result<(), ValidationFailure> {
         let operator_state = self.get_or_create_operator(signer);
         let message_slot = partial_signature_messages.slot;
@@ -130,7 +128,7 @@ impl DutyState {
             // recipient's gossip duplicate cache expires, so repetition does not prove peer
             // fault. Membership is checked before capacity so a recorded root stays IGNORE
             // even when the set is full.
-            if seen_roots.contains_key(&root) {
+            if seen_roots.contains(&root) {
                 return Err(ValidationFailure::RelayedDuplicateMessage {
                     got: format!("{kind:?} root {root:?}"),
                 });
@@ -140,7 +138,7 @@ impl DutyState {
                     got: format!("{kind:?} distinct roots exceed cap {cap}"),
                 });
             }
-            seen_roots.insert(root, received_from);
+            seen_roots.insert(root);
         }
 
         // Record the partial signature (only once)
@@ -288,19 +286,17 @@ pub(crate) struct SignerState {
     /// first such packet: every role's ring entries share this struct, but only
     /// `Role::ProposerPreferences` messages can ever populate it
     /// (`partial_signature_type_matches_role`), so the other roles pay one pointer instead of
-    /// two inline maps.
+    /// two inline sets.
     root_budgets: Option<Box<SigningRootBudgets>>,
 }
 
-/// Per-kind distinct-signing-root sets for the root-budgeted partial-signature kinds, each
-/// accepted root mapped to its first deliverer (`None` = locally injected). The verdict for a
-/// repeat is peer-agnostic Ignore (SIP-94 §7); the stored deliverer no longer affects
-/// classification and is retained only because issue #1254 scopes the peer plumbing as
-/// unchanged. The kinds are budgeted independently per SIP-94 §7: neither consumes the other.
+/// Per-kind distinct-signing-root sets for the root-budgeted partial-signature kinds. The
+/// verdict for a repeat is peer-agnostic Ignore (SIP-94 §7), so membership is all that is
+/// tracked. The kinds are budgeted independently per SIP-94 §7: neither consumes the other.
 #[derive(Debug, Clone, Default)]
 struct SigningRootBudgets {
-    preferences: HashMap<Hash256, Option<PeerId>>,
-    request_auth: HashMap<Hash256, Option<PeerId>>,
+    preferences: HashSet<Hash256>,
+    request_auth: HashSet<Hash256>,
 }
 
 impl SignerState {
@@ -322,7 +318,7 @@ impl SignerState {
     fn root_budget(
         &mut self,
         kind: PartialSignatureKind,
-    ) -> Option<(&mut HashMap<Hash256, Option<PeerId>>, usize)> {
+    ) -> Option<(&mut HashSet<Hash256>, usize)> {
         match kind {
             PartialSignatureKind::ProposerPreferences => Some((
                 &mut self.root_budgets.get_or_insert_default().preferences,

anchor/message_validator/src/lib.rs

@@ -14,7 +14,6 @@ use database::NetworkState;
 pub use duties_tracker::DutiesProvider;
 use duties_tracker::DutyAssignment;
 use fork::{Fork, ForkSchedule};
-use libp2p::PeerId;
 pub use libp2p::gossipsub::MessageAcceptance;
 use openssl::{
     hash::MessageDigest,
@@ -467,20 +466,11 @@ impl<S: SlotClock + 'static, D: DutiesProvider> Validator<S, D> {
     /// The `topic_context` provides information about which topic the message was
     /// received on, enabling validation of whether the message is on the correct
     /// subnet for its committee based on the topic's fork.
-    pub fn validate(
-        &self,
-        message_data: &[u8],
-        topic_context: &TopicContext,
-        received_from: Option<PeerId>,
-    ) -> ValidationResult {
+    pub fn validate(&self, message_data: &[u8], topic_context: &TopicContext) -> ValidationResult {
         match SignedSSVMessage::from_ssz_bytes(message_data) {
             Ok(signed_ssv_message) => {
                 trace!(msg = ?signed_ssv_message, "SignedSSVMessage deserialized");
-                match self.validate_decoded_message(
-                    &signed_ssv_message,
-                    topic_context,
-                    received_from,
-                ) {
+                match self.validate_decoded_message(&signed_ssv_message, topic_context) {
                     Ok(validated_message) => ValidationResult::Success(validated_message),
                     Err(failure) => {
                         ValidationResult::PostDecodeFailure(failure, signed_ssv_message)
@@ -497,7 +487,6 @@ impl<S: SlotClock + 'static, D: DutiesProvider> Validator<S, D> {
         &self,
         signed_ssv_message: &SignedSSVMessage,
         topic_context: &TopicContext,
-        received_from: Option<PeerId>,
     ) -> Result<ValidatedMessage, ValidationFailure> {
         let role = validate_structure_and_role(signed_ssv_message)?;
         let ssv_message = signed_ssv_message.ssv_message();
@@ -572,7 +561,6 @@ impl<S: SlotClock + 'static, D: DutiesProvider> Validator<S, D> {
             validation_context,
             duty_state.value_mut(),
             self.duties_provider.clone(),
-            received_from,
         )
         .map(|validated| ValidatedMessage::new(signed_ssv_message.clone(), validated))
     }
@@ -785,20 +773,16 @@ fn validate_ssv_message(
     validation_context: ValidationContext<impl SlotClock>,
     duty_state: &mut DutyState,
     duty_provider: Arc<impl DutiesProvider>,
-    received_from: Option<PeerId>,
 ) -> Result<ValidatedSSVMessage, ValidationFailure> {
     let ssv_message = validation_context.signed_ssv_message.ssv_message();
 
     match ssv_message.msg_type() {
         MsgType::SSVConsensusMsgType => {
             validate_consensus_message(validation_context, duty_state, duty_provider)
         }
-        MsgType::SSVPartialSignatureMsgType => validate_partial_signature_message(
-            validation_context,
-            duty_state,
-            duty_provider,
-            received_from,
-        ),
+        MsgType::SSVPartialSignatureMsgType => {
+            validate_partial_signature_message(validation_context, duty_state, duty_provider)
+        }
     }
 }