Miscellaneous fixes

.github/workflows/ci.yaml

@@ -151,6 +151,125 @@
           package: midnight-zkir
           args: --release --all-features
 
+  # ---------------------------------------------------------------------
+  # Solidity verifier generator (halo2_solidity_verifier).
+  #
+  # These three jobs are the per-PR gate. The heavy IVC proof benches and
+  # the release bytecode size/hash checks live in
+  # `.github/workflows/solidity_verifier_bench.yml`, which runs on pushes to
+  # `main`, on a weekly schedule, and on demand.
+  #
+  # Every job needs the pinned solc from
+  # `proofs/solidity-verifier/scripts/install_pinned_solc.sh`; the EVM jobs
+  # additionally need the Filecoin SRS that the rest of this workflow already
+  # caches at `zk_stdlib/examples/assets/bls_filecoin_2p19`, which is where
+  # the crate's `srs_dir()` looks by default.
+  # ---------------------------------------------------------------------
+  test-solidity-verifier:
+    if: github.event.pull_request.draft == false
+    name: Test Solidity verifier
+    runs-on: ubuntu-latest
+
+    env:
+      SOLC_INSTALL_DIR: ${{ github.workspace }}/.solc
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+
+      # Codegen/layout tests compile Solidity; the heavy proof/EVM cases
+      # self-skip because HALO2_SOLIDITY_RUN_EVM_TESTS is unset here.
+      - name: Install pinned solc
+        run: |
+          echo "SOLC=$(proofs/solidity-verifier/scripts/install_pinned_solc.sh "$SOLC_INSTALL_DIR" | tail -1)" >> "$GITHUB_ENV"
+
+      - uses: ./.github/actions/cargo-test
+        with:
+          package: halo2_solidity_verifier
+          args: --all-features --all-targets -- --nocapture
+
+  test-solidity-verifier-evm:
+    if: github.event.pull_request.draft == false
+    needs: download-srs
+    name: Test Solidity verifier real EVM
+    runs-on: ubuntu-latest
+
+    env:
+      SOLC_INSTALL_DIR: ${{ github.workspace }}/.solc
+      HALO2_SOLIDITY_RUN_EVM_TESTS: 1
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+
+      - name: Restore SRS from cache
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
+        with:
+          path: zk_stdlib/examples/assets/bls_filecoin_2p19
+          key: fixed-srs-cache
+
+      - name: Install pinned solc
+        run: |
+          echo "SOLC=$(proofs/solidity-verifier/scripts/install_pinned_solc.sh "$SOLC_INSTALL_DIR" | tail -1)" >> "$GITHUB_ENV"
+
+      - name: 'Install rust-toolchain.toml'
+        run: rustup toolchain install
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: "ci"
+
+      # Adversarial property tests: proof/VK/calldata mutations, non-canonical
+      # scalar and G1 rejection, EIP-170 runtime size, and the memoryguard
+      # overlap check against real compiled bytecode.
+      - name: Real EVM property tests
+        run: cargo test -p halo2_solidity_verifier --release --all-features pbt_ -- --nocapture
+
+      # End-to-end: real proof -> render -> solc -> Prague revm verification.
+      - name: Poseidon fixture
+        run: |
+          cargo test -p halo2_solidity_verifier --release \
+            --features evm,truncated-challenges --test poseidon_fixture -- --nocapture
+
+  test-solidity-verifier-trace:
+    if: github.event.pull_request.draft == false
+    needs: download-srs
+    name: Test Solidity verifier trace equivalence
+    runs-on: ubuntu-latest
+
+    env:
+      SOLC_INSTALL_DIR: ${{ github.workspace }}/.solc
+      HALO2_SOLIDITY_RUN_EVM_TESTS: 1
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+
+      - name: Restore SRS from cache
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
+        with:
+          path: zk_stdlib/examples/assets/bls_filecoin_2p19
+          key: fixed-srs-cache
+
+      - name: Install pinned solc
+        run: |
+          echo "SOLC=$(proofs/solidity-verifier/scripts/install_pinned_solc.sh "$SOLC_INSTALL_DIR" | tail -1)" >> "$GITHUB_ENV"
+
+      - name: 'Install rust-toolchain.toml'
+        run: rustup toolchain install
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: "ci"
+
+      # Per-identity differential between the native Midfall verifier and the
+      # generated Solidity verifier. This is the only check that compares
+      # quotient VM semantics against the Rust verifier end to end.
+      - name: Poseidon native/Solidity trace equivalence
+        run: |
+          cargo test -p halo2_solidity_verifier --release \
+            --features evm,truncated-challenges,rust-verifier-trace,solidity-trace \
+            --lib native_midfall_verifier_trace_matches_solidity_trace -- --nocapture
+
   doc-links:
     if: github.event.pull_request.draft == false
     name: Intra-doc links
@@ -175,7 +294,7 @@
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       - uses: dtolnay/rust-toolchain@nightly
       - run: rustup component add rustfmt --toolchain nightly
       - run: cargo +nightly fmt --all -- --check
 

.github/workflows/solidity_verifier_bench.yml

