Merge pull request risc0#68 from taikoxyz/improve-ci

feat: Driver pattern for generic Guest execution

.dockerignore

@@ -8,11 +8,9 @@
 !/docker/entrypoint.sh
 !/lib
 !/primitives
-!/raiko-guests
-!/raiko-host
+!/provers
+!/host
 !/rust-toolchain
+!/ra-tls
 !/taiko.toml
 !/tests
-# Ignore unnecessary files inside allowed directories
-# This should go after the allowed directories
-**/raiko-host/guests/sgx

.github/workflows/ci.yml

@@ -35,7 +35,8 @@ jobs:
       uses: cargo-bins/[email protected]
     - run: cargo binstall -y --force cargo-risczero
     - run: cargo risczero install
-    - run: cargo build -p risc0-guest
+    - run: cargo build -p risc0-prover --features enable
+    - run: cargo test -p risc0-prover --features enable
 
   build-test-sp1:
     name: Build and test sp1
@@ -53,8 +54,8 @@ jobs:
         run: |
           curl -L https://sp1.succinct.xyz | bash
           /home/runner/.config/.sp1/bin/sp1up
-          cargo build -p raiko-host --features succinct
-          cargo test -p raiko-host --features succinct
+          cargo build -p sp1-prover --features enable
+          cargo test -p sp1-prover --features enable
         shell: bash
 
   test-lib:

.gitignore

@@ -7,4 +7,4 @@ rpc_cache.json
 .idea
 *.json.gz
 .vscode/
-raiko-host/guests/sgx/raiko-guest
+*.elf

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "Cargo.toml",
+    ]
+}

Cargo.toml

@@ -2,13 +2,14 @@
 resolver = "2"
 members = [
     "lib",
+    "host",
     "primitives",
-    "raiko-host",
-    # "tests/*",
-    "raiko-guests/sgx",
+    "provers/sp1/prover",
+    "provers/risc0",
+    "provers/sgx/prover",
+    "provers/sgx/guest",
 ]
 
-
 # Always optimize; building and running the guest takes much longer without optimization.
 [profile.dev]
 opt-level = 3
@@ -30,6 +31,9 @@ revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "unst
 revm = { git = "https://github.com/taikoxyz/revm.git", branch = "unstable", default-features = false, features = [
     "serde",
 ] }
+sp1-core = { git = "https://github.com/succinctlabs/sp1.git", rev = "cb43fd74b24fad8ed24a4885499159de3680c89f" }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "cb43fd74b24fad8ed24a4885499159de3680c89f" }
+sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", rev = "cb43fd74b24fad8ed24a4885499159de3680c89f" }
 
 # for eip-4844
 c-kzg = "1.0.0"

Dockerfile

@@ -21,7 +21,7 @@ RUN cargo build --release ${BUILD_FLAGS}
 RUN ls -la /opt/raiko
 RUN ls -la /opt/raiko/target
 RUN ls -la /opt/raiko/target/release
-RUN ls -la /opt/raiko/target/release/raiko-host
+RUN ls -la /opt/raiko/target/release/host
 
 
 FROM gramineproject/gramine:1.6-jammy as runtime
@@ -48,30 +48,30 @@ RUN sed -i 's/https:\/\/localhost:8081/https:\/\/pccs:8081/g' /etc/sgx_default_q
 
 RUN mkdir -p \
     ./bin \
-    ./guests/sgx \
+    ./provers/sgx \
     /tmp/sgx \
     /var/log/raiko
 
 COPY --from=builder /opt/raiko/docker/entrypoint.sh ./bin/
-COPY --from=builder /opt/raiko/raiko-guests/sgx/config/raiko-guest.manifest.template ./guests/sgx/
-COPY --from=builder /opt/raiko/raiko-host/config/config.toml /etc/raiko/
+COPY --from=builder /opt/raiko/provers/sgx/config/raiko-guest.manifest.template ./provers/sgx/
+COPY --from=builder /opt/raiko/host/config/config.toml /etc/raiko/
 RUN ls -la /opt/raiko
 RUN ls -la /opt/raiko/bin
-RUN ls -la /opt/raiko/guests
-RUN ls -la /opt/raiko/guests/sgx
-COPY --from=builder /opt/raiko/target/release/raiko-guests ./guests/sgx/
-# ubuntu@VM-0-6-ubuntu:~/zeth-john/raiko-guests/sgx$ cargo build --release
+RUN ls -la /opt/raiko/provers
+RUN ls -la /opt/raiko/provers/sgx
+COPY --from=builder /opt/raiko/target/release/provers ./provers/sgx/
+# ubuntu@VM-0-6-ubuntu:~/zeth-john/provers/sgx$ cargo build --release
 # GROTH16_VERIFIER_ADDRESS="" cargo build --features "sgx" --release
-# ./raiko-guests/succinct/target
-# ./raiko-guests/risc0/guest/target
-# /target/release/raiko-host
-# "/opt/raiko/target/release/raiko-guests": not found
+# ./provers/sp1/target
+# ./provers/risc0/guest/target
+# /target/release/host
+# "/opt/raiko/target/release/provers": not found
 
-# COPY --from=builder /opt/raiko/target/release/raiko-host ./bin/
+# COPY --from=builder /opt/raiko/target/release/host ./bin/
 
 # ARG EDMM=0
 # ENV EDMM=${EDMM}
-# RUN cd ./guests/sgx && \
+# RUN cd ./provers/sgx && \
 #     gramine-manifest -Dlog_level=error -Darch_libdir=/lib/x86_64-linux-gnu/ raiko-guest.manifest.template raiko-guest.manifest
 
 # ENTRYPOINT [ "/opt/raiko/bin/entrypoint.sh" ]

README.md

@@ -49,7 +49,7 @@ Look into `prove_block.sh` for the available options or run the script without i
 Provers can be enabled using features. To compile with all of them (using standard options):
 
 ```
-cargo run --release --features "risc0 succinct"
+cargo run --release --features "risc0 sp1"
 ```
 
 ### risc zero
@@ -83,16 +83,19 @@ cargo run -F metal --release --features risc0
 
 CUDA needs to be installed when using `cuda`: https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html
 
-### succinct's SP1:
+### SP1:
 ```
-cargo run --release --features succinct
+cargo run --release --features sp1
 ```
 
 ### SGX:
 ```
+cargo build --release --features sgx
 cargo run --release --features sgx
 ```
 
+Make sure to first do a cargo build because cargo run does not build the sgx binary!
+
 If your CPU doesn't support SGX, you can still run the SGX code through gramine like it would on an SGX machine:
 
 ```