merge-queue: embarking main (036a982) and #5257 together

zebra-consensus/src/chain.rs

@@ -235,15 +235,7 @@ where
     let transaction = Buffer::new(BoxService::new(transaction), VERIFIER_BUFFER_BOUND);
 
     // block verification
-
-    let list = CheckpointList::new(network);
-
-    let max_checkpoint_height = if config.checkpoint_sync {
-        list.max_height()
-    } else {
-        list.min_height_in_range(network.mandatory_checkpoint_height()..)
-            .expect("hardcoded checkpoint list extends past canopy activation")
-    };
+    let (list, max_checkpoint_height) = init_checkpoint_list(config, network);
 
     let tip = match state_service
         .ready()
@@ -275,3 +267,20 @@ where
         max_checkpoint_height,
     )
 }
+
+/// Parses the checkpoint list for `network` and `config`.
+/// Returns the checkpoint list and maximum checkpoint height.
+pub fn init_checkpoint_list(config: Config, network: Network) -> (CheckpointList, Height) {
+    // TODO: Zebra parses the checkpoint list twice at startup.
+    //       Instead, cache the checkpoint list for each `network`.
+    let list = CheckpointList::new(network);
+
+    let max_checkpoint_height = if config.checkpoint_sync {
+        list.max_height()
+    } else {
+        list.min_height_in_range(network.mandatory_checkpoint_height()..)
+            .expect("hardcoded checkpoint list extends past canopy activation")
+    };
+
+    (list, max_checkpoint_height)
+}

zebra-state/Cargo.toml

@@ -15,6 +15,7 @@ dirs = "4.0.0"
 displaydoc = "0.2.3"
 futures = "0.3.24"
 hex = "0.4.3"
+indexmap = "1.9.1"
 itertools = "0.10.5"
 lazy_static = "1.4.0"
 metrics = "0.20.1"

zebra-state/src/error.rs

@@ -51,6 +51,10 @@ pub struct CommitBlockError(#[from] ValidateContextError);
 #[non_exhaustive]
 #[allow(missing_docs)]
 pub enum ValidateContextError {
+    #[error("block parent not found in any chain")]
+    #[non_exhaustive]
+    NotReadyToBeCommitted,
+
     #[error("block height {candidate_height:?} is lower than the current finalized height {finalized_tip_height:?}")]
     #[non_exhaustive]
     OrphanedBlock {