@@ -0,0 +1,110 @@
+name: Solidity verifier IVC bench
+
+# The two IVC jobs below each generate a real recursive proof and take up to
+# ~90 minutes, so they are deliberately not part of the per-PR gate in
+# `ci.yaml`. The fast Solidity verifier jobs (codegen/layout tests, real EVM
+# property tests, Poseidon fixture, Poseidon trace equivalence) run there on
+# every pull request.
+#
+# Run these here on pushes to `main`, weekly, and on demand. Trigger a run
+# against a branch from the Actions tab (`workflow_dispatch`) before merging a
+# change to memory layout, proof layout, the quotient VM, or the templates.
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    # Mondays 04:00 UTC.
+    - cron: "0 4 * * 1"
+  workflow_dispatch:
+
+jobs:
+  full-ivc-bench:
+    name: Full IVC bench and release bytecode sizes
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+    env:
+      SOLC_INSTALL_DIR: ${{ github.workspace }}/.solc
+      SRS_DIR: ${{ github.workspace }}/.srs
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+
+      # `ensure_srs_assets.sh` fetches bls_filecoin_2p19 plus the
+      # midnight-srs 2p19/2p20/2p22 powers the decider proof needs.
+      - name: Cache SRS assets
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
+        with:
+          path: .srs
+          key: srs-solidity-verifier-ivc-v1
+
+      - name: Install pinned solc
+        run: |
+          echo "SOLC=$(proofs/solidity-verifier/scripts/install_pinned_solc.sh "$SOLC_INSTALL_DIR" | tail -1)" >> "$GITHUB_ENV"
+
+      - name: 'Install rust-toolchain.toml'
+        run: rustup toolchain install
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: "ci"
+
+      - name: Ensure SRS assets
+        run: proofs/solidity-verifier/scripts/ensure_srs_assets.sh
+
+      - name: Full IVC bench
+        run: proofs/solidity-verifier/scripts/run_ivc_bench.sh --skip-srs-download
+
+      # Fails the run when a generated runtime crosses EIP-170 or when the
+      # published verifier/VK/quotient runtime hashes drift from the values
+      # recorded in docs/reference/REPRODUCIBLE_BUILDS.md.
+      - name: Release bytecode size/hash checks
+        run: proofs/solidity-verifier/scripts/check_release_bytecode_sizes.sh
+
+      - name: Upload IVC artifacts
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
+        if: always()
+        with:
+          name: ivc-keccak-solidity-dump
+          path: proofs/solidity-verifier/target/ivc-keccak-solidity-dump
+
+  ivc-trace-equivalence:
+    name: IVC native/Solidity trace equivalence
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+    env:
+      SOLC_INSTALL_DIR: ${{ github.workspace }}/.solc
+      SRS_DIR: ${{ github.workspace }}/.srs
+
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+
+      - name: Cache SRS assets
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
+        with:
+          path: .srs
+          key: srs-solidity-verifier-ivc-v1
+
+      - name: Install pinned solc
+        run: |
+          echo "SOLC=$(proofs/solidity-verifier/scripts/install_pinned_solc.sh "$SOLC_INSTALL_DIR" | tail -1)" >> "$GITHUB_ENV"
+
+      - name: 'Install rust-toolchain.toml'
+        run: rustup toolchain install
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+          shared-key: "ci"
+
+      - name: Ensure SRS assets
+        run: proofs/solidity-verifier/scripts/ensure_srs_assets.sh
+
+      # Compares the native Midfall verifier trace against the generated
+      # Solidity trace on the IVC decider proof, including quotient identity
+      # trace ids from the pinned external Halo2QuotientEvaluator.
+      - name: IVC trace equivalence
+        run: proofs/solidity-verifier/scripts/run_ivc_bench.sh --trace --skip-srs-download

aggregation/CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
 * truncated_challenges feature to allow --all-features compilation [#146](https://github.com/midnightntwrk/midnight-zk/pull/146)
 * Rebase to new `circuits/` with `keccak` and `blake2b` [#135](https://github.com/midnightntwrk/midnight-zk/pull/135)
 ### Fixed
+* Restore the transcript input bound required by `LightAggregator::verify`.
 * Fix cost model to pass correct number of committed instances [#280](https://github.com/midnightntwrk/midnight-zk/pull/280)
 
 ### Changed

aggregation/src/light_aggregator/mod.rs

@@ -81,7 +81,9 @@ use midnight_proofs::{
         },
         EvaluationDomain,
     },
-    transcript::{CircuitTranscript, Hashable, Sampleable, Transcript},
+    transcript::{
+        CircuitTranscript, Hashable, Sampleable, Transcript, TranscriptHash, TranscriptInputBytes,
+    },
 };
 use rand::{CryptoRng, RngCore};
 
@@ -414,6 +416,11 @@ impl<const NB_PROOFS: usize> LightAggregator<NB_PROOFS> {
         C: Hashable<T::Hash>,
         F: Sampleable<T::Hash> + Hashable<T::Hash>,
         u32: Hashable<T::Hash>,
+        // Required by `plonk::prepare`, which this method delegates to. The
+        // bound is satisfied by both real transcript input types (`Vec<u8>`
+        // and `Vec<Fq>`); propagating it here mirrors the other `prepare`
+        // callers in `proofs/tests/plonk_api.rs`.
+        <T::Hash as TranscriptHash>::Input: TranscriptInputBytes,
     {
         // Read the LHS of the acc from the transcript.
         let acc_lhs: Msm<S> = {

proofs/CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Blind logup multiplicities polynomial on non-usable rows for ZK [#312](https://github.com/midnightntwrk/midnight-zk/pull/312)
 
 ### Changed
+* Rework the Solidity verifier lowering pipeline and refresh its generated fixtures.
 * Simplify `CommitmentReference` by removing unused `Chopped` variant [#314](https://github.com/midnightntwrk/midnight-zk/pull/314)
 * Split linearization polynomial into non-constant and constant parts, removing the generator point from the MSM [#313](https://github.com/midnightntwrk/midnight-zk/pull/313)
 * Remove unnecessary polynomial padding in KZG multi-open [#276](https://github.com/midnightntwrk/midnight-zk/pull/276)