[Merged by Bors] - Release v4.1.0

beacon_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "4.0.1"
+version = "4.1.0"
 authors = ["Paul Hauner <[email protected]>", "Age Manning <[email protected]"]
 edition = "2021"
 

beacon_node/network/src/beacon_processor/worker/sync_methods.rs

@@ -9,12 +9,15 @@ use crate::sync::manager::{BlockProcessType, SyncMessage};
 use crate::sync::{BatchProcessResult, ChainId};
 use beacon_chain::CountUnrealized;
 use beacon_chain::{
-    observed_block_producers::Error as ObserveError, BeaconChainError, BeaconChainTypes,
-    BlockError, ChainSegmentResult, HistoricalBlockError, NotifyExecutionLayer,
+    observed_block_producers::Error as ObserveError, validator_monitor::get_block_delay_ms,
+    BeaconChainError, BeaconChainTypes, BlockError, ChainSegmentResult, HistoricalBlockError,
+    NotifyExecutionLayer,
 };
 use lighthouse_network::PeerAction;
 use slog::{debug, error, info, warn};
+use slot_clock::SlotClock;
 use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc;
 use types::{Epoch, Hash256, SignedBeaconBlock};
 
@@ -83,21 +86,38 @@ impl<T: BeaconChainTypes> Worker<T> {
                 return;
             }
         };
-        // Check if a block from this proposer is already known. If so, defer processing until later
-        // to avoid wasting time processing duplicates.
-        let proposal_already_known = match self
-            .chain
-            .observed_block_producers
-            .read()
-            .proposer_has_been_observed(block.message())
-        {
-            Ok(is_observed) => is_observed,
-            // Both of these blocks will be rejected, so reject them now rather
-            // than re-queuing them.
-            Err(ObserveError::FinalizedBlock { .. })
-            | Err(ObserveError::ValidatorIndexTooHigh { .. }) => false,
+
+        // Returns `true` if the time now is after the 4s attestation deadline.
+        let block_is_late = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            // If we can't read the system time clock then indicate that the
+            // block is late (and therefore should *not* be requeued). This
+            // avoids infinite loops.
+            .map_or(true, |now| {
+                get_block_delay_ms(now, block.message(), &self.chain.slot_clock)
+                    > self.chain.slot_clock.unagg_attestation_production_delay()
+            });
+
+        // Checks if a block from this proposer is already known.
+        let proposal_already_known = || {
+            match self
+                .chain
+                .observed_block_producers
+                .read()
+                .proposer_has_been_observed(block.message())
+            {
+                Ok(is_observed) => is_observed,
+                // Both of these blocks will be rejected, so reject them now rather
+                // than re-queuing them.
+                Err(ObserveError::FinalizedBlock { .. })
+                | Err(ObserveError::ValidatorIndexTooHigh { .. }) => false,
+            }
         };
-        if proposal_already_known {
+
+        // If we've already seen a block from this proposer *and* the block
+        // arrived before the attestation deadline, requeue it to ensure it is
+        // imported late enough that it won't receive a proposer boost.
+        if !block_is_late && proposal_already_known() {
             debug!(
                 self.log,
                 "Delaying processing of duplicate RPC block";

boot_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "boot_node"
-version = "4.0.1"
+version = "4.1.0"
 authors = ["Sigma Prime <[email protected]>"]
 edition = "2021"
 

common/lighthouse_version/src/lib.rs

@@ -17,8 +17,8 @@ pub const VERSION: &str = git_version!(
         // NOTE: using --match instead of --exclude for compatibility with old Git
         "--match=thiswillnevermatchlol"
     ],
-    prefix = "Lighthouse/v4.0.1-",
-    fallback = "Lighthouse/v4.0.1"
+    prefix = "Lighthouse/v4.1.0-",
+    fallback = "Lighthouse/v4.1.0"
 );
 
 /// Returns `VERSION`, but with platform information appended to the end.

lcli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lcli"
 description = "Lighthouse CLI (modeled after zcli)"
-version = "4.0.1"
+version = "4.1.0"
 authors = ["Paul Hauner <[email protected]>"]
 edition = "2021"
 

lighthouse/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse"
-version = "4.0.1"
+version = "4.1.0"
 authors = ["Sigma Prime <[email protected]>"]
 edition = "2021"
 autotests = false