chore: compile

crates/primitives/src/monorepo.rs

@@ -92,10 +92,10 @@ impl Monorepo {
         self.devnet().join("genesis-l1.json")
     }
 
-    /// Returns the L2 genesis file.
-    pub fn l2_genesis(&self) -> PathBuf {
-        self.devnet().join("genesis-l2.json")
-    }
+    // /// Returns the L2 genesis file.
+    // pub fn l2_genesis(&self) -> PathBuf {
+    //     self.devnet().join("genesis-l2.json")
+    // }
 
     /// Contracts directory.
     pub fn contracts(&self) -> PathBuf {
@@ -131,11 +131,6 @@ impl Monorepo {
     pub fn op_node_dir(&self) -> PathBuf {
         self.path().join("op-node")
     }
-
-    /// Returns the genesis rollup file.
-    pub fn genesis_rollup(&self) -> PathBuf {
-        self.devnet().join("rollup.json")
-    }
 }
 
 impl Monorepo {

crates/stages/src/stages.rs

@@ -65,7 +65,10 @@ impl Stages<'_> {
                 Arc::clone(&artifacts),
                 Arc::clone(&monorepo),
             )),
-            Box::new(prestate::Prestate::new(Arc::clone(&monorepo))),
+            Box::new(prestate::Prestate::new(
+                Arc::clone(&monorepo),
+                Arc::clone(&artifacts),
+            )),
             Box::new(allocs::Allocs::new(
                 Arc::clone(&artifacts),
                 Arc::clone(&monorepo),
@@ -94,8 +97,8 @@ impl Stages<'_> {
             Box::new(l2_exec::Executor::new(
                 self.config.l2_client_port,
                 self.config.l2_client,
-                Arc::clone(&composer),
-                Arc::clone(&artifacts),
+                // Arc::clone(&composer),
+                // Arc::clone(&artifacts),
             )),
             Box::new(rollup::Rollup::new(
                 self.config.rollup_client_port,

crates/stages/src/stages/allocs.rs

@@ -17,7 +17,7 @@ impl crate::Stage for Allocs {
     async fn execute(&self) -> Result<()> {
         tracing::info!(target: "stages", "Executing allocs stage");
 
-        let l2_genesis_file = self.monorepo.l2_genesis();
+        let l2_genesis_file = self.artifacts.l2_genesis();
         if l2_genesis_file.exists() {
             tracing::info!(target: "stages", "l2 genesis file already found");
             return Ok(());

crates/stages/src/stages/batcher.rs

@@ -25,7 +25,7 @@ impl crate::Stage for Batcher {
         let addresses_json = self.artifacts.l1_deployments();
         let addresses = crate::json::read_json(&addresses_json)?;
 
-        let genesis_rollup_file = self.monorepo.genesis_rollup();
+        let genesis_rollup_file = self.artifacts.rollup_genesis();
         let rollup_config = crate::json::read_json(&genesis_rollup_file)?;
         let start_batcher = Command::new("docker-compose")
             .args(["up", "-d", "--no-deps", "--build", "batcher"])

crates/stages/src/stages/prestate.rs

@@ -1,13 +1,14 @@
 use async_trait::async_trait;
 use eyre::Result;
-use op_primitives::Monorepo;
+use op_primitives::{Artifacts, Monorepo};
 use std::process::Command;
 use std::sync::Arc;
 
 /// Fault proof Prestate Stage
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct Prestate {
     monorepo: Arc<Monorepo>,
+    artifacts: Arc<Artifacts>,
 }
 
 #[async_trait]
@@ -17,7 +18,7 @@ impl crate::Stage for Prestate {
         tracing::info!(target: "stages", "Executing fault proof prestate stage");
 
         let monorepo = self.monorepo.path();
-        let l2_genesis_file = self.monorepo.l2_genesis();
+        let l2_genesis_file = self.artifacts.l2_genesis();
 
         if l2_genesis_file.exists() {
             tracing::info!(target: "stages", "l2 genesis file already found");
@@ -48,7 +49,10 @@ impl crate::Stage for Prestate {
 
 impl Prestate {
     /// Creates a new stage.
-    pub fn new(monorepo: Arc<Monorepo>) -> Self {
-        Self { monorepo }
+    pub fn new(monorepo: Arc<Monorepo>, artifacts: Arc<Artifacts>) -> Self {
+        Self {
+            monorepo,
+            artifacts,
+        }
     }
 }