save last state height

builder/src/lib.rs

@@ -120,6 +120,7 @@ pub mod testing {
         traits::{block_contents::BlockHeader, metrics::NoMetrics},
         ExecutionType, HotShotConfig, PeerConfig, ValidatorConfig,
     };
+    use portpicker::pick_unused_port;
     //use sequencer::persistence::NoStorage;
     use async_broadcast::{
         broadcast, Receiver as BroadcastReceiver, RecvError, Sender as BroadcastSender,
@@ -223,7 +224,11 @@ pub mod testing {
                 view_sync_timeout: Duration::from_secs(5),
                 fixed_leader_for_gpuvid: 0,
                 // ???
-                builder_url: Url::parse("http://127.0.0.1").unwrap(),
+                builder_url: Url::parse(&format!(
+                    "http://127.0.0.1:{}",
+                    pick_unused_port().unwrap()
+                ))
+                .unwrap(),
             };
 
             Self {

sequencer/Cargo.toml

@@ -11,7 +11,6 @@ testing = ["hotshot-testing"]
 [dev-dependencies]
 espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" }
 hotshot-query-service = { workspace = true, features = ["testing"] }
-portpicker = "0.1.1"
 rand = "0.8.5"
 tempfile = "3.9.0"
 
@@ -87,6 +86,7 @@ typenum = { version = "1.15.0", default-features = false, features = [
 ] }
 url = { workspace = true }
 vbs = { workspace = true }
+portpicker = "0.1.1"
 
 [package.metadata.cargo-udeps.ignore]
 normal = ["hotshot-testing"]

sequencer/src/context.rs

@@ -15,6 +15,7 @@ use hotshot::{
 use hotshot_orchestrator::client::OrchestratorClient;
 // Should move `STAKE_TABLE_CAPACITY` in the sequencer repo when we have variate stake table support
 use hotshot_stake_table::config::STAKE_TABLE_CAPACITY;
+use hotshot_testing::block_builder::{SimpleBuilderImplementation, TestBuilderImplementation};
 use hotshot_types::{
     consensus::ConsensusMetricsValue,
     traits::{election::Membership, metrics::Metrics},
@@ -71,7 +72,7 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
 {
     #[allow(clippy::too_many_arguments)]
     pub async fn init(
-        config: HotShotConfig<PubKey, ElectionConfig>,
+        mut config: HotShotConfig<PubKey, ElectionConfig>,
         instance_state: NodeState,
         persistence: P,
         networks: Networks<SeqTypes, Node<N, P>>,
@@ -91,14 +92,14 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
         );
         let membership = GeneralStaticCommittee::create_election(
             config.known_nodes_with_stake.clone(),
-            election_config,
+            election_config.clone(),
             0,
         );
         let memberships = Memberships {
             quorum_membership: membership.clone(),
             da_membership: membership.clone(),
             vid_membership: membership.clone(),
-            view_sync_membership: membership,
+            view_sync_membership: membership.clone(),
         };
 
         let stake_table_commit =
@@ -112,6 +113,13 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
 
         let persistence = Arc::new(RwLock::new(persistence));
 
+        let (builder_task, builder_url) =
+            <SimpleBuilderImplementation as TestBuilderImplementation<SeqTypes>>::start(Arc::new(
+                membership,
+            ))
+            .await;
+
+        config.builder_url = builder_url;
         let handle = SystemContext::init(
             config.my_own_validator_config.public_key,
             config.my_own_validator_config.private_key.clone(),
@@ -131,6 +139,11 @@ impl<N: network::Type, P: SequencerPersistence, Ver: StaticVersionType + 'static
             state_signer = state_signer.with_relay_server(url);
         }
 
+        // Hook the builder up to the event stream from the first node
+        if let Some(builder_task) = builder_task {
+            builder_task.start(Box::new(handle.get_event_stream()));
+        }
+
         Ok(Self::new(
             handle,
             persistence,

sequencer/src/lib.rs

@@ -418,6 +418,8 @@ pub mod testing {
         traits::{block_contents::BlockHeader, metrics::NoMetrics},
         ExecutionType, HotShotConfig, PeerConfig, ValidatorConfig,
     };
+    use portpicker::pick_unused_port;
+
     use std::time::Duration;
 
     #[derive(Clone)]
@@ -478,7 +480,11 @@ pub mod testing {
                 view_sync_timeout: Duration::from_secs(1),
                 data_request_delay: Duration::from_secs(1),
                 //??
-                builder_url: Url::parse("http://127.0.0.1").unwrap(),
+                builder_url: Url::parse(&format!(
+                    "http://127.0.0.1:{}",
+                    pick_unused_port().unwrap()
+                ))
+                .unwrap(),
             };
 
             Self {

sequencer/src/state.rs

@@ -473,6 +473,12 @@ pub async fn update_state_storage(
             .store_state::<BlockMerkleTree, 3>(proof.proof, path, block_number)
             .await
             .context("failed to insert merkle nodes for block merkle tree")?;
+
+        storage
+            .write()
+            .await
+            .set_last_state_height(block_number as usize)
+            .await?;
     }
 
     Ok(())