Merge branch 'main' into develop

Author: HrikB

.github/workflows/consistency.yml

@@ -7,14 +7,11 @@ on:
         description: "Version to check"
         required: true
 
-  release:
-    types: [published]
-
 env:
-  VERSION: ${{ github.event.inputs.version || github.event.release.tag_name }}
+  VERSION: ${{ github.event.inputs.version }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.inputs.version || github.event.release.tag_name }}
+  group: ${{ github.workflow }}-${{ github.event.inputs.version }}
   cancel-in-progress: true
 
 jobs:
@@ -28,6 +25,10 @@ jobs:
       - name: Checkout current repo
         uses: actions/checkout@v4
 
+      - name: Extract major.minor into TRUNC_VERSION
+        id: extract
+        run: echo "TRUNC_VERSION=$(echo '${{ env.VERSION }}' | cut -d '.' -f1-2)" >> "$GITHUB_ENV"
+
       - name: Install solc # svm should support arm64 linux
         run: (hash svm 2>/dev/null || cargo install --version 0.2.23 svm-rs) && svm install 0.8.19 && solc --version
 
@@ -47,9 +48,9 @@ jobs:
 
       - name: Compare output to version folder
         run: |
-          diff -r ~/.openvm/halo2/src/${VERSION} src/${VERSION} --exclude=verifier.bytecode.json
+          diff -r ~/.openvm/halo2/src/${TRUNC_VERSION} src/${TRUNC_VERSION} --exclude=verifier.bytecode.json
 
       - name: Compare compiled bytecode in repo to verifier.bytecode.json
         run: |
           forge build --force
-          diff <(jq -r '.bytecode.object | ltrimstr("0x")' out/OpenVmHalo2Verifier.sol/OpenVmHalo2Verifier.json) <(jq -r '.bytecode | ltrimstr("0x")' ~/.openvm/halo2/src/${VERSION}/verifier.bytecode.json)
+          diff <(jq -r '.bytecode.object | ltrimstr("0x")' out/OpenVmHalo2Verifier.sol/OpenVmHalo2Verifier.json) <(jq -r '.bytecode | ltrimstr("0x")' ~/.openvm/halo2/src/${TRUNC_VERSION}/verifier.bytecode.json)