consensus: construct checkpointer with a tip, not a block

zebra-consensus/src/chain.rs

@@ -123,7 +123,7 @@ where
             .expect("hardcoded checkpoint list extends past sapling activation")
     };
 
-    let tip_hash = match state_service
+    let tip = match state_service
         .ready_and()
         .await
         .unwrap()
@@ -134,21 +134,6 @@ where
         zs::Response::Tip(tip) => tip,
         _ => unreachable!("wrong response to Request::Tip"),
     };
-    let tip = if let Some((_height, hash)) = tip_hash {
-        match state_service
-            .ready_and()
-            .await
-            .unwrap()
-            .call(zs::Request::Block(hash.into()))
-            .await
-            .unwrap()
-        {
-            zs::Response::Block(block) => block,
-            _ => unreachable!("wrong response to Request::Block"),
-        }
-    } else {
-        None
-    };
 
     let block = BlockVerifier::new(state_service.clone());
     let checkpoint = CheckpointVerifier::from_checkpoint_list(list, tip, state_service);

zebra-consensus/src/checkpoint.rs

@@ -141,14 +141,17 @@ where
     /// than constructing multiple verification services for the same network. To
     /// clone a CheckpointVerifier, you might need to wrap it in a
     /// `tower::Buffer` service.
-    pub fn new(network: Network, initial_tip: Option<Arc<Block>>, state_service: S) -> Self {
+    pub fn new(
+        network: Network,
+        initial_tip: Option<(block::Height, block::Hash)>,
+        state_service: S,
+    ) -> Self {
         let checkpoint_list = CheckpointList::new(network);
         let max_height = checkpoint_list.max_height();
-        let initial_height = initial_tip.clone().map(|b| b.coinbase_height()).flatten();
         tracing::info!(
             ?max_height,
             ?network,
-            ?initial_height,
+            ?initial_tip,
             "initialising CheckpointVerifier"
         );
         Self::from_checkpoint_list(checkpoint_list, initial_tip, state_service)
@@ -168,7 +171,7 @@ where
     #[allow(dead_code)]
     pub(crate) fn from_list(
         list: impl IntoIterator<Item = (block::Height, block::Hash)>,
-        initial_tip: Option<Arc<Block>>,
+        initial_tip: Option<(block::Height, block::Hash)>,
         state_service: S,
     ) -> Result<Self, BoxError> {
         Ok(Self::from_checkpoint_list(
@@ -187,24 +190,18 @@ where
     /// hard-coded checkpoint lists. See that function for more details.
     pub(crate) fn from_checkpoint_list(
         checkpoint_list: CheckpointList,
-        initial_tip: Option<Arc<Block>>,
+        initial_tip: Option<(block::Height, block::Hash)>,
         state_service: S,
     ) -> Self {
         // All the initialisers should call this function, so we only have to
         // change fields or default values in one place.
         let (initial_tip_hash, verifier_progress) = match initial_tip {
-            Some(initial_tip) => {
+            Some((height, hash)) => {
-                let initial_height = initial_tip
+                if height >= checkpoint_list.max_height() {
-                    .coinbase_height()
-                    .expect("Bad initial tip: must have coinbase height");
-                if initial_height >= checkpoint_list.max_height() {
                     (None, Progress::FinalCheckpoint)
                 } else {
-                    metrics::gauge!("checkpoint.previous.height", initial_height.0 as i64);
+                    metrics::gauge!("checkpoint.previous.height", height.0 as i64);
-                    (
+                    (Some(hash), Progress::InitialTip(height))
-                        Some(initial_tip.hash()),
-                        Progress::InitialTip(initial_height),
-                    )
                 }
             }
             // We start by verifying the genesis block, by itself

zebra-consensus/src/checkpoint/tests.rs

@@ -266,8 +266,7 @@ async fn continuous_blockchain(restart_height: Option<block::Height>) -> Result<
     /// SPANDOC: Verify blocks, restarting at {?restart_height}
     {
         let initial_tip = restart_height
-            .map(|block::Height(height)| &blockchain[height as usize].0)
+            .map(|block::Height(height)| (blockchain[height as usize].1, blockchain[height as usize].2));
-            .cloned();
         let state_service = zebra_state::init(zebra_state::Config::ephemeral(), Mainnet);
         let mut checkpoint_verifier =
             CheckpointVerifier::from_list(checkpoint_list, initial_tip, state_service.clone())