BM-767: use risc0-zkvm v2.0 and boundless v0.7

.github/actions/bininstall-risc0/action.yml

@@ -0,0 +1,45 @@
+name: risczero toolchain install
+description: Install risczero toolchain
+
+inputs:
+  risczero-version:
+    description: 'Version of the RISC Zero zkvm to install'
+    required: false
+    default: '2.0.1'
+    type: string
+
+  toolchain-version:
+    description: 'Version of the RISC Zero toolchains to install'
+    required: false
+    default: '1.85.0'
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: install rust
+      uses: risc0/risc0/.github/actions/rustup@release-2.0
+      with:
+        toolchain: ${{ inputs.toolchain-version }}
+
+    - name: install rzup
+      run: |
+        curl -L https://risczero.com/install | bash
+        echo "$HOME/.risc0/bin" >> $GITHUB_PATH
+      shell: bash
+
+    - name: install rzup components
+      run: |
+        rzup install --verbose --force cargo-risczero ${{ inputs.risczero-version }}
+        rzup install --verbose --force r0vm ${{ inputs.risczero-version }}
+        rzup install --verbose --force rust ${{ inputs.toolchain-version }}
+        rzup install --verbose --force cpp
+      shell: bash
+
+    - name: test r0vm
+      shell: bash
+      run: r0vm --version
+
+    - name: test risczero
+      shell: bash
+      run: cargo risczero --version

.github/workflows/main.yml

@@ -43,24 +43,14 @@ jobs:
 
       - name: install foundry
         uses: foundry-rs/foundry-toolchain@v1
-
-      - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@release-1.2
-        with:
-          toolchain: '1.81'
 
-      - name: install cargo-binstall
-        uses: baptiste0928/cargo-install@904927dbe77864e0f2281519fe9d5bd097a220b3
+      - name: install cargo risczero
+        uses: ./.github/actions/bininstall-risc0
         with:
-          crate: cargo-binstall
-          version: '=1.10.8'
-          locked: true
-
-      - name: install cargo-risczero
-        run: cargo binstall -y --force cargo-risczero@1.2.0
-
-      - name: install risc0 toolchain
-        run: cargo risczero install --version r0.1.81.0
+          risczero-version: '2.0.1'
+          toolchain-version: '1.85.0'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: cargo build
         run: cargo build
@@ -88,9 +78,9 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
 
       - name: install rust
-        uses: risc0/risc0/.github/actions/rustup@release-1.2
+        uses: risc0/risc0/.github/actions/rustup@release-2.0
         with:
-          toolchain: '1.81'
+          toolchain: '1.85'
 
       - name: install cargo-sort
         uses: baptiste0928/cargo-install@904927dbe77864e0f2281519fe9d5bd097a220b3
@@ -99,13 +89,6 @@ jobs:
           version: "=1.0.9"
           locked: true
 
-      - name: install cargo-binstall
-        uses: baptiste0928/cargo-install@904927dbe77864e0f2281519fe9d5bd097a220b3
-        with:
-          crate: cargo-binstall
-          version: '=1.10.8'
-          locked: true
-
       - name: cargo Sort
         run: cargo sort --workspace --check
 

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/risc0-ethereum"]
 	path = lib/risc0-ethereum
-	url = https://github.com/risc0/risc0-ethereum
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	url = https://github.com/risc0/risc0-ethereum