Merge master with wasmer7 into zk-prove-any/sp1

.github/actions/install-rust/action.yml

@@ -6,7 +6,7 @@ inputs:
   toolchain:
     required: true
     description: 'Toolchain to install'
-    default: '1.88.0'
+    default: '1.93.0'
   targets:
     required: true
     description: 'Compilation targets to install'

.github/workflows/_validation-tests.yml

@@ -31,16 +31,16 @@ jobs:
 
       - name: Run arbitrator prover on block input json
         run: |
-          target/bin/prover target/machines/latest/machine.wavm.br -b \
+          target/bin/prover target/machines/latest/machine.v2.wavm.br -b \
           --json-inputs="${{ env.INPUT_FILE }}"
 
       - name: Run jit prover on block input json
         id: jit
         run: |
-          OUTPUT=$(target/bin/jit --binary target/machines/latest/replay.wasm --require-success --debug \
-            json --inputs '${{ env.INPUT_FILE }}')
-          
-          JIT_HASH=$(echo "$OUTPUT" | grep -oP 'hash \K(0x)?[a-f0-9]+')
+          target/bin/jit --binary target/machines/latest/replay.wasm --require-success --debug \
+            json --inputs '${{ env.INPUT_FILE }}' | tee /tmp/jit_output.txt
+
+          JIT_HASH=$(grep -oP 'hash \K(0x)?[a-f0-9]+' /tmp/jit_output.txt)
           echo "jit_hash=$JIT_HASH" >> $GITHUB_OUTPUT
 
       - name: Run Rust validation server (Native & Continuous)

.gitmodules

@@ -17,6 +17,7 @@
 [submodule "crates/tools/wasmer"]
 	path = crates/tools/wasmer
 	url = https://github.com/OffchainLabs/wasmer.git
+	branch = zk-prove-any/sp1-runner
 [submodule "nitro-testnode"]
 	path = nitro-testnode
 	url = https://github.com/OffchainLabs/nitro-testnode.git