Refactor prover api

.github/actions/cargo-risczero-install/action.yaml

@@ -0,0 +1,41 @@
+name: cargo risczero install
+description: Install cargo risczero, build toolchains, and r0vm.
+
+inputs:
+  ref:
+    description: 'Git reference to pull from risc0/risc0 and build'
+    required: true
+    type: string
+  toolchain-version:
+    description: 'Version of the RISC Zero toolchains to install'
+    required: true
+  features:
+    description: 'Comma separated list of feature flags to set when building cargo risczero'
+    required: false
+    default: 'default'
+    type: string
+
+runs:
+  using: composite
+  steps:
+      - name: checkout risc0
+        uses: actions/checkout@v4
+        with:
+          repository: 'risc0/risc0'
+          path: 'tmp/risc0'
+          ref: ${{ inputs.ref }}
+          lfs: true
+      - name: install cargo-risczero
+        run: cargo install --path risc0/cargo-risczero --no-default-features --features "${{ inputs.features }}"
+        working-directory: tmp/risc0
+        shell: bash
+      - name: install r0vm
+        run: cargo install --bin r0vm --path risc0/cargo-risczero --features "${{ inputs.features }}"
+        shell: bash
+        working-directory: tmp/risc0
+      - name: install toolchains
+        run: cargo risczero install --version ${{ inputs.toolchain-version }}
+        shell: bash
+      - name: cleanup
+        run: rm -rf tmp
+        shell: bash

.github/workflows/main.yml

@@ -15,12 +15,16 @@ concurrency:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   RUST_BACKTRACE: "1"
-  RISC0_CRATE_VERSION: "^0.21"
-  RISC0_TOOLCHAIN_VERSION: v2024-02-08.1
+  RISC0_MONOREPO_REF: "main"
+  RISC0_TOOLCHAIN_VERSION: v2024-04-22.0
 
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        feature: [default]
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - name: checkout dummy commit (submodule bug workaround)
@@ -32,21 +36,17 @@ jobs:
           submodules: recursive
 
       - name: Install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.21
+        uses: risc0/risc0/.github/actions/rustup@main
 
       - 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_CRATE_VERSION }}
-
       - name: risczero toolchain install
-        run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
+        uses: ./.github/actions/cargo-risczero-install
+        with:
+          ref: ${{ env.RISC0_MONOREPO_REF }}
+          toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
+          features: ${{ matrix.feature }}
 
       - name: build rust guest
         run: cargo build
@@ -62,9 +62,16 @@ jobs:
             RISC0_DEV_MODE: true
         run: forge test -vvv
 
-  bonsai-integration:
-    name: test bonsai integration
+  integration-test:
+    name: integration test
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        feature: [default]
+    env:
+      FEATURE: ${{ matrix.feature }}
+      RUST_BACKTRACE: full
     steps:
       # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842
       - name: checkout dummy commit (submodule bug workaround)
@@ -74,34 +81,28 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-
+      
       - name: Install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.21
+        uses: risc0/risc0/.github/actions/rustup@main
 
       - 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_CRATE_VERSION }}
-
       - name: risczero toolchain install
-        run: cargo risczero install --version $RISC0_TOOLCHAIN_VERSION
+        uses: ./.github/actions/cargo-risczero-install
+        with:
+          ref: ${{ env.RISC0_MONOREPO_REF }}
+          toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }}
+          features: ${{ matrix.feature }}
 
       - name: build rust guest
         run: cargo build
 
       - name: build solidity contracts
         run: forge build
 
-      - name: run foundry tests with bonsai proving
+      - name: run foundry tests with local prover
         env:
-          BONSAI_API_URL: ${{ secrets.BONSAI_API_URL }}
-          BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }}
           RISC0_DEV_MODE: false
         run: forge test -vvv
 
@@ -114,7 +115,7 @@ jobs:
           submodules: recursive
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@release-0.21
+        uses: risc0/risc0/.github/actions/rustup@main
 
       - name: install cargo-sort
         uses: risc0/cargo-install@v1

.gitmodules

@@ -13,4 +13,4 @@
 [submodule "lib/risc0-ethereum"]
 	path = lib/risc0-ethereum
 	url = https://github.com/risc0/risc0-ethereum
-	branch = release-0.9
+	branch = capossele/refactor-zkvm-usage