Backports for 0.20

.cargo/config.toml

@@ -4,7 +4,4 @@ xfast = "run --package xtask --"
 xtask = "run --package xtask --release --"
 
 [build]
-rustflags = [
-  "-Dclippy::all",
-  "-Dwarnings"
-]
+rustflags = ["-Dclippy::all", "-Dwarnings"]

.github/workflows/bench_applications.yml

@@ -59,8 +59,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

.github/workflows/bench_datasheet.yml

@@ -60,8 +60,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

.github/workflows/bench_pr.yml

@@ -39,8 +39,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

.github/workflows/bench_trends.yml

@@ -51,8 +51,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup

.github/workflows/main.yml

@@ -121,6 +121,7 @@ jobs:
       - run: cargo fmt --all --check --manifest-path bonsai/examples/governance/Cargo.toml
       - run: cargo fmt --all --check --manifest-path examples/Cargo.toml
       - run: cargo fmt --all --check --manifest-path tools/crates-validator/Cargo.toml
+      - run: cargo clippy -p risc0-zkvm
       - run: cargo sort --workspace --check
       - run: cargo sort --workspace --check benchmarks
       - run: cargo sort --workspace --check bonsai
@@ -154,8 +155,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup
@@ -165,14 +164,14 @@ jobs:
       - run: cargo run --bin cargo-risczero --no-default-features -- risczero install --version $RISC0_TOOLCHAIN_VERSION
       - name: build workspace
         run: |
-          cargo test -F $FEATURE -F fault-proof -F prove --workspace --timings --no-run \
+          cargo test -F $FEATURE -F prove --workspace --timings --no-run \
             --exclude doc-test \
             --exclude bonsai-ethereum-contracts \
             --exclude bonsai-ethereum-relay \
             --exclude bonsai-rest-api-mock
       - name: test workspace
         run: |
-          cargo test -F $FEATURE -F fault-proof -F prove --workspace --timings \
+          cargo test -F $FEATURE -F prove --workspace --timings \
             --exclude doc-test \
             --exclude bonsai-ethereum-contracts \
             --exclude bonsai-ethereum-relay \
@@ -204,11 +203,6 @@ jobs:
       - run: cargo check -p risc0-zkvm -F $FEATURE
       - run: cargo check
         working-directory: external/substrate
-      - uses: risc0/clippy-action@main
-        with:
-          reporter: "github-pr-check"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          clippy_flags: --features $FEATURE --all-targets
       - run: sccache --show-stats
 
   examples:
@@ -236,8 +230,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - if: matrix.feature == 'cuda'
         uses: ./.github/actions/cuda
       - uses: ./.github/actions/rustup
@@ -306,8 +298,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:
@@ -341,11 +331,6 @@ jobs:
       - uses: ./.github/actions/sccache
         with:
           key: macOS-default
-      - uses: risc0/clippy-action@main
-        with:
-          reporter: 'github-pr-check'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          clippy_flags: --manifest-path tools/crates-validator/Cargo.toml
       - run: cargo test
         working-directory: tools/crates-validator
       - run: sccache --show-stats
@@ -360,8 +345,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: browser-actions/setup-firefox@v1
       - run: firefox --version
       - uses: ./.github/actions/rustup
@@ -388,8 +371,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:
@@ -411,6 +392,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
+      - run: git lfs pull
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:

.github/workflows/nightly.yml

@@ -23,8 +23,6 @@ jobs:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :"
       - uses: actions/checkout@v4
-        with:
-          lfs: true
       - uses: ./.github/actions/rustup
       - name: Set the variables
         env:

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: true
-      - run: git lfs checkout
+      - run: git lfs pull
       - uses: ./.github/actions/rustup
       - uses: ./.github/actions/sccache
         with:

.github/workflows/website-test.yml

@@ -75,7 +75,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          lfs: true
           # Recursive checkout required to build Solidity contracts and bindings.
           submodules: recursive
       - uses: ./.github/actions/rustup

Cargo.toml

@@ -10,7 +10,6 @@ members = [
   "risc0/circuit/rv32im",
   "risc0/circuit/rv32im-sys",
   "risc0/core",
-  "risc0/fault",
   "risc0/r0vm",
   "risc0/sys",
   "risc0/tools",

bonsai/ethereum/contracts/BonsaiCheats.sol

@@ -22,8 +22,8 @@ import {CommonBase} from "forge-std/Base.sol";
 import {console2} from "forge-std/console2.sol";
 import {Strings2} from "murky_differential_testing/test/utils/Strings2.sol";
 
-import {IBonsaiRelay} from "./IBonsaiRelay.sol";
-import {BonsaiTestRelay} from "./BonsaiTestRelay.sol";
+import {IBonsaiRelay} from "./relay/IBonsaiRelay.sol";
+import {BonsaiTestRelay} from "./relay/BonsaiTestRelay.sol";
 
 /// @notice A base contract for testing a Bonsai callback receiver contract
 abstract contract BonsaiCheats is StdCheatsSafe, CommonBase {

bonsai/ethereum/contracts/BonsaiTest.sol

@@ -20,10 +20,10 @@ import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
 import {Strings2} from "lib/murky/differential_testing/test/utils/Strings2.sol";
 
-import {IBonsaiRelay, Callback, CallbackAuthorization} from "./IBonsaiRelay.sol";
-import {BonsaiRelay} from "./BonsaiRelay.sol";
-import {BonsaiRelayQueueWrapper} from "./BonsaiRelayQueueWrapper.sol";
-import {BonsaiTestRelay} from "./BonsaiTestRelay.sol";
+import {IBonsaiRelay, Callback, CallbackAuthorization} from "./relay/IBonsaiRelay.sol";
+import {BonsaiRelay} from "./relay/BonsaiRelay.sol";
+import {BonsaiRelayQueueWrapper} from "./relay/BonsaiRelayQueueWrapper.sol";
+import {BonsaiTestRelay} from "./relay/BonsaiTestRelay.sol";
 import {BonsaiCheats} from "./BonsaiCheats.sol";
 import {IRiscZeroVerifier} from "./IRiscZeroVerifier.sol";
 import {ControlID, RiscZeroGroth16Verifier} from "./groth16/RiscZeroGroth16Verifier.sol";