Release Candidate v4.0.1-rc.0 (#4123)

## Issue Addressed

NA

## Proposed Changes

Ensures that we log the values of the *head* block rather than the *justified* block.

## Additional Info

NA

Cargo.lock

@@ -618,7 +618,7 @@ dependencies = [
 
 [[package]]
 name = "beacon_node"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 dependencies = [
  "beacon_chain",
  "clap",
@@ -786,7 +786,7 @@ dependencies = [
 
 [[package]]
 name = "boot_node"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 dependencies = [
  "beacon_node",
  "clap",
@@ -3770,7 +3770,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "lcli"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 dependencies = [
  "account_utils",
  "beacon_chain",
@@ -4374,7 +4374,7 @@ dependencies = [
 
 [[package]]
 name = "lighthouse"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 dependencies = [
  "account_manager",
  "account_utils",

beacon_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beacon_node"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com"]
 edition = "2021"
 

boot_node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "boot_node"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 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.0-",
-    fallback = "Lighthouse/v4.0.0"
+    prefix = "Lighthouse/v4.0.1-rc.0-",
+    fallback = "Lighthouse/v4.0.1-rc.0"
 );
 
 /// Returns `VERSION`, but with platform information appended to the end.

consensus/fork_choice/src/fork_choice.rs

@@ -799,7 +799,10 @@ where
 
             // If block is from past epochs, try to update store's justified & finalized checkpoints right away
             if block.slot().epoch(E::slots_per_epoch()) < current_slot.epoch(E::slots_per_epoch()) {
-                self.pull_up_store_checkpoints()?;
+                self.pull_up_store_checkpoints(
+                    unrealized_justified_checkpoint,
+                    unrealized_finalized_checkpoint,
+                )?;
             }
 
             (
@@ -1159,15 +1162,21 @@ where
 
         // Update the justified/finalized checkpoints based upon the
         // best-observed unrealized justification/finality.
-        self.pull_up_store_checkpoints()?;
+        let unrealized_justified_checkpoint = *self.fc_store.unrealized_justified_checkpoint();
+        let unrealized_finalized_checkpoint = *self.fc_store.unrealized_finalized_checkpoint();
+        self.pull_up_store_checkpoints(
+            unrealized_justified_checkpoint,
+            unrealized_finalized_checkpoint,
+        )?;
 
         Ok(())
     }
 
-    fn pull_up_store_checkpoints(&mut self) -> Result<(), Error<T::Error>> {
-        // Update store.justified_checkpoint if a better unrealized justified checkpoint is known
-        let unrealized_justified_checkpoint = *self.fc_store.unrealized_justified_checkpoint();
-        let unrealized_finalized_checkpoint = *self.fc_store.unrealized_finalized_checkpoint();
+    fn pull_up_store_checkpoints(
+        &mut self,
+        unrealized_justified_checkpoint: Checkpoint,
+        unrealized_finalized_checkpoint: Checkpoint,
+    ) -> Result<(), Error<T::Error>> {
         self.update_checkpoints(
             unrealized_justified_checkpoint,
             unrealized_finalized_checkpoint,

consensus/proto_array/src/proto_array.rs

@@ -665,9 +665,9 @@ impl ProtoArray {
                 start_root: *justified_root,
                 justified_checkpoint: self.justified_checkpoint,
                 finalized_checkpoint: self.finalized_checkpoint,
-                head_root: justified_node.root,
-                head_justified_checkpoint: justified_node.justified_checkpoint,
-                head_finalized_checkpoint: justified_node.finalized_checkpoint,
+                head_root: best_node.root,
+                head_justified_checkpoint: best_node.justified_checkpoint,
+                head_finalized_checkpoint: best_node.finalized_checkpoint,
             })));
         }
 

lcli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "lcli"
 description = "Lighthouse CLI (modeled after zcli)"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2021"
 

lighthouse/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lighthouse"
-version = "4.0.0"
+version = "4.0.1-rc.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2021"
 autotests = false