fix: devnet 3 fixes

Makefile

@@ -48,7 +48,7 @@ test-devnet2: # Run all tests for for Devnet 2.
 
 .PHONY: test-devnet3
 test-devnet3: # Run all tests for for Devnet 3.
-	cargo test --workspace --no-default-features --features "devnet3" -- --nocapture
+	cargo test --workspace --no-default-features --features "devnet3" -- --nocapture --test-threads=1
 
 
 .PHONY: fmt

bin/ream/src/main.rs

@@ -292,7 +292,7 @@ pub async fn run_lean_node(config: LeanNodeConfig, executor: ReamExecutor, ream_
             lean_db,
             None,
             #[cfg(feature = "devnet3")]
-            None,
+            keystores.first().map(|keystore| keystore.index),
         )
         .expect("Could not get forkchoice store"),
     );
@@ -876,6 +876,11 @@ mod tests {
 
     #[test]
     fn test_lean_node_finalizes() {
+        let _ = tracing_subscriber::fmt()
+            .with_env_filter(Verbosity::Info.directive())
+            .with_test_writer()
+            .try_init();
+
         let cli = Cli::parse_from([
             "ream",
             "--ephemeral",
@@ -905,8 +910,8 @@ mod tests {
                 run_lean_node(*config, executor_handle, cloned_db).await;
             });
 
-            let result = timeout(Duration::from_secs(60), async {
-                sleep(Duration::from_secs(60)).await;
+            let result = timeout(Duration::from_secs(120), async {
+                sleep(Duration::from_secs(120)).await;
                 Ok::<_, ()>(())
             })
             .await;
@@ -927,6 +932,14 @@ mod tests {
         let justfication_lag = 4;
         let finalization_lag = 5;
 
+        info!(
+            "Test results: head_slot={}, justified_slot={}, finalized_slot={}, head_root={:?}",
+            head_state.slot,
+            head_state.latest_justified.slot,
+            head_state.latest_finalized.slot,
+            head
+        );
+
         assert!(
             head_state.slot > finalization_lag,
             "Expected the head slot to be greater than finalization lag"

crates/common/chain/lean/src/service.rs

@@ -133,7 +133,7 @@ impl LeanChainService {
                     }
                     if self.sync_status == SyncStatus::Synced {
                         #[cfg(feature = "devnet2")]
-                        self.store.write().await.tick_interval(tick_count % 4 == 1).await.expect("Failed to tick interval");
+                        self.store.write().await.tick_interval(tick_count % INTERVALS_PER_SLOT == 1).await.expect("Failed to tick interval");
                         #[cfg(feature = "devnet3")]
                         {
                             // TODO: update is_aggregator logic from devnet config

crates/common/chain/lean/src/sync/forward_background_syncer.rs

@@ -83,7 +83,7 @@ impl ForwardBackgroundSyncer {
             #[cfg(feature = "devnet2")]
             self.store.write().await.on_tick(time, false).await?;
             #[cfg(feature = "devnet3")]
-            self.store.write().await.on_tick(time, false, false).await?;
+            self.store.write().await.on_tick(time, false, true).await?;
             self.store.write().await.on_block(&block, true).await?;
         }