Run tests with prover enabled. (#932)

* Remove demo-rollup dep from demo-prover

* add methods to demo-rollup

* fix cargo hack

* fix cargo hack

* Cargo.toml

* install toolchain

* install toolchain

* modify workflow

* update cargo.toml

* rust.yaml

* Add guest-mock

* use real prover in bank tests

* native

* fix lint

* update yaml

* fic coverage

* ELF in CI

* update bench get_guest_options()

* update build.rs

* remove local from demo-rollup

* fix lint

* remove ide_setup

* Remove riscv32im-risc0-zkvm-elf

.github/workflows/rust.yml

@@ -113,16 +113,19 @@ jobs:
       - name: cargo hack
         run: make check-features
   test:
+    name: test
     runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 60
-    env:
-      CI_SKIP_GUEST_BUILD: "1"
     steps:
       - uses: actions/checkout@v3
       - uses: rui314/setup-mold@v1
       - name: Install Rust
         run: rustup show
       # `cargo-nextest` is much faster than standard `cargo test`.
+      - name: Install cargo-risc0 # Risc0 v0.17 and higher require a cargo extension to build the guest code
+        run: cargo install cargo-risczero
+      - name: Install risc0-zkvm toolchain # Use the risc0 cargo extension to install the risc0 std library for the current toolchain
+        run: cargo risczero install
       - uses: taiki-e/install-action@nextest
       - uses: Swatinem/rust-cache@v2
         with:
@@ -144,6 +147,10 @@ jobs:
       - uses: rui314/setup-mold@v1
       - name: Install Rust
         run: rustup show
+      - name: Install cargo-risc0 # Risc0 v0.17 and higher require a cargo extension to build the guest code
+        run: cargo install cargo-risczero
+      - name: Install risc0-zkvm toolchain # Use the risc0 cargo extension to install the risc0 std library for the current toolchain
+        run: cargo risczero install
       - uses: Swatinem/rust-cache@v2
         with:
           cache-provider: "buildjet"
@@ -193,17 +200,20 @@ jobs:
           echo "demo-rollup took too long to process transaction; exiting"
           exit 1
   coverage:
+    name: coverage
     runs-on: buildjet-8vcpu-ubuntu-2204
     timeout-minutes: 90
-    env:
-      CI_SKIP_GUEST_BUILD: "1"
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
       - uses: rui314/setup-mold@v1
       - name: Install Rust
         run: rustup show
+      - name: Install cargo-risc0 # Risc0 v0.17 and higher require a cargo extension to build the guest code
+        run: cargo install cargo-risczero
+      - name: Install risc0-zkvm toolchain # Use the risc0 cargo extension to install the risc0 std library for the current toolchain
+        run: cargo risczero install
       - name: add llvm component
         run: rustup component add llvm-tools-preview
       - name: cargo install cargo-llvm-cov
@@ -295,11 +305,18 @@ jobs:
         run: git diff --exit-code
   check-demo-rollup-bash-commands:
     runs-on: ubuntu-latest
+    # `test` has already built dependencies, so we can share
+    # caches (the profile is `dev` in both cases).
+    needs: test
     steps:
       - uses: actions/checkout@v3
       - uses: rui314/setup-mold@v1
       - name: Install Rust
         run: rustup show
+      - name: Install cargo-risc0 # Risc0 v0.17 and higher require a cargo extension to build the guest code
+        run: cargo install cargo-risczero
+      - name: Install risc0-zkvm toolchain # Use the risc0 cargo extension to install the risc0 std library for the current toolchain
+        run: cargo risczero install
       - uses: Swatinem/rust-cache@v2
         with:
           cache-provider: "buildjet"

examples/demo-prover/README.md

@@ -37,9 +37,6 @@ You'll need at least 96GiB of RAM to run this example on a x86_64 CPU. If you do
 3. Make sure that there's no data from previous runs `rm -rf demo_data`
 4. Execute `cargo run -- ../demo-rollup/rollup_config.toml`.
 
-## Development
-
-Follow our [IDE integration](./ide_setup.md) guide document.
 
 ## License
 

examples/demo-prover/methods/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 risc0-build = { workspace = true }
 
 [package.metadata.risc0]
-methods = ["guest"]
+methods = ["guest-celestia", "guest-mock"]
 
 [features]
 bench = []

examples/demo-prover/methods/build.rs

@@ -6,8 +6,13 @@ fn main() {
         let out_dir = std::env::var_os("OUT_DIR").unwrap();
         let out_dir = std::path::Path::new(&out_dir);
         let methods_path = out_dir.join("methods.rs");
-        std::fs::write(methods_path, "pub const ROLLUP_ELF: &[u8] = &[];")
-            .expect("Failed to write mock rollup elf");
+
+        let elf = r#"
+            pub const ROLLUP_ELF: &[u8] = &[];
+            pub const MOCK_DA_ELF: &[u8] = &[];
+        "#;
+
+        std::fs::write(methods_path, elf).expect("Failed to write mock rollup elf");
     } else {
         let guest_pkg_to_options = get_guest_options();
         risc0_build::embed_methods_with_options(guest_pkg_to_options);
@@ -23,7 +28,7 @@ fn get_guest_options() -> HashMap<&'static str, risc0_build::GuestOptions> {
 fn get_guest_options() -> HashMap<&'static str, risc0_build::GuestOptions> {
     let mut guest_pkg_to_options = HashMap::new();
     guest_pkg_to_options.insert(
-        "sov-demo-prover-guest",
+        "sov-demo-prover-guest-celestia",
         risc0_build::GuestOptions {
             features: vec!["bench".to_string()],
         },

examples/demo-prover/methods/guest/Cargo.toml → examples/demo-prover/methods/guest-celestia/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "sov-demo-prover-guest"
+name = "sov-demo-prover-guest-celestia"
 version = "0.2.0"
 edition = "2021"
 resolver = "2"
@@ -10,8 +10,7 @@ resolver = "2"
 anyhow = "1.0.68"
 risc0-zkvm = { version = "0.18", default-features = false, features = ["std"] }
 risc0-zkvm-platform = "0.18"
-demo-stf = { path = "../../../demo-stf", default-features = false }
-sov-demo-rollup = { path = "../../../demo-rollup", default-features = false }
+demo-stf = { path = "../../../demo-stf" }
 sov-risc0-adapter = { path = "../../../../adapters/risc0" }
 const-rollup-config = { path = "../../../const-rollup-config" }
 sov-celestia-adapter = { path = "../../../../adapters/celestia" }

examples/demo-prover/methods/guest/src/bin/rollup.rs → examples/demo-prover/methods/guest-celestia/src/bin/rollup.rs

@@ -6,7 +6,7 @@ use const_rollup_config::ROLLUP_NAMESPACE_RAW;
 use demo_stf::app::create_zk_app_template;
 use sov_celestia_adapter::types::NamespaceId;
 use sov_celestia_adapter::verifier::CelestiaVerifier;
-use sov_demo_rollup::AppVerifier;
+use demo_stf::AppVerifier;
 use sov_risc0_adapter::guest::Risc0Guest;
 
 // The rollup stores its data in the namespace b"sov-test" on Celestia