add CLI flag for weighted_attestation_data - fix

Author: petarjuki7

anchor/client/src/cli.rs

@@ -532,6 +532,13 @@ pub struct Node {
 
     #[clap(flatten)]
     pub logging_flags: FileLoggingFlags,
+
+    #[clap(
+        long,
+        help = "Enable attestation data scoring across multiple beacon nodes.",
+        display_order = 0
+    )]
+    pub with_weighted_attestation_data: bool,
 }
 
 pub fn get_color_style() -> Styles {

anchor/client/src/config.rs

@@ -72,6 +72,8 @@ pub struct Config {
     pub prefer_builder_proposals: bool,
     /// Controls whether the latency measurement service is enabled
     pub disable_latency_measurement_service: bool,
+    /// Enable attestation data scoring across multiple beacon nodes
+    pub with_weighted_attestation_data: bool,
 }
 
 impl Config {
@@ -115,6 +117,7 @@ impl Config {
             prefer_builder_proposals: false,
             gas_limit: 36_000_000,
             disable_latency_measurement_service: false,
+            with_weighted_attestation_data: false,
         }
     }
 }
@@ -260,6 +263,8 @@ pub fn from_cli(cli_args: &Node, global_config: GlobalConfig) -> Result<Config,
         config.processor.queue_size.insert(queue, size);
     }
 
+    config.with_weighted_attestation_data = cli_args.with_weighted_attestation_data;
+
     Ok(config)
 }
 

anchor/client/src/lib.rs

@@ -618,6 +618,7 @@ impl Client {
             beacon_nodes.clone(),
             executor.clone(),
             spec.clone(),
+            config.with_weighted_attestation_data,
         );
 
         // We use `SLOTS_PER_EPOCH` as the capacity of the block notification channel, because

anchor/validator_store/src/metadata_service.rs

@@ -28,6 +28,7 @@ pub struct MetadataService<E: EthSpec, T: SlotClock + 'static> {
     beacon_nodes: Arc<BeaconNodeFallback<T>>,
     executor: TaskExecutor,
     spec: Arc<ChainSpec>,
+    weighted_attestation_data: bool,
 }
 
 impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
@@ -38,6 +39,7 @@ impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
         beacon_nodes: Arc<BeaconNodeFallback<T>>,
         executor: TaskExecutor,
         spec: Arc<ChainSpec>,
+        weighted_attestation_data: bool,
     ) -> Self {
         Self {
             duties_service,
@@ -46,6 +48,7 @@ impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
             beacon_nodes,
             executor,
             spec,
+            weighted_attestation_data,
         }
     }
 
@@ -88,10 +91,7 @@ impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
     async fn update_metadata(&self) -> Result<(), String> {
         let slot = self.slot_clock.now().ok_or("Failed to read slot clock")?;
 
-        // For testing
-        let weighted = false;
-
-        let attestation_data = if weighted {
+        let attestation_data = if self.weighted_attestation_data {
             self.weighted_calculation(slot).await?
         } else {
             self.beacon_nodes
@@ -382,24 +382,37 @@ impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
             .await
         {
             Some(head_slot) => {
-                // Increase score based on the nearness of the head slot
-                // TODO: double check calculation
-                let distance = slot.as_u64().saturating_sub(head_slot.as_u64());
-                let bonus = 1.0 / (1 + distance) as f64;
-
-                trace!(
-                    client = %client_addr,
-                    head_slot = head_slot.as_u64(),
-                    attestation_slot = slot.as_u64(),
-                    source_epoch = attestation_data.source.epoch.as_u64(),
-                    target_epoch = attestation_data.target.epoch.as_u64(),
-                    base_score,
-                    bonus,
-                    total_score = base_score + bonus,
-                    "Scored attestation data"
-                );
+                let attestation_slot_u64 = slot.as_u64();
+                let head_slot_u64 = head_slot.as_u64();
+
+                if head_slot_u64 <= attestation_slot_u64 {
+                    // Increase score based on the nearness of the head slot
+                    let distance = attestation_slot_u64 - head_slot_u64;
+                    let bonus = 1.0 / (1 + distance) as f64;
+
+                    trace!(
+                        client = %client_addr,
+                        head_slot = head_slot_u64,
+                        attestation_slot = attestation_slot_u64,
+                        source_epoch = attestation_data.source.epoch.as_u64(),
+                        target_epoch = attestation_data.target.epoch.as_u64(),
+                        distance,
+                        base_score,
+                        bonus,
+                        total_score = base_score + bonus,
+                        "Scored attestation data"
+                    );
 
-                base_score + bonus
+                    base_score + bonus
+                } else {
+                    warn!(
+                        client = %client_addr,
+                        head_slot = head_slot_u64,
+                        attestation_slot = attestation_slot_u64,
+                        "Block slot is after attestation slot, skipping proximity bonus"
+                    );
+                    base_score
+                }
             }
             None => {
                 trace!(
@@ -419,6 +432,7 @@ impl<E: EthSpec, T: SlotClock + 'static> MetadataService<E, T> {
     }
 
     /// Get the slot number for a given block root with timeout
+    // Does this retry??
     async fn get_block_slot(
         &self,
         client: &BeaconNodeHttpClient,