Merge branch 'relay' into main

risc0 · Feb 27, 2024 · 16b1716 · 16b1716
2 parents 95e19de + d41f9e9
commit 16b1716
Show file tree

Hide file tree

Showing 21 changed files with 845 additions and 338 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -17,7 +17,6 @@ rustflags = [
     "-Doverflowing_literals",
     "-Dpath_statements",
     "-Dpatterns_in_fns_without_body",
-    "-Dprivate_in_public",
     "-Dtrivial_casts",
     "-Dtrivial_numeric_casts",
     "-Dunconditional_recursion",

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,6 +14,9 @@ concurrency:
 
 env:
   RUST_BACKTRACE: "1"
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  RISC0_VERSION: 0.20.1
+  RISC0_TOOLCHAIN_VERSION: test-release-2
 
 jobs:
   integration:
@@ -39,13 +42,12 @@ jobs:
         uses: risc0/cargo-install@v1
         with:
           crate: cargo-binstall
-          version: "1.4"
 
       - name: Cargo binstall cargo-risczero
-        run: cargo binstall -y --force cargo-risczero@0.19.1
+        run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
 
       - name: risczero toolchain install
-        run: cargo risczero install
+        run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
 
       - name: build solidity contracts
         run: forge build
@@ -79,13 +81,12 @@ jobs:
         uses: risc0/cargo-install@v1
         with:
           crate: cargo-binstall
-          version: "1.4"
 
       - name: Cargo binstall cargo-risczero
-        run: cargo binstall -y --force cargo-risczero@0.19.1
+        run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
 
       - name: risczero toolchain install
-        run: cargo risczero install
+        run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
 
       - name: build solidity contracts
         run: forge build

diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,6 @@ out/
 /broadcast/*/11155111/
 /broadcast/**/dry-run/
 
-# Docs
-docs/
-
 # Dotenv file
 .env
 

diff --git a/.gitmodules b/.gitmodules
@@ -13,4 +13,4 @@
 [submodule "lib/risc0"]
 	path = lib/risc0
 	url = https://github.com/risc0/risc0
-	branch = "release-0.19"
+	branch = "release-0.20"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,6 @@ out/ @@
     /broadcast/*/11155111/
     /broadcast/**/dry-run/
-    # Docs
-    docs/
     # Dotenv file
     .env
@@ Expand Down @@