Merge branch 'relay' into jy/fix-dockerfile-foundry

risc0 · Feb 27, 2024 · 308ed5e · 308ed5e
2 parents 695963b + 4e7bc16
commit 308ed5e
Show file tree

Hide file tree

Showing 27 changed files with 1,516 additions and 3,612 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/clean.yml b/.github/workflows/clean.yml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@42266f0b6bd28de208b7c47b50dd4bcf241f76ce
+        uses: risc0/risc0/.github/actions/rustup@release-0.19
 
       - name: cargo clean
         run: cargo clean
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
           submodules: recursive
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@42266f0b6bd28de208b7c47b50dd4bcf241f76ce
+        uses: risc0/risc0/.github/actions/rustup@release-0.19
 
       - name: install cargo-sort
         uses: risc0/cargo-install@v1

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:
@@ -30,11 +33,22 @@ jobs:
           submodules: recursive
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@42266f0b6bd28de208b7c47b50dd4bcf241f76ce
+        uses: risc0/risc0/.github/actions/rustup@release-0.19
 
       - name: Install Foundry
         uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
 
+      - name: Install cargo-install
+        uses: risc0/cargo-install@v1
+        with:
+          crate: cargo-binstall
+
+      - name: Cargo binstall cargo-risczero
+        run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
+
+      - name: risczero toolchain install
+        run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
+
       - name: build solidity contracts
         run: forge build
 
@@ -58,11 +72,22 @@ jobs:
           submodules: recursive
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@42266f0b6bd28de208b7c47b50dd4bcf241f76ce
+        uses: risc0/risc0/.github/actions/rustup@release-0.19
 
       - name: Install Foundry
         uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f
 
+      - name: Install cargo-install
+        uses: risc0/cargo-install@v1
+        with:
+          crate: cargo-binstall
+
+      - name: Cargo binstall cargo-risczero
+        run: cargo binstall -y --force cargo-risczero@${{ env.RISC0_VERSION }}
+
+      - name: risczero toolchain 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.17
+	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 @@