Do not depend on the submodule

Author: popzxc

.github/workflows/ci-check.yaml

@@ -19,8 +19,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          submodules: true
 
       - name: Install Rust toolchain
         uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
@@ -73,8 +71,6 @@ jobs:
     runs-on: matterlabs-ci-runner-high-performance
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          submodules: true
 
       - name: Install Rust toolchain
         uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
@@ -109,8 +105,6 @@ jobs:
 
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: true
 
       - name: Install Rust toolchain
         uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2

ethereum_prover/Cargo.toml

@@ -25,14 +25,23 @@ tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
 toml = "0.8"
 thiserror = "1"
 
-forward_system = { path = "../../zksync-os/forward_system", features = ["no_print", "pectra"] }
-oracle_provider = { path = "../../zksync-os/oracle_provider" }
-callable_oracles = { path = "../../zksync-os/callable_oracles" }
-crypto = { path = "../../zksync-os/crypto" }
-zk_ee = { path = "../../zksync-os/zk_ee" }
-basic_system = { path = "../../zksync-os/basic_system" }
-basic_bootloader = { path = "../../zksync-os/basic_bootloader" }
-zksync_os_runner = { path = "../../zksync-os/zksync_os_runner" }
+# forward_system = { path = "../../zksync-os/forward_system", features = ["no_print", "pectra"] }
+# oracle_provider = { path = "../../zksync-os/oracle_provider" }
+# callable_oracles = { path = "../../zksync-os/callable_oracles" }
+# crypto = { path = "../../zksync-os/crypto" }
+# zk_ee = { path = "../../zksync-os/zk_ee" }
+# basic_system = { path = "../../zksync-os/basic_system" }
+# basic_bootloader = { path = "../../zksync-os/basic_bootloader" }
+# zksync_os_runner = { path = "../../zksync-os/zksync_os_runner" }
+
+forward_system = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka", features = ["no_print", "pectra"] }
+oracle_provider = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+callable_oracles = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+crypto = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+zk_ee = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+basic_system = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+basic_bootloader = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
+zksync_os_runner = { git = "https://github.com/matter-labs/zksync-os", branch = "popzxc/more-ethproofs-fusaka" }
 
 # execution_utils = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", default-features = false, optional = true }
 # risc_v_simulator = { git = "https://github.com/matter-labs/zksync-airbender", branch = "dev", features = ["delegation"], optional = true }

ethereum_prover/tests/common/mod.rs

@@ -27,12 +27,11 @@ pub fn app_bin_path() -> PathBuf {
 }
 
 pub fn load_fixture_input(fixture: &str) -> EthBlockInput {
-    let block_json = std::fs::read_to_string(fixture_block_path(fixture))
-        .expect("read fixture block");
-    let witness_json = std::fs::read_to_string(fixture_witness_path(fixture))
-        .expect("read fixture witness");
-    let block: RpcBlock =
-        serde_json::from_str(&block_json).expect("parse fixture block");
+    let block_json =
+        std::fs::read_to_string(fixture_block_path(fixture)).expect("read fixture block");
+    let witness_json =
+        std::fs::read_to_string(fixture_witness_path(fixture)).expect("read fixture witness");
+    let block: RpcBlock = serde_json::from_str(&block_json).expect("parse fixture block");
     let witness: ExecutionWitness =
         serde_json::from_str(&witness_json).expect("parse fixture witness");
     EthBlockInput::new(block, witness)