From a1f97783758495bfe72cdc4c37433582acb598e2 Mon Sep 17 00:00:00 2001
From: Euicheon Hong <euicheon@intrinsictech.xyz>
Date: Thu, 14 May 2026 16:43:19 -0400
Subject: [PATCH 01/94] feat: add rvr mode in execution script

---
 .github/workflows/reth-benchmark.yml | 213 ++++++++++++++-------------
 Cargo.toml                           |  28 ++--
 bin/reth-benchmark/Cargo.toml        |  16 +-
 bin/stateless-guest/Cargo.toml       |   6 +-
 bin/stateless-guest/openvm.toml      |   1 -
 run.sh                               |  62 ++++++--
 6 files changed, 186 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index ab5410ab3..e8cbc32cf 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -4,6 +4,19 @@ run-name: "Reth Benchmark (block ${{ inputs.block_number || github.event.inputs.
 on:
   workflow_dispatch:
     inputs:
+      instance_family:
+        type: string
+        required: false
+        description: The family of the instance, can be multiple ones concat with "+" e.g. g6+g5
+        default: g7e.2xlarge
+      memory_allocator:
+        type: choice
+        required: false
+        description: Memory allocator to use
+        options:
+          - jemalloc
+          - mimalloc
+        default: jemalloc
       block_number:
         type: number
         required: false
@@ -12,7 +25,7 @@ on:
       mode:
         type: choice
         required: false
-        description: Benchmark mode
+        description: Running mode
         options:
           - execute
           - execute-metered
@@ -21,28 +34,6 @@ on:
           - prove-root
           - prove-evm
         default: prove-stark
-      rpc_input_cache:
-        type: choice
-        required: false
-        description: RPC input cache mode
-        options:
-          - use
-          - refresh
-          - disabled
-        default: use
-      instance_family:
-        type: string
-        required: false
-        description: Runner instance family, or multiple families joined with "+" (e.g. g6+g5)
-        default: g7e.2xlarge
-      memory_allocator:
-        type: choice
-        required: false
-        description: Host memory allocator
-        options:
-          - jemalloc
-          - mimalloc
-        default: jemalloc
       profiling:
         type: choice
         required: false
@@ -53,120 +44,125 @@ on:
           - guest # guest profiling (circuit flamegraphs)
           - nsys # nsys profiling (cuda)
         default: none
-      use_tco:
-        type: boolean
-        required: false
-        description: Use TCO instead of AOT
-        default: false
-      app_log_blowup:
+      max_segment_length:
         type: number
         required: false
-        description: App log blowup
-      app_l_skip:
-        type: number
+        description: Max segment length override for continuations
+      segment_max_memory:
+        type: string
         required: false
-        description: App univariate skip-domain log2
-      leaf_log_blowup:
+        description: GPU memory soft limit override for segmentation
+      app_l_skip:
         type: number
         required: false
-        description: Leaf aggregation log blowup
-      internal_log_blowup:
-        type: number
+        description: Log of univariate skip domain size override
+      exec_mode:
+        type: choice
         required: false
-        description: Internal aggregation log blowup
-      root_log_blowup:
-        type: number
+        description: OpenVM execution backend (aot is x86_64-only)
+        options:
+          - rvr
+          - aot
+          - tco
+        default: rvr
+      rpc_input_cache:
+        type: choice
         required: false
-        description: Root aggregation log blowup
+        description: RPC input cache mode
+        options:
+          - use
+          - refresh
+          - disabled
+        default: use
       num_children_leaf:
         type: number
         required: false
-        description: Leaf aggregation fan-in (app proofs)
+        description: Number of app proofs that leaf verifier aggregates
       num_children_internal:
         type: number
         required: false
-        description: Internal aggregation fan-in (proofs)
-      segment_max_memory:
-        type: string
-        required: false
-        description: Estimated VM segment proving-memory cap (bytes)
+        description: Number of proofs that internal verifier aggregates
   workflow_call:
     inputs:
       ref:
         type: string
         required: false
         description: Git ref to checkout
-      tag:
-        type: string
-        required: false
-        description: Tag for cache keys (default is commit hash)
-      block_number:
-        type: number
-        required: false
-        description: Ethereum block number
-        default: 24001988
-      mode:
-        type: string
-        required: false
-        description: "Benchmark mode: execute, execute-metered, prove-app, prove-stark, prove-root, or prove-evm"
-        default: prove-stark
-      rpc_input_cache:
-        type: string
-        required: false
-        description: RPC input cache mode (use, refresh, disabled)
-        default: use
       instance_family:
         type: string
         required: false
-        description: Runner instance family, or multiple families joined with "+" (e.g. g6+g5)
+        description: The family of the instance, can be multiple ones concat with "+" e.g. g6+g5
         default: g7e.2xlarge
       memory_allocator:
         type: string
         required: false
-        description: Host memory allocator (jemalloc or mimalloc)
+        description: Memory allocator to use (mimalloc or jemalloc)
         default: jemalloc
-      profiling:
-        type: string
-        required: false
-        description: Profiling mode (none, host, guest, nsys)
-        default: none
-      use_tco:
-        type: boolean
-        required: false
-        description: Use TCO instead of AOT
-        default: false
-      app_log_blowup:
+      block_number:
         type: number
         required: false
-        description: App log blowup
-      app_l_skip:
+        description: Block number to run the benchmark on
+        default: 23992138
+      app_log_blowup:
         type: number
         required: false
-        description: App univariate skip-domain log2
+        description: Application level log blowup
       leaf_log_blowup:
         type: number
         required: false
-        description: Leaf aggregation log blowup
+        description: Aggregation (leaf) level log blowup
       internal_log_blowup:
         type: number
         required: false
-        description: Internal aggregation log blowup
+        description: Internal level log blowup (only for e2e)
       root_log_blowup:
         type: number
         required: false
-        description: Root aggregation log blowup
+        description: Root level log blowup
+      mode:
+        type: string
+        required: false
+        description: Running mode, one of {execute, execute-metered, prove-app, prove-stark, prove-root, prove-evm}
+        default: prove-stark
+      profiling:
+        type: string
+        required: false
+        description: Profiling mode (none, host, guest, nsys)
+        default: none
+      max_segment_length:
+        type: number
+        required: false
+        description: Max segment length override for continuations
+      segment_max_memory:
+        type: string
+        required: false
+        description: GPU memory soft limit override for segmentation
+      app_l_skip:
+        type: number
+        required: false
+        description: Log of univariate skip domain size override
+      exec_mode:
+        type: string
+        required: false
+        description: OpenVM execution backend, one of {rvr, aot, tco} (aot is x86_64-only)
+        default: rvr
       num_children_leaf:
         type: number
         required: false
-        description: Leaf aggregation fan-in (app proofs)
+        description: Number of app proofs that leaf verifier aggregates
       num_children_internal:
         type: number
         required: false
-        description: Internal aggregation fan-in (proofs)
-      segment_max_memory:
+        description: Number of proofs that internal verifier aggregates
+      tag:
         type: string
         required: false
-        description: Estimated VM segment proving-memory cap (bytes)
+        description: Tag for cache keys (default is commit hash)
+      rpc_input_cache:
+        type: string
+        required: false
+        description: RPC input cache mode (use, refresh, disabled)
+        default: use
     secrets:
       GH_ACTIONS_DEPLOY_PRIVATE_KEY:
         required: true
@@ -298,6 +294,14 @@ jobs:
         if: ${{ startsWith(inputs.instance_family || github.event.inputs.instance_family, 'g') }}
         run: bash ./scripts/gpu_driver_setup.sh
 
+      - name: Install clang-22 and lld
+        if: ${{ (inputs.exec_mode || github.event.inputs.exec_mode) == 'rvr' }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          sudo ./llvm.sh 22
+          sudo apt-get install -y lld
+
       - name: Setup halo2 KZG params
         if: ${{ (github.event.inputs.mode == 'prove-evm') || (inputs.mode == 'prove-evm') }}
         run: bash ./ci/trusted_setup_s3.sh
@@ -350,7 +354,7 @@ jobs:
             FEATURES="${FEATURES},evm-verify"
           fi
 
-          USE_TCO="${{ inputs.use_tco || github.event.inputs.use_tco }}"
+          EXEC_MODE="${{ inputs.exec_mode || github.event.inputs.exec_mode || 'rvr' }}"
 
           # Resolve "native" to the host CPU name (e.g. znver3) so sccache keys and
           # cargo fingerprints differ across instance families (else SIGILL from reuse)
@@ -362,22 +366,25 @@ jobs:
           arch=$(uname -m)
           case $arch in
             arm64|aarch64)
-              USE_TCO="true"
-              ;;
-            x86_64|amd64)
-              if [[ "$USE_TCO" != "true" ]]; then
+              if [[ "$EXEC_MODE" == "aot" ]]; then
                 # aot enables halo2curves-axiom/asm which is x86_64-only
-                FEATURES="${FEATURES},aot"
+                echo "::error::exec_mode=aot is not supported on arm64; choose rvr or tco"
+                exit 1
               fi
               ;;
+            x86_64|amd64)
+              ;;
             *)
               echo "Unsupported architecture: $arch"
               exit 1
               ;;
           esac
-          if [[ "$USE_TCO" == "true" ]]; then
-            FEATURES="${FEATURES},tco"
-          fi
+          case "$EXEC_MODE" in
+            tco) FEATURES="${FEATURES},tco" ;;
+            aot) FEATURES="${FEATURES},aot" ;;
+            rvr) FEATURES="${FEATURES},rvr" ;;
+            *) echo "Unsupported exec_mode: $EXEC_MODE"; exit 1 ;;
+          esac
 
           if [[ "${{ inputs.profiling || github.event.inputs.profiling }}" == "host" || "${{ inputs.profiling || github.event.inputs.profiling }}" == "nsys" ]]; then
             RUSTFLAGS="${RUSTFLAGS} -C force-frame-pointers=yes"
@@ -567,6 +574,7 @@ jobs:
           LEAF_LOG_BLOWUP="${{ inputs.leaf_log_blowup || github.event.inputs.leaf_log_blowup }}"
           INTERNAL_LOG_BLOWUP="${{ inputs.internal_log_blowup || github.event.inputs.internal_log_blowup }}"
           ROOT_LOG_BLOWUP="${{ inputs.root_log_blowup || github.event.inputs.root_log_blowup }}"
+          MAX_SEGMENT_LENGTH="${{ inputs.max_segment_length || github.event.inputs.max_segment_length }}"
           SEGMENT_MAX_MEMORY="${{ inputs.segment_max_memory || github.event.inputs.segment_max_memory }}"
           APP_L_SKIP="${{ inputs.app_l_skip || github.event.inputs.app_l_skip }}"
           NUM_CHILDREN_LEAF="${{ inputs.num_children_leaf || github.event.inputs.num_children_leaf }}"
@@ -575,12 +583,15 @@ jobs:
           read_default() {
             awk -v arg="$1" '$0 ~ arg { in_arg = 1; next } in_arg && /\[default:/ { gsub(/.*\[default: |].*/, ""); print; exit }' <<< "$HELP_OUTPUT"
           }
+          DEFAULT_MAX_SEGMENT_LENGTH="$(read_default "--max-segment-length ")"
           DEFAULT_SEGMENT_MAX_MEMORY="$(read_default "--segment-max-memory ")"
-          if [[ -z "$DEFAULT_SEGMENT_MAX_MEMORY" ]]; then
+          if [[ -z "$DEFAULT_MAX_SEGMENT_LENGTH" || -z "$DEFAULT_SEGMENT_MAX_MEMORY" ]]; then
             echo "Failed to read segmentation defaults from ${{ env.BIN_NAME }} --help" >&2
             exit 1
           fi
+          RESOLVED_MAX_SEGMENT_LENGTH="${MAX_SEGMENT_LENGTH:-$DEFAULT_MAX_SEGMENT_LENGTH}"
           RESOLVED_SEGMENT_MAX_MEMORY="${SEGMENT_MAX_MEMORY:-$DEFAULT_SEGMENT_MAX_MEMORY}"
+          echo "RESOLVED_MAX_SEGMENT_LENGTH=$RESOLVED_MAX_SEGMENT_LENGTH" >> "$GITHUB_ENV"
           echo "RESOLVED_SEGMENT_MAX_MEMORY=$RESOLVED_SEGMENT_MAX_MEMORY" >> "$GITHUB_ENV"
           if [[ -n $APP_LOG_BLOWUP ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --app-log-blowup $APP_LOG_BLOWUP"
@@ -594,6 +605,9 @@ jobs:
           if [[ -n $ROOT_LOG_BLOWUP ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --root-log-blowup $ROOT_LOG_BLOWUP"
           fi
+          if [[ -n $MAX_SEGMENT_LENGTH ]]; then
+            OPTIONAL_ARGS="$OPTIONAL_ARGS --max-segment-length $MAX_SEGMENT_LENGTH"
+          fi
           if [[ -n $SEGMENT_MAX_MEMORY ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --segment-max-memory $SEGMENT_MAX_MEMORY"
           fi
@@ -768,6 +782,7 @@ jobs:
           source openvm/ci/scripts/utils.sh
 
           add_metadata $MD_PATH \
+            $RESOLVED_MAX_SEGMENT_LENGTH \
             ${{ inputs.instance_family || github.event.inputs.instance_family }} \
             ${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }} \
             $COMMIT_URL \
diff --git a/Cargo.toml b/Cargo.toml
index e574e3062..2ab8f7b12 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,25 +116,25 @@ alloy-transport-http = { version = "=2.0.5", default-features = false, features
     "reqwest-rustls-tls",
 ] }
 
-openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-keccak256 = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false, features = [
+openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-keccak256 = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false, features = [
     "bn254",
     "bls12_381",
 ] }
-openvm-sha2 = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256", branch = "main" }
-openvm-p256 = { git = "https://github.com/openvm-org/openvm.git", package = "p256", branch = "main" }
-openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
+openvm-sha2 = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256", branch = "develop-v2.1.0" }
+openvm-p256 = { git = "https://github.com/openvm-org/openvm.git", package = "p256", branch = "develop-v2.1.0" }
+openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 
 # openvm (host only)
-openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-build = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
+openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-build = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false }
 
 # crates/kzg
 hex = { version = "0.4.3", default-features = false }
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index a96b9be4f..fcc781183 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -46,14 +46,14 @@ reth-ethereum-primitives.workspace = true
 # Note: the openvm-sdk commit does not need to be exactly the same as the `openvm` commit used in the guest program: as long as
 # the openvm-sdk commit doesn't change any guest libraries, they are compatible
 # This allows us to not update revm and openvm-kzg each time we change openvm-sdk
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
-openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false, optional = true }
-openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false }
+openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false, optional = true }
+openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm.workspace = true
-openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
-openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "main", default-features = false }
+openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 
 # halo2
 halo2-axiom = { git = "https://github.com/axiom-crypto/halo2.git", tag = "v0.5.2", default-features = false, optional = true }
@@ -67,6 +67,8 @@ parallel = ["openvm-sdk/parallel"]
 metrics = ["openvm-sdk/metrics"]
 tco = ["openvm-sdk/tco"]
 aot = ["openvm-sdk/aot"]
+# Mutually exclusive with `aot`
+rvr = ["openvm-sdk/rvr"]
 evm-prove = ["openvm-sdk/evm-prove", "halo2-axiom"]
 evm-verify = ["evm-prove", "openvm-sdk/evm-verify", "halo2-axiom"]
 perf-metrics = ["openvm-sdk/perf-metrics"]
diff --git a/bin/stateless-guest/Cargo.toml b/bin/stateless-guest/Cargo.toml
index 30aa8e692..686f3861b 100644
--- a/bin/stateless-guest/Cargo.toml
+++ b/bin/stateless-guest/Cargo.toml
@@ -10,11 +10,11 @@ edition = "2021"
 openvm-stateless-executor = { path = "../../crates/stateless-executor", default-features = false }
 
 # openvm
-openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "main", features = [
+openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", features = [
     "std",
 ] }
-openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "main", optional = true }
-openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "main", optional = true }
+openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", optional = true }
+openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", optional = true }
 
 # Enable std feature for host builds (provides critical-section implementation)
 [target.'cfg(not(target_os = "zkvm"))'.dependencies]
diff --git a/bin/stateless-guest/openvm.toml b/bin/stateless-guest/openvm.toml
index fa23c1a13..eac2c0a81 100644
--- a/bin/stateless-guest/openvm.toml
+++ b/bin/stateless-guest/openvm.toml
@@ -1,4 +1,3 @@
-openvm_version = "v1.5"
 [app_vm_config.rv32i]
 [app_vm_config.rv32m]
 [app_vm_config.io]
diff --git a/run.sh b/run.sh
index 9fd9b52d7..bb13ce111 100755
--- a/run.sh
+++ b/run.sh
@@ -18,7 +18,9 @@
 #   --num-children-internal <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
-#   --tco               Use TCO instead of AOT (default is AOT on x86_64)
+#   --exec-mode <MODE>  Select the OpenVM execution backend: tco | aot | rvr.
+#                       Defaults to rvr. aot is not supported on arm64.
+#                       rvr requires clang-22 and lld on PATH.
 #   --perf              Run with perf + samply host profiling and upload to Firefox Profiler
 #   --nsys              Run with nsys profiling and output summary stats
 #   --nsys-gpu-metrics  Include nsys GPU hardware metrics (`--gpu-metrics-devices=all`).
@@ -75,7 +77,7 @@ PROFILE_OVERRIDE=""
 BLOCK_NUMBER_OVERRIDE=""
 USE_CUDA=false
 CUDA_REASON=""
-USE_TCO=false
+EXEC_MODE=""
 USE_PERF=false
 USE_NSYS=false
 USE_NSYS_GPU_METRICS=false
@@ -137,9 +139,17 @@ while [[ $# -gt 0 ]]; do
             CUDA_REASON="requested via --cuda script argument"
             shift
             ;;
-        --tco)
-            USE_TCO=true
-            shift
+        --exec-mode)
+            case "${2:-}" in
+                tco|aot|rvr)
+                    EXEC_MODE="$2"
+                    ;;
+                *)
+                    echo "Error: --exec-mode requires one of: tco, aot, rvr (got '${2:-}')" >&2
+                    exit 1
+                    ;;
+            esac
+            shift 2
             ;;
         --perf)
             USE_PERF=true
@@ -284,18 +294,18 @@ arch=$(uname -m)
 case $arch in
 arm64|aarch64)
     RUSTFLAGS="-Ctarget-cpu=native"
-    if [ "$USE_TCO" = "false" ]; then
-        USE_TCO=true
+    if [ -z "$EXEC_MODE" ]; then
+        EXEC_MODE="rvr"
+    elif [ "$EXEC_MODE" = "aot" ]; then
+        # aot enables halo2curves-axiom/asm which is x86_64-only
+        echo "Error: --exec-mode aot is not supported on arm64" >&2
+        exit 1
     fi
     ;;
 x86_64|amd64)
     RUSTFLAGS="-Ctarget-cpu=native"
-    if [ "$USE_TCO" = "false" ]; then
-        # aot enables halo2curves-axiom/asm which is x86_64-only
-        FEATURES="$FEATURES,aot"
-        if [ "$MODE" = "prove-evm" ]; then
-            FEATURES="$FEATURES,halo2-asm"
-        fi
+    if [ -z "$EXEC_MODE" ]; then
+        EXEC_MODE="rvr"
     fi
     ;;
 *)
@@ -303,9 +313,29 @@ echo "Unsupported architecture: $arch"
 exit 1
 ;;
 esac
-if [ "$USE_TCO" = "true" ]; then
-    FEATURES="$FEATURES,tco"
-fi
+case "$EXEC_MODE" in
+    tco)
+        FEATURES="$FEATURES,tco"
+        ;;
+    aot)
+        # aot enables halo2curves-axiom/asm which is x86_64-only
+        FEATURES="$FEATURES,aot"
+        if [ "$MODE" = "prove-evm" ]; then
+            FEATURES="$FEATURES,halo2-asm"
+        fi
+        ;;
+    rvr)
+        FEATURES="$FEATURES,rvr"
+        missing=()
+        command -v clang-22 >/dev/null 2>&1 || missing+=("clang-22")
+        command -v lld      >/dev/null 2>&1 || missing+=("lld")
+        if [ "${#missing[@]}" -gt 0 ]; then
+            echo "Error: --exec-mode rvr requires the following tools on PATH: ${missing[*]}" >&2
+            echo "       Install them or rerun with --exec-mode tco (or --exec-mode aot on x86_64)." >&2
+            exit 1
+        fi
+        ;;
+esac
 if [ "$USE_PERF" = "true" ] || [ "$USE_NSYS" = "true" ]; then
     RUSTFLAGS="$RUSTFLAGS -C force-frame-pointers=yes"
     # Default to profiling profile for host profiling if not overridden

From c63f735e24b352c7cd1598506563b6bea0dfdf6f Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Thu, 4 Jun 2026 11:05:52 +0200
Subject: [PATCH 02/94] =?UTF-8?q?feat:=20rv64=20migration=20=E2=80=94=20op?=
 =?UTF-8?q?envm=20develop-v2.1.0-rv64,=20no=5Fstd=20guest,=20openvm-1.94.0?=
 =?UTF-8?q?=20toolchain?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squash of the develop-v2.1.0-rv64 work rebased onto develop-v2.0.0-rc.1:
- openvm deps -> develop-v2.1.0-rv64 (e6803a8c), stark-backend pinned at 260062e9
- guest: no_std + rv64 target riscv64im-unknown-openvm-elf (target_os = "openvm"),
  getrandom-unsupported feature, cfg gates per openvm AGENTS.md
- build: prebuilt openvm-1.94.0 toolchain (auto-installed in run.sh, cached in CI)
- remove aot feature; rv32im -> riscv crate renames

rc.1 features are preserved: #606 input-gen helper, #609 prove-root mode +
Sdk::builder pk loading + root.pk keygen (`--proof-cache` is a todo!() until the
rv64 SDK gains prove_unwrapped_with_stark_proof). The #607 unsafe from_xy API
and #610 vk are v2.0.0-line specific; vk needs regeneration for the rv64 guest.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .cargo/config.local.toml               |   8 ++--
 .cargo/config.template.toml            |   8 ++--
 .cargo/config.toml                     |   8 ++--
 .github/workflows/reth-benchmark.yml   |  33 +++++++++++----
 .github/workflows/run-benchmark-v2.yml |  12 +++++-
 .github/workflows/update-openvm.yml    |  17 ++++----
 .github/workflows/update-patches.yml   |  11 +++--
 Cargo.toml                             |  14 ++++---
 Dockerfile                             |  12 +++---
 bin/reth-benchmark/Cargo.toml          |   2 +-
 bin/reth-benchmark/src/lib.rs          |   7 ++--
 bin/reth-verify/reth.vm.vk             | Bin 91033 -> 90334 bytes
 bin/stateless-guest/Cargo.toml         |  13 ++++--
 bin/stateless-guest/openvm.toml        |   4 +-
 bin/stateless-guest/src/main.rs        |  10 ++++-
 crates/chainspec/src/lib.rs            |   4 ++
 crates/mpt/Cargo.toml                  |   3 +-
 crates/mpt/src/hp.rs                   |   1 +
 crates/mpt/src/lib.rs                  |   4 ++
 crates/mpt/src/node.rs                 |   4 +-
 crates/mpt/src/state.rs                |   2 +
 crates/mpt/src/trie.rs                 |   7 +++-
 crates/revm-crypto/Cargo.toml          |  11 +++--
 crates/revm-crypto/src/lib.rs          |  11 +++--
 crates/stateless-executor/Cargo.toml   |   4 +-
 crates/stateless-executor/src/io.rs    |   3 +-
 crates/stateless-executor/src/lib.rs   |   8 +++-
 run.sh                                 |  54 ++++++++++++++++---------
 28 files changed, 187 insertions(+), 88 deletions(-)

diff --git a/.cargo/config.local.toml b/.cargo/config.local.toml
index 6220db5fc..2785ca448 100644
--- a/.cargo/config.local.toml
+++ b/.cargo/config.local.toml
@@ -58,10 +58,10 @@ openvm-keccak256-transpiler = { path = "../openvm-org/openvm/extensions/keccak25
 openvm-pairing-circuit = { path = "../openvm-org/openvm/extensions/pairing/circuit" }
 openvm-pairing-guest = { path = "../openvm-org/openvm/extensions/pairing/guest" }
 openvm-pairing-transpiler = { path = "../openvm-org/openvm/extensions/pairing/transpiler" }
-openvm-rv32-adapters = { path = "../openvm-org/openvm/extensions/rv32-adapters" }
-openvm-rv32im-circuit = { path = "../openvm-org/openvm/extensions/rv32im/circuit" }
-openvm-rv32im-guest = { path = "../openvm-org/openvm/extensions/rv32im/guest" }
-openvm-rv32im-transpiler = { path = "../openvm-org/openvm/extensions/rv32im/transpiler" }
+openvm-riscv-adapters = { path = "../openvm-org/openvm/extensions/riscv-adapters" }
+openvm-riscv-circuit = { path = "../openvm-org/openvm/extensions/riscv/circuit" }
+openvm-riscv-guest = { path = "../openvm-org/openvm/extensions/riscv/guest" }
+openvm-riscv-transpiler = { path = "../openvm-org/openvm/extensions/riscv/transpiler" }
 openvm-sha2-air = { path = "../openvm-org/openvm/crates/circuits/sha2-air" }
 openvm-sha2-circuit = { path = "../openvm-org/openvm/extensions/sha2/circuit" }
 openvm-sha2-guest = { path = "../openvm-org/openvm/extensions/sha2/guest" }
diff --git a/.cargo/config.template.toml b/.cargo/config.template.toml
index 5cb93b50d..01a4d489c 100644
--- a/.cargo/config.template.toml
+++ b/.cargo/config.template.toml
@@ -57,10 +57,10 @@ openvm-keccak256-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.gi
 openvm-pairing-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
 openvm-pairing-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
 openvm-pairing-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
-openvm-rv32-adapters = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
-openvm-rv32im-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
-openvm-rv32im-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
-openvm-rv32im-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
+openvm-riscv-adapters = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
+openvm-riscv-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
+openvm-riscv-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
+openvm-riscv-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
 openvm-sha2-air = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
 openvm-sha2-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
 openvm-sha2-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", rev = "$OPENVM_REV" }
diff --git a/.cargo/config.toml b/.cargo/config.toml
index 7a348ff0d..b8b8cb9ac 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -60,10 +60,10 @@
 # openvm-pairing-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
 # openvm-pairing-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
 # openvm-pairing-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
-# openvm-rv32-adapters = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
-# openvm-rv32im-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
-# openvm-rv32im-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
-# openvm-rv32im-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
+# openvm-riscv-adapters = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
+# openvm-riscv-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
+# openvm-riscv-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
+# openvm-riscv-transpiler = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
 # openvm-sha2-air = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
 # openvm-sha2-circuit = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
 # openvm-sha2-guest = { git = "ssh://git@github.com/openvm-org/openvm.git", branch = "main" }
diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index e8cbc32cf..e848b1852 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -61,10 +61,11 @@ on:
         required: false
         description: OpenVM execution backend (aot is x86_64-only)
         options:
+          - interpreter
           - rvr
           - aot
           - tco
-        default: rvr
+        default: interpreter
       rpc_input_cache:
         type: choice
         required: false
@@ -144,8 +145,8 @@ on:
       exec_mode:
         type: string
         required: false
-        description: OpenVM execution backend, one of {rvr, aot, tco} (aot is x86_64-only)
-        default: rvr
+        description: OpenVM execution backend, one of {interpreter, rvr, aot, tco} (aot is x86_64-only)
+        default: interpreter
       num_children_leaf:
         type: number
         required: false
@@ -180,6 +181,7 @@ on:
         value: ${{ jobs.run-reth.outputs.num_segments }}
 
 env:
+  OPENVM_BRANCH: develop-v2.1.0
   S3_MD_PATH: s3://${{ vars.S3_WORKFLOW_DATA_BUCKET }}/benchmark/github/results
   S3_FIXTURE_PATH: s3://${{ vars.S3_PUBLIC_DATA_BUCKET }}/benchmark/github/fixtures
   S3_METRICS_PATH: s3://${{ vars.S3_WORKFLOW_DATA_BUCKET }}/benchmark/github/metrics
@@ -260,7 +262,7 @@ jobs:
           ssh-keyscan github.com >> ~/.ssh/known_hosts
 
       - name: Checkout openvm (for scripts)
-        run: git clone --depth=1 https://github.com/openvm-org/openvm.git
+        run: git clone --depth=1 --branch="$OPENVM_BRANCH" https://github.com/openvm-org/openvm.git
       - name: Build openvm-prof
         working-directory: openvm
         run: |
@@ -352,9 +354,13 @@ jobs:
           MODE="${{ inputs.mode || github.event.inputs.mode }}"
           if [[ "$MODE" == "prove-evm" || "$MODE" == "prove-root" ]]; then
             FEATURES="${FEATURES},evm-verify"
+            arch=$(uname -m)
+            if [[ "$arch" == "x86_64" || "$arch" == "amd64" ]]; then
+              FEATURES="${FEATURES},halo2-asm"
+            fi
           fi
 
-          EXEC_MODE="${{ inputs.exec_mode || github.event.inputs.exec_mode || 'rvr' }}"
+          EXEC_MODE="${{ inputs.exec_mode || github.event.inputs.exec_mode || 'interpreter' }}"
 
           # Resolve "native" to the host CPU name (e.g. znver3) so sccache keys and
           # cargo fingerprints differ across instance families (else SIGILL from reuse)
@@ -368,7 +374,7 @@ jobs:
             arm64|aarch64)
               if [[ "$EXEC_MODE" == "aot" ]]; then
                 # aot enables halo2curves-axiom/asm which is x86_64-only
-                echo "::error::exec_mode=aot is not supported on arm64; choose rvr or tco"
+                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter, rvr, or tco"
                 exit 1
               fi
               ;;
@@ -380,6 +386,7 @@ jobs:
               ;;
           esac
           case "$EXEC_MODE" in
+            interpreter) ;; # default interpreted execution; no extra backend feature
             tco) FEATURES="${FEATURES},tco" ;;
             aot) FEATURES="${FEATURES},aot" ;;
             rvr) FEATURES="${FEATURES},rvr" ;;
@@ -426,14 +433,24 @@ jobs:
         run: |
           cargo build --locked -p cargo-openvm
           echo "${{ github.workspace }}/openvm/target/debug" >> $GITHUB_PATH
+      - name: Restore openvm toolchain from cache
+        if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
+        uses: runs-on/cache@v4
+        with:
+          path: ~/.openvm/toolchains
+          key: openvm-toolchain-openvm-1.94.0-${{ runner.os }}-${{ runner.arch }}
+      - name: Install openvm rust toolchain
+        if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
+        # skips download if restored from cache, just re-links into rustup
+        run: cargo openvm toolchain install
       - name: Build Guest ELF
         if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
         working-directory: bin/stateless-guest
         run: |
           GUEST_PROFILE=${{ steps.set-build-profiles.outputs.guest_profile }}
-          RUSTFLAGS="" OPENVM_RUST_TOOLCHAIN=${RUST_TOOLCHAIN} cargo openvm build --no-transpile --profile=$GUEST_PROFILE
+          RUSTFLAGS="" cargo openvm build --no-transpile --profile=$GUEST_PROFILE
           mkdir -p ../reth-benchmark/elf
-          cp target/riscv32im-risc0-zkvm-elf/$GUEST_PROFILE/openvm-stateless-guest ../reth-benchmark/elf/
+          cp target/riscv64im-unknown-openvm-elf/$GUEST_PROFILE/openvm-stateless-guest ../reth-benchmark/elf/
 
       - name: Save Guest ELF to cache
         if: steps.cache-guest-elf-restore.outputs.cache-hit != 'true'
diff --git a/.github/workflows/run-benchmark-v2.yml b/.github/workflows/run-benchmark-v2.yml
index 5de5643d8..5615dfb2e 100644
--- a/.github/workflows/run-benchmark-v2.yml
+++ b/.github/workflows/run-benchmark-v2.yml
@@ -42,6 +42,11 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false
+      - name: Cache openvm toolchain
+        uses: actions/cache@v4
+        with:
+          path: ~/.openvm/toolchains
+          key: openvm-toolchain-openvm-1.94.0-${{ runner.os }}-${{ runner.arch }}
       - name: Prepare input data
         run: |
           block_number="${{ inputs.block_number }}"
@@ -56,7 +61,10 @@ jobs:
 
             # Install OpenVM CLI
             echo "Installing OpenVM CLI..."
-            cargo +1.91.1 install --git https://github.com/openvm-org/openvm.git --locked --force cargo-openvm
+            cargo +1.91.1 install --git https://github.com/openvm-org/openvm.git --branch develop-v2.1.0 --locked --force cargo-openvm
+
+            # Install the openvm rust toolchain
+            cargo openvm toolchain install
 
             RPC_1=${{ secrets.RPC_URL_1 }}
 
@@ -64,7 +72,7 @@ jobs:
             cd bin/stateless-guest
             cargo openvm build
             mkdir -p ../reth-benchmark/elf
-            SRC="target/riscv32im-risc0-zkvm-elf/release/openvm-stateless-guest"
+            SRC="target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest"
             DEST="../reth-benchmark/elf/openvm-stateless-guest"
 
             if [ ! -f "$DEST" ] || ! cmp -s "$SRC" "$DEST"; then
diff --git a/.github/workflows/update-openvm.yml b/.github/workflows/update-openvm.yml
index 2d0da0e67..9c8d0245b 100644
--- a/.github/workflows/update-openvm.yml
+++ b/.github/workflows/update-openvm.yml
@@ -2,11 +2,14 @@ name: "Update openvm rev in dependencies"
 # Warning: this workflow will only work if openvm has also been updated in revm
 # Otherwise, use the update-patches.yml workflow instead
 
+env:
+  OPENVM_BRANCH: develop-v2.1.0
+
 on:
   workflow_dispatch:
     inputs:
       OPENVM_REV:
-        description: "New openvm rev (defaults to main head)"
+        description: "New openvm rev"
         required: false
 
 jobs:
@@ -18,20 +21,20 @@ jobs:
       - name: Check out the repository
         uses: actions/checkout@v4
 
-      - name: Get default OPENVM_REV from main (if none provided)
+      - name: Get default OPENVM_REV (if none provided)
         id: get-openvm-rev
         uses: actions/github-script@v6
+        env:
+          OPENVM_REV_INPUT: ${{ github.event.inputs.OPENVM_REV }}
         with:
           script: |
-            if ("${{ github.event.inputs.OPENVM_REV }}" !== "") {
-              // If provided by user, simply return it
-              return "${{ github.event.inputs.OPENVM_REV }}";
+            if (process.env.OPENVM_REV_INPUT !== "") {
+              return process.env.OPENVM_REV_INPUT;
             } else {
-              // Otherwise fetch latest commit of main
               const { data } = await github.rest.repos.getCommit({
                 owner: 'openvm-org',
                 repo: 'openvm',
-                ref: 'main'
+                ref: process.env.OPENVM_BRANCH
               });
               return data.sha;
             }
diff --git a/.github/workflows/update-patches.yml b/.github/workflows/update-patches.yml
index 84c33ef3c..225d99bef 100644
--- a/.github/workflows/update-patches.yml
+++ b/.github/workflows/update-patches.yml
@@ -1,5 +1,8 @@
 name: "Update openvm patches"
 
+env:
+  OPENVM_BRANCH: develop-v2.1.0
+
 on:
   workflow_dispatch:
     inputs:
@@ -7,7 +10,7 @@ on:
         description: "Optional ref for openvm-stark-backend (defaults to what openvm uses)"
         required: false
       OPENVM_REV:
-        description: "Optional ref for openvm (defaults to main head)"
+        description: "Optional ref for openvm"
         required: false
       run_benchmark:
         description: "Run reth benchmark after patching"
@@ -50,7 +53,7 @@ on:
       OPENVM_REV:
         type: string
         required: false
-        description: "Optional ref for openvm (defaults to main head)"
+        description: "Optional ref for openvm"
       run_benchmark:
         type: boolean
         required: false
@@ -113,12 +116,12 @@ jobs:
       pr_number: ${{ steps.create-pr.outputs.pr_number }}
       tag: ${{ steps.set-tag.outputs.tag }}
     steps:
-      - name: Get default OPENVM_REV from main (if none provided)
+      - name: Get default OPENVM_REV (if none provided)
         id: get-openvm-rev
         env:
           OPENVM_REV: "${{ inputs.OPENVM_REV || github.event.inputs.OPENVM_REV }}"
         run: |
-          echo "result=${OPENVM_REV:-$(git ls-remote https://github.com/openvm-org/openvm.git HEAD | cut -f1)}" >> "$GITHUB_OUTPUT"
+          echo "result=${OPENVM_REV:-$(git ls-remote https://github.com/openvm-org/openvm.git "refs/heads/$OPENVM_BRANCH" | cut -f1)}" >> "$GITHUB_OUTPUT"
 
       - name: Check out openvm repository
         uses: actions/checkout@v4
diff --git a/Cargo.toml b/Cargo.toml
index 2ab8f7b12..8868c0a6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,9 +36,9 @@ tokio = { version = "1.44.2", default-features = false, features = [
 ] }
 serde_json = "1.0.110"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-serde_with = "3.13.0"
+serde_with = { version = "3.13.0", default-features = false, features = ["macros", "alloc"] }
 url = "2.3"
-thiserror = "2.0.12"
+thiserror = { version = "2.0.12", default-features = false }
 hex-literal = "1.0.0"
 rayon = "1.10.0"
 bincode = { version = "2.0.1", default-features = false, features = [
@@ -48,10 +48,10 @@ bincode = { version = "2.0.1", default-features = false, features = [
 ] }
 toml = "0.9.2"
 smallvec = "1.13"
-bumpalo = "3.19.0"
-bytes = "1"
+bumpalo = { version = "3.19.0", default-features = false, features = ["collections"] }
+bytes = { version = "1", default-features = false }
 bitcode = { version = "0.6.5", default-features = false, features = ["serde"] }
-itertools = "0.14"
+itertools = { version = "0.14", default-features = false }
 actix-web = "4"
 reqwest = "0.12.20"
 tracing-actix-web = "0.7"
@@ -152,6 +152,10 @@ rust.missing_debug_implementations = "warn"
 rust.unreachable_pub = "warn"
 rust.unused_must_use = "deny"
 rust.rust_2018_idioms = { level = "deny", priority = -1 }
+rust.unexpected_cfgs = { level = "warn", check-cfg = [
+    "cfg(openvm_intrinsics)",
+    'cfg(target_os, values("openvm"))',
+] }
 rustdoc.all = "warn"
 
 [profile.release]
diff --git a/Dockerfile b/Dockerfile
index cbb608496..4d8739d8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,11 +17,13 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV CARGO_HOME="/root/.cargo" \
     RUSTUP_HOME="/root/.rustup" \
     PATH="/root/.cargo/bin:${PATH}"
-RUN rustup toolchain install nightly-2026-01-18 \
-    && rustup component add rust-src --toolchain nightly-2026-01-18
+RUN rustup toolchain install nightly-2026-01-18
 
 # Install cargo-openvm (builds the guest ELF)
-RUN cargo +1.91.1 install --git https://github.com/openvm-org/openvm.git --locked --force cargo-openvm
+RUN cargo +1.91.1 install --git https://github.com/openvm-org/openvm.git --branch develop-v2.1.0 --locked --force cargo-openvm
+
+# Install the openvm rust toolchain
+RUN cargo openvm toolchain install
 
 WORKDIR /app
 # Copy only Rust workspace files to keep build cache stable when server/ changes
@@ -32,9 +34,9 @@ COPY rustfmt.toml ./
 
 # Build guest ELF and place where host expects it
 WORKDIR /app/bin/stateless-guest
-RUN RUSTFLAGS="" OPENVM_RUST_TOOLCHAIN=nightly-2026-01-18 cargo openvm build --no-transpile --profile=release \
+RUN RUSTFLAGS="" cargo openvm build --no-transpile --profile=release \
     && mkdir -p ../reth-benchmark/elf \
-    && cp target/riscv32im-risc0-zkvm-elf/release/openvm-stateless-guest ../reth-benchmark/elf/
+    && cp target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest ../reth-benchmark/elf/
 
 # Build host binary
 WORKDIR /app
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index fcc781183..b86a1ce16 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -64,7 +64,7 @@ ignored = ["halo2-axiom"]
 [features]
 default = ["parallel", "jemalloc", "metrics"]
 parallel = ["openvm-sdk/parallel"]
-metrics = ["openvm-sdk/metrics"]
+metrics = ["openvm-sdk/metrics", "openvm-circuit/metrics", "openvm-stark-sdk/metrics"]
 tco = ["openvm-sdk/tco"]
 aot = ["openvm-sdk/aot"]
 # Mutually exclusive with `aot`
diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index 3847aaa2e..dbbd88629 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -71,6 +71,7 @@ pub enum BenchMode {
     ProveApp,
     /// Generate a full end-to-end STARK proof with aggregation.
     ProveStark,
+    /// Generate the root STARK proof without halo2 wrapping.
     #[cfg(feature = "evm-verify")]
     ProveRoot,
     /// Generate a full end-to-end halo2 proof for EVM verifier.
@@ -475,7 +476,7 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
     // MakeInput: encode stateless_input as JSON and write to disk.
     if matches!(args.mode, BenchMode::MakeInput) {
         let words = openvm::serde::to_vec(&stateless_input)?;
-        let bytes: Vec<u8> = words.into_iter().flat_map(|w: u32| w.to_le_bytes()).collect();
+        let bytes: Vec<u8> = words.into_iter().flat_map(|w: u64| w.to_le_bytes()).collect();
         let hex = format!("0x01{}", hex::encode(&bytes));
         let json = serde_json::json!({ "input": [hex] });
 
@@ -526,7 +527,7 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
                     println!("BENCH_BLOCK_HASH={block_hash}");
                 }
                 BenchMode::ExecuteMetered => {
-                    let (public_values, _segments) =
+                    let (public_values, _) =
                         info_span!("sdk.execute_metered", group = program_name)
                             .in_scope(|| sdk.execute_metered(exe, stdin))?;
                     let block_hash = hex::encode(&public_values);
@@ -639,7 +640,7 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
                     {
                         info!("Generating root proving key...");
                         let root_pk = sdk.root_pk();
-                        info!("Saving app root key to: {}", root_pk_path.display());
+                        info!("Saving root proving key to: {}", root_pk_path.display());
                         write_object_to_file(&root_pk_path, &root_pk)?;
                     }
 
diff --git a/bin/reth-verify/reth.vm.vk b/bin/reth-verify/reth.vm.vk
index 3b7587945af695b1a037fa6fc2cb196e79985d99..327ba8cb4ffce69aa022e34c93d1b0af074b50bc 100644
GIT binary patch
delta 11739
zcmc(Fd3=;b(tlMwlgV%fNRXQV31<=@K_CHy5Uzk=0whmHm_Q%|vWlW|59rJQnGE2H
z_@EI{&VUetSHP$!hsUa`>wPPiuDTuw0tyN`@3(tq0=mD?zVG|{{qgIb?&`C;s=B+X
zyPsMAa@5hoQP<eT-qc27H|#dUPQ%*A*_Cf5b|EHOWQ(>pv)g*qC+#A@p>wtoYp?0d
z$!m*K?4gRaYsOqv8VrsKD!1w+qV@Buf~`Ha^tGp2aEcYpyP`|8{eFL-)H=)^tm8b&
z2>AV0s<g5)#bJ$+{+3swIbfAbJ1Gg&Y?nYx^FXG*DB$q>okb3tQ~4GCl5F&k^Q>5r
zzhZ=QMH#{fr&C8O%2ci_Uljr>r>ep(5GZnLA5hK<7p3r)MM7yH+i#YFK2Q}X2}A-C
zK;SPbcb0;XqSC;OfWOq~w?1h$&{LG{^p`Ejhb!<F<c8dcK-v67xr-L5(m%Sg{0J!;
zYO;}15WIv*4UrAX3l^1)TC~Vt9zePzTgeS=?K9H7AR^#%IA#U{*<dN)D029{rKOG%
zN3MTn^gK?_E9y2Q`xeM8-P_We>vwp)C8c%;Tv6EP<vGZk=gf94DD&r*1m;KQ)%1#+
z<mi$I2D||W70t94WJZxU5O4-YILn-YvV0JMgwvUyA7vemjvG)~1Th6l1717G2n0s@
z$!?#yg6uO#BG`+HX3hwB9ZrYS3F(HSK)%zjFj?HXd0GH8*ZnBZPqd=M;Uy=bvBO!8
zI0P_k6tV!;<BqtVPCw=hb^cHpNLO^}tSVhGzW@Ty%Z$p)A7NW$SA@p=iBRighn6uW
z1mUMJ0p5T@Z6}Ar=`FKvt>3P-l5+`IFU$8U^hhGV=$6b(jnR6rUUO@3dxxiv`8r05
zlqd+8l`nFvP)p3~9qIQ5Ft`3PAXC8!%)sdMmlWw#2$qHOWhG9#8t}huo)_--KW+b~
z<|SSXuKI!?KQf9QEs9uADfu0xUPn=&=>ILDMu_}MykK6r|3jiqe*P6oa-OgNl@Lcc
z^Ryc^l8Wpzvi-|1uYD|ihaVf#K2xnkXo!F#GS_NrsA`SwN^CZ*xialD9DeMXOh1)|
zcLY$aaEvS}vf2HVfgVvskcXNky#iEJLQcDV(fm?uE9@jF0iY<w=wx>kdCBg?Z-v#{
z9_I-ys~P3xBOL`JoihqXj97$45EYtrC2fTH3JVwtjI{Y@2GSKLEdyS?r4)mK5F<Jn
z-e6EWfud5<yh06W2JK$L2E)eDgklN<NOl3K&|m(`Y?tVjjX^PRD8^)4gWI+8sAeH@
z!*M_{s#d;Q^H70mRj6rDUdy{wbpU#$P9SvURHG0HD#mtEF?NnB{_`f%v!cc-aE_YQ
z@;c1G#G-76Kg)lMEgAx)nMxAsS31)V)PU0hj%+{lGSrg4G?44}`ZJ-5;k~FV#YB__
z{9g1}7|m<9v}yOznJZkbp6$JZo;-Ty%%CR+Nlj{}PHbg%+HFltXcg@b2G4d2#-Ok@
zTX!YK7WWvR-<-VO%ns<bc}HtH6ddww6<vCCSx)|>sF)ZEZd%pn&<ig#IDJcA{?MNe
zMd#l;G{2<zq1{=FF6^$#YktVc&EHZ*r>DNZylPjEn4J^y$>t4uyutH3fpGSoeIHCR
ztkh0DJVo21_;_<~)yO!a%)Y2Q<e{B6ke6a8exI-Y>7mWr9}jjXLg%f`4ta8KUz9I&
z=wMY<k3+#1URYf{oi2EW{&Zq|JqpI0jyXN#kTIw^(ZYOcLX?|Nbm37?+s#$<?U0>S
zo2#k_CEkiL+b8VG>v4E;{`ww$c2@}o4Y`qf2DR<b_P`hlHZ%@-#Ky|(!wI|re>Hqx
z>T4b8d`+~CY!pRNR>v++8$_wr;gpV6RqrO&>6G3z*<D-Li)l;ks6E9~2kJ<jD8ah5
zcWm?4)S4PlJp|RgJ`hBc-CC30u45cEr>m$1wS;el@<i%PU8pN{qwds$lBkXKUGH)A
zqRD~Y^{GM4(A47&D|O%uYvq9ZZ8%&+*K`~hu-R@323uHrh9uiu!C<^~WXQb4ZNcEI
zJAMnsYzzitwgiI<-N9h5a-2)n1%p$Eq3*U|aE`S&vu)yc!C==5!QhZf=y?hV73066
z@i{a+fX<&FUGsFNjcv`&qs!r;UYqVaBCEG;4%%Duv)-~XMzBT?d$my;Y6ITmA;7s@
zY+b)C-Zq!Fk+pPNd;3CO$X}2(dw4vPb?5N*^*VEBo{P}Are^po2Nd2aT7$vwMc7UQ
zc?b{VQS9QWT+FlhMxKMlS+p3nK3)!_t9cXM!yD)UUQb&wVLn<;dwDNE&)NJ64`-pb
zITP{6JP5TXcsY7bz@)b{+8TSgqmhL9b6`r;6vR`a_4K%|QA24A<<@*XuE;TosWYn(
zM~nG(_Hh}n<iGM-zL(eYL%fBz^Df@QkMll$8ay227x-m<jo;*V`9uDckMS4$HGjva
z_$;62iyD(n9MVvlh_%IR-F1|Vk#UkM6UCJ4#U)c^x|B$%+$cB8t)hgeM7Xf#UnWFT
z4$_IT={|_4iUxtL;b5{5Y|TKJjW7@4b{<X30RQY(gUTp+1~jS~Fh)+DGIgAXc#M?M
zL|GxNjdsRt-Cb<~re-?sZ2d5`yKyaL)wC_@Ws8249;3(U3G0^0?P})CxZk*^G%B`p
zl5&YU4n<`BI4icMPiY=|au)kgmY<rGGf&m!T%DW@FgGa&g(`0*<)<Z?W}2!DJ5NR=
zrD1i?%USeNZmuui?Mq6_F-@<}=Sxu-BQD=G&CB_@9yL0gnYP$xdJ9coN+_>lG(|-+
zNC;)n6V#|eAWqItQ+O1O$R;P{Xu4JIvYU&slRO!r@xX@e7eW_l<VmW$!nu~X^kAXd
zit0$KItc!9fH5gGzo){JT34Y6O;R;*dc4J^HzKCFNlD2`xk<?|?KUiGJ7S{7fN>OO
z)xWVkwGAb5JatFt#wpzEzx4^$V>fn;@52Al-!r?p6*JqeLIa}Pu#o2S0`6jE&K|~X
ztT$$7SjT49H-a2*-95X%wP|*JPj~*$o@gl7%G2_UJSPXF8y}YEr53pZ{}=GQT##Sn
zqFj=oQsZJ6wshkcWXZ7oZ(+?-H(4#)bfGeAzyUOt?n2y=EP8-8(pHr1v~KoKj4Go?
zXr0xrSAvz*tD9#VZK4gdp7w<O0Kh+nvB0GK9-7LkW|ofU=y(8S!DrJQoCCNGVG<OO
zk5)qKWnlxah2Mab33UXIR34Pl7TyXSxf5YhE<4%eJS0IL{8+%TAV8_dEP9py4jqz3
zZ}MBvCRy|$e*`s|MaTF!;zwy+Xp>V7?WKM6B-PSWR%)+|R@qQminMhQ#Ur!;dSe!F
zhS=_9UDvB^@;a1+{4{aPERY@&!&VTVh0!}0`#`~Pj5>&|ri&A;<tqm_&A@_fgX-Z}
zwl<JCq2`m7zcfy%r01aT4uJZDw1W=O-;qCn^dWk$E_Ec5dSZQg{g?!-*lyedaSu+!
zB7A&UM_ZSW1sW1EJDy&!BdXa#cJmUxgFU<q_QcQSyoy)zUA%_xVT<qM3Vwh$@J8MQ
znQr49{4iJXZhnLx<tMm?pX6G8hWGPxe25S8i~JI7&a3=7{{sSjo8RO2A<&QcGd===
zp5TA-m;5jOhQH^NiF}%W<a7KJU*KQ(68{ELNJOIW+)z*IOCxD4O|2U%`$lKWwQ`+|
zw+@*tTEx+lQVbDogJJjr;Ymq=lpnS}uIzj5bNr+{1g4IGr9@eXoJ+RA{&a&;*$yj|
z4AZg;wx~A@%pO>zt6^pyhh0jCvDpXfGzcc=Y1pVtxwU5McB^H(ffS(CbSEbEZn_7@
zkqWHiO&EFyZ0v5U#ewmj59lNMjE>Rg@L$unbQ0lPI!EV`yM*#6GT6>Ls3CtuP5B&M
z#peN!q3$Fla6>+cmOJ3jBahP*_2-bkhKKS99?fIm$HHF+p9?<$3)#eip2SnQh^KjY
zCYSPG_-4L^Z-vTP$cwRQZoqc&@(MkbS>)$cbf=!qEVB4cJ)v2&0Vy@5*iuNTX`M~G
zus%X-^a)I>vgiA8j8GH%0;ctEX#0|$*erTSPiz)>KG8FqMW6HMFs<K$lat{19QZrS
zU(*E$^K)V;ha_O~xsf#Gt2j<tNNc?5bdUt;A|F8xDbic|NI%JtK{7->qv3Kp*vO(>
z8IO%K7wy#Mx?Pq^3fgo*|K4cPT8`ZS#O0KNZmngwyeKat^`cyYAlu1%@}Yc9pUH6`
z{t_g-2h=HY8psm359)TH=S3#NFn)((tY_3SmZ81{TB`obajc4>PR34Xh&OSPIcBYW
zCBf=;IJ2ob*$t&(Gy*ndERCo18sFiIjgt=Ju=)bRO9-#fYY2yte+j9V!s*v^9_3bi
z)evj!-m7XZy;WS#C|t79D*2?RCk+-c?3E?=`P{Ao4ON6A{biTusx+6lTqep3l%dw{
z3iAk4?KY>I1@7vl8%=LGa=Xl`r7qVdAT>7zwxegYZ&{&=c2_@C?JKZ)eA?3UhpMV&
z<vtV9_UZ}MQ(R_2adF*fZc}*|d;$D+pYp|_CTZq)I54spP8oSP)u=%CsH_Yla-+!9
zSQMUc!s9Y4O}Eo5hF8c#=yhL}Rs<9jm|>(58cfrv{6?UQB-D5=(_QXUep$$GSA<;Q
z3f%6cOHEfDK?P~<N{^ZVZ=qWOj8qV23=GsYRz$eX$xFR%U!hrm)^$^a2@9c9gD46L
z+{rm1sxepQM(w9#UX*vL0uu>Ew0U(>Xar9kJxdgEeN3~m5-pSrAuTt4K2WxC`evNo
zt|Ur}#;qjduB?uT0hCo%SIs~})j1-YT!l_Ep+<m<$XSWCy<%E3RB*YG7ExMmYHq%D
z!;ub_>qN|GjZ!gKH-RB6OB6zPSPVd=-4fG#g)an!%Bhy7+d6zC$9n5XwAK4)PwU#F
zu?USCrC;gL;@SiyO*ogCu0*b92O<R*OF%&364&4)SH+10ZkeVJ!8^)#n7LSkrW>oh
zc*)XAuM^XU9iwLTN|#>lF0h6j>+Eqanem6YQ=(Q<4{?Q&uIv@&IUUFD(E8Y|_?dy?
z%ZsV5J$mA&(0TPb+-@err4^Wy&3Wd$&;qUYC<IsruCUb6I<(+6s+nK1)LF23`gEsL
z&w5DY5o8Lxo`(pn+p$E7aT9R5eNNZLjaN{vxTxEz;Oug4x2M{>R1vBd`SgM%W-4Yo
z)$LPUM3zT*obaYA3^Tjbjb#z4(#uBmP%bP#HGGKuNI^(q<-V}!kns7+8zWk#ihSF#
zOkLKAqj7^m)2r5~+uS%^#mc+F+h>Xi{T12m;Y7afQn1nGw#J@__k??-=cd*PDS`t8
z{*fIY_Hu;L%L#S)QBHHD@#vI}LSw09an2H#=Dkm0h8h5CUdhp;7ejIy7U2?IeR+AP
zy$u0hIR(X-{(P)%w~E60bcktU35QBU!zsKPZ5^$3#D@8aFy=O`4qvorQAaOS6+8sI
z3<|N>@_ydI^G6936u4a2xL1Pdn_Nr%*h|V6n^>@BSi*XlC_1nKp`zdl>Na?e61$!l
zrI9y=WM`V`q3wEEjha@!&tp8wd?}eJ1flJr6<c_cu_H9@Pz-t_8?L<CnPx(fMQYvd
ze76gG+tv`K`6+o;4#`V63cM<>%Nz2Ryesd++<zjU$x%5WU*ItCFZou!ms3~Ek8)Oi
zmET2-XxRS-Mq{Ii(adOWv@lxXaiqP`!ALMV8(obaMzYb<NHzKxeQSRFqOgf)4em1!
z(H44`KBQ0RQ#wi~=%4fzeM8^VDf*Gl($Dk@U8LU$#~+Sj2iNBY+?bniEH~$t+?v~R
zd+xxU@MO{zcfllm8BOIr+?NM%2B+gvkjW*u9^8aW!hGC)w&9KE0i3({;M`s7LE+mt
zRzE^t;W+&*j?+KjG<^nV>GS+6PSU^QByHd%9gTBzLy3{55-V3pD`_k7(n&f?H|ZhC
z(o52$ucXUB87xC(n2eOMg7YGoc#65wPnBYvm}kjfa8ABSvSp5V=E-e1jg`?dS&rwD
zGVx2f1Z1VGlGSpj{8jFfHFCGCm3zdJb#kxVClzwPtd|F5gFGk?$wt{En`Mh^m2FZf
z+vP*rDZ6C1?2$+1ajB7gxa~eI`*Hg{D2L?*`5R{QHTj3UDQ{ywKk&%M@+qeCn0zk(
zl&|F*`A$yCDLEtO<Y!!Wf5q+gcM$jtH#6dltMHbiX0f}GME&uS(-0@OzDUL59M>Pm
zs_WoKsfSIPtbKo!_NP4LJ5f)h2IAQ>8)v-{IFjb$t5gBiRR4S+I&~W+WgE?bf016M
z=W$thlis1XX(cWNpWs@s3X9?k`Vv=&XR$EgYc~A;pfPnncv2j_B7YBa^qzbmAAzAG
zVTQg6Gjv)r^qa5|WjKubMnfaUXllfQp_YbvqKY><8i__1qZ{7vQjA_knsK$!ul7D+
ztk8AzAZ?~f+C?AZ8heC}Yf}D2-_Z|rn$FNqbb)@Q-zZ4THjd_ce3%+>3^(IAZo#d%
z4Y%WX?ug4{=pvcSJ-Iih@zvaq2XhvW)Hji-xQoofZDbC6aUWN={A%0`ALFMy;hXK3
zxOaVnJJ(6vx72O#XMNYZKtUF<>6=~y-1C}9Gifd@rH!<gj*=){rMo0aPf3-lrN0c2
zYa~;$WQ2@T_dwjc2`BW+myKC8O|JBWe1rM2P@-@l#}ytg5pAqNy%Ig|;=24kJuF{x
zl~l_k@|Zj!d*w-a3NI_q;%(&+URPey^Age=??7{W1kG^-L@CYjRakTUpcThYa$diy
z{HESjKu~O0aj5y|VW?+A8$t`}N9mLaKe8>>9V0PO$0{{Nr>3C6jN0_({C;%OR?XX5
z9siA9rPt{n^cKAfvOmB?Dn+9%n@ZJuU7OyHtBla+ccR4FZ#(dQVY6aK0(W$HaUbyc
zmZa-*QDf7bmz1BJlhnT=DXAh!mszKeMtPF)YzMomPB4-CgI23bBfC)r{R|V6;hXQ<
z=G&%DDVdRGcpG#@TIeorm}IZd^cA{&DPbH+V@Gfx;S0Y%s%OcN^8l#VPGu(C`u)<E
z5-}O!CJ{<>|45Xfo+j}w3DX{OnyN@9Y#LNnm*-p_5GBfPL^^uRG+l{DS6DX{!G#Qq
zE(#Tx=3)$77<rcUC@L~^z2?uCf#=a&*lJabMCh>;Pm^#FoDoDgqT^Pw43{Nk^t=T~
zmE)iW=2c?Zb{ua*7b6^!cUK3ht9Pi0$uGp?sz#AqN7m&r)m0$m6k&LUwau?M-<hB5
zx(|2gJlve8L8-gt4)H>d*kI^FdSnomSYsMO<0?Mw!lzoi-%nb0?>T7b(B7@$hfnD-
zF)w)4gl0xe#fh%GyK7h2r_laSg$C#Y9ncqApg*is2CUUU*s5!w6NXf5=mv8(vEpDi
zzQ!|;7x7YPg%upY1H;|Cj_>COc{5k?POgTA*vn7xvwQ$wDgK5hxHtG6{(wK>qj*R7
z3I^>57_*;Y%6?~tA&Zs<Fk-Q|oVS4iOMrSvg7NAD)i4m3dS$pq!*u1y1j!etOqMA!
z&8n?zR9n@Z+t({uNq?oabU#(owLFe<csx(!d@kVYc`{Gu8~8R*s$RgB;svY>)ULwk
z4Mp$0n&O8v&D-^>SB<7vy>h8f9B<$g#|QYtaTHHX|E%~iiCa{R>BDKYEBf%o=%f+t
zxogwLjq5{o8_|vGJDQ4poQ-4KH;=xmQS+vbsQB2ZMmAfcC=sf793reZG?48TCkOId
zwFd@)K2JlMC-d+DL_wxv4LkEJ4HwFd8ZMGK8ZMT(8oFhnhD&6LhD*hx;q9_q!#nW0
zq40TRwT50<qoGeM4VOuUhRbC`sN)LRqzlSqn}&XQSi^GJtzkeO)o`WMXt+vhHC!$G
zHM~;}YWP=qLBqS`WewNJYZ~4yZ)&(!-qr9PoCFksmUuqZiFI;J!+Yfm4e!I7j%rXL
z-)VTioYHW;oYn9FIj`Xcxv1fT64dY^F<AB6h`$smxJeplxLIN}+#<0WZj}}qZu3YR
zov4&}4Yy0YMzjMDjtarU(pAHqlBD4->7`+n^wDs)^w+Rj25PuRhG_VR4AbyY8KvQ4
za;=7sOOA$5$V3f?)kuL(?3KwH?vts23$Z5V;f?Dxc?V~p<2d{LAU}yBC=RuDqY=(K
zZH!Jh>-0AI*P59ev^&0qu_qirYYRv5Z1Je))RSaVj^L<=<K8TM-8FIOQ(t*aDhNYo
z7+xQSlfrOv7`no+FbqvBG1Y&n6rseVVws^~iOke+79Lww`CmM8gHGHivo*X4udb?M
zj@+W*t+Gf=pbDY66o&Z1r)$r02u4u|?bl)WErrlu;1JwFp;0b!2%e<SXy?fjN*Ej(
z_Hzosa}*k$!(=Q53E3bd8yeKqUt9aLf>E>skHkuTi|J`RtuDt~uu3cG?c*v;L8$eb
zx}4x^uBr|DiZR!616&{?ja79Kgf$Zax&bn|83d?dg&G_GUapY*d+EQIWaEIoK-S|e
za|6OAgl!0e`4VLzjLbn)h%f_THo`oFHpX&lYh0rC2nmMb&`-1RCHZ;qt)Qtxwj^o}
z6OGw;tv2ZvN=EyNgt6SkGXO{BL39lb#!?)GBXc`E(08N+>Wq*0DU^!RER;8-92~A2
z;&>g4gE#3^0glxT>3W)k15ra9!n<hb!l!?gFT^oi!Ksv{p*oVQ_C**?!D$#1up3Rs
z(5j%gZs@M~??5k7TT%^KLNhVMtlHCKIW{V~5{JWQ=*8Ol6JW#enW_@9&A=!39U4B2
zuPrLS3twIotcQ3vjL04wDl=eG+~}=803+wF`#zL`+d!>u|1@wD?MK`OFavjhdicQJ
zG4hp$-oVxIIQ<Ju7lMJ3iq|J{o2K96la6X!FVd{`^hEx<;aPym{Qu}1ga`i_x2xKb
zPJBb~jE2d`huy7P*I-)tDfr0pM?ZiT%M$rd!6QD{Y%yk06oSK0cp5;JO_L@@7Bw{n
z;PwAczM^mvM`y&N8h?e5EGV%lh_kQ|l*`1wXNJ&d8i)HDRNEDPG)m!XADRRk8}k%B
zg|Ea8#M)QjUlyw?*1C9b#by`VD&BO#8gDMdw-(QN{Kw=}@VA2i=Yzj_=HVY9a3_ME
z-xVAZcP@DFH=R^jxP!qt2*KJ9bx!sE?V=Ga$IqO3<NGsbzQJEELN1O|Z~<#%w?$D*
zbQInPs2y|54sC5sxPei>Q9=VpVnd>O6}M02^oE|$e{0n^>d!+d72i+g2EC5yAryK4
z=G3@<a2`8VbSdIBZR$5{)HtR|(`K=)+O%!gKE6Z8P6>&fyL9c=y+=~*D@Ay#@cb_h
zF!<oTh>|8Xm`__~PAj1YCVUo6Kl+Z2r`Y|k_M;sWKFg$2>rc$5jLE;`(&#y>C)257
z{JmmZ!!`pbW$SJIschZZPULNUX&k+@yhkE++tu0h;9tnCDRbCIO-Z(7^`xY)_s^%v
zFE^S?oi0`u)ASCr+tb@uKi`59w-nw)k4%}|jH>o^txvbRIxnE}cf8sVy5Z45lv{i*
zpSrF6W(2iZR}GER&p(&$HP23_w@SGWMIUIjfRc~Bw}4(5{bB;eE^fv2eLpLkR^9Ar
z*_={-`K2Z8IQ057+9;LNXlwDWakSv6EGLyev(BW)=XP+?(p^0}(mgY-?@cw^_qU?A
zH;))c=Wl&|9A%^hd()hz%@)$&e>|8<>-X9w(37{$oJr+lzGzKJH=gZ65B}W0C6z6{
zV-U@leD^4N_xL>yns?;fFuHrq{jO0o{-a5~C~4)vDYRlly?ol=uh%%5I{WQj^!<jH
JJO7Wx{a=LD(~bZD

delta 12797
zcmc(GcVJXS*Y`Oy+07CHp_hO}3=m*LNf0SgLTEw7gtB)RNFb2HDj-;pn4r50$!4)3
zUNE9a5fDfss1ajBR8$lT*c%Gieeihz3!;?$elvFyg1(>c_r3qTGnqM4&zw0kb7s!D
zn=fCot=?-JY8UqAQ6%ir9wqHGs#7bw@-2j25EB(eMcZ52qk6`Wc6Gp^b5Ubg4DHIj
zR^;`HvQv6T^F-(FEB0K}dtNv^Hmuz3KOtJZureI)i%ORXJWpK2OZX5A?!pUrs_4e0
zF`t-Cd0R6_t~VnHmmkUq`GX;^`4V?B5ArzS4VryLdvmyOnB&9%d#N{65Gpf6KvY(<
zMTFww9q5%CN<(l2J-Lo3kMbE_Pp}j?TKY0FJfl6Oqdh8=mX)ap8C{|Zbw=gO>K*Xd
zv=6~K;5@nBkj<zIp<pQATUO`|g}mO7Cs-FkC@3o{a1@q%yug4i`JtfKV}8_Ph|g9~
z=pdVNu3#|a!3;d1vU*VF396j_JD;j+WYt7^L^8qB0*}}2a=8}TiZogvF7<fIqsz)w
z>0ex_&r?4)m8fHZ#SYB`T?#HJS5)RMDlMN~6jGUBJ|?N=l@^qtTt~27$e$ZjYzc-a
znCl1ygIPf;@ZOx()<4n~Ob<py=R44n9R(qBc!Gs~IO-TA?Q<Qaet+8NvW&8_(gL^F
z;R<>dWz~Gza;l@Nnnfr?R9LvcHkk+`lzB>Bh&=cUAyI}&nJa7^d_jj-Q{c^a<mTp%
zK~xxpK=#5hK}X16<}Y)3RdW@2%CJ{}qRf@6IIdzKQ?bVu#2TIdODk|tnkPsOzs(P3
z_!pvg1fa3XDsFg!{-MBA;83`OeqB(2{edn8A*)T$Q;spLEJ`yxi$M5j+vGHtYm|TX
z1v7B?!6Hwo!lp2zn?_vVwFRlrQAeC27L^x{N?@za<0){c3RjR6Ju0J$axEW1nM-Xa
z5B3gbjU@8X(NUZaDmt1IqubQ;@;o2(+D0%qf@x~^I~-s&P+-p~S`;#jhEP`Eu?JPk
zf*@b#L2iK`)&G5S-~VU(zcjaNz7=T3d5}?bC<_0^EqiXrZ^wRh{3YT0d(l6aV8Hr6
zJ4Vv(zev>WEN_OlZaFMiR61I_h51obnC1)S4-8#!sB%N0TyJh6wm)D9RO@6g6ghKg
ze?>RS63Y2X`sF$t`3`^NsNryCgmR<oV{-LkdMJo3sg_DDpNc$oe?da7-(7CUfyHhL
zW&njBVvBP9WOwBHZMlAPfvvUA+J|X37kNt;6qJs>*)_Q|+S>AJ52(!mWa`voLP77S
zTyHS66#FR@a5$`aKvaaRc>q-?a(W@OAw%reR3r2A;`I3;oi12EAFv0#aP^GL0=d}x
z5O*rFj$4_lTv3B9@VCRH`_?UpB1~@)y>%4*>R2>5Gpa!$22(?VEB+8fiiTxoioKQZ
zzdlq-94a;yl`Xs}$d3GhwqR*)_k73L1y~nHZoQ-_ECez%Y!eLm^Ftw=s!(ny=qPY_
z9gqTr@EACV=>>ychr$=#2p4bz*G8oe>zg$k_94Bs@=u@3Rdb^AC2a0WY#-hCOnBYc
zKYS?Yz~=8=TIOA`tg@0QDoQ9s{XZl+7e3;$9rm?eT=`zlq9QsKp1g)Tb(-!k-&h$_
z89i)kWo%{7Dw^K<<vlZ8n=7f4zcR*U^M@-tO&;&MC2duuxR}m_<(b`MZA7_q9^Ls-
zJT85w&)Mq|dj6cu`Y<Fwl^uhfiX&GOYIc|pZ@esvhi!dXo*9ll$HSSE#i_W;xE)uZ
z4Q?yjDPK|13Rf(J`)nOHq$eK^^Eo~jUF6>)=<xO!0=`N-I>Ns#my=tkosD+2p6qJ9
z9wo;oZkyb5)fHWfs(Mc9Q{Zx8Ov}Bvbyc}6-Q#X_c->4ol^MnA83QNaCA^Jn=D2P{
zqes(d8bf2uyShEo=u*0r`ol-nj85`38h#OVq6E5_I@2YTNL_$H>Yz|4*N8g6#{$Mu
z6nqSjHbxvxc5;xzoSD?#oZ2%csXfJ`rVCw&uPb$<B<fB*s3$oonL3(-QpPuO09y>O
zMAs}&Iqc|&RgOM}@Mk#O=Tta6{A4(s`D-{l<L7XAzF9u_o0|EThoYk9gu_YZ>EX#y
zQ_;+HrrqSbCLA8HF&v(K+u3m3hH!Y%+Hg3o7?tICldVMmk*J%maGwiDpF^FRj)F(d
zh8L;v>dKA+vl{nIIGj*NhZ_F{wEYC-s@;zmOSSnD>5o7kP?_-~{vCDfWH{PvobHcO
z1DVUy`<i>w4@8|i7mhP4M!wN1krTjO#lb}Qfy`9K=5?bwMQv1xdq#D#e@)A{xiEJ=
zoY0+<z@t9Yj|R}?G@M4#Sh|ujX%e|<8qJ_Q>cKs@jC<6a9yQzHD+3A3C_wknN?J`1
zA@?Ya;taluv$%l0JQvT-o4AM<b2{CE+S~a~uA-H^g&yRMw2?PZ6*fx%HA`t1@8Y+3
z0>8)OS<vS^4)NDK8udqcvT$Q3*l3!VEeb@Qm?>t69Px7t@e7JiBkYlTCA!Ox%=gFl
zkM0kuv&g7va&@l5*98;qp+g63s>`_*-NDP*<O+U}*YQT)!d1M3Yq*x5<K4W6_wt*V
z;=BAIf68C*5&o8c<bU%C{*C|Ov&_OK8i^(%5x823cA}%WSacEHMY8BCE)@gC5RoQE
zi41X-$P$X`sh5DzT##HSt`T#^d~t(VD2hahxJ?9vS{1BDjl&II5@mo7chU;PL~Cg~
z)zD~gVLW(J2rkS+Scq^dLXgK{7P{dD(Mo=nSAtKk@Ef`|5AjT$nxW$y#0J<^M%N&2
z=qARZU^$%;z2vL%b@Q_sLv2hGD5EAmw@*~`cG^LY(c?8)`8#F%0Z!$jb=)vw^Th0y
zHGRF4*_WK@51`7G;>=9$6=~y|m6D>8y`0HTXR4}AbsEW;hJkFo3)HpNB^A~66;7w_
z>~#7D8U8_;$u7ePz-2aQ;56WL-e<*wG{`iP{W(U!U92dobB2-X%rq1UaH^jwP{9er
zP9sa<(RD7QTo;UDq3{KOE-=9wPfbDfv(SM?t4(HJ16Pvm)(EYtZD|&45MzERPRu`f
zt;W-UD<BkODbDDWGux<V(*S3tGczSKItsTAM4=rqQB(8uwRa^n#i8%c9jF)g=6;+=
z$$S~&LEIB%y*b%@X-<3dz?_)QNj&MFy~%Uio6Y7rdi4gTfAU17*k9!w!Wga0K63||
zX>%Rs_PObtU|v7>a??N8?(4<>?1?7vt75NsUA!sY5(ANb{eJ|djFL7PEgkZ8k;F}8
zQ{<3N6_LdMJFM9<&uo`iMuTx`%5aq|hpZb+SJC~{8M5zTdW0%bvYj3`UBOAV<y1>+
z%oTkS&98!O%(wcq@Kw<k+DIGdsfZs8cwx8-*pz>YysT;#=(tG7gDD+816<7ntU}1+
zdpSV&LWZW}Y(D_M5vdvcF#HCja<~${3KI8mguG!qlV@-ak}K&2eu1w7yb1&;QJYTh
z^9K+x>GUao22qnvNBAp<+;sYp|AqKzJ(ZT`d%<pcD$5{%r-^wG!t)VsK)6{ff<P`t
zxD~;VP%6qG?Lr85Al!|x0%4W74?=r2!Wx8i2oED{M%X4QA<Q2|cnqNi;VFb?5S~YP
zQM?5C`3k~bk&`9%A@MfC0fhGvK0^3Rd@i!Zmk37?zCrjN;a>><MmR1eijzWdaSc|k
zmJ;N0nvLn#ty3TK<vtyqYfxtS7?~(%gU{BQRe{s#VAY#)H`p~EEE;Vt59P&oB+HM)
zdFz1H!Q%?4iR2;k;yb(4bYJ#C(_S0tdD=$1fawL=OuOj~<aZ&xo8GTa9jr^4;iBO+
z-uwS()VV7s;rJxup!G$#6o+*Hj_+U`-JaZ?hvO*msLrCNzPQb_Q5X9X|Jy5j1TJia
zbQx~nyZ9bn!7F(c-_NUg4L`)|c>{0a&AgSjaWy~6kMZODB=6*>`5As5ck+w;62HQ)
z^6R)$-r~1;KW^yv`6K=qTjq2AG8OivulQ^Jj=#sAIm-XxWBfD!!YBE6{*zDRbs1(M
zB+OgUB1SY8O+}n}-^Tup$B1#_3Nc<>Ehbd_)Q#J>zFFKN77L$PB3fa}vmw2<P=|Xr
z^`Eem_K@U}w4VpyqAtT#d?{|u0X$dK;8Grly;zH@c?kC7bGV?>aKG+m#wA=N_OK0C
zaf#T=jc_5~Cf?*GxRwJo{!M1Pu2AFYcDf7CoO@{%-G@E#08aNhoYgH@|Jk_l0`#QW
zch>~pAv!|e(hqbL{y6<YClP+3vqXHHZ2SZ6+gOg{9n_kSP&}Wd1U!M`RXLx8)NPHJ
zP`d;1Nwl?58e4u0U%^-NL@j+?>|!_k6!>X4t}}3K^LRF2!`J$FK3~r_@FKp2i`mD1
z*z^X|wb*vcu$;@Wpy{+6*ZwLzY3@gQ4HkDDmNlI=A+-eyn@-h8RfBtT=?Of*tj+x#
zmR3D@Ud1Bs<$Zc-51{RSy}0RgkiW#*rjzd*y}0T06aU0E%zOtp5Q}-*!0zKD@FF@&
zjl~LZsD)_FZACmMa3|3j@1i8pQ}n{i=m_{QKnxZ`@j4nQ)Y5-TSBoG|5!d2TG=Q!Z
z>TUN6Ekt?;awn0C<=NsaEfoWN80cDYmZyp1G+PMB7@Js$hJ@0iXxJEXXayCBA1F_>
z5L;2x8Z~Vpsp5emfeS<@NTAM;HC@DR)Fxrjo~Z4Getm)M2>K=SOfdlRX0Z4aEry~+
z8d{7*i!s7i0DAL4@l0&i8K7E8lRw0tVm5V@K!TmqO?H)8asWE?#Xy76rVGgV0dKhh
zK+pyK=F1!87_ms&z`-Qpmy6_aDwlW2G;xnyL4FBit9TIDl6fdv?LbePsFK^|Hd&b{
zpM-Y;eP_&5Ay|qhw2j`DFW?}4iYMxiY>wF0#k_0xu=bbHK<wzD`nf-r#^Lea3UbL!
z=`{y;pKj`W5t`7;2(KXQrF{r5BL50fuSC-ObROkq+P2~5yqY#O?)`a<?15~zJA0G4
z>yzHT;_Q+-j~7@V;4blNs3M8yWz)$SIvB;pp6rrh1GPEU6AN*JXN`K!xYrulMpeGs
zQ(PC77;E!OinAAI``t!$U`dWqxuiUxqRrJ4t5sGkDK{s73NnoBO`Edo5xWieVgse{
z{v`qU&5<Uqfp8#s0vt$JT~woN-J^K%;s_$QMi#+is7j5{W8@i|;1zBQyYA{!8AU*L
zwgHZ4I_mq*GL-ii8mNToQfwHT1Im|2Jn9=d(36+vF0Lmi+i;aER-6tPisA0;?Ci+A
z6#c%s#+nHCO|weefq;<>QtB52OJku^qbLfpjebsx>S7QBvf$SmmY<~ykWoY%vz)HK
zkfVmnb{WNsLAC1aQ`~an6`ljq*3ViTK=v<Pj2v*rT~h6duwii^P*T0V8V%91o;Rrq
zpEU^#f$};=YqqLMs|n?tZ&RW;WOPi)O37-_Rwu1VW*g?MhuWK)KX2Pt;WHv!04mG5
ziyL^qQBtj(wHRjSgX7G;2b=H&^ZJ8hP2WL#(_1cZ=DP=nn}-j^cF|K%gSr&Y)%t*^
zY8u!C{^H{7b<Sc>#r2)Jb%nn(+j<28o68@`Gl0uwWS7h;S-dGbZ!_9QIx8~kox8rD
z-EJ5Qr~5IVFS_~+Bc}>GQqLZ3BmBo&SPaAH^%!)*+KrjeldRLArwMMH-(mIb(X$Sn
zwK+YhDJdzgX~s=Psyo%%wZ1BaARohJN7kZl!Hva=oV>j3S?kx%nq_STYw!p%)lhk?
zhDEF2V+1xE#eqB{kXLMYJm)D_v#3A6Xnj8C+g!ak4}!$nWNWjt-PiyrS*}3CJySQ1
zHM~DE*;(!hDOpyPJ{)>isL5-B6iW4{a*=|_IYVQMb*fj~W<=$>DBzi86stvQHOgXz
zIvnV`ewH3ri4E&e1r4a4e-Q=~Bivhz<6+T+-J0OTOd{EO9Ez*j*OlNTL>LHi>yL?&
zsmX9^LPoK|bKXV9LcylwY)ek(`1~#)#8FW4MjxhBmun1UjGASg$k01EFRx!#O2akS
zT$vBuxY%V(P*H?SE@Pl!6-+2LXC7&NxgtY*i+a88k%=_ed>6>CI*QHL4`1xd0V~~*
zm0*53w#bD%$j-(&!(G$>tjk_JYhC#xmN&3xjjYJL8;+sb0x29h`(T$FlD%$mdPgWI
zzNOfAUK-UOmB<2vu41gH>gonv#n%4Tvaf*{wRTh8;??b;s(ix*SqEqBcJ~AW_nccq
z#p0>^8dRHi#Jf;xJ`|HaflhN!9D+XcwfIi_0A1$a;+QxgeuXA;N}LvFMHrutV`Qvs
zE?dghvYm{V9c6;-4Be%h>@IuCUb2r&k(bKL<Uo1394d#`^!O^LnQt|1fGV;Lrkum{
zHGM<h)4%B7bc}wc-{=(mNoOcbf}=Q^8*yW9%FVeYx8k<ko;z|U?#zj-w38m})Y?fZ
zw3EwtAas)<Jd8(jI*)+vIF7G_qI5IVrQ4vgRw+Xt)QP8{PQ2tp;pb2lYUwysgkPZ|
zoPvsQ1_}a;D5wVxC<skNoM<jui8i9W=pZhFbuCeJ6Fp#G>myQOVY^HWf{kssNEf5=
zw7(JxM3z`eE@*nwVP=~p@?mK6itEJn;--3iqFmfA?h^M1pDFGa4~n&7gV-dth-$Gz
zJRx?9r^R#P1+hoGCf<OlVZV3}Yw(HqLLAoY|55w|=Km(rVdM;h@eRELOVCs{lPzQ`
z*+xzj?c_zW1D=A*$tjbu2)(fkeX$U!vL6<szYps%04p*`4#uhs!MY5S!)2NrA=BkZ
zIZBR}W8_$wA;-xp<dyO&IbL2ZC&)>1vNWVePL<hmy3CccWWFqvUU{vYE3cE+%bVoQ
z@)lVlZ<Ri|M3%~+TqbXqcgf}QUb#}<C-0XJ$cN-Qxj~NGC^yS3cv5ziukbFpTfQXc
z(gFFN{6IQk?`2rmTfyc#f?C3UIsz)~WccwY8BV#{k3i`Nno7fKuKD%j=#+<H{dkz>
z!|$Qj=q2b=@6fw+09KKY=~Ma~+SOtD3ft@sdJb=4_?qj_tdTR`fC{g;`~lSWPocak
zPJac({d@7FI4b@FmHlV%`*-n&I3v#C8$u)5SjI(o+#dYBNM0;2kzHhx?15KtZ*VwO
z_6K7Jfu+M_+RnL*t-gjf(N?OaCqTi|^d0?3Khb~a1pP|C(;sx2&JnX@J3Barn{YF3
z!TYEUx8n|c5ns%g;0F`kpl<hswW<%NKmqR$<#P~U&O@PskL4>lQ|oA6XlV<erxiiB
zwv?)!up>XiFZ(QG0d(OL(1m}4F8qhqg-L6|41F{fns77GQnZE<IUZ)@1aXPz3PZ9}
z^cE?ipXd)`^5tTf7y(UoEHve-M5dSkW#dN5ff6zk3P}O9lWAgsxUt@z92CpMonpDT
zSInyr4~U1vda+SFBC5o8@wj+W)QV@tF7dKZHnlgkxcNYQtR>A?;#<fW#rzXs{GYIw
zC~Nz9O>Z{EK;E49gnTC~gAEoH%ShD0e5_9w-$D9<zNCrr7`vofPLb1Oj+`N9$~;*h
zXUl8k963)ekT=SOvPc%o#qu^8kV|Em3`wWBQ{F9CNK>wo6>_y)BiG9H@?p72J|efu
zN~!31LB1$omaoWn<@@qOslGEsA+)75=wtY@L|1jh{$(Vl=vbxlbSe)GuBokV!5>CD
z)ki&>HnQ93ReGJ?q_=24y+<F=hx7@3rYCR&((zmRuC_X!E2X2U<x*>>cjD&+yDQ>5
zbLWaLI&oZ#Q4FiB4^LoM{gW-KNoudmRA=&y&fZRE@AKt$AFRvjf?cv1&nVPs7rCo(
zBcMiIEKrwxg8~beEYz>HNGm8xsED-CR|wviImH3DKVSp~)!p|n3)ka7Dq<r>SIgo3
z2&XVA2y-~xpor~Tl~~TAMAe;lYIxYjGwTM@I$T}Gu<kU~!qV-sR5Id{Q;>*sRO35U
zrLx`Q6=6B6w=Rm57+Gp$%dqZr-l)k?)^%K)I-RMm(Sb^<3?Pw(oSIWZoOOtl%B8fe
zC7ac4Jq5S*lFjP93FaYD9`N8HtChau>gq?TtE;L*YGE?{{s>P~HCBa9jS?BN4!I@(
z4CJV?im8dbD`_|E0%vhRV`MrdYT;BZcgQE?PFX9Tl|!)Yn&J!Sq>5o(_*mOdFB9#0
z^d2%|MBnxaqo((qG&$VH)k3zc7}b@l;=192RZ^!vF4mzutfEaf?piUl8xQf_z&GN1
z+Cp5fiy(89Ij98R)^5dBtIR?H7>1T|kZ<R^VI#f|mf^Lq2|ogB@OFLzSMaki|Gvzx
z!PN5(AAsTa6F$g?`5XQLcAew6k5Az)Cfvjh2qz_)+TsRI!2O#9q0|Q=X+Xu7-8edF
zEUw*5F-aI=3a;H5xO59}<<5y*x{F{9z7>|>rL|E>oX}`)ImG|nWKsn^Nb6}QO=g2V
zJe9L~I_L5%&gVIpR0)V*%B5U}j|X?dKxu;f)i6%3g>iB-rmzi$$?Y&r*1#nB8cdOI
zVhZXL-6!}&cNm}Oe!wTX|8T`je0ZpMs4rg{JpfjjAvCP^Kwmx+-D*rHPHNt?X$(FB
z$mk|9j^@ICb;aR<c-n{xi1mRL%?5Ey#h^iapw=-M1o{%GRK!v$r*Z;r#Z-JgoULIG
zo}*#8n6F_-+^FF)u}H()MTv%Y2%m<fc$}#IcZzZi?-F-tc(+)t;c{VWc#o*iaD{kK
zK_A~M*69LMY}9b2*rMSoQKjL1VuywmqDI5}MXiRb#d8`yAa-l`pxC3~8nIWyhs2v2
zt`++=TqoYwaJ~3g!wuqdKwm09EDq^{jpAz!H;L~x+zgwWn$aWTn1)+mwp017;&%<V
ziPIWZim--NLb9r_7SS3$DjI9JUBqd)L$uWJG0|4T$3+K@^`XNPFx{z+H6l^NC-Kcy
z<#&oC4WAND4QoXo4WAbMG<*gIJk{=5ak+-iiQyVPFGgy(ON`a<1#zW@yG5pkFN#ST
zz9if<Rv~y<Ow$E>#0(8z5qW^+LhXtJxH!MWrTG)SK>sONs`jl=+f25_#n=_EzkYb+
zji`NSD2MHisdzmVz+zjwX%wv1zKOyE3+J!G#s-}d_mF|7<!t=a!N3Dk{p7(Qk{09$
z#H&G<%Lt5$KwAXbBQT8ZrusYZXi_j%Hqo#t9#AUZ3>pJ=ra_Q3x}X)*2UXDqbSv0S
zw%0Ho%7g(_78)B{kjO%J79Z49Ya3Z;k4NAy1oS8u!h$=<8pS3oc#_m;KFp7;VPn}E
z_9$8KELp=h78bk(Buo?r!fc>bzaU5h&u+oMnQ{-T=_<VkrthV&)vL7P(r&Jy$3eVm
zy}CXpkXE(u70WU>4!TfXLsiuXjEak>Q*FTmHKd?tz{bCpD-?e({d>to(E%#i2H0yi
zB5XmZLKw?7JRWVFnTe<nVIIOlgj*3_lS^qYEW~dhyd%}@?xDH(UBp|Mvx0^W6UBZ#
zyZv&m=Eeg080{+x$8k5`DEy|zvj4{7;eIuK2$O)Xl!??8KYr;&DcGPHD32u<9`Uhw
z*0;n1pL8mR1_4gTPdt<wkc%%N3eLn&W)z%7y*13IR1HU99M!%6qbXPjn=@c{Y~!K2
zz*|3b-S0_a^^n)n91JnHw%--p(iS}g2I|o?qIP^HUe>;c@##gN_a^A53O<7G6bf#I
z#;RZ=#Ffw}tMMa~LHKY}jE}DRX9>s^<Dp+ePvU+V1a;&o-TrBM29tXhaR<ObP(m6}
zYp|p4Gu+$s5gmdKJcV*F(Sl?&`2m%x>5uqQr{KTvy-vZS_-dzMqq@$u{U-1}iQjAl
z#s8vjQa?BZgsd%h;nws`5>rJPox=qk+3#S6<)fiUUFZjsQl$PVC~HErd=%eAA490Y
z@fGxxd>XpIb9m=GF9+kEy}+mItomrZ4-L{WKst6sv`!BN6A91tIIOz*P0=*UzQAXq
z6u$PL8(+iXYN1@<*IkIUuSlE1cX0EHcc<`>io;XbUeRPK?(2h7@vY2<pG<`hg-`nc
zj)hN$e^`t}IJ_qu#_y@%vJQm9Cr|5SBs#bIZ1`OG&~%+Wg!uPkana)N&p*HO)6YNu
z2z5g{SU-9}QEXz5f~bqOK~KcDC2n_d$Ear9SjIF-Z0zU~i{GbJJe$n}8{6?SIl}Mt
z)UU8kbWW~t=5XUayOCAykd7NhislO)e!fvrki*McHg3{1u37UIEnCHR?Ak4<dyk&Z
z<l4CDu*v-2Uot-Y^rDEa8a;0&HU8{fd;<FF_8C-G`c_YpgC7^v^|!TG(4K84ub`)o
zwJD&?)q`hJe%mdrsoS-m7EpQZpF^m!HnANY&G@=0b-MR9H|>v)zYhPT5O2SjwjFIg
zf^I$0W*l8qw52D#csenKzH6J3NtZr6<x+a;?v=SjzInH{p?-b4^`nYn`y~1>W1XZO
zCsuW(h0|&hX!z@QWzw9A+?ljw^zM%IN7d80lrnZ<KCK)Z6;B-=DW6MsOgc4({y2SI
zfBNv-+r6N_PZZ7H@m43=H@C7io%_i<ohEyS_o4ST-ZY*Leti07x@B~cgYKAqSqgdc
z?(sFFm{$8o(%ZqiuBX_2E3c(_X)m^*@AC5<^v>OXG^2tcRRz?%W%HZql8i4dqX+t)
za?+}0@x$orhh9sdGlkL3>0tSfed*RAvo574=C_eFGv}L`WX`y^JH5a5iX@tH-PQ%P
Z&z--B5)YNQsd1+trZ?bsr+;Sn{{ggcnY{o2

diff --git a/bin/stateless-guest/Cargo.toml b/bin/stateless-guest/Cargo.toml
index 686f3861b..0b4cf8229 100644
--- a/bin/stateless-guest/Cargo.toml
+++ b/bin/stateless-guest/Cargo.toml
@@ -10,21 +10,26 @@ edition = "2021"
 openvm-stateless-executor = { path = "../../crates/stateless-executor", default-features = false }
 
 # openvm
-openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", features = [
-    "std",
-] }
+openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false, features = ["getrandom-unsupported"] }
 openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", optional = true }
 openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", optional = true }
 
 # Enable std feature for host builds (provides critical-section implementation)
-[target.'cfg(not(target_os = "zkvm"))'.dependencies]
+[target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
 openvm-stateless-executor = { path = "../../crates/stateless-executor", default-features = false, features = ["std"] }
 
 [package.metadata.cargo-machete]
 ignored = ["openvm-algebra-guest", "openvm-ecc-guest"]
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(openvm_intrinsics)',
+    'cfg(target_os, values("openvm"))',
+] }
+
 [features]
 default = ["extensions"]
+std = ["openvm/std", "openvm-stateless-executor/std"]
 extensions = [
     "openvm-stateless-executor/openvm",
     "dep:openvm-algebra-guest",
diff --git a/bin/stateless-guest/openvm.toml b/bin/stateless-guest/openvm.toml
index eac2c0a81..130945596 100644
--- a/bin/stateless-guest/openvm.toml
+++ b/bin/stateless-guest/openvm.toml
@@ -1,5 +1,5 @@
-[app_vm_config.rv32i]
-[app_vm_config.rv32m]
+[app_vm_config.rv64i]
+[app_vm_config.rv64m]
 [app_vm_config.io]
 
 [app_vm_config.keccak]
diff --git a/bin/stateless-guest/src/main.rs b/bin/stateless-guest/src/main.rs
index 6a1f66b57..3b75b5aea 100644
--- a/bin/stateless-guest/src/main.rs
+++ b/bin/stateless-guest/src/main.rs
@@ -1,7 +1,15 @@
+#![cfg_attr(
+    all(not(feature = "std"), any(openvm_intrinsics, target_os = "openvm")),
+    no_main
+)]
+#![cfg_attr(not(feature = "std"), no_std)]
+
 use openvm::io::{read, reveal_bytes32};
 use openvm_stateless_executor::{io::StatelessExecutorInput, ChainVariant, StatelessExecutor};
 
-#[cfg(all(target_os = "zkvm", feature = "extensions"))]
+openvm::entry!(main);
+
+#[cfg(all(any(openvm_intrinsics, target_os = "openvm"), feature = "extensions"))]
 openvm::init!();
 
 pub fn main() {
diff --git a/crates/chainspec/src/lib.rs b/crates/chainspec/src/lib.rs
index cdded0b53..ac3216d14 100644
--- a/crates/chainspec/src/lib.rs
+++ b/crates/chainspec/src/lib.rs
@@ -1,3 +1,7 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+
 use alloy_eips::{eip7840::BlobParams, eip7892::BlobScheduleBlobParams};
 use alloy_hardforks::mainnet::{MAINNET_BPO1_TIMESTAMP, MAINNET_BPO2_TIMESTAMP};
 use reth_chainspec::{
diff --git a/crates/mpt/Cargo.toml b/crates/mpt/Cargo.toml
index cfc941905..9aa7e7d97 100644
--- a/crates/mpt/Cargo.toml
+++ b/crates/mpt/Cargo.toml
@@ -29,4 +29,5 @@ workspace = true
 
 [features]
 default = []
-host = []
+std = []
+host = ["std"]
diff --git a/crates/mpt/src/hp.rs b/crates/mpt/src/hp.rs
index 1ae15075a..5aff8090c 100644
--- a/crates/mpt/src/hp.rs
+++ b/crates/mpt/src/hp.rs
@@ -195,6 +195,7 @@ pub(crate) fn to_encoded_path_with_bump<'a>(
 
 /// Encodes nibbles into the standard hex-prefix format.
 #[cfg(feature = "host")]
+#[allow(dead_code)]
 #[inline]
 pub(crate) fn to_encoded_path(nibs: &[u8], is_leaf: bool) -> Vec<u8> {
     let is_odd = !nibs.len().is_multiple_of(2);
diff --git a/crates/mpt/src/lib.rs b/crates/mpt/src/lib.rs
index ede499cff..05d150e87 100644
--- a/crates/mpt/src/lib.rs
+++ b/crates/mpt/src/lib.rs
@@ -1,3 +1,7 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+
 mod trie;
 pub use trie::*;
 
diff --git a/crates/mpt/src/node.rs b/crates/mpt/src/node.rs
index 8effa94c1..56cbef7cf 100644
--- a/crates/mpt/src/node.rs
+++ b/crates/mpt/src/node.rs
@@ -49,8 +49,8 @@ pub(crate) enum NodeRef<'a> {
     Digest(&'a [u8]),
 }
 
-impl std::fmt::Display for NodeRef<'_> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl core::fmt::Display for NodeRef<'_> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         match self {
             NodeRef::Bytes(bytes) => write!(f, "Bytes(0x{})", hex::encode(bytes)),
             NodeRef::Digest(digest) => write!(f, "Digest(0x{})", hex::encode(digest)),
diff --git a/crates/mpt/src/state.rs b/crates/mpt/src/state.rs
index 8e5f5af1e..bd7f76eba 100644
--- a/crates/mpt/src/state.rs
+++ b/crates/mpt/src/state.rs
@@ -1,3 +1,5 @@
+use alloc::{boxed::Box, vec, vec::Vec};
+
 use alloy_trie::TrieAccount;
 use bumpalo::Bump;
 use revm::database::BundleState;
diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index ac4cf6a41..ac2825d0f 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -1,4 +1,5 @@
-use std::{
+use alloc::vec::Vec;
+use core::{
     cell::{Cell, RefCell},
     mem::MaybeUninit,
 };
@@ -6,7 +7,7 @@ use std::{
 use alloy_rlp::Encodable;
 use bumpalo::Bump;
 use bytes::Buf;
-use revm_primitives::{hex, keccak256, B256};
+use revm_primitives::{keccak256, B256};
 use smallvec::SmallVec;
 
 use crate::{
@@ -1050,12 +1051,14 @@ impl<'a> Mpt<'a> {
     }
 }
 
+#[cfg(feature = "std")]
 impl Mpt<'_> {
     pub fn print_trie(&self) {
         self.print_trie_internal(self.root_id, 0);
     }
 
     fn print_trie_internal(&self, node_id: NodeId, depth: usize) {
+        use revm_primitives::hex;
         let indent = "  ".repeat(depth);
         match &self.nodes[node_id as usize] {
             NodeData::Null => {
diff --git a/crates/revm-crypto/Cargo.toml b/crates/revm-crypto/Cargo.toml
index 7c356ee1c..b7415432f 100644
--- a/crates/revm-crypto/Cargo.toml
+++ b/crates/revm-crypto/Cargo.toml
@@ -20,7 +20,7 @@ alloy-consensus = { workspace = true, features = ["crypto-backend"] }
 # OpenVM dependencies for optimized crypto (only needed when running in zkvm)
 openvm-curve-utils = { workspace = true, features = ["bn254", "bls12_381"] }
 openvm-ecc-guest = { workspace = true }
-openvm-sha2 = { workspace = true, features = ["import_sha2"] }
+openvm-sha2 = { workspace = true }
 openvm-pairing = { workspace = true, features = ["bn254", "bls12_381"] }
 openvm-k256 = { workspace = true }
 openvm-p256 = { workspace = true }
@@ -35,9 +35,14 @@ ark-bn254 = "0.5"
 ark-bls12-381 = "0.5"
 ark-ec = "0.5"
 
-[target.'cfg(target_os = "zkvm")'.dependencies]
+[target.'cfg(all(target_arch = "riscv64", any(target_os = "none", target_os = "openvm")))'.dependencies]
 revm-primitives = { workspace = true, features = ["hashbrown"] }
 alloy-primitives = { workspace = true, features = ["native-keccak"] }
 
-[target.'cfg(not(target_os = "zkvm"))'.dependencies]
+[target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
+openvm-sha2 = { workspace = true, features = ["import_sha2"] }
 openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
+
+[features]
+default = []
+std = []
diff --git a/crates/revm-crypto/src/lib.rs b/crates/revm-crypto/src/lib.rs
index 0cfbbd94a..090e3e623 100644
--- a/crates/revm-crypto/src/lib.rs
+++ b/crates/revm-crypto/src/lib.rs
@@ -3,6 +3,11 @@
 //! This module provides OpenVM-optimized implementations of cryptographic operations
 //! for both transaction validation (via Alloy crypto provider) and precompile execution.
 
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+
+use alloc::{boxed::Box, sync::Arc, vec, vec::Vec};
 use alloy_consensus::crypto::{
     backend::{install_default_provider, CryptoProvider},
     RecoveryError,
@@ -21,7 +26,6 @@ use openvm_pairing::{
     bn254::{self as bn, Bn254},
     PairingCheck,
 };
-use openvm_sha2::Digest;
 use revm::{
     install_crypto,
     precompile::{
@@ -36,7 +40,6 @@ use revm::{
         Crypto, PrecompileHalt,
     },
 };
-use std::{sync::Arc, vec::Vec};
 
 use openvm_curve_utils::SubgroupCheck;
 
@@ -116,6 +119,8 @@ struct OpenVmCrypto;
 impl Crypto for OpenVmCrypto {
     /// Custom SHA-256 implementation with openvm optimization
     fn sha256(&self, input: &[u8]) -> [u8; 32] {
+        #[cfg(not(openvm_intrinsics))]
+        use openvm_sha2::Digest;
         openvm_sha2::Sha256::digest(input).into()
     }
 
@@ -385,7 +390,7 @@ fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
 }
 
 /// Install OpenVM crypto implementations globally
-pub fn install_openvm_crypto() -> Result<bool, Box<dyn std::error::Error>> {
+pub fn install_openvm_crypto() -> Result<bool, Box<dyn core::error::Error>> {
     // Install OpenVM k256 provider for Alloy (transaction validation)
     install_default_provider(Arc::new(OpenVmK256Provider))?;
 
diff --git a/crates/stateless-executor/Cargo.toml b/crates/stateless-executor/Cargo.toml
index 0d7a61bef..6e3d57e31 100644
--- a/crates/stateless-executor/Cargo.toml
+++ b/crates/stateless-executor/Cargo.toml
@@ -36,7 +36,7 @@ revm.workspace = true
 revm-primitives.workspace = true
 
 # alloy
-alloy-primitives = { workspace = true, features = ["rayon", "map-foldhash"] }
+alloy-primitives = { workspace = true, features = ["map-foldhash"] }
 alloy-consensus = { workspace = true, features = ["crypto-backend", "serde-bincode-compat"] }
 alloy-rlp.workspace = true
 alloy-trie.workspace = true
@@ -52,5 +52,5 @@ bincode = { workspace = true, features = ["serde", "std"] }
 
 [features]
 default = []
-std = ["openvm-chainspec/std"]
+std = ["openvm-chainspec/std", "openvm-mpt/std"]
 openvm = ["dep:openvm-revm-crypto"]
diff --git a/crates/stateless-executor/src/io.rs b/crates/stateless-executor/src/io.rs
index 27789d808..abd19b827 100644
--- a/crates/stateless-executor/src/io.rs
+++ b/crates/stateless-executor/src/io.rs
@@ -1,4 +1,5 @@
-use std::iter::once;
+use alloc::{boxed::Box, format, string::ToString, vec::Vec};
+use core::iter::once;
 
 use crate::error::StatelessExecutorError;
 use alloy_consensus::Header;
diff --git a/crates/stateless-executor/src/lib.rs b/crates/stateless-executor/src/lib.rs
index 9aa31fe26..84dc49299 100644
--- a/crates/stateless-executor/src/lib.rs
+++ b/crates/stateless-executor/src/lib.rs
@@ -1,8 +1,13 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+
 pub mod error;
 /// Client program input data types.
 pub mod io;
 
-use std::{fmt::Debug, sync::Arc};
+use alloc::{sync::Arc, vec, vec::Vec};
+use core::fmt::Debug;
 
 use alloy_consensus::{proofs::calculate_receipt_root, Header, TxReceipt};
 use alloy_primitives::Bloom;
@@ -56,7 +61,6 @@ impl StatelessExecutor {
         // Install OpenVM crypto optimizations
         #[cfg(feature = "openvm")]
         {
-            println!("Installing OpenVM crypto optimizations");
             openvm_revm_crypto::install_openvm_crypto()
                 .expect("failed to install OpenVM crypto provider");
         }
diff --git a/run.sh b/run.sh
index bb13ce111..69b83bca0 100755
--- a/run.sh
+++ b/run.sh
@@ -4,7 +4,7 @@
 #
 # Options:
 #   --mode <MODE>       Set the proving mode (default: prove-app)
-#                       Valid modes: prove-app, prove-stark, prove-evm, keygen, generate-vm-vkey
+#                       Valid modes: prove-app, prove-stark, prove-root, prove-evm, keygen, keygen-root, generate-vm-vkey
 #   --generate-vm-vkey  Shortcut for --mode generate-vm-vkey
 #   --profile <PROFILE> Set the Cargo build profile (default: profiling)
 #                       Valid profiles: dev, release, profiling
@@ -16,10 +16,11 @@
 #   --root-log-blowup <N>
 #   --num-children-leaf <N>
 #   --num-children-internal <N>
+#   --max-segment-length <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
-#   --exec-mode <MODE>  Select the OpenVM execution backend: tco | aot | rvr.
-#                       Defaults to rvr. aot is not supported on arm64.
+#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | aot | rvr.
+#                       Defaults to interpreter. aot is not supported on arm64.
 #                       rvr requires clang-22 and lld on PATH.
 #   --perf              Run with perf + samply host profiling and upload to Firefox Profiler
 #   --nsys              Run with nsys profiling and output summary stats
@@ -48,16 +49,19 @@ REPO_ROOT=$(git rev-parse --show-toplevel)
 WORKDIR=$REPO_ROOT
 RUST_TOOLCHAIN=$(sed -n 's/^channel = "\(.*\)"/\1/p' "$REPO_ROOT/rust-toolchain.toml")
 
-DEST="$REPO_ROOT/bin/reth-benchmark/elf/openvm-stateless-guest"
+cd "$REPO_ROOT/bin/stateless-guest"
+if ! rustup toolchain list | grep -q '^openvm-1\.94\.0'; then
+    echo "openvm-1.94.0 toolchain not found; installing..."
+    cargo openvm toolchain install
+fi
+cargo openvm build
+mkdir -p ../reth-benchmark/elf
+SRC="target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest"
+DEST="../reth-benchmark/elf/openvm-stateless-guest"
 
-build_openvm_guest_elf() {
-    cd "$REPO_ROOT/bin/stateless-guest"
-    OPENVM_RUST_TOOLCHAIN=$RUST_TOOLCHAIN cargo openvm build
-    mkdir -p ../reth-benchmark/elf
-    SRC="target/riscv32im-risc0-zkvm-elf/release/openvm-stateless-guest"
+if [ ! -f "$DEST" ] || ! cmp -s "$SRC" "$DEST"; then
     cp "$SRC" "$DEST"
-    cd "$WORKDIR"
-}
+fi
 
 cd $WORKDIR
 
@@ -102,6 +106,10 @@ while [[ $# -gt 0 ]]; do
             BLOCK_NUMBER_OVERRIDE="$2"
             shift 2
             ;;
+        --max-segment-length)
+            MAX_SEGMENT_LENGTH="$2"
+            shift 2
+            ;;
         --segment-max-memory)
             SEGMENT_MAX_MEMORY="$2"
             shift 2
@@ -141,11 +149,11 @@ while [[ $# -gt 0 ]]; do
             ;;
         --exec-mode)
             case "${2:-}" in
-                tco|aot|rvr)
+                interpreter|tco|aot|rvr)
                     EXEC_MODE="$2"
                     ;;
                 *)
-                    echo "Error: --exec-mode requires one of: tco, aot, rvr (got '${2:-}')" >&2
+                    echo "Error: --exec-mode requires one of: interpreter, tco, aot, rvr (got '${2:-}')" >&2
                     exit 1
                     ;;
             esac
@@ -281,6 +289,10 @@ if [ "$USE_NSYS" = "true" ]; then
 fi
 if [ "$MODE" = "prove-evm" ] || [ "$MODE" = "prove-root" ] || [ "$MODE" = "keygen-root" ]; then
     FEATURES="$FEATURES,evm-verify"
+    arch=$(uname -m)
+    if [ "$arch" = "x86_64" ] || [ "$arch" = "amd64" ]; then
+        FEATURES="$FEATURES,halo2-asm"
+    fi
 fi
 
 # `keygen-root` is a shell-level alias: enable evm-verify (handled above) and pass --mode keygen
@@ -295,7 +307,7 @@ case $arch in
 arm64|aarch64)
     RUSTFLAGS="-Ctarget-cpu=native"
     if [ -z "$EXEC_MODE" ]; then
-        EXEC_MODE="rvr"
+        EXEC_MODE="interpreter"
     elif [ "$EXEC_MODE" = "aot" ]; then
         # aot enables halo2curves-axiom/asm which is x86_64-only
         echo "Error: --exec-mode aot is not supported on arm64" >&2
@@ -305,7 +317,7 @@ arm64|aarch64)
 x86_64|amd64)
     RUSTFLAGS="-Ctarget-cpu=native"
     if [ -z "$EXEC_MODE" ]; then
-        EXEC_MODE="rvr"
+        EXEC_MODE="interpreter"
     fi
     ;;
 *)
@@ -314,6 +326,9 @@ exit 1
 ;;
 esac
 case "$EXEC_MODE" in
+    interpreter)
+        # default interpreted execution; no extra backend feature
+        ;;
     tco)
         FEATURES="$FEATURES,tco"
         ;;
@@ -348,7 +363,6 @@ if [ "$USE_NSYS" = "false" ]; then
     export JEMALLOC_SYS_WITH_MALLOC_CONF="retain:true,background_thread:true,metadata_thp:always,dirty_decay_ms:10000,muzzy_decay_ms:10000,abort_conf:true"
 fi
 if [[ "${OPENVM_BENCH_SKIP_BUILD:-0}" != "1" ]]; then
-    build_openvm_guest_elf
     RUSTFLAGS=$RUSTFLAGS cargo $TOOLCHAIN build --bin $BIN_NAME --profile=$PROFILE --no-default-features --features=$FEATURES
 fi
 
@@ -387,6 +401,10 @@ if [[ -n $PROOF_CACHE ]]
 then
     CONFIG_ARGS="$CONFIG_ARGS --proof-cache ${PROOF_CACHE}"
 fi
+if [[ -n $MAX_SEGMENT_LENGTH ]]
+then
+    CONFIG_ARGS="$CONFIG_ARGS --max-segment-length ${MAX_SEGMENT_LENGTH}"
+fi
 if [[ -n $SEGMENT_MAX_MEMORY ]]
 then
     CONFIG_ARGS="$CONFIG_ARGS --segment-max-memory ${SEGMENT_MAX_MEMORY}"
@@ -415,11 +433,11 @@ if [ "$USE_PERF" = "true" ]; then
 
     echo "Running with perf profiling (freq=${PERF_FREQ})..."
     export OUTPUT_PATH="metrics.json"
-    perf record -F $PERF_FREQ --call-graph=dwarf -g -o perf.data -- $BIN $BIN_ARGS
+    perf record -F $PERF_FREQ --call-graph=fp -g -o perf.data -- $BIN $BIN_ARGS
 
     echo "Converting perf.data with samply..."
     mkdir -p samply_profile
-    samply import perf.data --unstable-presymbolicate --save-only --output samply_profile/profile.json.gz
+    samply import perf.data --presymbolicate --save-only --output samply_profile/profile.json.gz
     echo "Saved profile: samply_profile/profile.json.gz"
 
     FIREFOX_PROFILER_URL=$(python3 "$REPO_ROOT/scripts/upload_firefox_profile.py" samply_profile/profile.json.gz) || true

From a11ec100712a4cdf7310a5a5d4b96d6c8e9e1ead Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 19 Jun 2026 12:11:54 +0200
Subject: [PATCH 03/94] chore: update reth benchmark SDK execution calls

---
 bin/reth-benchmark/src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index dbbd88629..5b9a71f5f 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -520,16 +520,16 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
         info_span!("reth-block", block_number = block_number).in_scope(|| -> Result<()> {
             match args.mode {
                 BenchMode::Execute => {
-                    let public_values = info_span!("sdk.execute", group = program_name)
-                        .in_scope(|| sdk.execute(exe, stdin))?;
+                    let public_values = info_span!("sdk.compile_and_execute", group = program_name)
+                        .in_scope(|| sdk.compile_and_execute(exe, stdin))?;
                     let block_hash = hex::encode(&public_values);
                     info!("Execute completed, block hash: {}", block_hash);
                     println!("BENCH_BLOCK_HASH={block_hash}");
                 }
                 BenchMode::ExecuteMetered => {
                     let (public_values, _) =
-                        info_span!("sdk.execute_metered", group = program_name)
-                            .in_scope(|| sdk.execute_metered(exe, stdin))?;
+                        info_span!("sdk.compile_and_execute_metered", group = program_name)
+                            .in_scope(|| sdk.compile_and_execute_metered(exe, stdin))?;
                     let block_hash = hex::encode(&public_values);
                     info!("Execute metered completed, block hash: {}", block_hash);
                     println!("BENCH_BLOCK_HASH={block_hash}");

From c56a0a5e91ca4607e8e36fbdf9a7507c736b78f7 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 19 Jun 2026 22:54:58 +0200
Subject: [PATCH 04/94] fix: align vendored kzg with rv64 OpenVM

---
 bin/reth-verify/Cargo.toml                    |  3 +++
 bin/reth-verify/src/main.rs                   | 26 ++++++++++++++++---
 crates/curve-utils/src/lib.rs                 |  2 +-
 crates/kzg/Cargo.toml                         |  5 +++-
 crates/kzg/build.rs                           | 10 +++----
 crates/kzg/src/kzg_proof.rs                   | 13 +++++-----
 crates/kzg/src/lib.rs                         |  2 +-
 crates/kzg/src/trusted_setup.rs               |  1 +
 crates/kzg/src/types.rs                       |  2 +-
 .../kzg/tests/programs/verify_kzg/openvm.toml |  4 +--
 10 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/bin/reth-verify/Cargo.toml b/bin/reth-verify/Cargo.toml
index cad1700fa..38dc45929 100644
--- a/bin/reth-verify/Cargo.toml
+++ b/bin/reth-verify/Cargo.toml
@@ -12,7 +12,10 @@ workspace = true
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
 eyre.workspace = true
+serde.workspace = true
 zstd.workspace = true
+bincode1 = { package = "bincode", version = "1.3.3" }
 
+openvm-circuit.workspace = true
 openvm-verify-stark-host.workspace = true
 openvm-stark-sdk.workspace = true
diff --git a/bin/reth-verify/src/main.rs b/bin/reth-verify/src/main.rs
index fa467f9e3..41b23722b 100644
--- a/bin/reth-verify/src/main.rs
+++ b/bin/reth-verify/src/main.rs
@@ -1,8 +1,12 @@
 use std::{fs, path::PathBuf};
 
 use clap::Parser;
-use eyre::{Result, WrapErr};
-use openvm_stark_sdk::openvm_stark_backend::codec::Decode;
+use eyre::{eyre, Result, WrapErr};
+use openvm_circuit::system::memory::merkle::public_values::UserPublicValuesProof;
+use openvm_stark_sdk::{
+    config::baby_bear_poseidon2::{BabyBearPoseidon2Config as SC, DIGEST_SIZE, F},
+    openvm_stark_backend::proof::Proof,
+};
 use openvm_verify_stark_host::{
     verify_vm_stark_proof_decoded,
     vk::{read_vk_from_file, VmStarkVerifyingKey},
@@ -27,6 +31,12 @@ struct Args {
     vm_vk: PathBuf,
 }
 
+#[derive(Clone, serde::Serialize, serde::Deserialize)]
+struct StarkProofWithPublicValue<Field> {
+    proof: Proof<SC>,
+    user_public_values: Option<UserPublicValuesProof<DIGEST_SIZE, Field>>,
+}
+
 fn decode_persisted_final_proof_bytes(path: &PathBuf, proof_bytes: Vec<u8>) -> Result<Vec<u8>> {
     if proof_bytes.starts_with(&ZSTD_FRAME_MAGIC) {
         return zstd::decode_all(&proof_bytes[..]).wrap_err_with(|| {
@@ -41,9 +51,17 @@ fn load_stark_final_proof(path: &PathBuf) -> Result<VmStarkProof> {
     let proof_bytes = fs::read(path)
         .wrap_err_with(|| format!("Failed to read STARK final proof {}", path.display()))?;
     let proof_bytes = decode_persisted_final_proof_bytes(path, proof_bytes)?;
+    let proof: StarkProofWithPublicValue<F> = bincode1::deserialize(&proof_bytes)
+        .wrap_err_with(|| format!("Failed to deserialize STARK final proof {}", path.display()))?;
+
+    let user_pvs_proof = proof.user_public_values.ok_or_else(|| {
+        eyre!(
+            "Proof {} does not include user public values; this is not a final STARK proof",
+            path.display()
+        )
+    })?;
 
-    VmStarkProof::decode_from_bytes(&proof_bytes)
-        .wrap_err_with(|| format!("Failed to decode STARK final proof {}", path.display()))
+    Ok(VmStarkProof { inner: proof.proof, user_pvs_proof, deferral_merkle_proofs: None })
 }
 
 fn main() -> Result<()> {
diff --git a/crates/curve-utils/src/lib.rs b/crates/curve-utils/src/lib.rs
index 602aba726..b9bcc25ac 100644
--- a/crates/curve-utils/src/lib.rs
+++ b/crates/curve-utils/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(target_os = "zkvm", no_std)]
+#![cfg_attr(any(openvm_intrinsics, target_os = "openvm"), no_std)]
 //! Subgroup membership checks for elliptic curve points.
 //!
 //! For pairing-based cryptography to be secure, points must lie in the correct
diff --git a/crates/kzg/Cargo.toml b/crates/kzg/Cargo.toml
index a2d8e5656..c02c97514 100644
--- a/crates/kzg/Cargo.toml
+++ b/crates/kzg/Cargo.toml
@@ -6,6 +6,9 @@ homepage.workspace = true
 exclude.workspace = true
 version.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 openvm-algebra-guest.workspace = true
 openvm-curve-utils = { workspace = true, features = ["bls12_381"] }
@@ -22,7 +25,7 @@ serde-big-array.workspace = true
 [dev-dependencies]
 serde_yaml.workspace = true
 
-[target.'cfg(not(target_os = "zkvm"))'.dev-dependencies]
+[target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dev-dependencies]
 openvm-stark-sdk.workspace = true
 
 openvm.workspace = true
diff --git a/crates/kzg/build.rs b/crates/kzg/build.rs
index beffb6caa..0269f6dab 100644
--- a/crates/kzg/build.rs
+++ b/crates/kzg/build.rs
@@ -3,18 +3,18 @@ const TRUSTED_SETUP_FILE: &str = include_str!("src/trusted_setup.txt");
 include!("src/enums.rs");
 include!("src/consts.rs");
 
-#[cfg(any(target_os = "zkvm", doc))]
+#[cfg(doc)]
 fn main() {
-    // Binaries cannot be built in a RISC-V environment or when building docs
+    // Binaries cannot be built when building docs
 }
 
-#[cfg(not(any(target_os = "zkvm", doc)))]
+#[cfg(not(doc))]
 fn main() {
     use bls12_381::{G1Affine, G2Affine, Scalar};
     use std::{fs, io::Write, path::Path};
 
     #[derive(Debug, Clone, PartialEq, Eq)]
-    pub struct KzgSettingsOwned {
+    struct KzgSettingsOwned {
         pub roots_of_unity: [Scalar; NUM_ROOTS_OF_UNITY],
         pub g1_points: [G1Affine; NUM_G1_POINTS],
         pub g2_points: [G2Affine; NUM_G2_POINTS],
@@ -26,7 +26,7 @@ fn main() {
             .map_err(|e| KzgError::InvalidHexFormat(format!("Failed to decode hex: {}", e)))
     }
 
-    pub fn load_trusted_setup_file_brute() -> Result<KzgSettingsOwned, KzgError> {
+    fn load_trusted_setup_file_brute() -> Result<KzgSettingsOwned, KzgError> {
         let trusted_setup_file: Vec<String> =
             TRUSTED_SETUP_FILE.split('\n').map(|x| x.to_string()).collect();
 
diff --git a/crates/kzg/src/kzg_proof.rs b/crates/kzg/src/kzg_proof.rs
index e2eda5fca..3fa289de0 100644
--- a/crates/kzg/src/kzg_proof.rs
+++ b/crates/kzg/src/kzg_proof.rs
@@ -4,11 +4,11 @@ use alloc::{string::ToString, vec::Vec};
 #[cfg(not(feature = "use-intrinsics"))]
 use bls12_381::{multi_miller_loop, G2Prepared, Gt};
 use bls12_381::{G1Affine, G2Affine, Scalar};
-#[cfg(target_os = "zkvm")]
+#[cfg(any(openvm_intrinsics, target_os = "openvm"))]
 use core::cmp::Ordering;
 use hex_literal::hex;
 use openvm_algebra_guest::{field::FieldExtension, IntMod};
-#[cfg(target_os = "zkvm")]
+#[cfg(any(openvm_intrinsics, target_os = "openvm"))]
 use openvm_curve_utils::SubgroupCheck;
 use openvm_ecc_guest::{
     weierstrass::{CachedMulTable, IntrinsicCurve, WeierstrassPoint},
@@ -30,6 +30,7 @@ const G2_AFFINE_GENERATOR: Bls12_381G2Affine = Bls12_381G2Affine::new(
     )
 );
 
+#[derive(Debug)]
 pub struct KzgProof {}
 
 impl KzgProof {
@@ -188,7 +189,7 @@ fn to_openvm_g2_affine(g2: G2Affine) -> Bls12_381G2Affine {
 /// Returns true if the field element is lexicographically larger than its negation.
 ///
 /// The input `y` does not need to be reduced modulo the modulus.
-#[cfg(target_os = "zkvm")]
+#[cfg(any(openvm_intrinsics, target_os = "openvm"))]
 fn is_lex_largest(y: &Fp) -> bool {
     let neg_y = -y.clone();
     // This is a way to force y and -y are both in reduced form simultaneously using `iseqmod`
@@ -207,7 +208,7 @@ fn is_lex_largest(y: &Fp) -> bool {
 }
 
 // hint_decompress is currently not implemented on host because of the need to do a sqrt
-#[cfg(target_os = "zkvm")]
+#[cfg(any(openvm_intrinsics, target_os = "openvm"))]
 pub fn safe_g1_affine_from_bytes(bytes: &Bytes48) -> Result<Bls12_381G1Affine, KzgError> {
     use openvm_ecc_guest::weierstrass::FromCompressed;
 
@@ -247,7 +248,7 @@ pub fn safe_g1_affine_from_bytes(bytes: &Bytes48) -> Result<Bls12_381G1Affine, K
 }
 
 /// Assumes that G1Affine is a point on the curve in the correct subgroup.
-#[cfg(not(target_os = "zkvm"))]
+#[cfg(not(any(openvm_intrinsics, target_os = "openvm")))]
 fn to_openvm_g1_affine(g1: G1Affine) -> Bls12_381G1Affine {
     if g1.is_identity().unwrap_u8() != 0 {
         return <Bls12_381G1Affine as Group>::IDENTITY;
@@ -258,7 +259,7 @@ fn to_openvm_g1_affine(g1: G1Affine) -> Bls12_381G1Affine {
     unsafe { Bls12_381G1Affine::from_xy_unchecked(x, y) }
 }
 
-#[cfg(not(target_os = "zkvm"))]
+#[cfg(not(any(openvm_intrinsics, target_os = "openvm")))]
 pub fn safe_g1_affine_from_bytes(bytes: &Bytes48) -> Result<Bls12_381G1Affine, KzgError> {
     let g1 = safe_g1_affine_from_bytes_native(bytes)?;
     Ok(to_openvm_g1_affine(g1))
diff --git a/crates/kzg/src/lib.rs b/crates/kzg/src/lib.rs
index 6e8f6d834..d953298bd 100644
--- a/crates/kzg/src/lib.rs
+++ b/crates/kzg/src/lib.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(target_os = "zkvm", no_std)]
+#![cfg_attr(any(openvm_intrinsics, target_os = "openvm"), no_std)]
 
 extern crate alloc;
 
diff --git a/crates/kzg/src/trusted_setup.rs b/crates/kzg/src/trusted_setup.rs
index 1783801f7..dab003861 100644
--- a/crates/kzg/src/trusted_setup.rs
+++ b/crates/kzg/src/trusted_setup.rs
@@ -6,6 +6,7 @@ use spin::Once;
 
 // https://users.rust-lang.org/t/can-i-conveniently-compile-bytes-into-a-rust-program-with-a-specific-alignment/24049/2
 #[repr(C)] // guarantee 'bytes' comes after '_align'
+#[derive(Debug)]
 pub struct AlignedAs<Align, Bytes: ?Sized> {
     pub _align: [Align; 0],
     pub bytes: Bytes,
diff --git a/crates/kzg/src/types.rs b/crates/kzg/src/types.rs
index 38cbde3e4..e200d9477 100644
--- a/crates/kzg/src/types.rs
+++ b/crates/kzg/src/types.rs
@@ -10,7 +10,7 @@ use crate::{get_kzg_settings, Bytes32, Bytes48, KzgError};
 
 /// Inputs to pass to the VM for KZG proof verification
 /// Excludes `KzgSettings`, which is read from disk by the VM
-#[derive(Clone, Deserialize, Serialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct KzgInputs {
     pub commitment_bytes: Bytes48,
     pub z_bytes: Bytes32,
diff --git a/crates/kzg/tests/programs/verify_kzg/openvm.toml b/crates/kzg/tests/programs/verify_kzg/openvm.toml
index 20d06d34d..aaa3d7c77 100644
--- a/crates/kzg/tests/programs/verify_kzg/openvm.toml
+++ b/crates/kzg/tests/programs/verify_kzg/openvm.toml
@@ -1,5 +1,5 @@
-[app_vm_config.rv32i]
-[app_vm_config.rv32m]
+[app_vm_config.rv64i]
+[app_vm_config.rv64m]
 [app_vm_config.io]
 
 [app_vm_config.modular]

From 73815592422f781dbda6a100f96b4165b407caa5 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 11:07:34 +0200
Subject: [PATCH 05/94] chore: update OpenVM dependencies to v2.1

---
 Cargo.lock                          | 3863 +++++++++++++--------------
 Cargo.toml                          |    2 +-
 bin/reth-benchmark/Cargo.toml       |    4 +-
 bin/stateless-guest/Cargo.lock      |  989 ++++---
 crates/mpt/src/node.rs              |    2 +-
 crates/mpt/src/state.rs             |    2 +-
 crates/mpt/src/trie.rs              |    5 +-
 crates/stateless-executor/src/io.rs |    2 +-
 8 files changed, 2427 insertions(+), 2442 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 457146686..f149cfb76 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,61 +2,13 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "abi_stable"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d6512d3eb05ffe5004c59c206de7f99c34951504056ce23fc953842f12c445"
-dependencies = [
- "abi_stable_derive",
- "abi_stable_shared",
- "const_panic",
- "core_extensions",
- "crossbeam-channel",
- "generational-arena",
- "libloading 0.7.4",
- "lock_api",
- "parking_lot",
- "paste",
- "repr_offset",
- "rustc_version 0.4.1",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "abi_stable_derive"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7178468b407a4ee10e881bc7a328a65e739f0863615cca4429d43916b05e898"
-dependencies = [
- "abi_stable_shared",
- "as_derive_utils",
- "core_extensions",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.1",
- "syn 1.0.109",
- "typed-arena",
-]
-
-[[package]]
-name = "abi_stable_shared"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b5df7688c123e63f4d4d649cba63f2967ba7f7861b1664fca3f77d3dad2b63"
-dependencies = [
- "core_extensions",
-]
-
 [[package]]
 name = "actix-codec"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -69,23 +21,23 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.2"
+version = "3.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49"
+checksum = "48e2faa3e7418ed780cca54829d32782a4008a077230f67457caa063415e99c2"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
  "base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "brotli",
  "bytes",
  "bytestring",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "encoding_rs",
  "flate2",
- "foldhash 0.1.5",
+ "foldhash 0.2.0",
  "futures-core",
  "h2 0.3.27",
  "http 0.2.12",
@@ -97,8 +49,8 @@ dependencies = [
  "mime",
  "percent-encoding",
  "pin-project-lite",
- "rand 0.9.2",
- "sha1",
+ "rand 0.10.2",
+ "sha1 0.11.0",
  "smallvec",
  "tokio",
  "tokio-util",
@@ -113,14 +65,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "actix-router"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
+checksum = "14f8c75c51892f18d9c46150c5ac7beb81c95f78c8b83a634d49f4ca32551fe7"
 dependencies = [
  "bytestring",
  "cfg-if 1.0.4",
@@ -180,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.12.1"
+version = "4.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1654a77ba142e37f049637a3e5685f864514af11fcbc51cb51eb6596afe5b8d6"
+checksum = "df09e2d9239703dd64056359c920c7f3fba6535ec61a0059e0f44e095ffe02b4"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -197,9 +149,9 @@ dependencies = [
  "bytestring",
  "cfg-if 1.0.4",
  "cookie",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "encoding_rs",
- "foldhash 0.1.5",
+ "foldhash 0.2.0",
  "futures-core",
  "futures-util",
  "impl-more",
@@ -215,7 +167,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2 0.6.3",
+ "socket2 0.6.5",
  "time",
  "tracing",
  "url",
@@ -230,14 +182,14 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
@@ -254,7 +206,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
- "crypto-common 0.1.6",
+ "crypto-common 0.1.7",
  "generic-array",
 ]
 
@@ -290,7 +242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if 1.0.4",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -298,9 +250,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -313,9 +265,9 @@ checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
 
 [[package]]
 name = "alloc-stdlib"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
 dependencies = [
  "alloc-no-stdlib",
 ]
@@ -350,7 +302,7 @@ dependencies = [
  "alloy-pubsub",
  "alloy-rpc-client",
  "alloy-rpc-types",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-signer",
  "alloy-signer-local",
  "alloy-transport",
@@ -370,7 +322,7 @@ dependencies = [
  "alloy-rlp",
  "num_enum",
  "serde",
- "strum 0.27.1",
+ "strum 0.27.2",
 ]
 
 [[package]]
@@ -382,22 +334,22 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-trie 0.9.4",
  "alloy-tx-macros",
  "auto_impl",
  "borsh",
  "c-kzg",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "either",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell",
- "rand 0.8.5",
+ "rand 0.8.7",
  "secp256k1 0.30.0",
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -410,7 +362,7 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
 ]
 
@@ -434,7 +386,7 @@ dependencies = [
  "futures",
  "futures-util",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -461,11 +413,11 @@ dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
  "alloy-sol-types",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "itoa",
  "serde",
  "serde_json",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -478,7 +430,7 @@ dependencies = [
  "alloy-rlp",
  "crc",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -505,7 +457,7 @@ dependencies = [
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -519,7 +471,7 @@ dependencies = [
  "borsh",
  "once_cell",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -533,14 +485,14 @@ dependencies = [
  "borsh",
  "once_cell",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "alloy-eips"
-version = "1.5.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "813a67f87e56b38554d18b182616ee5006e8e2bf9df96a0df8bf29dff1d52e3f"
+checksum = "e6ef28c9fdad22d4eec52d894f5f2673a0895f1e5ef196734568e68c0f6caca8"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -548,16 +500,15 @@ dependencies = [
  "alloy-eip7928 0.3.7",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 1.5.2",
+ "alloy-serde 1.8.3",
  "auto_impl",
  "borsh",
  "c-kzg",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "either",
  "serde",
  "serde_with",
  "sha2 0.10.9",
- "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -572,11 +523,11 @@ dependencies = [
  "alloy-eip7928 0.3.7",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "auto_impl",
  "borsh",
  "c-kzg",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "either",
  "ethereum_ssz",
  "ethereum_ssz_derive",
@@ -599,9 +550,9 @@ dependencies = [
  "alloy-rpc-types-eth",
  "alloy-sol-types",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "revm 40.0.3",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -613,7 +564,7 @@ checksum = "ab0e0fe9e6d1120ad7bb9254c3fc2b9bc80a8df42a033fb626be6559c13d5153"
 dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-trie 0.9.4",
  "borsh",
  "serde",
@@ -654,10 +605,10 @@ checksum = "ec0a82e56b1843bce483942d54fcadea92e676f1bde162e93c7d3b621fabc4e1"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
- "http 1.3.1",
+ "http 1.4.2",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -675,16 +626,16 @@ dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-any",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-signer",
  "alloy-sol-types",
  "async-trait",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures-utils-wasm",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -696,7 +647,7 @@ dependencies = [
  "alloy-consensus",
  "alloy-eips 2.0.5",
  "alloy-primitives",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
 ]
 
@@ -710,21 +661,20 @@ dependencies = [
  "bytes",
  "cfg-if 1.0.4",
  "const-hex",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "foldhash 0.2.0",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "hashbrown 0.17.1",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "itoa",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rapidhash",
- "rayon",
  "ruint",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "secp256k1 0.31.1",
  "serde",
  "sha3 0.11.0",
@@ -763,13 +713,13 @@ dependencies = [
  "either",
  "futures",
  "futures-utils-wasm",
- "lru 0.16.3",
+ "lru 0.16.4",
  "parking_lot",
  "pin-project",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "url",
@@ -811,13 +761,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp-derive"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36834a5c0a2fa56e171bf256c34d70fca07d0c0031583edea1c4946b7889c9e"
+checksum = "9d4311c03125e8a18296504560b9de3d75ecbd0dcda7f71e6cf2a196d57e6fba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -835,7 +785,7 @@ dependencies = [
  "alloy-transport-ws",
  "futures",
  "pin-project",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "serde",
  "serde_json",
  "tokio",
@@ -859,7 +809,7 @@ dependencies = [
  "alloy-rpc-types-eth",
  "alloy-rpc-types-trace",
  "alloy-rpc-types-txpool",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
 ]
 
@@ -883,7 +833,7 @@ checksum = "2ff111a54268dc0bbd3b17f98571a7e27cc661dc081ad2999d91888647eb2e11"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
 ]
 
@@ -897,7 +847,7 @@ dependencies = [
  "alloy-network-primitives",
  "alloy-primitives",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
  "serde_json",
 ]
@@ -911,13 +861,13 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rpc-types-engine",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "ethereum_ssz",
  "ethereum_ssz_derive",
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tree_hash",
  "tree_hash_derive",
 ]
@@ -930,7 +880,7 @@ checksum = "48b9ad6eee93dd35a9ec0a6c1c6b180892a900ee17a6ed6500921552dd71e846"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "serde",
  "serde_with",
 ]
@@ -945,14 +895,14 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 2.1.0",
- "derive_more 2.0.1",
+ "alloy-serde 2.1.1",
+ "derive_more 2.1.1",
  "ethereum_ssz",
  "ethereum_ssz_derive",
  "jsonwebtoken",
- "rand 0.8.5",
+ "rand 0.8.7",
  "serde",
- "strum 0.27.1",
+ "strum 0.27.2",
 ]
 
 [[package]]
@@ -967,13 +917,13 @@ dependencies = [
  "alloy-network-primitives",
  "alloy-primitives",
  "alloy-rlp",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-sol-types",
  "itertools 0.14.0",
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -986,7 +936,7 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
  "serde_json",
 ]
@@ -999,10 +949,10 @@ checksum = "514b4b1ce3354f65067b4fc7eb75358e0f2ec8be3340c96dea65d6894f9ca435"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -1013,15 +963,15 @@ checksum = "76e34a42ebb4a71ab0bfdebc6d2f3c7bf809f01edf154d08fed159d10d1ef1d4"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "serde",
 ]
 
 [[package]]
 name = "alloy-serde"
-version = "1.5.2"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946a0d413dbb5cd9adba0de5f8a1a34d5b77deda9b69c1d7feed8fc875a1aa26"
+checksum = "11ece63b89294b8614ab3f483560c08d016930f842bf36da56bf0b764a15c11e"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -1030,9 +980,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf028ac8bcb161ad7c104243e710cece8e1a794f65ee6c35c4c4d693c8e80ee"
+checksum = "c1e97b3e0b9f816b25083045dcfa69431bd059a078e828e4d82d296d1949b96c"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -1041,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5f392f2f56b2417ea6b74e1e116c6f35df5ab5fce4dc422e277d72ee18ff7b"
+checksum = "6913d06ccc0d9c6ab67e2f82e2fbe292706da1f91442f30cded2d04b56bf0d58"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -1051,7 +1001,7 @@ dependencies = [
  "either",
  "elliptic-curve",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -1068,8 +1018,8 @@ dependencies = [
  "coins-bip32",
  "coins-bip39",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.8.5",
- "thiserror 2.0.12",
+ "rand 0.8.7",
+ "thiserror 2.0.18",
  "zeroize",
 ]
 
@@ -1084,7 +1034,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1097,12 +1047,12 @@ dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
  "sha3 0.11.0",
- "syn 2.0.102",
+ "syn 2.0.118",
  "syn-solidity",
 ]
 
@@ -1120,7 +1070,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.102",
+ "syn 2.0.118",
  "syn-solidity",
 ]
 
@@ -1131,7 +1081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "857b470ecdd2ed38beaf82ad1a38c516a8ff75266750f38b9eeed001d575241b"
 dependencies = [
  "serde",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -1155,13 +1105,13 @@ dependencies = [
  "alloy-json-rpc",
  "auto_impl",
  "base64 0.22.1",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
  "futures-utils-wasm",
  "parking_lot",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "tracing",
@@ -1178,7 +1128,7 @@ dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
  "itertools 0.14.0",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "serde_json",
  "tower",
  "tracing",
@@ -1214,7 +1164,7 @@ dependencies = [
  "alloy-pubsub",
  "alloy-transport",
  "futures",
- "http 1.3.1",
+ "http 1.4.2",
  "rustls",
  "serde_json",
  "tokio",
@@ -1233,7 +1183,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arrayvec",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "nybbles 0.3.4",
  "serde",
  "smallvec",
@@ -1249,32 +1199,26 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arrayvec",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "nybbles 0.4.8",
  "serde",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-tx-macros"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2cd27809c88c413e5542dbd5a8eff8c12f0086af920e881ae586d3a787d5e5"
+checksum = "406bc1183f6843e0aba09f7b3365e828b597213d60793ba5cb41befc863e3a78"
 dependencies = [
  "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -1301,9 +1245,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.19"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -1316,44 +1260,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "aquamarine"
@@ -1366,7 +1310,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1412,7 +1356,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.5",
  "itertools 0.13.0",
  "num-bigint",
  "num-integer",
@@ -1478,6 +1422,23 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ff"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af"
+dependencies = [
+ "ark-ff-asm 0.6.0",
+ "ark-ff-macros 0.6.0",
+ "ark-serialize 0.6.0",
+ "ark-std 0.6.0",
+ "digest 0.10.7",
+ "educe",
+ "num-bigint",
+ "num-traits",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-ff-asm"
 version = "0.3.0"
@@ -1505,7 +1466,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2"
+dependencies = [
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1543,7 +1514,20 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1558,7 +1542,7 @@ dependencies = [
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
@@ -1617,13 +1601,26 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
- "ark-serialize-derive",
+ "ark-serialize-derive 0.5.0",
  "ark-std 0.5.0",
  "arrayvec",
  "digest 0.10.7",
  "num-bigint",
 ]
 
+[[package]]
+name = "ark-serialize"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b"
+dependencies = [
+ "ark-serialize-derive 0.6.0",
+ "ark-std 0.6.0",
+ "digest 0.10.7",
+ "num-bigint",
+ "serde_with",
+]
+
 [[package]]
 name = "ark-serialize-derive"
 version = "0.5.0"
@@ -1632,7 +1629,18 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1642,7 +1650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -1652,7 +1660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -1662,7 +1670,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155"
+dependencies = [
+ "num-traits",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -1673,40 +1691,27 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "as_derive_utils"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff3c96645900a44cf11941c111bd08a6573b0e2f9f69bc9264b179d8fae753c4"
-dependencies = [
- "core_extensions",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "asn1_der"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247"
+checksum = "4858a9d740c5007a9069007c3b4e91152d0506f13c1b31dd49051fd537656156"
 
 [[package]]
 name = "async-compression"
-version = "0.4.33"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93c1f86859c1af3d514fa19e8323147ff10ea98684e6c7b307912509f50e67b2"
+checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac"
 dependencies = [
  "compression-codecs",
  "compression-core",
- "futures-core",
  "pin-project-lite",
  "tokio",
 ]
@@ -1730,7 +1735,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1741,7 +1746,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1790,20 +1795,20 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.16.3"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
 dependencies = [
  "aws-lc-sys",
  "untrusted 0.7.1",
@@ -1812,14 +1817,15 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.40.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
 dependencies = [
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
+ "pkg-config",
 ]
 
 [[package]]
@@ -1830,9 +1836,9 @@ checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7"
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if 1.0.4",
@@ -1841,7 +1847,7 @@ dependencies = [
  "object",
  "rustc-demangle",
  "serde",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -1866,6 +1872,12 @@ dependencies = [
  "match-lookup",
 ]
 
+[[package]]
+name = "base45"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240e56f4d3c453c36faacb695c535a4d5f8c7d23dac175014f32eb0a71012a03"
+
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -1880,9 +1892,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
-version = "1.8.0"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
 
 [[package]]
 name = "bech32"
@@ -1925,40 +1937,22 @@ dependencies = [
  "virtue",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
-dependencies = [
- "bitflags 2.10.0",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex 1.3.0",
- "syn 2.0.102",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "shlex 1.3.0",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1978,28 +1972,49 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitcode"
-version = "0.6.6"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf300f4aa6e66f3bdff11f1236a88c622fe47ea814524792240b4d554d9858ee"
+checksum = "0a6ed1b54d8dc333e7be604d00fa9262f4635485ffea923647b6521a5fff045d"
 dependencies = [
  "bytemuck",
  "serde",
 ]
 
+[[package]]
+name = "bitcoin-consensus-encoding"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2d6094e2a1ba3c93b5a596fe5a10d1a10c3c6e06785cde89f693a044c01aa40"
+dependencies = [
+ "bitcoin-internals",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a30a22d1f112dde8e16be7b45c63645dc165cef254f835b3e1e9553e485cfa64"
+dependencies = [
+ "hex-conservative 0.3.2",
+]
+
 [[package]]
 name = "bitcoin-io"
-version = "0.1.3"
+version = "0.1.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
+checksum = "bb5de036369d1ac59d3c1819ebc4d850f89466f5401c571a285b6ed564a4cb78"
+dependencies = [
+ "bitcoin-consensus-encoding",
+]
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.14.0"
+version = "0.14.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+checksum = "bca4c7abb40c8817d77403c880988cfd484f23ab2365726afb2f798363e2c4a2"
 dependencies = [
  "bitcoin-io",
- "hex-conservative",
+ "hex-conservative 0.2.2",
 ]
 
 [[package]]
@@ -2010,9 +2025,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
@@ -2025,9 +2040,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
 [[package]]
 name = "bitvec"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
 dependencies = [
  "funty",
  "radium",
@@ -2047,9 +2062,9 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99"
+checksum = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -2148,9 +2163,9 @@ dependencies = [
 
 [[package]]
 name = "bon"
-version = "3.6.4"
+version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61138465baf186c63e8d9b6b613b508cd832cba4ce93cf37ce5f096f91ac1a6"
+checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561"
 dependencies = [
  "bon-macros",
  "rustversion",
@@ -2158,9 +2173,9 @@ dependencies = [
 
 [[package]]
 name = "bon-macros"
-version = "3.6.4"
+version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40d1dad34aa19bf02295382f08d9bc40651585bd497266831d40ee6296fb49ca"
+checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
  "darling 0.20.11",
  "ident_case",
@@ -2168,46 +2183,47 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "borsh"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
+checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145"
 dependencies = [
  "borsh-derive",
+ "bytes",
  "cfg_aliases",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c"
+checksum = "3ae8fb4fb5740e4b2c4884ff95f5f32f5e8479db1e8fd8eb49ddbe09eb09bb7c"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "boyer-moore-magiclen"
-version = "0.2.22"
+version = "0.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7441b4796eb8a7107d4cd99d829810be75f5573e1081c37faa0e8094169ea0d6"
+checksum = "43f0fdabfbc8017645223fd529c6077df2c491277e44e88ed8afd5afe54e715a"
 dependencies = [
  "debug-helper",
 ]
 
 [[package]]
 name = "brotli"
-version = "8.0.2"
+version = "8.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -2216,9 +2232,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "5.0.0"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -2236,9 +2252,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "byte-slice-cast"
@@ -2248,9 +2264,9 @@ checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
 
 [[package]]
 name = "bytemuck"
-version = "1.23.1"
+version = "1.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
+checksum = "d6aedf8ae72766347502cf3cb4f41cf5e9cc37d28bee90f1fdaaae15f9cf9424"
 
 [[package]]
 name = "byteorder"
@@ -2260,24 +2276,24 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bytesize"
-version = "2.0.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3c8f83209414aacf0eeae3cf730b18d6981697fba62f200fcfb92b9f082acba"
+checksum = "3d7c8918969267b2932ffd5655509bbbea0833823058c378876953217f5fc50e"
 
 [[package]]
 name = "bytestring"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "113b4343b5f6617e7ad401ced8de3cc8b012e73a594347c307b90db3e9271289"
+checksum = "86566c496f2f47d9b8147a4c8b02ffdb69c919fe0c2b2e7195d22cbba0e635c9"
 dependencies = [
  "bytes",
 ]
@@ -2294,9 +2310,9 @@ dependencies = [
 
 [[package]]
 name = "c-kzg"
-version = "2.1.7"
+version = "2.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6648ed1e4ea8e8a1a4a2c78e1cda29a3fd500bc622899c340d8525ea9a76b24a"
+checksum = "38d04308254695569fdb9bfe3bacc1c91837a670d0806605eb82d63748fbd3a6"
 dependencies = [
  "blst",
  "cc",
@@ -2309,11 +2325,11 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2327,9 +2343,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87a0c0e6148f11f01f32650a2ea02d532b2ad4e81d8bd41e6e565b5adc5e6082"
+checksum = "dd0061da739915fae12ea00e16397555ed4371a6bb285431aab930f61b0aa4ba"
 dependencies = [
  "serde",
  "serde_core",
@@ -2343,7 +2359,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform 0.1.9",
- "semver 1.0.26",
+ "semver 1.0.28",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -2356,11 +2372,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9"
 dependencies = [
  "camino",
- "cargo-platform 0.3.2",
- "semver 1.0.26",
+ "cargo-platform 0.3.3",
+ "semver 1.0.28",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2371,9 +2387,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.65"
+version = "1.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
+checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -2427,17 +2443,16 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -2473,7 +2488,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
- "crypto-common 0.1.6",
+ "crypto-common 0.1.7",
  "inout",
 ]
 
@@ -2485,14 +2500,14 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.9",
+ "libloading",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.56"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2500,9 +2515,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.56"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2512,21 +2527,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.55"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.5"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
 [[package]]
 name = "cmake"
@@ -2543,7 +2558,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
 dependencies = [
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -2573,7 +2588,7 @@ dependencies = [
  "hmac",
  "once_cell",
  "pbkdf2",
- "rand 0.8.5",
+ "rand 0.8.7",
  "sha2 0.10.9",
  "thiserror 1.0.69",
 ]
@@ -2593,15 +2608,15 @@ dependencies = [
  "ripemd",
  "serde",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3 0.10.9",
  "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
 [[package]]
 name = "colored"
@@ -2625,9 +2640,9 @@ dependencies = [
 
 [[package]]
 name = "compression-codecs"
-version = "0.4.32"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "680dc087785c5230f8e8843e2e57ac7c1c90488b6a91b88caa265410568f441b"
+checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
 dependencies = [
  "brotli",
  "compression-core",
@@ -2639,9 +2654,9 @@ dependencies = [
 
 [[package]]
 name = "compression-core"
-version = "0.4.31"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789"
 
 [[package]]
 name = "concat-kdf"
@@ -2654,15 +2669,14 @@ dependencies = [
 
 [[package]]
 name = "const-hex"
-version = "1.14.1"
+version = "1.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff"
+checksum = "33e2a781ebdf4467d1428dc4593067825fb646f6871475098d8577421af73558"
 dependencies = [
  "cfg-if 1.0.4",
  "cpufeatures 0.2.17",
- "hex",
  "proptest",
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -2671,6 +2685,12 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
 [[package]]
 name = "const-str"
 version = "0.4.3"
@@ -2679,11 +2699,12 @@ checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3"
 
 [[package]]
 name = "const_format"
-version = "0.2.34"
+version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
 dependencies = [
  "const_format_proc_macros",
+ "konst",
 ]
 
 [[package]]
@@ -2697,26 +2718,17 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "const_panic"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e262cdaac42494e3ae34c43969f9cdeb7da178bdb4b66fa6a1ea2edb4c8ae652"
-dependencies = [
- "typewit",
-]
-
 [[package]]
 name = "constant_time_eq"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
 
 [[package]]
 name = "convert_case"
-version = "0.7.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -2758,30 +2770,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "core2"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "core_extensions"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bb5e5d0269fd4f739ea6cedaf29c16d81c27a7ce7582008e90eb50dcd57003"
-dependencies = [
- "core_extensions_proc_macros",
-]
-
-[[package]]
-name = "core_extensions_proc_macros"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533d38ecd2709b7608fb8e18e4504deb99e9a72879e6aa66373a76d8dc4259ea"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -2802,33 +2790,33 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d"
 dependencies = [
  "crc-catalog",
 ]
 
 [[package]]
 name = "crc-catalog"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if 1.0.4",
 ]
 
 [[package]]
 name = "criterion"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d883447757bb0ee46f233e9dc22eb84d93a9508c9b868687b274fc431d886bf"
+checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3"
 dependencies = [
  "alloca",
  "anes",
@@ -2851,9 +2839,9 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed943f81ea2faa8dcecbbfa50164acf95d555afec96a27871663b300e387b2e4"
+checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea"
 dependencies = [
  "cast",
  "itertools 0.13.0",
@@ -2880,18 +2868,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -2899,33 +2887,33 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "803d13fb3b09d88be9f4dbc29062c66b19bf7170867ceb746d2a8689bf6c7a26"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crunchy"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-bigint"
@@ -2941,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -3026,7 +3014,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3060,7 +3048,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3074,7 +3062,7 @@ dependencies = [
  "quote",
  "serde",
  "strsim",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3085,7 +3073,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3096,7 +3084,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3117,15 +3105,15 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.18"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+checksum = "3259c913752a86488b501ed8680446a5ed2d5aeac6e596cb23ba3800768ea32c"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -3133,19 +3121,19 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090"
 dependencies = [
  "data-encoding",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "debug-helper"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
+checksum = "80a4af69c60438a1a82af89d362f4729fd38db7b73f305a237636fad31ceb2bf"
 
 [[package]]
 name = "delay_map"
@@ -3164,17 +3152,16 @@ version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
- "const-oid",
+ "const-oid 0.9.6",
  "zeroize",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
- "powerfmt",
  "serde_core",
 ]
 
@@ -3197,7 +3184,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3208,18 +3195,18 @@ checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "derive-where"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
+checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3240,7 +3227,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3250,7 +3237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3264,11 +3251,11 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
- "derive_more-impl 2.0.1",
+ "derive_more-impl 2.1.1",
 ]
 
 [[package]]
@@ -3279,20 +3266,21 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
  "unicode-xid",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "rustc_version 0.4.1",
+ "syn 2.0.118",
  "unicode-xid",
 ]
 
@@ -3334,8 +3322,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
- "const-oid",
- "crypto-common 0.1.6",
+ "const-oid 0.9.6",
+ "crypto-common 0.1.7",
  "subtle",
 ]
 
@@ -3346,6 +3334,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
  "block-buffer 0.12.1",
+ "const-oid 0.10.2",
  "crypto-common 0.2.2",
 ]
 
@@ -3392,9 +3381,9 @@ dependencies = [
  "more-asserts",
  "multiaddr",
  "parking_lot",
- "rand 0.8.5",
+ "rand 0.8.7",
  "smallvec",
- "socket2 0.6.3",
+ "socket2 0.6.5",
  "tokio",
  "tracing",
  "uint 0.10.0",
@@ -3403,20 +3392,20 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "doctest-file"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+checksum = "c2db04e74f0a9a93103b50e90b96024c9b2bdca8bce6a632ec71b88736d3d359"
 
 [[package]]
 name = "dotenv"
@@ -3432,9 +3421,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dtor"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934"
+checksum = "404d02eeb088a82cfd873006cb713fe411306c7d182c344905e101fb1167d301"
 dependencies = [
  "dtor-proc-macro",
 ]
@@ -3453,9 +3442,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
 
 [[package]]
 name = "ecdsa"
@@ -3506,7 +3495,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3584,31 +3573,31 @@ dependencies = [
  "hex",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log",
- "rand 0.8.5",
+ "rand 0.8.7",
  "secp256k1 0.30.0",
  "serde",
- "sha3 0.10.8",
+ "sha3 0.10.9",
  "zeroize",
 ]
 
 [[package]]
 name = "enum-ordinalize"
-version = "4.3.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5"
+checksum = "07f808d588c10e464ea6f7d3eaed500049eff30aaac103460f61828c2d65b3eb"
 dependencies = [
  "enum-ordinalize-derive",
 ]
 
 [[package]]
 name = "enum-ordinalize-derive"
-version = "4.3.1"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
+checksum = "42e528e2d34ba8a67a1a650b86beae8ef69fc5fdb638016f386b973226590432"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3632,12 +3621,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.12"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3676,9 +3665,9 @@ dependencies = [
 
 [[package]]
 name = "ethereum_serde_utils"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc1355dbb41fbbd34ec28d4fb2a57d9a70c67ac3c19f6a5ca4d4a176b9e997a"
+checksum = "38df44a7a271ab43835678f9215b53cc2523e4714a215da6643d83dc110245da"
 dependencies = [
  "alloy-primitives",
  "hex",
@@ -3711,7 +3700,7 @@ dependencies = [
  "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3737,9 +3726,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fastrlp"
@@ -3825,7 +3814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3848,14 +3837,14 @@ checksum = "6dc7a9cb3326bafb80642c5ce99b39a2c0702d4bfa8ee8a3e773791a6cbe2407"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -3867,7 +3856,7 @@ version = "0.10.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
 dependencies = [
- "spin 0.9.8",
+ "spin 0.9.9",
 ]
 
 [[package]]
@@ -3905,9 +3894,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -3935,9 +3924,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3950,9 +3939,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3960,15 +3949,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -3977,48 +3966,48 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+checksum = "af43fadb8a98512d547e37b4e92e0ced13e205c061b87b4623eff01d918d6968"
 dependencies = [
  "gloo-timers",
- "send_wrapper 0.4.0",
+ "send_wrapper",
 ]
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4028,7 +4017,6 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -4038,15 +4026,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9"
 
-[[package]]
-name = "generational-arena"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7"
-dependencies = [
- "cfg-if 1.0.4",
-]
-
 [[package]]
 name = "generator"
 version = "0.8.9"
@@ -4058,8 +4037,8 @@ dependencies = [
  "libc",
  "log",
  "rustversion",
- "windows-link 0.2.0",
- "windows-result 0.4.0",
+ "windows-link",
+ "windows-result",
 ]
 
 [[package]]
@@ -4075,55 +4054,52 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if 1.0.4",
  "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if 1.0.4",
- "js-sys",
  "libc",
- "r-efi 5.2.0",
- "wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
+ "r-efi 5.3.0",
+ "wasip2",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if 1.0.4",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
  "rand_core 0.10.1",
- "wasip2",
- "wasip3",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "getset"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3586f256131df87204eb733da72e3d3eb4f343c639f4b7be279ac7c48baeafe"
+checksum = "6cf442baaabe4213ce7d1239afc26c039180b6456da2cededa316ae2c8a77a77"
 dependencies = [
- "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4138,9 +4114,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "git-version"
@@ -4159,7 +4135,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4168,7 +4144,7 @@ version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "libc",
  "libgit2-sys",
  "log",
@@ -4177,9 +4153,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "gloo-net"
@@ -4191,7 +4167,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 1.3.1",
+ "http 1.4.2",
  "js-sys",
  "pin-project",
  "serde",
@@ -4204,9 +4180,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-timers"
-version = "0.2.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "482ce8a491a501da4cd806bd190275363d674f2845005c6ddbd5d3e1dd54495d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4229,12 +4205,12 @@ dependencies = [
 
 [[package]]
 name = "gmp-mpfr-sys"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cfc928d8ff4ab3767a3674cf55f81186436fb6070866bb1443ffe65a640d2d6"
+checksum = "7db155b537cb791b133341f99f68371d86ee7fa4c79aacfbc376d72d23c70531"
 dependencies = [
  "libc",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4256,7 +4232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff 0.13.1",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rand_xorshift 0.3.0",
  "subtle",
@@ -4274,7 +4250,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4283,17 +4259,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.12.1",
+ "http 1.4.2",
+ "indexmap 2.14.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4302,12 +4278,13 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.6.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "cfg-if 1.0.4",
  "crunchy",
+ "zerocopy",
 ]
 
 [[package]]
@@ -4328,15 +4305,15 @@ dependencies = [
  "crossbeam",
  "ff 0.13.1",
  "group 0.13.0",
- "halo2curves-axiom 0.7.0",
+ "halo2curves-axiom 0.7.2",
  "itertools 0.11.0",
  "maybe-rayon",
  "pairing 0.23.0",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rayon",
  "rustc-hash 1.1.0",
- "sha3 0.10.8",
+ "sha3 0.10.9",
  "tracing",
 ]
 
@@ -4358,7 +4335,7 @@ dependencies = [
  "git-version",
  "group 0.13.0",
  "halo2-axiom",
- "halo2curves-axiom 0.7.0",
+ "halo2curves-axiom 0.7.2",
  "itertools 0.11.0",
  "lazy_static",
  "libc",
@@ -4369,12 +4346,12 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "pairing 0.23.0",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rayon",
  "rustacuda",
  "rustc-hash 1.1.0",
- "sha3 0.10.8",
+ "sha3 0.10.9",
  "subtle",
  "tracing",
  "yastl",
@@ -4411,7 +4388,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "rayon",
@@ -4436,9 +4413,9 @@ dependencies = [
 
 [[package]]
 name = "halo2curves-axiom"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8309e4638b4f1bcf6613d72265a84074d26034c35edc5d605b5688e580b8b8"
+checksum = "b0cd39c0df23c8b72cb7158ccb106341b078d5019b5478b3bfdaf14e898177d3"
 dependencies = [
  "blake2b_simd",
  "digest 0.10.7",
@@ -4451,7 +4428,7 @@ dependencies = [
  "pairing 0.23.0",
  "pasta_curves 0.5.1",
  "paste",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rayon",
  "serde",
@@ -4464,8 +4441,8 @@ dependencies = [
 
 [[package]]
 name = "halo2curves-axiom"
-version = "0.7.2"
-source = "git+https://github.com/axiom-crypto/halo2curves.git?tag=v0.7.2#3a65a710e27fe03711f6fb4fc0c4469ae351974a"
+version = "0.7.3"
+source = "git+https://github.com/axiom-crypto/halo2curves.git?tag=v0.7.3#d744f712fbeaf62576b2b10842822919551c5ef8"
 dependencies = [
  "blake2b_simd",
  "digest 0.10.7",
@@ -4478,7 +4455,7 @@ dependencies = [
  "pairing 0.23.0",
  "pasta_curves 0.5.1",
  "paste",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rayon",
  "serde",
@@ -4518,9 +4495,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -4545,7 +4522,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "foldhash 0.2.0",
- "rayon",
  "serde",
  "serde_core",
 ]
@@ -4601,18 +4577,27 @@ dependencies = [
 
 [[package]]
 name = "hex-conservative"
-version = "0.2.1"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "hex-conservative"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+checksum = "830e599c2904b08f0834ee6337d8fe8f0ed4a63b5d9e7a7f49c0ffa06d08d360"
 dependencies = [
  "arrayvec",
 ]
 
 [[package]]
 name = "hex-literal"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71"
+checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
 
 [[package]]
 name = "hickory-net"
@@ -4630,8 +4615,8 @@ dependencies = [
  "idna",
  "ipnet",
  "jni 0.22.4",
- "rand 0.10.1",
- "thiserror 2.0.12",
+ "rand 0.10.2",
+ "thiserror 2.0.18",
  "tinyvec",
  "tokio",
  "tracing",
@@ -4650,10 +4635,10 @@ dependencies = [
  "jni 0.22.4",
  "once_cell",
  "prefix-trie",
- "rand 0.10.1",
+ "rand 0.10.2",
  "ring",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "url",
@@ -4676,12 +4661,12 @@ dependencies = [
  "ndk-context",
  "once_cell",
  "parking_lot",
- "rand 0.10.1",
+ "rand 0.10.2",
  "resolv-conf",
  "serde",
  "smallvec",
- "system-configuration 0.7.0",
- "thiserror 2.0.12",
+ "system-configuration",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -4717,34 +4702,33 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http 1.4.2",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "pin-project-lite",
 ]
@@ -4778,9 +4762,9 @@ dependencies = [
 
 [[package]]
 name = "humantime"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15"
 
 [[package]]
 name = "humantime-serde"
@@ -4788,7 +4772,7 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
 dependencies = [
- "humantime 2.3.0",
+ "humantime 2.4.0",
  "serde",
 ]
 
@@ -4803,15 +4787,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
- "h2 0.4.12",
- "http 1.3.1",
+ "futures-core",
+ "h2 0.4.15",
+ "http 1.4.2",
  "http-body",
  "httparse",
  "httpdate",
@@ -4824,17 +4809,16 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.7"
+version = "0.27.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.2",
  "hyper",
  "hyper-util",
  "log",
  "rustls",
  "rustls-native-certs",
- "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
@@ -4871,24 +4855,23 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.14"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "hyper",
  "ipnet",
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
- "system-configuration 0.6.1",
+ "socket2 0.6.5",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
@@ -4897,9 +4880,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -4907,7 +4890,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.2",
+ "windows-core",
 ]
 
 [[package]]
@@ -4921,12 +4904,13 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -4934,9 +4918,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -4947,11 +4931,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -4962,42 +4945,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -5005,12 +4984,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -5019,9 +4992,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -5030,9 +5003,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -5057,7 +5030,7 @@ dependencies = [
  "archery",
  "bitmaps",
  "imbl-sized-chunks",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "rand_xoshiro",
  "serde_core",
  "version_check",
@@ -5084,9 +5057,9 @@ dependencies = [
 
 [[package]]
 name = "impl-more"
-version = "0.1.9"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a5a9a0ff0086c7a148acb942baaabeadf9504d10400b5a05645853729b9cd2"
+checksum = "35a84fd5aa25fae5c0f4a33d9cac2ca017fc622cbd089be2229993514990f870"
 
 [[package]]
 name = "impl-trait-for-tuples"
@@ -5096,7 +5069,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5120,9 +5093,9 @@ dependencies = [
 
 [[package]]
 name = "indenter"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
 
 [[package]]
 name = "indexmap"
@@ -5137,33 +5110,32 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
- "rayon",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
 
 [[package]]
 name = "inotify"
-version = "0.11.0"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
+checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "inotify-sys",
  "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
 dependencies = [
  "libc",
 ]
@@ -5190,45 +5162,36 @@ dependencies = [
  "recvmsg",
  "tokio",
  "widestring",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ipconfig"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222"
 dependencies = [
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "widestring",
- "windows-sys 0.48.0",
- "winreg",
+ "windows-registry",
+ "windows-result",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "iri-string"
-version = "0.7.8"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
 dependencies = [
- "memchr",
  "serde",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
@@ -5268,9 +5231,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jni"
@@ -5281,7 +5244,7 @@ dependencies = [
  "cesu8",
  "cfg-if 1.0.4",
  "combine",
- "jni-sys 0.3.0",
+ "jni-sys 0.3.1",
  "log",
  "thiserror 1.0.69",
  "walkdir",
@@ -5300,9 +5263,9 @@ dependencies = [
  "jni-sys 0.4.1",
  "log",
  "simd_cesu8",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "walkdir",
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -5315,14 +5278,17 @@ dependencies = [
  "quote",
  "rustc_version 0.4.1",
  "simd_cesu8",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
 
 [[package]]
 name = "jni-sys"
@@ -5340,28 +5306,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
 dependencies = [
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.33"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.4.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.97"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
  "cfg-if 1.0.4",
  "futures-util",
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -5393,14 +5358,14 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "gloo-net",
- "http 1.3.1",
+ "http 1.4.2",
  "jsonrpsee-core",
  "pin-project",
  "rustls",
  "rustls-pki-types",
  "rustls-platform-verifier 0.5.3",
  "soketto",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-rustls",
  "tokio-util",
@@ -5418,17 +5383,17 @@ dependencies = [
  "bytes",
  "futures-timer",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "jsonrpsee-types",
  "parking_lot",
  "pin-project",
- "rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rand 0.9.5",
+ "rustc-hash 2.1.3",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tower",
@@ -5453,7 +5418,7 @@ dependencies = [
  "rustls-platform-verifier 0.5.3",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tower",
  "url",
@@ -5466,10 +5431,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2da3f8ab5ce1bb124b6d082e62dffe997578ceaf0aeb9f3174a214589dc00f07"
 dependencies = [
  "heck",
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5479,7 +5444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c51b7c290bb68ce3af2d029648148403863b982f138484a73f02a9dd52dbd7f"
 dependencies = [
  "futures-util",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -5491,7 +5456,7 @@ dependencies = [
  "serde",
  "serde_json",
  "soketto",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -5505,10 +5470,10 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc88ff4688e43cc3fa9883a8a95c6fa27aa2e76c96e610b737b6554d650d7fd5"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.2",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -5529,7 +5494,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b6fceceeb05301cc4c065ab3bd2fa990d41ff4eb44e4ca1b30fa99c057c3e79"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.2",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -5539,19 +5504,20 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "10.3.0"
+version = "10.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0529410abe238729a60b108898784df8984c87f6054c9c4fcacc47e4803c1ce1"
+checksum = "eba32bfb4ffdeaca3e34431072faf01745c9b26d25504aa7a6cf5684334fc4fc"
 dependencies = [
  "aws-lc-rs",
  "base64 0.22.1",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "js-sys",
  "pem",
  "serde",
  "serde_json",
  "signature",
  "simple_asn1",
+ "zeroize",
 ]
 
 [[package]]
@@ -5586,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -5603,9 +5569,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
 dependencies = [
  "cpufeatures 0.2.17",
 ]
@@ -5622,19 +5588,34 @@ dependencies = [
 
 [[package]]
 name = "keccak-asm"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a"
+checksum = "dd5dc2c0d691cbf7595cde551ced329cca99c2387c2cbc97754c5d0cd045d3ee"
 dependencies = [
  "digest 0.10.7",
  "sha3-asm",
 ]
 
+[[package]]
+name = "konst"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+dependencies = [
+ "konst_macro_rules",
+]
+
+[[package]]
+name = "konst_macro_rules"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+
 [[package]]
 name = "kqueue"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -5642,11 +5623,11 @@ dependencies = [
 
 [[package]]
 name = "kqueue-sys"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.0",
  "libc",
 ]
 
@@ -5662,15 +5643,9 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin 0.9.9",
 ]
 
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "left-right"
 version = "0.11.7"
@@ -5690,9 +5665,9 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.18.3+1.9.2"
+version = "0.18.5+1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487"
+checksum = "005d6ae6eac1912906073e069f7db60b1fa98e052a68227824afe3e3a1c59ca2"
 dependencies = [
  "cc",
  "libc",
@@ -5700,16 +5675,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if 1.0.4",
- "winapi",
-]
-
 [[package]]
 name = "libloading"
 version = "0.8.9"
@@ -5717,30 +5682,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if 1.0.4",
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.42"
+version = "0.1.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9d6fac27761dabcd4ee73571cdb06b7022dc99089acbe5435691edffaac0f4"
+checksum = "6a45a52f43e1c16f667ccfe4dd8c85b7f7c204fd5e3bf46c5b0db9a5c3c0b8e9"
 dependencies = [
  "cc",
- "libc",
 ]
 
 [[package]]
 name = "libp2p-identity"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c7892c221730ba55f7196e98b0b8ba5e04b4155651736036628e9f73ed6fc3"
+checksum = "9525f3831544f7ae497bde79adf114ef127b0fbbb97edbbf692a80408636421c"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -5748,31 +5712,30 @@ dependencies = [
  "hkdf",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "multihash",
- "quick-protobuf",
+ "prost",
  "sha2 0.10.9",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "libproc"
-version = "0.14.10"
+version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb"
+checksum = "a54ad7278b8bc5301d5ffd2a94251c004feb971feba96c971ea4063645990757"
 dependencies = [
- "bindgen 0.70.1",
+ "bindgen",
  "errno",
  "libc",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
- "bitflags 2.10.0",
  "libc",
 ]
 
@@ -5782,7 +5745,7 @@ version = "0.17.3+10.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef2a00ee60fe526157c9023edab23943fae1ce2ab6f4abb2a807c1746835de9"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "bzip2-sys",
  "cc",
  "libc",
@@ -5803,7 +5766,7 @@ dependencies = [
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
- "rand 0.8.5",
+ "rand 0.8.7",
  "serde",
  "sha2 0.9.9",
 ]
@@ -5839,9 +5802,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.23"
+version = "1.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d118bbf3771060e7311cc7bb0545b01d08a8b4a7de949198dec1fa0ca1c0f7"
+checksum = "85bc9657773828b90eeb625adff10eeac83cc21bbfd8e23a03eaa8a33c9e28d9"
 dependencies = [
  "cc",
  "libc",
@@ -5867,15 +5830,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "local-channel"
@@ -5896,11 +5859,10 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
  "serde",
 ]
@@ -5913,9 +5875,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "loom"
@@ -5927,7 +5889,7 @@ dependencies = [
  "generator",
  "scoped-tls",
  "tracing",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -5936,14 +5898,14 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.15.4",
+ "hashbrown 0.15.5",
 ]
 
 [[package]]
 name = "lru"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
 dependencies = [
  "hashbrown 0.16.1",
 ]
@@ -5966,9 +5928,9 @@ dependencies = [
 
 [[package]]
 name = "lz4_flex"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c23545df7ecf1b16c303910a69b079e8e251d60f7dd2cc9b4177f2afaf1746"
+checksum = "90071f8077f8e40adfc4b7fe9cd495ce316263f19e75c2211eeff3fdf475a3d9"
 
 [[package]]
 name = "mach2"
@@ -5979,6 +5941,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
+
 [[package]]
 name = "macro-string"
 version = "0.2.0"
@@ -5987,7 +5955,7 @@ checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -5998,7 +5966,7 @@ checksum = "757aee279b8bdbb9f9e676796fd459e4207a1f986e87886700abf589f5abf771"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6032,15 +6000,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memmap2"
-version = "0.9.9"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
 dependencies = [
  "libc",
 ]
@@ -6073,13 +6041,13 @@ dependencies = [
 
 [[package]]
 name = "metrics-derive"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a87f4b19620e4c561f7b48f5e6ca085b1780def671696a6a3d9d0c137360ec"
+checksum = "161ab904c2c62e7bda0f7562bf22f96440ca35ff79e66c800cbac298f2f4f5ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6090,27 +6058,27 @@ checksum = "1db0d8f1fc9e62caebd0319e11eaec5822b0186c171568f0480b46a0137f9108"
 dependencies = [
  "base64 0.22.1",
  "evmap",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "metrics 0.24.6",
  "metrics-util 0.20.4",
  "quanta",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "metrics-process"
-version = "2.4.2"
+version = "2.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f615e08e049bd14a44c4425415782efb9bcd479fc1e19ddeb971509074c060d0"
+checksum = "4268d87f64a752f5a651314fc683f04da10be65701ea3e721ba4d74f79163cac"
 dependencies = [
  "libc",
  "libproc",
- "mach2",
+ "mach2 0.6.0",
  "metrics 0.24.6",
  "once_cell",
  "procfs",
  "rlimit",
- "windows 0.62.1",
+ "windows",
 ]
 
 [[package]]
@@ -6119,7 +6087,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62a6a1f7141f1d9bc7a886b87536bbfc97752e08b369e1e0453a9acfab5f5da4"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "itoa",
  "lockfree-object-pool",
  "metrics 0.23.1",
@@ -6127,7 +6095,7 @@ dependencies = [
  "once_cell",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -6140,7 +6108,7 @@ dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
  "hashbrown 0.14.5",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "metrics 0.23.1",
  "num_cpus",
  "ordered-float",
@@ -6160,17 +6128,17 @@ dependencies = [
  "hashbrown 0.16.1",
  "metrics 0.24.6",
  "quanta",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rand_xoshiro",
  "rapidhash",
- "sketches-ddsketch 0.3.0",
+ "sketches-ddsketch 0.3.1",
 ]
 
 [[package]]
 name = "mimalloc"
-version = "0.1.46"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995942f432bbb4822a7e9c3faa87a695185b0d09273ba85f097b54f4e458f2af"
+checksum = "2d4139bb28d14ad1facf21d5eb8825051b326e172d216b39f6d31df53cc97862"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -6204,6 +6172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -6214,14 +6183,14 @@ checksum = "c505b3e17ed6b70a7ed2e67fbb2c560ee327353556120d6e72f5232b6880d536"
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.61.1",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6242,14 +6211,14 @@ checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "moka"
-version = "0.12.13"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac832c50ced444ef6be0767a008b02c106a909ba79d1d830501e94b96f6b7e"
+checksum = "957228ad12042ee839f93c8f257b62b4c0ab5eaae1d4fa60de53b27c9d7c5046"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-epoch",
@@ -6289,23 +6258,23 @@ dependencies = [
 
 [[package]]
 name = "multibase"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77"
+checksum = "7e0e4a371cbf1dfd666b658ba137763edb23c45beb43cfe369b5593cd6b437b6"
 dependencies = [
  "base-x",
  "base256emoji",
+ "base45",
  "data-encoding",
  "data-encoding-macro",
 ]
 
 [[package]]
 name = "multihash"
-version = "0.19.3"
+version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
+checksum = "577c63b00ad74d57e8c9aa870b5fccebf2fd64a308a5aee9f1bb88e4aea19447"
 dependencies = [
- "core2",
  "unsigned-varint",
 ]
 
@@ -6317,9 +6286,9 @@ checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577"
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
 dependencies = [
  "libc",
  "log",
@@ -6327,7 +6296,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
@@ -6362,6 +6331,18 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.13.0",
+ "cfg-if 1.0.4",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -6387,7 +6368,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -6405,25 +6386,25 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
 name = "ntapi"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
 dependencies = [
  "winapi",
 ]
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.1"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -6442,13 +6423,13 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
  "serde",
 ]
 
@@ -6463,9 +6444,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-integer"
@@ -6478,11 +6459,10 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -6511,7 +6491,7 @@ dependencies = [
  "num-integer",
  "num-modular",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -6561,10 +6541,10 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -6618,7 +6598,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
@@ -6633,9 +6613,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -6652,9 +6632,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "oorandom"
@@ -6670,15 +6650,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cfg-if 1.0.4",
  "foreign-types",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -6691,20 +6670,20 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
 dependencies = [
  "cc",
  "libc",
@@ -6722,7 +6701,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -6734,25 +6713,25 @@ checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d"
 dependencies = [
  "async-trait",
  "bytes",
- "http 1.3.1",
+ "http 1.4.2",
  "opentelemetry",
- "reqwest 0.12.20",
+ "reqwest 0.12.28",
 ]
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf"
+checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f"
 dependencies = [
- "http 1.3.1",
+ "http 1.4.2",
  "opentelemetry",
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry_sdk",
  "prost",
- "reqwest 0.12.20",
- "thiserror 2.0.12",
+ "reqwest 0.12.28",
+ "thiserror 2.0.18",
  "tokio",
  "tonic",
  "tracing",
@@ -6788,38 +6767,39 @@ dependencies = [
  "futures-util",
  "opentelemetry",
  "percent-encoding",
- "rand 0.9.2",
- "thiserror 2.0.12",
+ "rand 0.9.5",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "bytemuck",
  "num-bigint",
  "openvm-custom-insn",
  "openvm-platform",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
 ]
 
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
  "derive_more 1.0.0",
  "eyre",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "num-bigint",
  "num-traits",
  "once_cell",
  "openvm-algebra-transpiler",
+ "openvm-algebra-utils",
  "openvm-circuit",
  "openvm-circuit-derive",
  "openvm-circuit-primitives",
@@ -6829,11 +6809,13 @@ dependencies = [
  "openvm-cuda-common",
  "openvm-instructions",
  "openvm-mod-circuit-builder",
- "openvm-rv32-adapters",
- "openvm-rv32im-circuit",
+ "openvm-riscv-adapters",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-algebra",
+ "rvr-openvm-lift",
  "serde",
  "serde_with",
  "strum 0.26.3",
@@ -6842,25 +6824,25 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-macros-common",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "num-bigint",
  "once_cell",
  "openvm-algebra-complex-macros",
  "openvm-algebra-moduli-macros",
  "openvm-custom-insn",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde-big-array",
  "strum_macros 0.26.4",
 ]
@@ -6868,33 +6850,43 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "num-bigint",
  "num-prime",
  "openvm-macros-common",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-algebra-guest",
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-instructions-derive",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
+[[package]]
+name = "openvm-algebra-utils"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "rand 0.9.5",
+]
+
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6909,19 +6901,21 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
- "openvm-rv32-adapters",
- "openvm-rv32im-circuit",
- "openvm-rv32im-transpiler",
+ "openvm-riscv-adapters",
+ "openvm-riscv-circuit",
+ "openvm-riscv-transpiler",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-bigint",
+ "rvr-openvm-lift",
  "serde",
 ]
 
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6930,22 +6924,22 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-bigint-guest",
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-instructions-derive",
- "openvm-rv32im-transpiler",
+ "openvm-riscv-transpiler",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6967,9 +6961,8 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
- "abi_stable",
  "backtrace",
  "bytesize",
  "cfg-if 1.0.4",
@@ -6980,7 +6973,7 @@ dependencies = [
  "getset",
  "itertools 0.14.0",
  "libc",
- "libloading 0.8.9",
+ "libloading",
  "memmap2",
  "metrics 0.23.1",
  "openvm-circuit-derive",
@@ -6991,13 +6984,19 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
+ "openvm-platform",
  "openvm-poseidon2-air",
  "openvm-stark-backend",
  "openvm-stark-sdk",
  "p3-baby-bear",
  "p3-field",
- "rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rand 0.9.5",
+ "rustc-hash 2.1.3",
+ "rvr-openvm",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+ "rvr-state",
  "serde",
  "serde-big-array",
  "static_assertions",
@@ -7009,18 +7008,18 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7032,7 +7031,7 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-stark-backend",
- "rand 0.9.2",
+ "rand 0.9.5",
  "struct-reflection",
  "tracing",
 ]
@@ -7040,12 +7039,12 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7056,13 +7055,13 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7109,7 +7108,7 @@ dependencies = [
  "p3-maybe-rayon",
  "p3-util",
  "rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "serde",
  "thiserror 1.0.69",
  "tracing",
@@ -7134,8 +7133,8 @@ dependencies = [
  "p3-field",
  "p3-symmetric",
  "p3-util",
- "rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rand 0.9.5",
+ "rustc-hash 2.1.3",
  "serde",
  "thiserror 1.0.69",
  "tracing",
@@ -7181,17 +7180,22 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
+[[package]]
+name = "openvm-decoder"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7209,19 +7213,22 @@ dependencies = [
  "openvm-deferral-transpiler",
  "openvm-instructions",
  "openvm-poseidon2-air",
- "openvm-rv32im-circuit",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
  "p3-field",
- "rand 0.9.2",
- "rustc-hash 2.1.1",
+ "rand 0.9.5",
+ "rustc-hash 2.1.3",
+ "rvr-openvm-ext-deferral",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-lift",
  "serde",
 ]
 
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7230,7 +7237,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7246,13 +7253,13 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
  "derive_more 1.0.0",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "hex-literal",
  "lazy_static",
  "num-bigint",
@@ -7268,10 +7275,13 @@ dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
  "openvm-mod-circuit-builder",
- "openvm-rv32-adapters",
+ "openvm-riscv-adapters",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-ecc",
+ "rvr-openvm-lift",
  "serde",
  "serde_with",
  "strum 0.26.3",
@@ -7280,18 +7290,18 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
  "group 0.13.0",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "once_cell",
  "openvm",
  "openvm-algebra-guest",
  "openvm-custom-insn",
  "openvm-ecc-sw-macros",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
  "strum_macros 0.26.4",
 ]
@@ -7299,24 +7309,24 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-macros-common",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
+ "openvm-decoder",
  "openvm-ecc-guest",
  "openvm-instructions",
  "openvm-instructions-derive",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
@@ -7327,7 +7337,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7344,26 +7354,26 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-keccak256-guest",
- "spin 0.10.0",
+ "spin 0.10.1",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7378,11 +7388,13 @@ dependencies = [
  "openvm-cuda-common",
  "openvm-instructions",
  "openvm-keccak256-transpiler",
- "openvm-rv32im-circuit",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
  "p3-keccak-air",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-keccak",
+ "rvr-openvm-lift",
  "serde",
  "strum 0.26.3",
  "tiny-keccak",
@@ -7391,7 +7403,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-platform",
 ]
@@ -7399,14 +7411,14 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-instructions-derive",
  "openvm-keccak256-guest",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
@@ -7431,22 +7443,22 @@ dependencies = [
  "serde",
  "serde-big-array",
  "serde_yaml",
- "spin 0.10.0",
- "toml 0.9.5",
+ "spin 0.10.1",
+ "toml 0.9.12+spec-1.1.0",
 ]
 
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7456,8 +7468,8 @@ dependencies = [
  "openvm-instructions",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.7",
+ "rand 0.9.5",
  "tracing",
 ]
 
@@ -7474,7 +7486,7 @@ dependencies = [
  "revm-primitives 24.0.1",
  "serde",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -7498,17 +7510,17 @@ dependencies = [
  "reth-primitives-traits",
  "reth-revm",
  "tokio",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
  "url",
 ]
 
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "group 0.13.0",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "hex-literal",
  "itertools 0.14.0",
  "num-bigint",
@@ -7522,20 +7534,20 @@ dependencies = [
  "openvm-ecc-sw-macros",
  "openvm-pairing-guest",
  "openvm-platform",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
 ]
 
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
  "derive_more 1.0.0",
  "eyre",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "num-bigint",
  "num-traits",
  "openvm-algebra-circuit",
@@ -7550,10 +7562,12 @@ dependencies = [
  "openvm-mod-circuit-builder",
  "openvm-pairing-guest",
  "openvm-pairing-transpiler",
- "openvm-rv32im-circuit",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-pairing",
+ "rvr-openvm-lift",
  "serde",
  "strum 0.26.3",
 ]
@@ -7561,10 +7575,10 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "blstrs",
- "halo2curves-axiom 0.7.2",
+ "halo2curves-axiom 0.7.3",
  "hex-literal",
  "itertools 0.14.0",
  "lazy_static",
@@ -7582,30 +7596,30 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-pairing-guest",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "libm",
  "openvm-custom-insn",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
 ]
 
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7616,14 +7630,14 @@ dependencies = [
  "p3-poseidon2",
  "p3-poseidon2-air",
  "p3-symmetric",
- "rand 0.9.2",
+ "rand 0.9.5",
  "zkhash-axiom",
 ]
 
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7651,10 +7665,10 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -7688,9 +7702,9 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "toml 0.9.5",
+ "toml 0.9.12+spec-1.1.0",
  "tracing",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
  "url",
  "zstd",
 ]
@@ -7699,10 +7713,13 @@ dependencies = [
 name = "openvm-reth-verify"
 version = "0.4.0"
 dependencies = [
+ "bincode 1.3.3",
  "clap",
  "eyre",
+ "openvm-circuit",
  "openvm-stark-sdk",
  "openvm-verify-stark-host",
+ "serde",
  "zstd",
 ]
 
@@ -7717,59 +7734,22 @@ dependencies = [
  "ark-ec",
  "ark-ff 0.5.0",
  "aurora-engine-modexp",
- "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=main)",
+ "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-curve-utils",
  "openvm-ecc-guest",
  "openvm-keccak256",
  "openvm-kzg",
  "openvm-pairing",
  "openvm-sha2",
- "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=main)",
+ "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "revm 40.0.3",
  "revm-primitives 24.0.1",
 ]
 
 [[package]]
-name = "openvm-rpc-proxy"
-version = "0.4.0"
-dependencies = [
- "actix-web",
- "alloy",
- "alloy-chains",
- "alloy-consensus",
- "alloy-json-rpc",
- "alloy-primitives",
- "alloy-provider",
- "alloy-rpc-types",
- "alloy-rpc-types-debug",
- "alloy-trie 0.9.4",
- "clap",
- "eyre",
- "itertools 0.14.0",
- "openvm-stateless-executor",
- "openvm-stateless-witness",
- "rayon",
- "reqwest 0.12.20",
- "reth-chainspec",
- "reth-ethereum-primitives",
- "reth-evm",
- "reth-evm-ethereum",
- "reth-primitives-traits",
- "revm 40.0.3",
- "risc0-ethereum-trie",
- "serde_json",
- "thiserror 2.0.12",
- "tokio",
- "tower",
- "tracing",
- "tracing-actix-web",
- "tracing-subscriber 0.3.22",
-]
-
-[[package]]
-name = "openvm-rv32-adapters"
+name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7777,16 +7757,16 @@ dependencies = [
  "openvm-circuit-primitives",
  "openvm-circuit-primitives-derive",
  "openvm-instructions",
- "openvm-rv32im-circuit",
+ "openvm-riscv-circuit",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
 ]
 
 [[package]]
-name = "openvm-rv32im-circuit"
+name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7803,44 +7783,83 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
- "openvm-rv32im-transpiler",
+ "openvm-riscv-transpiler",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-riscv",
+ "rvr-openvm-lift",
  "serde",
  "strum 0.26.3",
  "tracing",
 ]
 
 [[package]]
-name = "openvm-rv32im-guest"
+name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
 ]
 
 [[package]]
-name = "openvm-rv32im-transpiler"
+name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-instructions-derive",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "serde",
  "strum 0.26.3",
  "tracing",
 ]
 
+[[package]]
+name = "openvm-rpc-proxy"
+version = "0.4.0"
+dependencies = [
+ "actix-web",
+ "alloy",
+ "alloy-chains",
+ "alloy-consensus",
+ "alloy-json-rpc",
+ "alloy-primitives",
+ "alloy-provider",
+ "alloy-rpc-types",
+ "alloy-rpc-types-debug",
+ "alloy-trie 0.9.4",
+ "clap",
+ "eyre",
+ "itertools 0.14.0",
+ "openvm-stateless-executor",
+ "openvm-stateless-witness",
+ "rayon",
+ "reqwest 0.12.28",
+ "reth-chainspec",
+ "reth-ethereum-primitives",
+ "reth-evm",
+ "reth-evm-ethereum",
+ "reth-primitives-traits",
+ "revm 40.0.3",
+ "risc0-ethereum-trie",
+ "serde_json",
+ "thiserror 2.0.18",
+ "tokio",
+ "tower",
+ "tracing",
+ "tracing-actix-web",
+ "tracing-subscriber 0.3.23",
+]
+
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7880,7 +7899,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7901,14 +7920,15 @@ dependencies = [
  "openvm-keccak256-transpiler",
  "openvm-pairing-circuit",
  "openvm-pairing-transpiler",
- "openvm-rv32im-circuit",
- "openvm-rv32im-transpiler",
+ "openvm-riscv-circuit",
+ "openvm-riscv-transpiler",
  "openvm-sha2-circuit",
  "openvm-sha2-transpiler",
  "openvm-stark-backend",
  "openvm-stark-sdk",
  "openvm-transpiler",
  "openvm-verify-stark-circuit",
+ "rvr-openvm-lift",
  "serde",
  "toml 0.8.23",
 ]
@@ -7916,7 +7936,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7925,21 +7945,21 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ndarray",
  "num_enum",
  "openvm-circuit-primitives",
  "openvm-circuit-primitives-derive",
  "openvm-stark-backend",
- "rand 0.9.2",
+ "rand 0.9.5",
  "sha2 0.10.9",
 ]
 
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7955,12 +7975,14 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
- "openvm-rv32im-circuit",
+ "openvm-riscv-circuit",
  "openvm-sha2-air",
  "openvm-sha2-transpiler",
  "openvm-stark-backend",
  "openvm-stark-sdk",
- "rand 0.9.2",
+ "rand 0.9.5",
+ "rvr-openvm-ext-sha2",
+ "rvr-openvm-lift",
  "serde",
  "sha2 0.10.9",
 ]
@@ -7968,7 +7990,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-platform",
 ]
@@ -7976,14 +7998,14 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-instructions-derive",
  "openvm-sha2-guest",
  "openvm-stark-backend",
  "openvm-transpiler",
- "rrs-lib",
  "strum 0.26.3",
 ]
 
@@ -8014,7 +8036,7 @@ dependencies = [
  "p3-util",
  "postcard",
  "rayon",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -8043,13 +8065,13 @@ dependencies = [
  "p3-bn254",
  "p3-field",
  "p3-poseidon2",
- "rand 0.9.2",
+ "rand 0.9.5",
  "serde",
  "serde_json",
  "static_assertions",
  "tracing",
  "tracing-forest",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
  "zkhash-axiom",
 ]
 
@@ -8080,7 +8102,7 @@ dependencies = [
  "revm-primitives 24.0.1",
  "serde",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -8106,14 +8128,14 @@ dependencies = [
  "reth-trie",
  "serde",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8137,14 +8159,14 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "elf",
  "eyre",
+ "openvm-decoder",
  "openvm-instructions",
  "openvm-platform",
  "openvm-stark-backend",
- "rrs-lib",
  "rustc-demangle",
  "thiserror 1.0.69",
 ]
@@ -8152,7 +8174,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8182,7 +8204,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8221,7 +8243,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#15a7ab6baed03d75050dbef2bbad4b4e98fb8dba"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -8258,7 +8280,7 @@ dependencies = [
  "p3-monty-31",
  "p3-poseidon2",
  "p3-symmetric",
- "rand 0.9.2",
+ "rand 0.9.5",
 ]
 
 [[package]]
@@ -8273,7 +8295,7 @@ dependencies = [
  "p3-symmetric",
  "p3-util",
  "paste",
- "rand 0.9.2",
+ "rand 0.9.5",
  "serde",
 ]
 
@@ -8302,7 +8324,7 @@ dependencies = [
  "p3-matrix",
  "p3-maybe-rayon",
  "p3-util",
- "spin 0.10.0",
+ "spin 0.10.1",
  "tracing",
 ]
 
@@ -8317,7 +8339,7 @@ dependencies = [
  "p3-maybe-rayon",
  "p3-util",
  "paste",
- "rand 0.9.2",
+ "rand 0.9.5",
  "serde",
  "tracing",
 ]
@@ -8345,7 +8367,7 @@ dependencies = [
  "p3-matrix",
  "p3-maybe-rayon",
  "p3-util",
- "rand 0.9.2",
+ "rand 0.9.5",
  "tracing",
 ]
 
@@ -8359,7 +8381,7 @@ dependencies = [
  "p3-field",
  "p3-maybe-rayon",
  "p3-util",
- "rand 0.9.2",
+ "rand 0.9.5",
  "serde",
  "tracing",
 ]
@@ -8383,7 +8405,7 @@ dependencies = [
  "p3-field",
  "p3-symmetric",
  "p3-util",
- "rand 0.9.2",
+ "rand 0.9.5",
 ]
 
 [[package]]
@@ -8403,9 +8425,9 @@ dependencies = [
  "p3-symmetric",
  "p3-util",
  "paste",
- "rand 0.9.2",
+ "rand 0.9.5",
  "serde",
- "spin 0.10.0",
+ "spin 0.10.1",
  "tracing",
 ]
 
@@ -8419,7 +8441,7 @@ dependencies = [
  "p3-mds",
  "p3-symmetric",
  "p3-util",
- "rand 0.9.2",
+ "rand 0.9.5",
 ]
 
 [[package]]
@@ -8433,7 +8455,7 @@ dependencies = [
  "p3-matrix",
  "p3-maybe-rayon",
  "p3-poseidon2",
- "rand 0.9.2",
+ "rand 0.9.5",
  "tracing",
 ]
 
@@ -8509,17 +8531,17 @@ version = "3.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a"
 dependencies = [
- "proc-macro-crate 3.3.0",
+ "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -8527,15 +8549,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if 1.0.4",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link",
 ]
 
 [[package]]
@@ -8548,7 +8570,7 @@ dependencies = [
  "ff 0.12.1",
  "group 0.12.1",
  "lazy_static",
- "rand 0.8.5",
+ "rand 0.8.7",
  "static_assertions",
  "subtle",
 ]
@@ -8563,7 +8585,7 @@ dependencies = [
  "ff 0.13.1",
  "group 0.13.0",
  "lazy_static",
- "rand 0.8.5",
+ "rand 0.8.7",
  "static_assertions",
  "subtle",
 ]
@@ -8596,18 +8618,17 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.0"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
+checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9"
 dependencies = [
  "memchr",
- "thiserror 2.0.12",
  "ucd-trie",
 ]
 
@@ -8650,7 +8671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared 0.11.3",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -8673,7 +8694,7 @@ dependencies = [
  "phf_shared 0.11.3",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8686,7 +8707,7 @@ dependencies = [
  "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8724,14 +8745,14 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pin-utils"
@@ -8751,9 +8772,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plotters"
@@ -8797,15 +8818,15 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
@@ -8820,7 +8841,7 @@ dependencies = [
  "ff 0.13.1",
  "lazy_static",
  "log",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_xorshift 0.3.0",
  "thiserror 1.0.69",
 ]
@@ -8839,9 +8860,9 @@ dependencies = [
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -8884,12 +8905,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.33"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -8924,11 +8945,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.3.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.22.27",
+ "toml_edit 0.25.12+spec-1.1.0",
 ]
 
 [[package]]
@@ -8950,14 +8971,14 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -8968,7 +8989,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "chrono",
  "flate2",
  "procfs-core",
@@ -8981,23 +9002,22 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "chrono",
  "hex",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.7.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
+checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.10.0",
- "lazy_static",
+ "bitflags 2.13.0",
  "num-traits",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rand_chacha 0.9.0",
  "rand_xorshift 0.4.0",
  "regex-syntax",
@@ -9008,9 +9028,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -9018,15 +9038,15 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -9039,7 +9059,7 @@ dependencies = [
  "libc",
  "once_cell",
  "raw-cpuid",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "web-sys",
  "winapi",
 ]
@@ -9050,30 +9070,21 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quick-protobuf"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
 dependencies = [
  "bytes",
  "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustls",
- "socket2 0.5.10",
- "thiserror 2.0.12",
+ "socket2 0.6.5",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
  "web-time",
@@ -9081,21 +9092,22 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
 dependencies = [
  "aws-lc-rs",
  "bytes",
- "getrandom 0.3.3",
+ "getrandom 0.4.3",
  "lru-slab",
- "rand 0.9.2",
+ "rand 0.10.2",
+ "rand_pcg",
  "ring",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tinyvec",
  "tracing",
  "web-time",
@@ -9103,32 +9115,32 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.12"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
+checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "r-efi"
@@ -9154,9 +9166,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -9166,23 +9178,23 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
  "rand_chacha 0.9.0",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
  "serde",
 ]
 
 [[package]]
 name = "rand"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
 dependencies = [
  "chacha20",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
  "rand_core 0.10.1",
 ]
 
@@ -9203,7 +9215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -9212,16 +9224,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.9.3"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "serde",
 ]
 
@@ -9231,6 +9243,15 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
 
+[[package]]
+name = "rand_pcg"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
+dependencies = [
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.3.0"
@@ -9246,7 +9267,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 dependencies = [
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -9255,26 +9276,26 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
 dependencies = [
- "rand_core 0.9.3",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
 name = "rapidhash"
-version = "4.4.2"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b266a82f4aa99bb5c25e28d11cc44ace63d91adbcbcee4d323e2ae3d49ef37"
+checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e"
 dependencies = [
- "rand 0.9.2",
+ "getrandom 0.3.4",
  "rustversion",
 ]
 
 [[package]]
 name = "raw-cpuid"
-version = "11.5.0"
+version = "11.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
@@ -9285,9 +9306,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -9311,11 +9332,11 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.12"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
 ]
 
 [[package]]
@@ -9324,36 +9345,36 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
  "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf"
+checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -9363,9 +9384,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -9374,30 +9395,21 @@ dependencies = [
 
 [[package]]
 name = "regex-lite"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "repr_offset"
-version = "0.2.2"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1070755bd29dffc19d0971cab794e607839ba2ef4b69a9e6fbc8733c1b72ea"
-dependencies = [
- "tstr",
-]
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reqwest"
-version = "0.12.20"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -9405,8 +9417,8 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.12",
- "http 1.3.1",
+ "h2 0.4.15",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -9441,15 +9453,15 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -9521,11 +9533,11 @@ dependencies = [
  "alloy-consensus",
  "alloy-eips 2.0.5",
  "alloy-primitives",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "metrics 0.24.6",
  "parking_lot",
  "pin-project",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rayon",
  "reth-chainspec",
  "reth-errors",
@@ -9557,7 +9569,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-trie 0.9.4",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "reth-ethereum-forks",
  "reth-network-peers",
  "reth-primitives-traits",
@@ -9574,11 +9586,11 @@ dependencies = [
  "cfg-if 1.0.4",
  "eyre",
  "libc",
- "rand 0.8.5",
+ "rand 0.8.7",
  "reth-fs-util",
  "secp256k1 0.30.0",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -9608,7 +9620,7 @@ checksum = "ceeb8dab90194305d3f7e3f043a22d2db1fb54b6dcf5d8e75c5a4fa8540e1f57"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -9623,7 +9635,7 @@ dependencies = [
  "reth-stages-types",
  "reth-static-file-types",
  "serde",
- "toml 0.9.5",
+ "toml 0.9.12+spec-1.1.0",
  "url",
 ]
 
@@ -9638,7 +9650,7 @@ dependencies = [
  "auto_impl",
  "reth-execution-types",
  "reth-primitives-traits",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -9667,10 +9679,10 @@ dependencies = [
  "alloy-rpc-types-engine",
  "alloy-transport",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "eyre",
  "futures",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "reth-node-api",
  "reth-tracing",
  "ringbuffer",
@@ -9685,7 +9697,7 @@ version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
  "alloy-primitives",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "eyre",
  "libc",
  "metrics 0.24.6",
@@ -9699,10 +9711,10 @@ dependencies = [
  "reth-static-file-types",
  "reth-storage-errors",
  "reth-tracing",
- "rustc-hash 2.1.1",
- "strum 0.27.1",
+ "rustc-hash 2.1.3",
+ "strum 0.27.2",
  "sysinfo",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -9715,7 +9727,7 @@ dependencies = [
  "alloy-primitives",
  "arrayvec",
  "bytes",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "metrics 0.24.6",
  "modular-bitfield",
  "reth-codecs",
@@ -9756,7 +9768,7 @@ dependencies = [
  "reth-trie-db",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -9785,7 +9797,7 @@ dependencies = [
  "enr",
  "itertools 0.14.0",
  "parking_lot",
- "rand 0.8.5",
+ "rand 0.8.7",
  "reth-ethereum-forks",
  "reth-net-banlist",
  "reth-net-nat",
@@ -9793,7 +9805,7 @@ dependencies = [
  "schnellru",
  "secp256k1 0.30.0",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -9806,19 +9818,19 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59c
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "discv5",
  "enr",
  "futures",
  "itertools 0.14.0",
  "metrics 0.24.6",
- "rand 0.9.2",
+ "rand 0.9.5",
  "reth-chainspec",
  "reth-ethereum-forks",
  "reth-metrics",
  "reth-network-peers",
  "secp256k1 0.30.0",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -9841,7 +9853,7 @@ dependencies = [
  "secp256k1 0.30.0",
  "serde",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -9868,7 +9880,7 @@ dependencies = [
  "reth-primitives-traits",
  "reth-storage-api",
  "reth-tasks",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -9892,11 +9904,11 @@ dependencies = [
  "futures",
  "hmac",
  "pin-project",
- "rand 0.8.5",
+ "rand 0.8.7",
  "reth-network-peers",
  "secp256k1 0.30.0",
  "sha2 0.10.9",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -9947,7 +9959,7 @@ dependencies = [
  "reth-primitives-traits",
  "reth-trie-common",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
 ]
 
@@ -9964,9 +9976,9 @@ dependencies = [
  "alloy-rlp",
  "alloy-rpc-types-engine",
  "crossbeam-channel",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "metrics 0.24.6",
  "moka",
  "parking_lot",
@@ -9999,7 +10011,7 @@ dependencies = [
  "revm-primitives 24.0.1",
  "revm-state 12.0.1",
  "schnellru",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -10047,7 +10059,7 @@ dependencies = [
  "ethereum_ssz_derive",
  "sha2 0.10.9",
  "snap",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10059,7 +10071,7 @@ dependencies = [
  "bytes",
  "eyre",
  "futures-util",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "reth-era",
  "reth-fs-util",
  "sha2 0.10.9",
@@ -10096,7 +10108,7 @@ dependencies = [
  "reth-consensus",
  "reth-execution-errors",
  "reth-storage-errors",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10108,7 +10120,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "bytes",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
  "pin-project",
  "reth-codecs",
@@ -10120,7 +10132,7 @@ dependencies = [
  "reth-primitives-traits",
  "serde",
  "snap",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -10140,13 +10152,13 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "bytes",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "reth-chainspec",
  "reth-codecs-derive",
  "reth-ethereum-primitives",
  "reth-primitives-traits",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10217,7 +10229,7 @@ dependencies = [
  "reth-payload-primitives",
  "reth-primitives-traits",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10230,7 +10242,7 @@ dependencies = [
  "alloy-primitives",
  "auto_impl",
  "once_cell",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
 ]
 
 [[package]]
@@ -10298,7 +10310,7 @@ dependencies = [
  "alloy-evm",
  "alloy-primitives",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures-util",
  "metrics 0.24.6",
  "rayon",
@@ -10360,7 +10372,7 @@ dependencies = [
  "alloy-rlp",
  "nybbles 0.4.8",
  "reth-storage-errors",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10373,7 +10385,7 @@ dependencies = [
  "alloy-evm",
  "alloy-primitives",
  "alloy-rlp",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "reth-ethereum-primitives",
  "reth-primitives-traits",
  "reth-trie-common",
@@ -10414,7 +10426,7 @@ dependencies = [
  "reth-tasks",
  "reth-tracing",
  "rmp-serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-util",
  "tracing",
@@ -10441,7 +10453,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59c
 dependencies = [
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -10484,7 +10496,7 @@ dependencies = [
  "jsonrpsee",
  "pin-project",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -10497,15 +10509,15 @@ name = "reth-libmdbx"
 version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "byteorder",
  "crossbeam-queue",
  "dashmap",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "parking_lot",
  "reth-mdbx-sys",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -10514,7 +10526,7 @@ name = "reth-mdbx-sys"
 version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "cc",
 ]
 
@@ -10547,9 +10559,9 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59c
 dependencies = [
  "futures-util",
  "if-addrs",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -10565,7 +10577,7 @@ dependencies = [
  "alloy-rlp",
  "aquamarine",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "discv5",
  "enr",
  "futures",
@@ -10573,8 +10585,8 @@ dependencies = [
  "metrics 0.24.6",
  "parking_lot",
  "pin-project",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.7",
+ "rand 0.9.5",
  "rayon",
  "reth-chainspec",
  "reth-consensus",
@@ -10598,13 +10610,13 @@ dependencies = [
  "reth-tasks",
  "reth-tokio-util",
  "reth-transaction-pool",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "schnellru",
  "secp256k1 0.30.0",
  "serde",
  "smallvec",
- "socket2 0.6.3",
- "thiserror 2.0.12",
+ "socket2 0.6.5",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -10621,7 +10633,7 @@ dependencies = [
  "alloy-rpc-types-admin",
  "alloy-rpc-types-eth",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "enr",
  "futures",
  "reth-eth-wire-types",
@@ -10631,7 +10643,7 @@ dependencies = [
  "reth-network-types",
  "reth-tokio-util",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
 ]
@@ -10645,7 +10657,7 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "auto_impl",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
  "reth-consensus",
  "reth-eth-wire-types",
@@ -10668,7 +10680,7 @@ dependencies = [
  "enr",
  "secp256k1 0.30.0",
  "serde_with",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "url",
 ]
@@ -10694,12 +10706,12 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59c
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "lz4_flex",
  "memmap2",
  "reth-fs-util",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
  "zstd",
 ]
@@ -10806,13 +10818,13 @@ dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "clap",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "dirs-next",
  "eyre",
  "futures",
- "humantime 2.3.0",
+ "humantime 2.4.0",
  "ipnet",
- "rand 0.9.2",
+ "rand 0.9.5",
  "reth-chainspec",
  "reth-cli-util",
  "reth-config",
@@ -10842,9 +10854,9 @@ dependencies = [
  "reth-transaction-pool",
  "secp256k1 0.30.0",
  "serde",
- "strum 0.27.1",
- "thiserror 2.0.12",
- "toml 0.9.5",
+ "strum 0.27.2",
+ "thiserror 2.0.18",
+ "toml 0.9.12+spec-1.1.0",
  "tracing",
  "url",
  "vergen",
@@ -10914,7 +10926,7 @@ dependencies = [
  "reth-transaction-pool",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tokio-tungstenite",
@@ -10931,9 +10943,9 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rpc-types-engine",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
- "humantime 2.3.0",
+ "humantime 2.4.0",
  "pin-project",
  "reth-engine-primitives",
  "reth-network-api",
@@ -10953,7 +10965,7 @@ source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59c
 dependencies = [
  "bytes",
  "eyre",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body-util",
  "jsonrpsee-server",
  "metrics 0.24.6",
@@ -10961,7 +10973,7 @@ dependencies = [
  "metrics-process",
  "metrics-util 0.20.4",
  "procfs",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "reth-metrics",
  "reth-tasks",
  "tokio",
@@ -10989,7 +11001,7 @@ dependencies = [
  "alloy-consensus",
  "alloy-primitives",
  "alloy-rpc-types",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures-util",
  "metrics 0.24.6",
  "reth-chain-state",
@@ -11036,7 +11048,7 @@ dependencies = [
  "reth-trie-common",
  "serde",
  "sha2 0.10.9",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
 ]
 
@@ -11066,7 +11078,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "dashmap",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "modular-bitfield",
  "once_cell",
  "quanta",
@@ -11077,7 +11089,7 @@ dependencies = [
  "revm-state 12.0.1",
  "secp256k1 0.30.0",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11122,7 +11134,7 @@ dependencies = [
  "revm-database 15.0.2",
  "rocksdb",
  "smallvec",
- "strum 0.27.1",
+ "strum 0.27.2",
  "tracing",
 ]
 
@@ -11148,8 +11160,8 @@ dependencies = [
  "reth-static-file-types",
  "reth-storage-api",
  "reth-tokio-util",
- "rustc-hash 2.1.1",
- "thiserror 2.0.12",
+ "rustc-hash 2.1.3",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -11160,12 +11172,12 @@ version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
  "alloy-primitives",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "modular-bitfield",
  "reth-codecs",
  "serde",
- "strum 0.27.1",
- "thiserror 2.0.12",
+ "strum 0.27.2",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -11207,11 +11219,11 @@ dependencies = [
  "alloy-rpc-types-mev",
  "alloy-rpc-types-trace",
  "alloy-rpc-types-txpool",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-signer",
  "alloy-signer-local",
  "async-trait",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "dyn-clone",
  "futures",
  "itertools 0.14.0",
@@ -11253,7 +11265,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -11279,7 +11291,7 @@ dependencies = [
  "alloy-rpc-types-mev",
  "alloy-rpc-types-trace",
  "alloy-rpc-types-txpool",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "jsonrpsee",
  "reth-chain-state",
  "reth-engine-primitives",
@@ -11298,7 +11310,7 @@ dependencies = [
  "alloy-network",
  "alloy-provider",
  "dyn-clone",
- "http 1.3.1",
+ "http 1.4.2",
  "jsonrpsee",
  "metrics 0.24.6",
  "pin-project",
@@ -11325,7 +11337,7 @@ dependencies = [
  "reth-tokio-util",
  "reth-transaction-pool",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-util",
  "tower",
@@ -11350,7 +11362,7 @@ dependencies = [
  "reth-evm",
  "reth-primitives-traits",
  "reth-rpc-traits",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11379,7 +11391,7 @@ dependencies = [
  "reth-tasks",
  "reth-transaction-pool",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -11400,7 +11412,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-rpc-types-eth",
  "alloy-rpc-types-mev",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "async-trait",
  "auto_impl",
  "dyn-clone",
@@ -11445,17 +11457,17 @@ dependencies = [
  "alloy-primitives",
  "alloy-rpc-client",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-sol-types",
  "alloy-transport",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "futures",
  "itertools 0.14.0",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "metrics 0.24.6",
- "rand 0.9.2",
- "reqwest 0.13.3",
+ "rand 0.9.5",
+ "reqwest 0.13.4",
  "reth-chain-state",
  "reth-chainspec",
  "reth-errors",
@@ -11475,7 +11487,7 @@ dependencies = [
  "revm-inspectors",
  "schnellru",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -11488,7 +11500,7 @@ version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
  "alloy-rpc-types-engine",
- "http 1.3.1",
+ "http 1.4.2",
  "jsonrpsee-http-client",
  "pin-project",
  "tower",
@@ -11509,7 +11521,7 @@ dependencies = [
  "reth-errors",
  "reth-network-api",
  "serde",
- "strum 0.27.1",
+ "strum 0.27.2",
 ]
 
 [[package]]
@@ -11524,7 +11536,7 @@ dependencies = [
  "alloy-rpc-types-eth",
  "alloy-signer",
  "reth-primitives-traits",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11541,7 +11553,7 @@ dependencies = [
  "num-traits",
  "page_size",
  "rayon",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "reth-chainspec",
  "reth-codecs",
  "reth-config",
@@ -11570,7 +11582,7 @@ dependencies = [
  "reth-tasks",
  "reth-trie",
  "reth-trie-db",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -11598,7 +11610,7 @@ dependencies = [
  "reth-static-file",
  "reth-static-file-types",
  "reth-tokio-util",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tracing",
 ]
@@ -11642,11 +11654,11 @@ version = "2.3.0"
 source = "git+https://github.com/paradigmxyz/reth?tag=v2.3.0#9384bc53d8c0c77e59cac83fdaaf3b372c6d2216"
 dependencies = [
  "alloy-primitives",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "fixed-map",
  "reth-stages-types",
  "serde",
- "strum 0.27.1",
+ "strum 0.27.2",
  "tracing",
 ]
 
@@ -11684,14 +11696,14 @@ dependencies = [
  "alloy-eips 2.0.5",
  "alloy-primitives",
  "alloy-rlp",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "reth-codecs",
  "reth-primitives-traits",
  "reth-prune-types",
  "reth-static-file-types",
  "revm-database-interface 12.1.1",
  "revm-state 12.0.1",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -11708,7 +11720,7 @@ dependencies = [
  "pin-project",
  "rayon",
  "reth-metrics",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "thread-priority",
  "tokio",
  "tracing",
@@ -11740,7 +11752,7 @@ dependencies = [
  "tracing-journald",
  "tracing-logfmt",
  "tracing-samply",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -11757,7 +11769,7 @@ dependencies = [
  "opentelemetry_sdk",
  "tracing",
  "tracing-opentelemetry",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
  "url",
 ]
 
@@ -11772,13 +11784,13 @@ dependencies = [
  "alloy-rlp",
  "aquamarine",
  "auto_impl",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "futures-util",
  "imbl",
  "metrics 0.24.6",
  "parking_lot",
  "pin-project",
- "rand 0.9.2",
+ "rand 0.9.5",
  "reth-chain-state",
  "reth-chainspec",
  "reth-eth-wire-types",
@@ -11794,12 +11806,12 @@ dependencies = [
  "revm 40.0.3",
  "revm-interpreter 37.0.3",
  "revm-primitives 24.0.1",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.3",
  "schnellru",
  "serde",
  "serde_json",
  "smallvec",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -11839,11 +11851,11 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "alloy-rpc-types-eth",
- "alloy-serde 2.1.0",
+ "alloy-serde 2.1.1",
  "alloy-trie 0.9.4",
  "arrayvec",
  "bytes",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "itertools 0.14.0",
  "nybbles 0.4.8",
  "rayon",
@@ -11885,7 +11897,7 @@ dependencies = [
  "alloy-rlp",
  "crossbeam-channel",
  "crossbeam-utils",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "itertools 0.14.0",
  "metrics 0.24.6",
  "rayon",
@@ -11897,7 +11909,7 @@ dependencies = [
  "reth-tasks",
  "reth-trie",
  "revm-state 12.0.1",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
@@ -12065,7 +12077,7 @@ version = "7.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c"
 dependencies = [
- "alloy-eips 1.5.2",
+ "alloy-eips 1.8.3",
  "revm-bytecode 6.2.2",
  "revm-database-interface 7.0.5",
  "revm-primitives 20.2.1",
@@ -12080,7 +12092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a69c3ce73454a09ef89a66177239d7c4f5f697227ae27254c99451866603b19d"
 dependencies = [
  "alloy-eips 2.0.5",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "revm-bytecode 11.0.1",
  "revm-database-interface 12.1.1",
  "revm-primitives 24.0.1",
@@ -12112,7 +12124,7 @@ dependencies = [
  "revm-primitives 24.0.1",
  "revm-state 12.0.1",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -12204,7 +12216,7 @@ dependencies = [
  "revm 40.0.3",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -12314,7 +12326,7 @@ version = "7.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "revm-bytecode 6.2.2",
  "revm-primitives 20.2.1",
  "serde",
@@ -12327,7 +12339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40eff6067185cf80932e06f6a9c8045b012ecb6f99a8d6edc618ec2792373e14"
 dependencies = [
  "alloy-eip7928 0.4.5",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "nonmax",
  "revm-bytecode 11.0.1",
  "revm-primitives 24.0.1",
@@ -12352,7 +12364,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if 1.0.4",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted 0.9.0",
  "windows-sys 0.52.0",
@@ -12383,14 +12395,14 @@ dependencies = [
  "alloy-trie 0.8.1",
  "arrayvec",
  "itertools 0.14.0",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "rlimit"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+checksum = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3"
 dependencies = [
  "libc",
 ]
@@ -12471,9 +12483,9 @@ dependencies = [
 
 [[package]]
 name = "rug"
-version = "1.29.0"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f6c8f906c90b48e0c1745c9f814c3a31c5eba847043b05c3e9a934dec7c4b3"
+checksum = "07a8857882aec59d27254b02481c709327c13de6fad1da60bfc4f9783eaaa61e"
 dependencies = [
  "az",
  "gmp-mpfr-sys",
@@ -12483,14 +12495,15 @@ dependencies = [
 
 [[package]]
 name = "ruint"
-version = "1.17.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278"
+checksum = "45caf26f647c19115bf9c453c70ffe4a4a3a6390dceebd942610584f99b8ddce"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "ark-ff 0.5.0",
+ "ark-ff 0.6.0",
  "bytes",
  "fastrlp 0.3.1",
  "fastrlp 0.4.0",
@@ -12500,8 +12513,8 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.7",
+ "rand 0.9.5",
  "rlp",
  "ruint-macro",
  "serde_core",
@@ -12546,9 +12559,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.25"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
 
 [[package]]
 name = "rustc-hash"
@@ -12558,11 +12571,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 dependencies = [
- "rand 0.8.5",
+ "rand 0.9.5",
 ]
 
 [[package]]
@@ -12586,27 +12599,27 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.26",
+ "semver 1.0.28",
 ]
 
 [[package]]
 name = "rustix"
-version = "1.0.7"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -12620,21 +12633,21 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
+checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
 dependencies = [
  "openssl-probe",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.5.1",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
 dependencies = [
  "web-time",
  "zeroize",
@@ -12655,7 +12668,7 @@ dependencies = [
  "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki",
- "security-framework 3.5.1",
+ "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
  "windows-sys 0.59.0",
@@ -12676,10 +12689,10 @@ dependencies = [
  "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki",
- "security-framework 3.5.1",
+ "security-framework",
  "security-framework-sys",
- "webpki-root-certs 1.0.5",
- "windows-sys 0.61.1",
+ "webpki-root-certs 1.0.8",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -12690,9 +12703,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.3"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -12702,15 +12715,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 dependencies = [
  "fnv",
  "quick-error",
@@ -12718,11 +12731,188 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "rvr-openvm"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-instructions",
+ "openvm-platform",
+ "openvm-riscv-guest",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "rvr-openvm-build"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+
+[[package]]
+name = "rvr-openvm-ext-algebra"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "num-bigint",
+ "openvm-algebra-transpiler",
+ "openvm-algebra-utils",
+ "openvm-instructions",
+ "openvm-stark-backend",
+ "rand 0.9.5",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "rvr-openvm-ext-bigint"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-bigint-transpiler",
+ "openvm-instructions",
+ "openvm-riscv-transpiler",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "rvr-openvm-ext-deferral"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "libloading",
+ "openvm-circuit",
+ "openvm-deferral-transpiler",
+ "openvm-instructions",
+ "openvm-stark-backend",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+]
+
+[[package]]
+name = "rvr-openvm-ext-ecc"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-ecc-transpiler",
+ "openvm-instructions",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+ "strum 0.26.3",
+]
+
+[[package]]
+name = "rvr-openvm-ext-ffi-common"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-instructions",
+ "openvm-platform",
+]
+
+[[package]]
+name = "rvr-openvm-ext-keccak"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-instructions",
+ "openvm-keccak256-transpiler",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+]
+
+[[package]]
+name = "rvr-openvm-ext-pairing"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-instructions",
+ "openvm-pairing-transpiler",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+]
+
+[[package]]
+name = "rvr-openvm-ext-riscv"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "libloading",
+ "openvm-circuit",
+ "openvm-instructions",
+ "openvm-riscv-transpiler",
+ "openvm-stark-backend",
+ "rand 0.9.5",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+]
+
+[[package]]
+name = "rvr-openvm-ext-sha2"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "openvm-instructions",
+ "openvm-sha2-transpiler",
+ "openvm-stark-backend",
+ "rvr-openvm-build",
+ "rvr-openvm-ir",
+ "rvr-openvm-lift",
+]
+
+[[package]]
+name = "rvr-openvm-ir"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "rvr-openvm-lift"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "libloading",
+ "openvm-instructions",
+ "openvm-riscv-transpiler",
+ "openvm-stark-backend",
+ "rvr-openvm-ext-ffi-common",
+ "rvr-openvm-ir",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "rvr-state"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+dependencies = [
+ "nix",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "safe_arch"
@@ -12744,11 +12934,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
 dependencies = [
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -12765,9 +12955,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -12820,7 +13010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
+ "rand 0.8.7",
  "secp256k1-sys 0.10.1",
  "serde",
 ]
@@ -12832,7 +13022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.9.2",
+ "rand 0.9.5",
  "secp256k1-sys 0.11.0",
 ]
 
@@ -12856,24 +13046,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework"
-version = "3.5.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -12882,9 +13059,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.15.0"
+version = "2.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -12901,11 +13078,12 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -12917,12 +13095,6 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "send_wrapper"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
-
 [[package]]
 name = "send_wrapper"
 version = "0.6.0"
@@ -12974,16 +13146,16 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "itoa",
  "memchr",
  "serde",
@@ -13002,9 +13174,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
  "serde_core",
 ]
@@ -13023,19 +13195,19 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.14.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
  "base64 0.22.1",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
- "schemars 1.0.4",
- "serde",
- "serde_derive",
+ "schemars 1.2.1",
+ "serde_core",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -13043,14 +13215,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.14.0"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13059,7 +13231,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "itoa",
  "ryu",
  "serde",
@@ -13078,15 +13250,26 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
 dependencies = [
  "cfg-if 1.0.4",
  "cpufeatures 0.2.17",
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
+dependencies = [
+ "cfg-if 1.0.4",
+ "cpufeatures 0.3.0",
+ "digest 0.11.3",
+]
+
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -13113,12 +13296,12 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
 dependencies = [
  "digest 0.10.7",
- "keccak 0.1.5",
+ "keccak 0.1.6",
 ]
 
 [[package]]
@@ -13133,9 +13316,9 @@ dependencies = [
 
 [[package]]
 name = "sha3-asm"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5"
+checksum = "a6287fd675f713484342a89cbf0a386abef5f15919cfad607e5e1f19e1e15331"
 dependencies = [
  "cc",
  "cfg-if 1.0.4",
@@ -13164,10 +13347,11 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.5"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
@@ -13181,11 +13365,17 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
 [[package]]
 name = "simd_cesu8"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520"
 dependencies = [
  "rustc_version 0.4.1",
  "simdutf8",
@@ -13199,21 +13389,21 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "simple_asn1"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "time",
 ]
 
 [[package]]
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "sketches-ddsketch"
@@ -13223,18 +13413,15 @@ checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
 
 [[package]]
 name = "sketches-ddsketch"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
+checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "slotmap"
@@ -13247,9 +13434,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 dependencies = [
  "serde",
 ]
@@ -13274,11 +13461,11 @@ dependencies = [
  "num-integer",
  "num-traits",
  "pairing 0.23.0",
- "rand 0.8.5",
+ "rand 0.8.7",
  "revm 27.1.0",
  "ruint",
  "serde",
- "sha3 0.10.8",
+ "sha3 0.10.9",
 ]
 
 [[package]]
@@ -13296,7 +13483,7 @@ dependencies = [
  "num-bigint",
  "num-integer",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_chacha 0.3.1",
  "serde",
  "serde_json",
@@ -13315,12 +13502,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13332,27 +13519,27 @@ dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures",
- "http 1.3.1",
+ "http 1.4.2",
  "httparse",
  "log",
- "rand 0.8.5",
- "sha1",
+ "rand 0.8.7",
+ "sha1 0.10.7",
 ]
 
 [[package]]
 name = "spin"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
 dependencies = [
  "lock_api",
 ]
 
 [[package]]
 name = "spin"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
 dependencies = [
  "lock_api",
 ]
@@ -13369,9 +13556,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_assertions"
@@ -13408,7 +13595,7 @@ checksum = "59ab74230a0592602e361bd63c645413fa8cbe4500d10274e849179e5c72548f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13422,11 +13609,11 @@ dependencies = [
 
 [[package]]
 name = "strum"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros 0.27.1",
+ "strum_macros 0.27.2",
 ]
 
 [[package]]
@@ -13439,20 +13626,19 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.27.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "rustversion",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13480,9 +13666,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.102"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13498,7 +13684,7 @@ dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13518,7 +13704,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13532,18 +13718,7 @@ dependencies = [
  "ntapi",
  "objc2-core-foundation",
  "objc2-io-kit",
- "windows 0.62.1",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
- "system-configuration-sys",
+ "windows",
 ]
 
 [[package]]
@@ -13552,7 +13727,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -13581,15 +13756,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.20.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13619,7 +13794,7 @@ dependencies = [
  "cfg-if 1.0.4",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13630,7 +13805,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
  "test-case-core",
 ]
 
@@ -13645,11 +13820,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.12",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -13660,18 +13835,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13682,26 +13857,25 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
 [[package]]
 name = "thread-priority"
-version = "3.0.0"
+version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2210811179577da3d54eb69ab0b50490ee40491a25d95b8c6011ba40771cb721"
+checksum = "8d2e834949be5111506bb252643498af1514f600d9e1dceedaa42afae155b67f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "cfg-if 1.0.4",
  "libc",
  "log",
  "rustversion",
- "windows 0.61.3",
+ "windows",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
 dependencies = [
  "cfg-if 1.0.4",
- "once_cell",
 ]
 
 [[package]]
@@ -13715,9 +13889,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-sys"
-version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
+version = "0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
+checksum = "cd8aa5b2ab86a2cefa406d889139c162cbb230092f7d1d7cbc1716405d852a3b"
 dependencies = [
  "cc",
  "libc",
@@ -13725,9 +13899,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemallocator"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
+checksum = "0359b4327f954e0567e69fb191cf1436617748813819c94b8cd4a431422d053a"
 dependencies = [
  "libc",
  "tikv-jemalloc-sys",
@@ -13735,12 +13909,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.46"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
 dependencies = [
  "deranged",
- "itoa",
  "libc",
  "num-conv",
  "num_threads",
@@ -13752,15 +13925,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.26"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
 dependencies = [
  "num-conv",
  "time-core",
@@ -13777,9 +13950,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -13797,9 +13970,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -13822,9 +13995,9 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.3",
+ "socket2 0.6.5",
  "tokio-macros",
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13835,7 +14008,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -13850,9 +14023,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -13860,9 +14033,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -13889,9 +14062,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.15"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -13916,17 +14089,17 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
- "indexmap 2.12.1",
- "serde",
- "serde_spanned 1.0.3",
- "toml_datetime 0.7.3",
+ "indexmap 2.14.0",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.14",
+ "winnow 0.7.15",
 ]
 
 [[package]]
@@ -13940,9 +14113,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.3"
+version = "0.7.5+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
@@ -13953,7 +14135,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "toml_datetime 0.6.11",
  "winnow 0.5.40",
 ]
@@ -13964,21 +14146,33 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "serde",
  "serde_spanned 0.6.9",
  "toml_datetime 0.6.11",
  "toml_write",
- "winnow 0.7.14",
+ "winnow 0.7.15",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+dependencies = [
+ "indexmap 2.14.0",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "winnow 1.0.4",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 0.7.14",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -13989,20 +14183,20 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "toml_writer"
-version = "1.0.4"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tonic"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a286e33f82f8a1ee2df63f4fa35c0becf4a85a0cb03091a15fd7bf0b402dc94a"
+checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
  "bytes",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "hyper",
@@ -14021,9 +14215,9 @@ dependencies = [
 
 [[package]]
 name = "tonic-prost"
-version = "0.14.3"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c55a2d6a14174563de34409c9f92ff981d006f56da9c6ecd40d9d4a31500b0"
+checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0"
 dependencies = [
  "bytes",
  "prost",
@@ -14032,14 +14226,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap 2.12.1",
+ "indexmap 2.14.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper",
@@ -14052,22 +14246,21 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.0",
  "bytes",
  "futures-core",
  "futures-util",
- "http 1.3.1",
+ "http 1.4.2",
  "http-body",
  "http-body-util",
  "http-range-header",
  "httpdate",
- "iri-string",
  "mime",
  "mime_guess",
  "percent-encoding",
@@ -14078,6 +14271,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
+ "url",
  "uuid",
 ]
 
@@ -14107,9 +14301,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-actix-web"
-version = "0.7.20"
+version = "0.7.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f28f45dd524790b44a7b372f7c3aec04a3af6b42d494e861b67de654cb25a5e"
+checksum = "36bb7a33ce7f0807d44124b5119ea3581fd59028db56477a7aa01741c869ca6a"
 dependencies = [
  "actix-web",
  "mutually_exclusive_features",
@@ -14126,9 +14320,9 @@ checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c"
 dependencies = [
  "crossbeam-channel",
  "symlink",
- "thiserror 2.0.12",
+ "thiserror 2.0.18",
  "time",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14139,7 +14333,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -14150,7 +14344,7 @@ checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724"
 dependencies = [
  "serde_json",
  "tracing-core",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14173,7 +14367,7 @@ dependencies = [
  "smallvec",
  "thiserror 1.0.69",
  "tracing",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14194,7 +14388,7 @@ checksum = "2d3a81ed245bfb62592b1e2bc153e77656d94ee6a0497683a65a12ccaf2438d0"
 dependencies = [
  "libc",
  "tracing-core",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14217,7 +14411,7 @@ dependencies = [
  "time",
  "tracing",
  "tracing-core",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14232,7 +14426,7 @@ dependencies = [
  "tracing",
  "tracing-core",
  "tracing-log",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
  "web-time",
 ]
 
@@ -14245,11 +14439,11 @@ dependencies = [
  "cfg-if 1.0.4",
  "itoa",
  "libc",
- "mach2",
+ "mach2 0.5.0",
  "memmap2",
  "smallvec",
  "tracing-core",
- "tracing-subscriber 0.3.22",
+ "tracing-subscriber 0.3.23",
 ]
 
 [[package]]
@@ -14273,9 +14467,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -14324,7 +14518,7 @@ dependencies = [
  "darling 0.23.0",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -14333,21 +14527,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tstr"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8e0294f14baae476d0dd0a2d780b2e24d66e349a9de876f5126777a37bdba7"
-dependencies = [
- "tstr_proc_macros",
-]
-
-[[package]]
-name = "tstr_proc_macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a"
-
 [[package]]
 name = "tungstenite"
 version = "0.28.0"
@@ -14356,23 +14535,17 @@ checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http 1.4.2",
  "httparse",
  "log",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rustls",
  "rustls-pki-types",
- "sha1",
- "thiserror 2.0.12",
+ "sha1 0.10.7",
+ "thiserror 2.0.18",
  "utf-8",
 ]
 
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
 [[package]]
 name = "typeid"
 version = "1.0.3"
@@ -14385,12 +14558,6 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
-[[package]]
-name = "typewit"
-version = "1.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c1ae7cc0fdb8b842d65d127cb981574b0d2b249b74d1c7a2986863dc134f71"
-
 [[package]]
 name = "ucd-trie"
 version = "0.1.7"
@@ -14429,21 +14596,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.8.1"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-xid"
@@ -14457,7 +14624,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
- "crypto-common 0.1.6",
+ "crypto-common 0.1.7",
  "subtle",
 ]
 
@@ -14503,14 +14670,15 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -14533,11 +14701,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.19.0"
+version = "1.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
+checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.4.3",
  "js-sys",
  "wasm-bindgen",
 ]
@@ -14652,38 +14820,20 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
 [[package]]
 name = "wasip2"
-version = "1.0.3+wasi-0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
-dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.120"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if 1.0.4",
  "once_cell",
@@ -14694,9 +14844,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.70"
+version = "0.4.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -14704,9 +14854,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.120"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -14714,48 +14864,26 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.120"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.120"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.12.1",
- "wasm-encoder",
- "wasmparser",
-]
-
 [[package]]
 name = "wasm-streams"
 version = "0.5.0"
@@ -14769,18 +14897,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.10.0",
- "hashbrown 0.15.4",
- "indexmap 2.12.1",
- "semver 1.0.26",
-]
-
 [[package]]
 name = "wasmtimer"
 version = "0.4.3"
@@ -14797,9 +14913,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.97"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -14821,14 +14937,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
 dependencies = [
- "webpki-root-certs 1.0.5",
+ "webpki-root-certs 1.0.8",
 ]
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc"
+checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -14839,14 +14955,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.0",
+ "webpki-roots 1.0.8",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.0"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
+checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -14889,7 +15005,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -14900,93 +15016,47 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.61.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
-dependencies = [
- "windows-collections 0.2.0",
- "windows-core 0.61.2",
- "windows-future 0.2.1",
- "windows-link 0.1.3",
- "windows-numerics 0.2.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.62.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e6c4a1f363c8210c6f77ba24f645c61c6fb941eccf013da691f7e09515b8ac"
-dependencies = [
- "windows-collections 0.3.1",
- "windows-core 0.62.1",
- "windows-future 0.3.1",
- "windows-numerics 0.3.0",
-]
-
-[[package]]
-name = "windows-collections"
-version = "0.2.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
 dependencies = [
- "windows-core 0.61.2",
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
 ]
 
 [[package]]
 name = "windows-collections"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123e712f464a8a60ce1a13f4c446d2d43ab06464cb5842ff68f5c71b6fb7852e"
-dependencies = [
- "windows-core 0.62.1",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-core",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.62.1"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.2.0",
- "windows-result 0.4.0",
- "windows-strings 0.5.0",
-]
-
-[[package]]
-name = "windows-future"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
- "windows-threading 0.1.0",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-future"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f3db6b24b120200d649cd4811b4947188ed3a8d2626f7075146c5d178a9a4a"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
 dependencies = [
- "windows-core 0.62.1",
- "windows-link 0.2.0",
- "windows-threading 0.2.0",
+ "windows-core",
+ "windows-link",
+ "windows-threading",
 ]
 
 [[package]]
@@ -14997,7 +15067,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -15008,86 +15078,52 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-link"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
-
-[[package]]
-name = "windows-numerics"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
-dependencies = [
- "windows-core 0.61.2",
- "windows-link 0.1.3",
-]
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-numerics"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
 dependencies = [
- "windows-core 0.62.1",
- "windows-link 0.2.0",
+ "windows-core",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-registry"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
-dependencies = [
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
-dependencies = [
- "windows-link 0.2.0",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -15099,15 +15135,6 @@ dependencies = [
  "windows-targets 0.42.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -15132,16 +15159,16 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.4",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.61.1"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -15159,21 +15186,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -15192,37 +15204,28 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
-dependencies = [
- "windows-link 0.2.0",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows-threading"
-version = "0.1.0"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
 name = "windows-threading"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab47f085ad6932defa48855254c758cdd0e2f2d48e62a34118a268d8f345e118"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
 dependencies = [
- "windows-link 0.2.0",
+ "windows-link",
 ]
 
 [[package]]
@@ -15231,12 +15234,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -15245,9 +15242,9 @@ checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -15255,12 +15252,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -15269,9 +15260,9 @@ checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -15279,12 +15270,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -15293,9 +15278,9 @@ checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
 
 [[package]]
 name = "windows_i686_gnullvm"
@@ -15305,9 +15290,9 @@ checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -15315,12 +15300,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -15329,9 +15308,9 @@ checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -15339,12 +15318,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -15353,9 +15326,9 @@ checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -15363,12 +15336,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -15377,9 +15344,9 @@ checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -15387,12 +15354,6 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -15401,9 +15362,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.53.0"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
@@ -15416,140 +15377,33 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if 1.0.4",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.10.0",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap 2.12.1",
- "prettyplease",
- "syn 2.0.102",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.102",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags 2.10.0",
- "indexmap 2.12.1",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.12.1",
- "log",
- "semver 1.0.26",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "ws_stream_wasm"
@@ -15563,8 +15417,8 @@ dependencies = [
  "log",
  "pharos",
  "rustc_version 0.4.1",
- "send_wrapper 0.6.0",
- "thiserror 2.0.12",
+ "send_wrapper",
+ "thiserror 2.0.18",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -15597,11 +15451,10 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -15609,82 +15462,82 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.25"
+version = "0.8.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
+checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.25"
+version = "0.8.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
+checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -15693,9 +15546,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -15704,13 +15557,13 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.102",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -15733,18 +15586,18 @@ dependencies = [
  "jubjub",
  "lazy_static",
  "pasta_curves 0.5.1",
- "rand 0.8.5",
+ "rand 0.8.7",
  "serde",
  "sha2 0.10.9",
- "sha3 0.10.8",
+ "sha3 0.10.9",
  "subtle",
 ]
 
 [[package]]
 name = "zmij"
-version = "1.0.19"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zstd"
@@ -15766,9 +15619,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.15+zstd.1.5.7"
+version = "2.0.16+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 8868c0a6b..0ad5d937c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -134,7 +134,7 @@ openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branc
 openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-build = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
 
 # crates/kzg
 hex = { version = "0.4.3", default-features = false }
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index b86a1ce16..c9490e031 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -46,8 +46,8 @@ reth-ethereum-primitives.workspace = true
 # Note: the openvm-sdk commit does not need to be exactly the same as the `openvm` commit used in the guest program: as long as
 # the openvm-sdk commit doesn't change any guest libraries, they are compatible
 # This allows us to not update revm and openvm-kzg each time we change openvm-sdk
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false }
-openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2", default-features = false, optional = true }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
+openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false, optional = true }
 openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm.workspace = true
 openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 566a968fe..74c65649a 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -22,15 +22,15 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "alloy-chains"
-version = "0.2.34"
+version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e0378e959aa6a885897522080a990e80eb317f1e9a222a604492ea50e13096"
+checksum = "c36ddb69f5e41407e7a93aead3480f7c8ff076e73d01a951ae8f7ea4542c1ca0"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "num_enum",
+ "phf 0.14.0",
  "serde",
- "strum",
 ]
 
 [[package]]
@@ -52,7 +52,7 @@ dependencies = [
  "either",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell",
- "rand 0.8.5",
+ "rand 0.8.7",
  "secp256k1 0.30.0",
  "serde",
  "serde_json",
@@ -116,14 +116,16 @@ dependencies = [
 
 [[package]]
 name = "alloy-eip7928"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8222b1d88f9a6d03be84b0f5e76bb60cd83991b43ad8ab6477f0e4a7809b98d"
+checksum = "6b827a6d7784fe3eb3489d40699407a4cdcce74271421a01bdffe60cf573bb16"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "borsh",
+ "once_cell",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
@@ -149,7 +151,7 @@ dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
  "alloy-eip7702",
- "alloy-eip7928 0.3.3",
+ "alloy-eip7928 0.3.7",
  "alloy-primitives",
  "alloy-rlp",
  "alloy-serde",
@@ -249,15 +251,14 @@ dependencies = [
  "derive_more",
  "foldhash 0.2.0",
  "hashbrown 0.17.1",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "itoa",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "keccak-asm",
  "paste",
  "proptest",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rapidhash",
- "rayon",
  "ruint",
  "rustc-hash",
  "secp256k1 0.31.1",
@@ -278,13 +279,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp-derive"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36834a5c0a2fa56e171bf256c34d70fca07d0c0031583edea1c4946b7889c9e"
+checksum = "9d4311c03125e8a18296504560b9de3d75ecbd0dcda7f71e6cf2a196d57e6fba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -326,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf028ac8bcb161ad7c104243e710cece8e1a794f65ee6c35c4c4d693c8e80ee"
+checksum = "c1e97b3e0b9f816b25083045dcfa69431bd059a078e828e4d82d296d1949b96c"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -346,7 +347,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -358,12 +359,12 @@ dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
  "sha3",
- "syn 2.0.114",
+ "syn 2.0.118",
  "syn-solidity",
 ]
 
@@ -379,7 +380,7 @@ dependencies = [
  "macro-string",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "syn-solidity",
 ]
 
@@ -390,7 +391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "857b470ecdd2ed38beaf82ad1a38c516a8ff75266750f38b9eeed001d575241b"
 dependencies = [
  "serde",
- "winnow 1.0.3",
+ "winnow",
 ]
 
 [[package]]
@@ -424,14 +425,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2cd27809c88c413e5542dbd5a8eff8c12f0086af920e881ae586d3a787d5e5"
+checksum = "406bc1183f6843e0aba09f7b3365e828b597213d60793ba5cb41befc863e3a78"
 dependencies = [
- "darling 0.23.0",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -546,6 +547,23 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ff"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af"
+dependencies = [
+ "ark-ff-asm 0.6.0",
+ "ark-ff-macros 0.6.0",
+ "ark-serialize 0.6.0",
+ "ark-std 0.6.0",
+ "digest 0.10.7",
+ "educe",
+ "num-bigint",
+ "num-traits",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-ff-asm"
 version = "0.3.0"
@@ -573,7 +591,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2"
+dependencies = [
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -611,7 +639,20 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -685,13 +726,26 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
- "ark-serialize-derive",
+ "ark-serialize-derive 0.5.0",
  "ark-std 0.5.0",
  "arrayvec",
  "digest 0.10.7",
  "num-bigint",
 ]
 
+[[package]]
+name = "ark-serialize"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b"
+dependencies = [
+ "ark-serialize-derive 0.6.0",
+ "ark-std 0.6.0",
+ "digest 0.10.7",
+ "num-bigint",
+ "serde_with",
+]
+
 [[package]]
 name = "ark-serialize-derive"
 version = "0.5.0"
@@ -700,7 +754,18 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -710,7 +775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -720,7 +785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -730,7 +795,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155"
+dependencies = [
+ "num-traits",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -741,9 +816,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
 dependencies = [
  "serde",
 ]
@@ -766,14 +841,14 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "base16ct"
@@ -814,36 +889,57 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
+[[package]]
+name = "bitcoin-consensus-encoding"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2d6094e2a1ba3c93b5a596fe5a10d1a10c3c6e06785cde89f693a044c01aa40"
+dependencies = [
+ "bitcoin-internals",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a30a22d1f112dde8e16be7b45c63645dc165cef254f835b3e1e9553e485cfa64"
+dependencies = [
+ "hex-conservative 0.3.2",
+]
+
 [[package]]
 name = "bitcoin-io"
-version = "0.1.4"
+version = "0.1.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953"
+checksum = "bb5de036369d1ac59d3c1819ebc4d850f89466f5401c571a285b6ed564a4cb78"
+dependencies = [
+ "bitcoin-consensus-encoding",
+]
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.14.1"
+version = "0.14.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b"
+checksum = "bca4c7abb40c8817d77403c880988cfd484f23ab2365726afb2f798363e2c4a2"
 dependencies = [
  "bitcoin-io",
- "hex-conservative",
+ "hex-conservative 0.2.2",
 ]
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "bitvec"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837"
 dependencies = [
  "funty",
  "radium",
@@ -908,32 +1004,42 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f"
+checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145"
 dependencies = [
  "borsh-derive",
+ "bytes",
  "cfg_aliases",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c"
+checksum = "3ae8fb4fb5740e4b2c4884ff95f5f32f5e8479db1e8fd8eb49ddbe09eb09bb7c"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
+]
+
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.19.1"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "byte-slice-cast"
@@ -943,9 +1049,9 @@ checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "d6aedf8ae72766347502cf3cb4f41cf5e9cc37d28bee90f1fdaaae15f9cf9424"
 
 [[package]]
 name = "byteorder"
@@ -955,18 +1061,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "c-kzg"
-version = "2.1.7"
+version = "2.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6648ed1e4ea8e8a1a4a2c78e1cda29a3fd500bc622899c340d8525ea9a76b24a"
+checksum = "38d04308254695569fdb9bfe3bacc1c91837a670d0806605eb82d63748fbd3a6"
 dependencies = [
  "blst",
  "cc",
@@ -979,9 +1085,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.54"
+version = "1.2.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583"
+checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1003,9 +1109,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
 dependencies = [
  "iana-time-zone",
  "num-traits",
@@ -1021,9 +1127,9 @@ checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
 
 [[package]]
 name = "const-hex"
-version = "1.17.0"
+version = "1.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bb320cac8a0750d7f25280aa97b09c26edfe161164238ecbbb31092b079e735"
+checksum = "33e2a781ebdf4467d1428dc4593067825fb646f6871475098d8577421af73558"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.2.17",
@@ -1039,11 +1145,12 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const_format"
-version = "0.2.35"
+version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
+checksum = "4481a617ad9a412be3b97c5d403fef8ed023103368908b9c50af598ff467cc1e"
 dependencies = [
  "const_format_proc_macros",
+ "konst",
 ]
 
 [[package]]
@@ -1107,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "crc-catalog"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+checksum = "217698eaf96b4a3f0bc4f3662aaa55bdf913cd54d7204591faa790070c6d0853"
 
 [[package]]
 name = "critical-section"
@@ -1119,9 +1226,9 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -1129,18 +1236,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crunchy"
@@ -1179,38 +1286,14 @@ dependencies = [
  "hybrid-array",
 ]
 
-[[package]]
-name = "darling"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
-dependencies = [
- "darling_core 0.21.3",
- "darling_macro 0.21.3",
-]
-
 [[package]]
 name = "darling"
 version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
 dependencies = [
- "darling_core 0.23.0",
- "darling_macro 0.23.0",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.114",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -1224,18 +1307,7 @@ dependencies = [
  "quote",
  "serde",
  "strsim",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
-dependencies = [
- "darling_core 0.21.3",
- "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1244,16 +1316,16 @@ version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
- "darling_core 0.23.0",
+ "darling_core",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "dashmap"
-version = "6.1.0"
+version = "6.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -1276,11 +1348,10 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
- "powerfmt",
  "serde_core",
 ]
 
@@ -1297,13 +1368,13 @@ dependencies = [
 
 [[package]]
 name = "derive-where"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
+checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1325,7 +1396,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.114",
+ "syn 2.0.118",
  "unicode-xid",
 ]
 
@@ -1362,13 +1433,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1407,14 +1478,14 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 dependencies = [
  "serde",
 ]
@@ -1453,22 +1524,22 @@ dependencies = [
 
 [[package]]
 name = "enum-ordinalize"
-version = "4.3.2"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0"
+checksum = "07f808d588c10e464ea6f7d3eaed500049eff30aaac103460f61828c2d65b3eb"
 dependencies = [
  "enum-ordinalize-derive",
 ]
 
 [[package]]
 name = "enum-ordinalize-derive"
-version = "4.3.2"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
+checksum = "42e528e2d34ba8a67a1a650b86beae8ef69fc5fdb638016f386b973226590432"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1489,9 +1560,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fastrlp"
@@ -1528,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "fixed-hash"
@@ -1539,7 +1610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rustc-hex",
  "static_assertions",
 ]
@@ -1561,7 +1632,7 @@ checksum = "6dc7a9cb3326bafb80642c5ce99b39a2c0702d4bfa8ee8a3e773791a6cbe2407"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1599,26 +1670,26 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-core",
  "futures-task",
  "pin-project-lite",
- "pin-utils",
+ "slab",
 ]
 
 [[package]]
@@ -1651,10 +1722,21 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
+ "r-efi 5.3.0",
  "wasip2",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -1674,8 +1756,8 @@ dependencies = [
 
 [[package]]
 name = "halo2curves-axiom"
-version = "0.7.2"
-source = "git+https://github.com/axiom-crypto/halo2curves.git?tag=v0.7.2#3a65a710e27fe03711f6fb4fc0c4469ae351974a"
+version = "0.7.3"
+source = "git+https://github.com/axiom-crypto/halo2curves.git?tag=v0.7.3#d744f712fbeaf62576b2b10842822919551c5ef8"
 dependencies = [
  "blake2b_simd",
  "digest 0.10.7",
@@ -1688,7 +1770,7 @@ dependencies = [
  "pairing",
  "pasta_curves",
  "paste",
- "rand 0.8.5",
+ "rand 0.8.7",
  "rand_core 0.6.4",
  "rayon",
  "serde",
@@ -1722,12 +1804,6 @@ dependencies = [
  "foldhash 0.1.5",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
-
 [[package]]
 name = "hashbrown"
 version = "0.17.1"
@@ -1735,7 +1811,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 dependencies = [
  "foldhash 0.2.0",
- "rayon",
  "serde",
  "serde_core",
 ]
@@ -1770,6 +1845,15 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "hex-conservative"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830e599c2904b08f0834ee6337d8fe8f0ed4a63b5d9e7a7f49c0ffa06d08d360"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "hex-literal"
 version = "1.1.0"
@@ -1796,9 +1880,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1820,12 +1904,13 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -1833,9 +1918,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1846,9 +1931,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -1860,15 +1945,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
  "icu_collections",
  "icu_locale_core",
@@ -1880,15 +1965,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -1918,9 +2003,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1943,7 +2028,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -1959,13 +2044,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.16.1",
- "rayon",
+ "hashbrown 0.17.1",
  "serde",
  "serde_core",
 ]
@@ -1999,27 +2083,28 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.85"
+version = "0.3.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
 dependencies = [
- "once_cell",
+ "cfg-if",
+ "futures-util",
  "wasm-bindgen",
 ]
 
@@ -2040,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2067,28 +2152,43 @@ dependencies = [
 
 [[package]]
 name = "keccak-asm"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a"
+checksum = "dd5dc2c0d691cbf7595cde551ced329cca99c2387c2cbc97754c5d0cd045d3ee"
 dependencies = [
  "digest 0.10.7",
  "sha3-asm",
 ]
 
+[[package]]
+name = "konst"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128133ed7824fcd73d6e7b17957c5eb7bacb885649bd8c69708b2331a10bcefb"
+dependencies = [
+ "konst_macro_rules",
+]
+
+[[package]]
+name = "konst_macro_rules"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.9.8",
+ "spin 0.9.9",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libm"
@@ -2098,21 +2198,21 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "linked_list_allocator"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
+checksum = "2b23ac50abb8261cb38c6e2a7192d3302e0836dac1628f6a93b82b4fad185897"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "lock_api"
@@ -2125,9 +2225,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "lru"
@@ -2146,14 +2246,14 @@ checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "modular-bitfield"
@@ -2173,7 +2273,7 @@ checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2201,13 +2301,13 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -2221,9 +2321,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
 [[package]]
 name = "num-integer"
@@ -2236,11 +2336,10 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -2269,7 +2368,7 @@ dependencies = [
  "num-integer",
  "num-modular",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -2305,9 +2404,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -2315,13 +2414,13 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2340,9 +2439,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 dependencies = [
  "critical-section",
  "portable-atomic",
@@ -2351,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2359,24 +2458,24 @@ dependencies = [
  "num-bigint",
  "openvm-custom-insn",
  "openvm-platform",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
 ]
 
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-macros-common",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2384,7 +2483,7 @@ dependencies = [
  "openvm-algebra-complex-macros",
  "openvm-algebra-moduli-macros",
  "openvm-custom-insn",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde-big-array",
  "strum_macros 0.26.4",
 ]
@@ -2392,13 +2491,13 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "num-bigint",
  "num-prime",
  "openvm-macros-common",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2423,17 +2522,17 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2444,7 +2543,7 @@ dependencies = [
  "openvm-algebra-guest",
  "openvm-custom-insn",
  "openvm-ecc-sw-macros",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
  "strum_macros 0.26.4",
 ]
@@ -2452,11 +2551,11 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-macros-common",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2466,17 +2565,17 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-keccak256-guest",
- "spin 0.10.0",
+ "spin 0.10.1",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-platform",
 ]
@@ -2494,15 +2593,15 @@ dependencies = [
  "openvm-pairing",
  "serde",
  "serde-big-array",
- "spin 0.10.0",
+ "spin 0.10.1",
 ]
 
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2523,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "group",
  "hex-literal",
@@ -2539,14 +2638,14 @@ dependencies = [
  "openvm-ecc-sw-macros",
  "openvm-pairing-guest",
  "openvm-platform",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
  "serde",
 ]
 
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2565,13 +2664,13 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "critical-section",
  "embedded-alloc",
  "libm",
  "openvm-custom-insn",
- "openvm-rv32im-guest",
+ "openvm-riscv-guest",
 ]
 
 [[package]]
@@ -2581,22 +2680,22 @@ dependencies = [
  "alloy-consensus",
  "alloy-primitives",
  "aurora-engine-modexp",
- "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=main)",
+ "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-curve-utils",
  "openvm-ecc-guest",
  "openvm-keccak256",
  "openvm-kzg",
  "openvm-pairing",
  "openvm-sha2",
- "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=main)",
+ "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "revm",
  "revm-primitives",
 ]
 
 [[package]]
-name = "openvm-rv32im-guest"
+name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2605,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2614,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "openvm-platform",
 ]
@@ -2673,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=main#3ee99e5002e123a6ca50c815c3e40ab0bd96b0e3"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2722,7 +2821,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2748,7 +2847,7 @@ dependencies = [
  "ff",
  "group",
  "lazy_static",
- "rand 0.8.5",
+ "rand 0.8.7",
  "static_assertions",
  "subtle",
 ]
@@ -2767,9 +2866,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.5"
+version = "2.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
+checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -2782,10 +2881,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
  "phf_macros",
- "phf_shared",
+ "phf_shared 0.13.1",
  "serde",
 ]
 
+[[package]]
+name = "phf"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
+dependencies = [
+ "phf_shared 0.14.0",
+]
+
 [[package]]
 name = "phf_generator"
 version = "0.13.1"
@@ -2793,7 +2901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared",
+ "phf_shared 0.13.1",
 ]
 
 [[package]]
@@ -2803,10 +2911,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
 dependencies = [
  "phf_generator",
- "phf_shared",
+ "phf_shared 0.13.1",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2819,16 +2927,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "pin-project-lite"
-version = "0.2.16"
+name = "phf_shared"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
+dependencies = [
+ "siphasher",
+]
 
 [[package]]
-name = "pin-utils"
-version = "0.1.0"
+name = "pin-project-lite"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pkcs8"
@@ -2842,21 +2953,21 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
@@ -2898,9 +3009,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
  "toml_edit",
 ]
@@ -2924,7 +3035,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -2938,15 +3049,15 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
+checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
 dependencies = [
  "bit-set",
  "bit-vec",
  "bitflags",
  "num-traits",
- "rand 0.9.2",
+ "rand 0.9.5",
  "rand_chacha 0.9.0",
  "rand_xorshift",
  "regex-syntax",
@@ -2963,9 +3074,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.44"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
  "proc-macro2",
 ]
@@ -2976,6 +3087,12 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -2984,9 +3101,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -2996,9 +3113,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.5",
@@ -3055,18 +3172,18 @@ dependencies = [
 
 [[package]]
 name = "rapidhash"
-version = "4.2.1"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8b5b858a440a0bc02625b62dd95131b9201aa9f69f411195dd4a7cfb1de3d7"
+checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -3108,14 +3225,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
 
 [[package]]
 name = "reth-chainspec"
@@ -3163,7 +3280,7 @@ checksum = "ceeb8dab90194305d3f7e3f043a22d2db1fb54b6dcf5d8e75c5a4fa8540e1f57"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -3494,7 +3611,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b378c2653331fe60969d9745e802cd773d82a20d8aaced914dfcf26ab8f0d9"
 dependencies = [
  "bitvec",
- "phf",
+ "phf 0.13.1",
  "revm-primitives",
  "serde",
 ]
@@ -3691,26 +3808,28 @@ dependencies = [
 
 [[package]]
 name = "rlsf"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222fb240c3286247ecdee6fa5341e7cdad0ffdf8e7e401d9937f2d58482a20bf"
+checksum = "1646a59a9734b8b7a0ac51689388a60fe1625d4b956348e9de07591a1478457a"
 dependencies = [
  "cfg-if",
  "const-default",
  "libc",
+ "rustversion",
  "svgbobdoc",
 ]
 
 [[package]]
 name = "ruint"
-version = "1.17.2"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a"
+checksum = "45caf26f647c19115bf9c453c70ffe4a4a3a6390dceebd942610584f99b8ddce"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "ark-ff 0.5.0",
+ "ark-ff 0.6.0",
  "bytes",
  "fastrlp 0.3.1",
  "fastrlp 0.4.0",
@@ -3720,8 +3839,8 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.8.7",
+ "rand 0.9.5",
  "rlp",
  "ruint-macro",
  "serde_core",
@@ -3737,9 +3856,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
 [[package]]
 name = "rustc-hex"
@@ -3762,14 +3881,14 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.27",
+ "semver 1.0.28",
 ]
 
 [[package]]
 name = "rustix"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
  "bitflags",
  "errno",
@@ -3780,9 +3899,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "rusty-fork"
@@ -3810,9 +3929,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -3848,7 +3967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
+ "rand 0.8.7",
  "secp256k1-sys 0.10.1",
  "serde",
 ]
@@ -3860,7 +3979,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.9.2",
+ "rand 0.9.5",
  "secp256k1-sys 0.11.0",
 ]
 
@@ -3893,9 +4012,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "semver-parser"
@@ -3951,16 +4070,16 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "itoa",
  "memchr",
  "serde",
@@ -3970,17 +4089,18 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.16.1"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
 dependencies = [
  "base64 0.22.1",
+ "bs58",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "schemars 0.9.0",
- "schemars 1.2.0",
+ "schemars 1.2.1",
  "serde_core",
  "serde_json",
  "serde_with_macros",
@@ -3989,14 +4109,14 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.16.1"
+version = "3.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
 dependencies = [
- "darling 0.21.3",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4032,9 +4152,9 @@ dependencies = [
 
 [[package]]
 name = "sha3-asm"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5"
+checksum = "a6287fd675f713484342a89cbf0a386abef5f15919cfad607e5e1f19e1e15331"
 dependencies = [
  "cc",
  "cfg-if",
@@ -4042,9 +4162,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signature"
@@ -4058,30 +4178,36 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "spin"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
 
 [[package]]
 name = "spin"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
 
 [[package]]
 name = "spki"
@@ -4130,7 +4256,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4142,7 +4268,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4177,9 +4303,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4195,7 +4321,7 @@ dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4206,7 +4332,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4217,12 +4343,12 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.24.0"
+version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
  "windows-sys",
@@ -4245,7 +4371,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4259,12 +4385,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.46"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
 dependencies = [
  "deranged",
- "itoa",
  "num-conv",
  "powerfmt",
  "serde_core",
@@ -4274,15 +4399,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.26"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
 dependencies = [
  "num-conv",
  "time-core",
@@ -4299,42 +4424,57 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
 [[package]]
 name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
  "serde_core",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.23.10+spec-1.0.0"
+version = "0.25.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.14.0",
  "toml_datetime",
  "toml_parser",
- "winnow 0.7.14",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 0.7.14",
+ "winnow",
 ]
 
 [[package]]
@@ -4356,7 +4496,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4410,15 +4550,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
 
 [[package]]
 name = "unicode-width"
@@ -4489,18 +4629,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.4+wasi-0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
 dependencies = [
  "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.108"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4511,9 +4651,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.108"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4521,22 +4661,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.108"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.108"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
 dependencies = [
  "unicode-ident",
 ]
@@ -4562,7 +4702,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4573,7 +4713,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
@@ -4611,33 +4751,24 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wit-bindgen"
-version = "0.51.0"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
 name = "writeable"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "wyz"
@@ -4650,9 +4781,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -4661,82 +4792,82 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.34"
+version = "0.8.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d"
+checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.34"
+version = "0.8.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d"
+checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zerotrie"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -4745,9 +4876,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -4756,20 +4887,20 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 2.0.118",
 ]
 
 [[package]]
 name = "zmij"
-version = "1.0.17"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zstd"
diff --git a/crates/mpt/src/node.rs b/crates/mpt/src/node.rs
index 56cbef7cf..bea884605 100644
--- a/crates/mpt/src/node.rs
+++ b/crates/mpt/src/node.rs
@@ -1,4 +1,4 @@
-use std::cell::Cell;
+use core::cell::Cell;
 
 use revm_primitives::hex;
 
diff --git a/crates/mpt/src/state.rs b/crates/mpt/src/state.rs
index bd7f76eba..d14f4734b 100644
--- a/crates/mpt/src/state.rs
+++ b/crates/mpt/src/state.rs
@@ -1,4 +1,4 @@
-use alloc::{boxed::Box, vec, vec::Vec};
+use alloc::{vec, vec::Vec};
 
 use alloy_trie::TrieAccount;
 use bumpalo::Bump;
diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index ac2825d0f..d0d67f2ff 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -1,5 +1,6 @@
 use alloc::vec::Vec;
 use core::{
+    alloc::Layout,
     cell::{Cell, RefCell},
     mem::MaybeUninit,
 };
@@ -116,7 +117,7 @@ fn is_null_ref(slice: &[u8]) -> bool {
 /// an inline loop.
 #[inline(always)]
 fn bytes_eq(a: &[u8], b: &[u8]) -> bool {
-    a.len() == b.len() && std::iter::zip(a, b).all(|(x, y)| x == y)
+    a.len() == b.len() && core::iter::zip(a, b).all(|(x, y)| x == y)
 }
 
 /// Writes an RLP header with the given base code (`EMPTY_LIST_CODE` for lists,
@@ -351,7 +352,7 @@ impl<'a> Mpt<'a> {
         let childs = unsafe {
             &mut *self
                 .bump
-                .alloc_layout(std::alloc::Layout::new::<[Cell<Option<NodeId>>; 16]>())
+                .alloc_layout(Layout::new::<[Cell<Option<NodeId>>; 16]>())
                 .cast::<[MaybeUninit<Option<NodeId>>; 16]>()
                 .as_ptr()
         };
diff --git a/crates/stateless-executor/src/io.rs b/crates/stateless-executor/src/io.rs
index abd19b827..d5e120640 100644
--- a/crates/stateless-executor/src/io.rs
+++ b/crates/stateless-executor/src/io.rs
@@ -1,4 +1,4 @@
-use alloc::{boxed::Box, format, string::ToString, vec::Vec};
+use alloc::{format, string::ToString, vec::Vec};
 use core::iter::once;
 
 use crate::error::StatelessExecutorError;

From f6481f34a784e6f03ee41c0c6982d47da6263e7b Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 12:00:25 +0200
Subject: [PATCH 06/94] chore: clean up v2.1 rv64 follow-ups

---
 .github/workflows/reth-benchmark.yml   | 30 +++++++++++-----------
 .github/workflows/run-benchmark-v2.yml |  2 +-
 Cargo.lock                             |  3 ---
 Dockerfile                             |  2 +-
 bin/reth-benchmark/README.md           |  2 +-
 bin/reth-verify/Cargo.toml             |  3 ---
 bin/reth-verify/src/main.rs            | 27 +++-----------------
 crates/guest-mem/src/lib.rs            |  2 +-
 crates/stateless-executor/Cargo.toml   |  2 +-
 crates/stateless-executor/src/lib.rs   |  2 +-
 run.sh                                 | 35 ++++++++++----------------
 scripts/generate-inputs-parallel.sh    |  2 +-
 12 files changed, 39 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index e848b1852..7d72665e7 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -44,10 +44,22 @@ on:
           - guest # guest profiling (circuit flamegraphs)
           - nsys # nsys profiling (cuda)
         default: none
-      max_segment_length:
+      app_log_blowup:
+        type: number
+        required: false
+        description: Application level log blowup
+      leaf_log_blowup:
+        type: number
+        required: false
+        description: Aggregation (leaf) level log blowup
+      internal_log_blowup:
+        type: number
+        required: false
+        description: Internal level log blowup
+      root_log_blowup:
         type: number
         required: false
-        description: Max segment length override for continuations
+        description: Root level log blowup
       segment_max_memory:
         type: string
         required: false
@@ -130,10 +142,6 @@ on:
         required: false
         description: Profiling mode (none, host, guest, nsys)
         default: none
-      max_segment_length:
-        type: number
-        required: false
-        description: Max segment length override for continuations
       segment_max_memory:
         type: string
         required: false
@@ -591,7 +599,6 @@ jobs:
           LEAF_LOG_BLOWUP="${{ inputs.leaf_log_blowup || github.event.inputs.leaf_log_blowup }}"
           INTERNAL_LOG_BLOWUP="${{ inputs.internal_log_blowup || github.event.inputs.internal_log_blowup }}"
           ROOT_LOG_BLOWUP="${{ inputs.root_log_blowup || github.event.inputs.root_log_blowup }}"
-          MAX_SEGMENT_LENGTH="${{ inputs.max_segment_length || github.event.inputs.max_segment_length }}"
           SEGMENT_MAX_MEMORY="${{ inputs.segment_max_memory || github.event.inputs.segment_max_memory }}"
           APP_L_SKIP="${{ inputs.app_l_skip || github.event.inputs.app_l_skip }}"
           NUM_CHILDREN_LEAF="${{ inputs.num_children_leaf || github.event.inputs.num_children_leaf }}"
@@ -600,15 +607,12 @@ jobs:
           read_default() {
             awk -v arg="$1" '$0 ~ arg { in_arg = 1; next } in_arg && /\[default:/ { gsub(/.*\[default: |].*/, ""); print; exit }' <<< "$HELP_OUTPUT"
           }
-          DEFAULT_MAX_SEGMENT_LENGTH="$(read_default "--max-segment-length ")"
           DEFAULT_SEGMENT_MAX_MEMORY="$(read_default "--segment-max-memory ")"
-          if [[ -z "$DEFAULT_MAX_SEGMENT_LENGTH" || -z "$DEFAULT_SEGMENT_MAX_MEMORY" ]]; then
+          if [[ -z "$DEFAULT_SEGMENT_MAX_MEMORY" ]]; then
             echo "Failed to read segmentation defaults from ${{ env.BIN_NAME }} --help" >&2
             exit 1
           fi
-          RESOLVED_MAX_SEGMENT_LENGTH="${MAX_SEGMENT_LENGTH:-$DEFAULT_MAX_SEGMENT_LENGTH}"
           RESOLVED_SEGMENT_MAX_MEMORY="${SEGMENT_MAX_MEMORY:-$DEFAULT_SEGMENT_MAX_MEMORY}"
-          echo "RESOLVED_MAX_SEGMENT_LENGTH=$RESOLVED_MAX_SEGMENT_LENGTH" >> "$GITHUB_ENV"
           echo "RESOLVED_SEGMENT_MAX_MEMORY=$RESOLVED_SEGMENT_MAX_MEMORY" >> "$GITHUB_ENV"
           if [[ -n $APP_LOG_BLOWUP ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --app-log-blowup $APP_LOG_BLOWUP"
@@ -622,9 +626,6 @@ jobs:
           if [[ -n $ROOT_LOG_BLOWUP ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --root-log-blowup $ROOT_LOG_BLOWUP"
           fi
-          if [[ -n $MAX_SEGMENT_LENGTH ]]; then
-            OPTIONAL_ARGS="$OPTIONAL_ARGS --max-segment-length $MAX_SEGMENT_LENGTH"
-          fi
           if [[ -n $SEGMENT_MAX_MEMORY ]]; then
             OPTIONAL_ARGS="$OPTIONAL_ARGS --segment-max-memory $SEGMENT_MAX_MEMORY"
           fi
@@ -799,7 +800,6 @@ jobs:
           source openvm/ci/scripts/utils.sh
 
           add_metadata $MD_PATH \
-            $RESOLVED_MAX_SEGMENT_LENGTH \
             ${{ inputs.instance_family || github.event.inputs.instance_family }} \
             ${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }} \
             $COMMIT_URL \
diff --git a/.github/workflows/run-benchmark-v2.yml b/.github/workflows/run-benchmark-v2.yml
index 5615dfb2e..c1abce08d 100644
--- a/.github/workflows/run-benchmark-v2.yml
+++ b/.github/workflows/run-benchmark-v2.yml
@@ -86,7 +86,7 @@ jobs:
 
             # Build the benchmark binary
             export JEMALLOC_SYS_WITH_MALLOC_CONF="retain:true,background_thread:true,metadata_thp:always,thp:always,dirty_decay_ms:10000,muzzy_decay_ms:10000,abort_conf:true"
-            cargo build --bin openvm-reth-benchmark --profile=release --no-default-features --features="bench-metrics,jemalloc,evm-verify"
+            cargo build --bin openvm-reth-benchmark --profile=release --no-default-features --features="metrics,jemalloc,evm-verify"
 
             # Generate input data
             echo "Generating input for block $block_number..."
diff --git a/Cargo.lock b/Cargo.lock
index f149cfb76..14b81979f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7713,13 +7713,10 @@ dependencies = [
 name = "openvm-reth-verify"
 version = "0.4.0"
 dependencies = [
- "bincode 1.3.3",
  "clap",
  "eyre",
- "openvm-circuit",
  "openvm-stark-sdk",
  "openvm-verify-stark-host",
- "serde",
  "zstd",
 ]
 
diff --git a/Dockerfile b/Dockerfile
index 4d8739d8e..1d656508c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,7 +61,7 @@ RUN S5CMD_VER=$(curl -s https://api.github.com/repos/peak/s5cmd/releases/latest
 
 WORKDIR /app
 COPY --from=builder /app/target/release/openvm-reth-benchmark /usr/local/bin/openvm-reth-benchmark
-COPY --from=builder /app/bin/openvm-reth-benchmark/elf/openvm-stateless-guest /app/bin/openvm-reth-benchmark/elf/openvm-stateless-guest
+COPY --from=builder /app/bin/reth-benchmark/elf/openvm-stateless-guest /app/bin/reth-benchmark/elf/openvm-stateless-guest
 COPY server /app/server
 
 RUN python3 -m venv /opt/venv \
diff --git a/bin/reth-benchmark/README.md b/bin/reth-benchmark/README.md
index b0d33a325..4ef6a5b79 100644
--- a/bin/reth-benchmark/README.md
+++ b/bin/reth-benchmark/README.md
@@ -86,7 +86,7 @@ Before running the benchmark, you must first compile the guest program using `ca
 cd bin/stateless-guest
 cargo openvm build
 mkdir -p ../reth-benchmark/elf
-cp target/riscv32im-risc0-zkvm-elf/release/openvm-stateless-guest ../reth-benchmark/elf/
+cp target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest ../reth-benchmark/elf/
 cd ../..
 ```
 
diff --git a/bin/reth-verify/Cargo.toml b/bin/reth-verify/Cargo.toml
index 38dc45929..cad1700fa 100644
--- a/bin/reth-verify/Cargo.toml
+++ b/bin/reth-verify/Cargo.toml
@@ -12,10 +12,7 @@ workspace = true
 [dependencies]
 clap = { workspace = true, features = ["derive"] }
 eyre.workspace = true
-serde.workspace = true
 zstd.workspace = true
-bincode1 = { package = "bincode", version = "1.3.3" }
 
-openvm-circuit.workspace = true
 openvm-verify-stark-host.workspace = true
 openvm-stark-sdk.workspace = true
diff --git a/bin/reth-verify/src/main.rs b/bin/reth-verify/src/main.rs
index 41b23722b..feb30a05b 100644
--- a/bin/reth-verify/src/main.rs
+++ b/bin/reth-verify/src/main.rs
@@ -1,12 +1,8 @@
 use std::{fs, path::PathBuf};
 
 use clap::Parser;
-use eyre::{eyre, Result, WrapErr};
-use openvm_circuit::system::memory::merkle::public_values::UserPublicValuesProof;
-use openvm_stark_sdk::{
-    config::baby_bear_poseidon2::{BabyBearPoseidon2Config as SC, DIGEST_SIZE, F},
-    openvm_stark_backend::proof::Proof,
-};
+use eyre::{Result, WrapErr};
+use openvm_stark_sdk::openvm_stark_backend::codec::Decode;
 use openvm_verify_stark_host::{
     verify_vm_stark_proof_decoded,
     vk::{read_vk_from_file, VmStarkVerifyingKey},
@@ -31,12 +27,6 @@ struct Args {
     vm_vk: PathBuf,
 }
 
-#[derive(Clone, serde::Serialize, serde::Deserialize)]
-struct StarkProofWithPublicValue<Field> {
-    proof: Proof<SC>,
-    user_public_values: Option<UserPublicValuesProof<DIGEST_SIZE, Field>>,
-}
-
 fn decode_persisted_final_proof_bytes(path: &PathBuf, proof_bytes: Vec<u8>) -> Result<Vec<u8>> {
     if proof_bytes.starts_with(&ZSTD_FRAME_MAGIC) {
         return zstd::decode_all(&proof_bytes[..]).wrap_err_with(|| {
@@ -51,17 +41,8 @@ fn load_stark_final_proof(path: &PathBuf) -> Result<VmStarkProof> {
     let proof_bytes = fs::read(path)
         .wrap_err_with(|| format!("Failed to read STARK final proof {}", path.display()))?;
     let proof_bytes = decode_persisted_final_proof_bytes(path, proof_bytes)?;
-    let proof: StarkProofWithPublicValue<F> = bincode1::deserialize(&proof_bytes)
-        .wrap_err_with(|| format!("Failed to deserialize STARK final proof {}", path.display()))?;
-
-    let user_pvs_proof = proof.user_public_values.ok_or_else(|| {
-        eyre!(
-            "Proof {} does not include user public values; this is not a final STARK proof",
-            path.display()
-        )
-    })?;
-
-    Ok(VmStarkProof { inner: proof.proof, user_pvs_proof, deferral_merkle_proofs: None })
+    VmStarkProof::decode_from_bytes(&proof_bytes)
+        .wrap_err_with(|| format!("Failed to decode STARK final proof {}", path.display()))
 }
 
 fn main() -> Result<()> {
diff --git a/crates/guest-mem/src/lib.rs b/crates/guest-mem/src/lib.rs
index 1399215f6..d936ab87e 100644
--- a/crates/guest-mem/src/lib.rs
+++ b/crates/guest-mem/src/lib.rs
@@ -65,7 +65,7 @@ pub unsafe fn compare_bytes(mut a: *const u8, mut b: *const u8, mut n: usize) ->
     }
 }
 
-#[cfg(target_os = "zkvm")]
+#[cfg(target_os = "openvm")]
 mod c_exports {
     #[unsafe(no_mangle)]
     unsafe extern "C" fn memcmp(a: *const u8, b: *const u8, n: usize) -> i32 {
diff --git a/crates/stateless-executor/Cargo.toml b/crates/stateless-executor/Cargo.toml
index 6e3d57e31..bac438196 100644
--- a/crates/stateless-executor/Cargo.toml
+++ b/crates/stateless-executor/Cargo.toml
@@ -41,7 +41,7 @@ alloy-consensus = { workspace = true, features = ["crypto-backend", "serde-binco
 alloy-rlp.workspace = true
 alloy-trie.workspace = true
 
-[target.'cfg(target_os = "zkvm")'.dependencies]
+[target.'cfg(target_os = "openvm")'.dependencies]
 openvm-guest-mem.workspace = true
 
 [package.metadata.cargo-machete]
diff --git a/crates/stateless-executor/src/lib.rs b/crates/stateless-executor/src/lib.rs
index 84dc49299..7b727eb74 100644
--- a/crates/stateless-executor/src/lib.rs
+++ b/crates/stateless-executor/src/lib.rs
@@ -24,7 +24,7 @@ use bumpalo::Bump;
 
 // Links the guest's optimized `memcmp`/`bcmp` overrides into every binary
 // that executes blocks inside the zkVM.
-#[cfg(target_os = "zkvm")]
+#[cfg(target_os = "openvm")]
 use openvm_guest_mem as _;
 
 use crate::{
diff --git a/run.sh b/run.sh
index 69b83bca0..ba79a8db3 100755
--- a/run.sh
+++ b/run.sh
@@ -16,7 +16,6 @@
 #   --root-log-blowup <N>
 #   --num-children-leaf <N>
 #   --num-children-internal <N>
-#   --max-segment-length <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
 #   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | aot | rvr.
@@ -49,21 +48,20 @@ REPO_ROOT=$(git rev-parse --show-toplevel)
 WORKDIR=$REPO_ROOT
 RUST_TOOLCHAIN=$(sed -n 's/^channel = "\(.*\)"/\1/p' "$REPO_ROOT/rust-toolchain.toml")
 
-cd "$REPO_ROOT/bin/stateless-guest"
-if ! rustup toolchain list | grep -q '^openvm-1\.94\.0'; then
-    echo "openvm-1.94.0 toolchain not found; installing..."
-    cargo openvm toolchain install
-fi
-cargo openvm build
-mkdir -p ../reth-benchmark/elf
-SRC="target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest"
-DEST="../reth-benchmark/elf/openvm-stateless-guest"
+DEST="$REPO_ROOT/bin/reth-benchmark/elf/openvm-stateless-guest"
 
-if [ ! -f "$DEST" ] || ! cmp -s "$SRC" "$DEST"; then
-    cp "$SRC" "$DEST"
-fi
+build_openvm_guest_elf() {
+    cd "$REPO_ROOT/bin/stateless-guest"
+    cargo openvm build
+    mkdir -p ../reth-benchmark/elf
+    SRC="target/riscv64im-unknown-openvm-elf/release/openvm-stateless-guest"
+    if [ ! -f "$DEST" ] || ! cmp -s "$SRC" "$DEST"; then
+        cp "$SRC" "$DEST"
+    fi
+    cd "$WORKDIR"
+}
 
-cd $WORKDIR
+cd "$WORKDIR"
 
 # =============== GPU memory usage monitoring ============================
 source "$REPO_ROOT/scripts/gpu_monitor.sh"
@@ -106,10 +104,6 @@ while [[ $# -gt 0 ]]; do
             BLOCK_NUMBER_OVERRIDE="$2"
             shift 2
             ;;
-        --max-segment-length)
-            MAX_SEGMENT_LENGTH="$2"
-            shift 2
-            ;;
         --segment-max-memory)
             SEGMENT_MAX_MEMORY="$2"
             shift 2
@@ -363,6 +357,7 @@ if [ "$USE_NSYS" = "false" ]; then
     export JEMALLOC_SYS_WITH_MALLOC_CONF="retain:true,background_thread:true,metadata_thp:always,dirty_decay_ms:10000,muzzy_decay_ms:10000,abort_conf:true"
 fi
 if [[ "${OPENVM_BENCH_SKIP_BUILD:-0}" != "1" ]]; then
+    build_openvm_guest_elf
     RUSTFLAGS=$RUSTFLAGS cargo $TOOLCHAIN build --bin $BIN_NAME --profile=$PROFILE --no-default-features --features=$FEATURES
 fi
 
@@ -401,10 +396,6 @@ if [[ -n $PROOF_CACHE ]]
 then
     CONFIG_ARGS="$CONFIG_ARGS --proof-cache ${PROOF_CACHE}"
 fi
-if [[ -n $MAX_SEGMENT_LENGTH ]]
-then
-    CONFIG_ARGS="$CONFIG_ARGS --max-segment-length ${MAX_SEGMENT_LENGTH}"
-fi
 if [[ -n $SEGMENT_MAX_MEMORY ]]
 then
     CONFIG_ARGS="$CONFIG_ARGS --segment-max-memory ${SEGMENT_MAX_MEMORY}"
diff --git a/scripts/generate-inputs-parallel.sh b/scripts/generate-inputs-parallel.sh
index 55a67b431..ed41a1dda 100755
--- a/scripts/generate-inputs-parallel.sh
+++ b/scripts/generate-inputs-parallel.sh
@@ -51,7 +51,7 @@ else
     exit 1
 fi
 
-cd bin/openvm-reth-benchmark
+cd bin/reth-benchmark
 # The binary has a static include_bytes! but doesn't really need this ELF for proof input generation:
 mkdir -p elf
 touch elf/openvm-stateless-guest

From 1e20204f12768923dfc545928de99bcc5929c182 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 12:17:08 +0200
Subject: [PATCH 07/94] fix: add explicit kzg test lifetimes

---
 crates/kzg/src/kzg_proof.rs           | 2 +-
 crates/kzg/tests/integration_tests.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/kzg/src/kzg_proof.rs b/crates/kzg/src/kzg_proof.rs
index 3fa289de0..fd9c6307b 100644
--- a/crates/kzg/src/kzg_proof.rs
+++ b/crates/kzg/src/kzg_proof.rs
@@ -296,7 +296,7 @@ pub mod tests {
         let kzg_settings = KzgSettings::load_trusted_setup_file().unwrap();
 
         for (test_file, data) in &VERIFY_KZG_PROOF_TESTS {
-            let test: Test<Input> = serde_yaml::from_str(data).unwrap();
+            let test: Test<Input<'_>> = serde_yaml::from_str(data).unwrap();
             let (Ok(commitment), Ok(z), Ok(y), Ok(proof)) = (
                 test.input.get_commitment(),
                 test.input.get_z(),
diff --git a/crates/kzg/tests/integration_tests.rs b/crates/kzg/tests/integration_tests.rs
index 6c7e1a0bf..f46f93fcf 100644
--- a/crates/kzg/tests/integration_tests.rs
+++ b/crates/kzg/tests/integration_tests.rs
@@ -48,7 +48,7 @@ fn test_multiple_invalid_verify_kzg() {
 }
 
 pub fn run_test_from_yaml_str(data: &str) {
-    let test: Test<Input> = from_str(data).unwrap();
+    let test: Test<Input<'_>> = from_str(data).unwrap();
     let (Ok(commitment), Ok(z), Ok(y), Ok(proof)) = (
         test.input.get_commitment(),
         test.input.get_z(),

From 7f67db40772ae154ae77ef6cee97cd98c4852391 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 12:31:37 +0200
Subject: [PATCH 08/94] chore: default benchmark execution to rvr

---
 .github/workflows/reth-benchmark.yml | 14 ++++++--------
 Dockerfile                           |  4 ++--
 bin/reth-benchmark/Cargo.toml        |  1 -
 bin/reth-benchmark/src/lib.rs        |  2 --
 bin/reth-benchmark/src/main.rs       |  2 --
 run.sh                               | 17 +++++++----------
 rust-toolchain.toml                  |  1 -
 7 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index 7d72665e7..18819b574 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -76,8 +76,7 @@ on:
           - interpreter
           - rvr
           - aot
-          - tco
-        default: interpreter
+        default: rvr
       rpc_input_cache:
         type: choice
         required: false
@@ -153,8 +152,8 @@ on:
       exec_mode:
         type: string
         required: false
-        description: OpenVM execution backend, one of {interpreter, rvr, aot, tco} (aot is x86_64-only)
-        default: interpreter
+        description: OpenVM execution backend, one of {interpreter, rvr, aot} (aot is x86_64-only)
+        default: rvr
       num_children_leaf:
         type: number
         required: false
@@ -305,7 +304,7 @@ jobs:
         run: bash ./scripts/gpu_driver_setup.sh
 
       - name: Install clang-22 and lld
-        if: ${{ (inputs.exec_mode || github.event.inputs.exec_mode) == 'rvr' }}
+        if: ${{ (inputs.exec_mode || github.event.inputs.exec_mode || 'rvr') == 'rvr' }}
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
@@ -368,7 +367,7 @@ jobs:
             fi
           fi
 
-          EXEC_MODE="${{ inputs.exec_mode || github.event.inputs.exec_mode || 'interpreter' }}"
+          EXEC_MODE="${{ inputs.exec_mode || github.event.inputs.exec_mode || 'rvr' }}"
 
           # Resolve "native" to the host CPU name (e.g. znver3) so sccache keys and
           # cargo fingerprints differ across instance families (else SIGILL from reuse)
@@ -382,7 +381,7 @@ jobs:
             arm64|aarch64)
               if [[ "$EXEC_MODE" == "aot" ]]; then
                 # aot enables halo2curves-axiom/asm which is x86_64-only
-                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter, rvr, or tco"
+                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter or rvr"
                 exit 1
               fi
               ;;
@@ -395,7 +394,6 @@ jobs:
           esac
           case "$EXEC_MODE" in
             interpreter) ;; # default interpreted execution; no extra backend feature
-            tco) FEATURES="${FEATURES},tco" ;;
             aot) FEATURES="${FEATURES},aot" ;;
             rvr) FEATURES="${FEATURES},rvr" ;;
             *) echo "Unsupported exec_mode: $EXEC_MODE"; exit 1 ;;
diff --git a/Dockerfile b/Dockerfile
index 1d656508c..44538abea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-# Toolchains: stable for cargo-openvm, nightly for tco build
+# Toolchains: stable for cargo-openvm, nightly for host build
 ENV CARGO_HOME="/root/.cargo" \
     RUSTUP_HOME="/root/.rustup" \
     PATH="/root/.cargo/bin:${PATH}"
@@ -41,7 +41,7 @@ RUN RUSTFLAGS="" cargo openvm build --no-transpile --profile=release \
 # Build host binary
 WORKDIR /app
 ENV JEMALLOC_SYS_WITH_MALLOC_CONF="retain:true,background_thread:true,metadata_thp:always,dirty_decay_ms:10000,muzzy_decay_ms:10000,abort_conf:true"
-ARG FEATURES="metrics,jemalloc,tco,unprotected,cuda"
+ARG FEATURES="metrics,jemalloc,rvr,unprotected,cuda"
 ARG PROFILE="release"
 # CUDA SASS targets: 89 = Ada, 120 = Blackwell
 ARG CUDA_ARCH="89,120"
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index c9490e031..fb2ced2eb 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -65,7 +65,6 @@ ignored = ["halo2-axiom"]
 default = ["parallel", "jemalloc", "metrics"]
 parallel = ["openvm-sdk/parallel"]
 metrics = ["openvm-sdk/metrics", "openvm-circuit/metrics", "openvm-stark-sdk/metrics"]
-tco = ["openvm-sdk/tco"]
 aot = ["openvm-sdk/aot"]
 # Mutually exclusive with `aot`
 rvr = ["openvm-sdk/rvr"]
diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index 5b9a71f5f..cb7e665c2 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "tco", allow(incomplete_features))]
-#![cfg_attr(feature = "tco", feature(explicit_tail_calls))]
 use std::{fs, io::Write, path::PathBuf, time::Instant};
 
 use alloy_provider::RootProvider;
diff --git a/bin/reth-benchmark/src/main.rs b/bin/reth-benchmark/src/main.rs
index 8af569192..1bb63b375 100644
--- a/bin/reth-benchmark/src/main.rs
+++ b/bin/reth-benchmark/src/main.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "tco", allow(incomplete_features))]
-#![cfg_attr(feature = "tco", feature(explicit_tail_calls))]
 use clap_builder::Parser;
 use openvm_reth_benchmark::{run_reth_benchmark, HostArgs};
 
diff --git a/run.sh b/run.sh
index ba79a8db3..2f307d4b8 100755
--- a/run.sh
+++ b/run.sh
@@ -18,8 +18,8 @@
 #   --num-children-internal <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
-#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | aot | rvr.
-#                       Defaults to interpreter. aot is not supported on arm64.
+#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | rvr | aot.
+#                       Defaults to rvr. aot is not supported on arm64.
 #                       rvr requires clang-22 and lld on PATH.
 #   --perf              Run with perf + samply host profiling and upload to Firefox Profiler
 #   --nsys              Run with nsys profiling and output summary stats
@@ -143,11 +143,11 @@ while [[ $# -gt 0 ]]; do
             ;;
         --exec-mode)
             case "${2:-}" in
-                interpreter|tco|aot|rvr)
+                interpreter|rvr|aot)
                     EXEC_MODE="$2"
                     ;;
                 *)
-                    echo "Error: --exec-mode requires one of: interpreter, tco, aot, rvr (got '${2:-}')" >&2
+                    echo "Error: --exec-mode requires one of: interpreter, rvr, aot (got '${2:-}')" >&2
                     exit 1
                     ;;
             esac
@@ -301,7 +301,7 @@ case $arch in
 arm64|aarch64)
     RUSTFLAGS="-Ctarget-cpu=native"
     if [ -z "$EXEC_MODE" ]; then
-        EXEC_MODE="interpreter"
+        EXEC_MODE="rvr"
     elif [ "$EXEC_MODE" = "aot" ]; then
         # aot enables halo2curves-axiom/asm which is x86_64-only
         echo "Error: --exec-mode aot is not supported on arm64" >&2
@@ -311,7 +311,7 @@ arm64|aarch64)
 x86_64|amd64)
     RUSTFLAGS="-Ctarget-cpu=native"
     if [ -z "$EXEC_MODE" ]; then
-        EXEC_MODE="interpreter"
+        EXEC_MODE="rvr"
     fi
     ;;
 *)
@@ -323,9 +323,6 @@ case "$EXEC_MODE" in
     interpreter)
         # default interpreted execution; no extra backend feature
         ;;
-    tco)
-        FEATURES="$FEATURES,tco"
-        ;;
     aot)
         # aot enables halo2curves-axiom/asm which is x86_64-only
         FEATURES="$FEATURES,aot"
@@ -340,7 +337,7 @@ case "$EXEC_MODE" in
         command -v lld      >/dev/null 2>&1 || missing+=("lld")
         if [ "${#missing[@]}" -gt 0 ]; then
             echo "Error: --exec-mode rvr requires the following tools on PATH: ${missing[*]}" >&2
-            echo "       Install them or rerun with --exec-mode tco (or --exec-mode aot on x86_64)." >&2
+            echo "       Install them or rerun with --exec-mode interpreter (or --exec-mode aot on x86_64)." >&2
             exit 1
         fi
         ;;
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f23878919..6c5c92206 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,4 @@
 [toolchain]
 #channel = "1.91.1"
-# To use the "tco" feature, switch to Rust nightly:
 channel = "nightly-2026-01-18"
 components = ["clippy", "rustfmt"]

From f09db2659ed04eaf81c4811803e1eb35ca27f7f1 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 12:40:39 +0200
Subject: [PATCH 09/94] fix: restore tco and install openvm kzg toolchain

---
 .github/workflows/reth-benchmark.yml |  6 ++++--
 .github/workflows/tests-kzg.yml      | 12 +++++++++---
 bin/reth-benchmark/Cargo.toml        |  1 +
 bin/reth-benchmark/src/lib.rs        |  3 +++
 bin/reth-benchmark/src/main.rs       |  3 +++
 run.sh                               |  9 ++++++---
 rust-toolchain.toml                  |  1 +
 7 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index 18819b574..44058b205 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -76,6 +76,7 @@ on:
           - interpreter
           - rvr
           - aot
+          - tco
         default: rvr
       rpc_input_cache:
         type: choice
@@ -152,7 +153,7 @@ on:
       exec_mode:
         type: string
         required: false
-        description: OpenVM execution backend, one of {interpreter, rvr, aot} (aot is x86_64-only)
+        description: OpenVM execution backend, one of {interpreter, rvr, aot, tco} (aot is x86_64-only)
         default: rvr
       num_children_leaf:
         type: number
@@ -381,7 +382,7 @@ jobs:
             arm64|aarch64)
               if [[ "$EXEC_MODE" == "aot" ]]; then
                 # aot enables halo2curves-axiom/asm which is x86_64-only
-                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter or rvr"
+                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter, rvr, or tco"
                 exit 1
               fi
               ;;
@@ -394,6 +395,7 @@ jobs:
           esac
           case "$EXEC_MODE" in
             interpreter) ;; # default interpreted execution; no extra backend feature
+            tco) FEATURES="${FEATURES},tco" ;;
             aot) FEATURES="${FEATURES},aot" ;;
             rvr) FEATURES="${FEATURES},rvr" ;;
             *) echo "Unsupported exec_mode: $EXEC_MODE"; exit 1 ;;
diff --git a/.github/workflows/tests-kzg.yml b/.github/workflows/tests-kzg.yml
index 7d01a7605..56d52593a 100644
--- a/.github/workflows/tests-kzg.yml
+++ b/.github/workflows/tests-kzg.yml
@@ -25,6 +25,7 @@ env:
   CARGO_TERM_COLOR: always
   CARGO_NET_GIT_FETCH_WITH_CLI: "true"
   OPENVM_FAST_TEST: "1"
+  OPENVM_BRANCH: develop-v2.1.0
 
 jobs:
   test:
@@ -41,15 +42,20 @@ jobs:
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@nextest
+      - name: Restore openvm toolchain from cache
+        uses: runs-on/cache@v4
+        with:
+          path: ~/.openvm/toolchains
+          key: openvm-toolchain-openvm-1.94.0-${{ runner.os }}-${{ runner.arch }}
 
       # The KZG integration tests build a zkVM guest via the OpenVM SDK, which
-      # compiles with `-Z build-std` using OpenVM's pinned nightly + rust-src.
-      # This must match `DEFAULT_RUSTUP_TOOLCHAIN_NAME` in OpenVM's
-      # crates/toolchain/build (overridable via the OPENVM_RUST_TOOLCHAIN env var).
+      # compiles with OpenVM's named rustup toolchain.
       - name: Install OpenVM guest toolchain
         run: |
           rustup install nightly-2026-01-18
           rustup component add rust-src --toolchain nightly-2026-01-18
+          cargo install --git https://github.com/openvm-org/openvm.git --branch "$OPENVM_BRANCH" --locked --force cargo-openvm
+          cargo openvm toolchain install
 
       - name: Run tests
         run: cargo nextest run -p openvm-kzg --release
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index fb2ced2eb..c9490e031 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -65,6 +65,7 @@ ignored = ["halo2-axiom"]
 default = ["parallel", "jemalloc", "metrics"]
 parallel = ["openvm-sdk/parallel"]
 metrics = ["openvm-sdk/metrics", "openvm-circuit/metrics", "openvm-stark-sdk/metrics"]
+tco = ["openvm-sdk/tco"]
 aot = ["openvm-sdk/aot"]
 # Mutually exclusive with `aot`
 rvr = ["openvm-sdk/rvr"]
diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index cb7e665c2..318946177 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -1,3 +1,6 @@
+#![cfg_attr(feature = "tco", allow(incomplete_features))]
+#![cfg_attr(feature = "tco", feature(explicit_tail_calls))]
+
 use std::{fs, io::Write, path::PathBuf, time::Instant};
 
 use alloy_provider::RootProvider;
diff --git a/bin/reth-benchmark/src/main.rs b/bin/reth-benchmark/src/main.rs
index 1bb63b375..0fd205d36 100644
--- a/bin/reth-benchmark/src/main.rs
+++ b/bin/reth-benchmark/src/main.rs
@@ -1,3 +1,6 @@
+#![cfg_attr(feature = "tco", allow(incomplete_features))]
+#![cfg_attr(feature = "tco", feature(explicit_tail_calls))]
+
 use clap_builder::Parser;
 use openvm_reth_benchmark::{run_reth_benchmark, HostArgs};
 
diff --git a/run.sh b/run.sh
index 2f307d4b8..dd07b8f37 100755
--- a/run.sh
+++ b/run.sh
@@ -18,7 +18,7 @@
 #   --num-children-internal <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
-#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | rvr | aot.
+#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | aot | rvr.
 #                       Defaults to rvr. aot is not supported on arm64.
 #                       rvr requires clang-22 and lld on PATH.
 #   --perf              Run with perf + samply host profiling and upload to Firefox Profiler
@@ -143,11 +143,11 @@ while [[ $# -gt 0 ]]; do
             ;;
         --exec-mode)
             case "${2:-}" in
-                interpreter|rvr|aot)
+                interpreter|tco|aot|rvr)
                     EXEC_MODE="$2"
                     ;;
                 *)
-                    echo "Error: --exec-mode requires one of: interpreter, rvr, aot (got '${2:-}')" >&2
+                    echo "Error: --exec-mode requires one of: interpreter, tco, aot, rvr (got '${2:-}')" >&2
                     exit 1
                     ;;
             esac
@@ -323,6 +323,9 @@ case "$EXEC_MODE" in
     interpreter)
         # default interpreted execution; no extra backend feature
         ;;
+    tco)
+        FEATURES="$FEATURES,tco"
+        ;;
     aot)
         # aot enables halo2curves-axiom/asm which is x86_64-only
         FEATURES="$FEATURES,aot"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 6c5c92206..f23878919 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,5 @@
 [toolchain]
 #channel = "1.91.1"
+# To use the "tco" feature, switch to Rust nightly:
 channel = "nightly-2026-01-18"
 components = ["clippy", "rustfmt"]

From f6854b4aba9eedd4e2fc35cffa25bce0927b26f9 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <shuklaayush247@gmail.com>
Date: Mon, 22 Jun 2026 18:55:05 +0200
Subject: [PATCH 10/94] fix: expose reth workload construction (#631)

(cherry picked from commit 169e7aa9e2df2b2f0719e2c581c075ba81946829)
---
 bin/reth-benchmark/src/cli.rs |  61 ++++++--
 bin/reth-benchmark/src/lib.rs | 283 ++++++++++++++++++----------------
 2 files changed, 196 insertions(+), 148 deletions(-)

diff --git a/bin/reth-benchmark/src/cli.rs b/bin/reth-benchmark/src/cli.rs
index 66728b7b9..3c9762dd3 100644
--- a/bin/reth-benchmark/src/cli.rs
+++ b/bin/reth-benchmark/src/cli.rs
@@ -1,17 +1,41 @@
-use alloy_provider::{Provider as _, RootProvider};
-use clap::Parser;
+use std::path::PathBuf;
+
+use alloy_provider::{network::Ethereum, Provider as _, RootProvider};
+use clap::Args;
+use openvm_rpc_proxy::DEFAULT_PREIMAGE_CACHE_NIBBLES;
 use url::Url;
 
-/// The arguments for configuring the chain data provider.
-#[derive(Debug, Clone, Parser)]
-pub(super) struct ProviderArgs {
+#[derive(Debug, Clone, Args)]
+pub struct RethInputSource {
+    /// The block number of the block to execute.
+    #[clap(long)]
+    pub block_number: Option<u64>,
+
     /// The rpc url used to fetch data about the block. If not provided, will use the
     /// RPC_{chain_id} env var.
     #[clap(long)]
-    rpc_url: Option<Url>,
+    pub rpc_url: Option<Url>,
+
     /// The chain ID. If not provided, requires the rpc_url argument to be provided.
     #[clap(long)]
-    chain_id: Option<u64>,
+    pub chain_id: Option<u64>,
+
+    /// Optional path to the directory containing cached client input. A new cache file will be
+    /// created from RPC data if it doesn't already exist.
+    #[clap(long)]
+    pub cache_dir: Option<PathBuf>,
+
+    /// Optional path to the input file.
+    #[arg(long)]
+    pub input_path: Option<PathBuf>,
+
+    /// The number of nibbles to precompute for the preimage lookup table.
+    /// Higher values increase startup time but reduce RPC calls for missing storage keys.
+    ///
+    /// Warning: This is a form of grinding, so higher values will be slower on machines with many
+    /// CPU cores.
+    #[clap(long, default_value_t = DEFAULT_PREIMAGE_CACHE_NIBBLES, value_parser = clap::value_parser!(u8).range(..=8))]
+    pub preimage_cache_nibbles: u8,
 }
 
 pub(super) struct ProviderConfig {
@@ -19,14 +43,25 @@ pub(super) struct ProviderConfig {
     pub chain_id: u64,
 }
 
-impl ProviderArgs {
-    pub(super) async fn into_provider(self) -> eyre::Result<ProviderConfig> {
+impl RethInputSource {
+    pub fn new(block_number: u64) -> Self {
+        Self {
+            block_number: Some(block_number),
+            rpc_url: None,
+            chain_id: None,
+            cache_dir: None,
+            input_path: None,
+            preimage_cache_nibbles: DEFAULT_PREIMAGE_CACHE_NIBBLES,
+        }
+    }
+
+    pub(super) async fn resolve_provider(&self) -> eyre::Result<ProviderConfig> {
         // We don't need RPC when using cache with known chain ID, so we leave it as `Option<Url>`
         // here and decide on whether to panic later.
         //
         // On the other hand chain ID is always needed.
-        let (rpc_url, chain_id) = match (self.rpc_url, self.chain_id) {
-            (Some(rpc_url), Some(chain_id)) => (Some(rpc_url), chain_id),
+        let (rpc_url, chain_id) = match (self.rpc_url.as_ref(), self.chain_id) {
+            (Some(rpc_url), Some(chain_id)) => (Some(rpc_url.clone()), chain_id),
             (None, Some(chain_id)) => {
                 match std::env::var(format!("RPC_{chain_id}")) {
                     Ok(rpc_env_var) => {
@@ -41,10 +76,10 @@ impl ProviderArgs {
             }
             (Some(rpc_url), None) => {
                 // We can find out about chain ID from RPC.
-                let provider: RootProvider = RootProvider::new_http(rpc_url.clone());
+                let provider = RootProvider::<Ethereum>::new_http(rpc_url.clone());
                 let chain_id = provider.get_chain_id().await?;
 
-                (Some(rpc_url), chain_id)
+                (Some(rpc_url.clone()), chain_id)
             }
             (None, None) => {
                 eyre::bail!("either --rpc-url or --chain-id must be used")
diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index 318946177..84bb2a3d8 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -1,7 +1,11 @@
 #![cfg_attr(feature = "tco", allow(incomplete_features))]
 #![cfg_attr(feature = "tco", feature(explicit_tail_calls))]
-
-use std::{fs, io::Write, path::PathBuf, time::Instant};
+use std::{
+    fs,
+    io::Write,
+    path::{Path, PathBuf},
+    time::Instant,
+};
 
 use alloy_provider::RootProvider;
 use alloy_rpc_client::RpcClient;
@@ -12,7 +16,7 @@ use openvm_circuit::arch::{
     execution_mode::metered::segment_ctx::DEFAULT_MAX_MEMORY, instructions::exe::VmExe,
     verify_segments, VmCircuitConfig,
 };
-use openvm_rpc_proxy::{RpcExecutor, DEFAULT_PREIMAGE_CACHE_NIBBLES};
+use openvm_rpc_proxy::RpcExecutor;
 use openvm_sdk::{
     config::{
         AggregationSystemParams, AggregationTreeConfig, AppConfig, DEFAULT_APP_LOG_BLOWUP,
@@ -20,7 +24,7 @@ use openvm_sdk::{
         DEFAULT_ROOT_LOG_BLOWUP,
     },
     fs::{read_object_from_file, write_object_to_file},
-    Sdk, SC,
+    Sdk, StdIn, SC,
 };
 use openvm_sdk_config::{SdkVmConfig, TranspilerConfig};
 #[cfg(feature = "evm-verify")]
@@ -53,9 +57,11 @@ use openvm_verify_stark_host::{
 pub use reth_ethereum_primitives as reth_primitives;
 use tracing::{info, info_span};
 
+const VM_MAX_CONSTRAINT_DEGREE: usize = 4;
+
 mod cli;
-use cli::ProviderArgs;
 mod soundness;
+pub use cli::RethInputSource;
 
 /// Enum representing the execution mode of the host executable.
 #[derive(Debug, Clone, clap::ValueEnum)]
@@ -114,23 +120,44 @@ impl std::fmt::Display for BenchMode {
     }
 }
 
+#[derive(Parser, Debug)]
+#[command(allow_external_subcommands = true)]
+pub struct BenchmarkCli {
+    /// Application level log blowup
+    #[arg(long, default_value_t = DEFAULT_APP_LOG_BLOWUP)]
+    pub app_log_blowup: usize,
+
+    /// Log of univariate skip domain size
+    #[arg(long, default_value_t = DEFAULT_APP_L_SKIP)]
+    pub app_l_skip: usize,
+
+    /// Aggregation (leaf) level log blowup
+    #[arg(long, default_value_t = DEFAULT_LEAF_LOG_BLOWUP)]
+    pub leaf_log_blowup: usize,
+
+    /// Internal level log blowup
+    #[arg(long, default_value_t = DEFAULT_INTERNAL_LOG_BLOWUP)]
+    pub internal_log_blowup: usize,
+
+    /// Root level log blowup
+    #[arg(long, default_value_t = DEFAULT_ROOT_LOG_BLOWUP)]
+    pub root_log_blowup: usize,
+
+    #[command(flatten)]
+    pub agg_tree_config: AggregationTreeConfig,
+
+    /// Estimated proving-memory cap per VM segment, in bytes
+    #[arg(long, default_value_t = DEFAULT_MAX_MEMORY)]
+    pub segment_max_memory: usize,
+}
+
 /// The arguments for the host executable.
 #[derive(Debug, Parser)]
 pub struct HostArgs {
-    /// The block number of the block to execute.
-    #[clap(long)]
-    block_number: Option<u64>,
-    #[clap(flatten)]
-    provider: ProviderArgs,
-
     /// The execution mode.
     #[clap(long, value_enum)]
     mode: BenchMode,
 
-    /// Optional path to the directory containing cached client input. A new cache file will be
-    /// created from RPC data if it doesn't already exist.
-    #[clap(long)]
-    cache_dir: Option<PathBuf>,
     /// The path to the CSV file containing the execution data.
     #[clap(long, default_value = "report.csv")]
     report_path: PathBuf,
@@ -141,9 +168,8 @@ pub struct HostArgs {
     #[clap(flatten)]
     benchmark: BenchmarkCli,
 
-    /// Optional path to the input file.
-    #[arg(long)]
-    pub input_path: Option<PathBuf>,
+    #[clap(flatten)]
+    input: RethInputSource,
 
     /// Path to write the fixtures to. Only needed for mode=make_input
     #[arg(long)]
@@ -174,45 +200,41 @@ pub struct HostArgs {
     /// If specified, loads the agg proving key from this path.
     #[arg(long)]
     pub agg_pk_path: Option<PathBuf>,
-
-    /// The number of nibbles to precompute for the preimage lookup table.
-    /// Higher values increase startup time but reduce RPC calls for missing storage keys.
-    ///
-    /// Warning: This is a form of grinding, so higher values will be slower on machines with many
-    /// CPU cores.
-    #[clap(long, default_value_t = DEFAULT_PREIMAGE_CACHE_NIBBLES, value_parser = clap::value_parser!(u8).range(..=8))]
-    pub preimage_cache_nibbles: u8,
 }
 
-#[derive(Parser, Debug)]
-#[command(allow_external_subcommands = true)]
-pub struct BenchmarkCli {
-    /// Application level log blowup
-    #[arg(long, default_value_t = DEFAULT_APP_LOG_BLOWUP)]
-    pub app_log_blowup: usize,
-
-    /// Log of univariate skip domain size
-    #[arg(long, default_value_t = DEFAULT_APP_L_SKIP)]
-    pub app_l_skip: usize,
-
-    /// Aggregation (leaf) level log blowup
-    #[arg(long, default_value_t = DEFAULT_LEAF_LOG_BLOWUP)]
-    pub leaf_log_blowup: usize,
-
-    /// Internal level log blowup
-    #[arg(long, default_value_t = DEFAULT_INTERNAL_LOG_BLOWUP)]
-    pub internal_log_blowup: usize,
+pub struct RethWorkload {
+    pub exe: VmExe<F>,
+    pub stdin: StdIn,
+}
 
-    /// Root level log blowup
-    #[arg(long, default_value_t = DEFAULT_ROOT_LOG_BLOWUP)]
-    pub root_log_blowup: usize,
+impl std::fmt::Debug for RethWorkload {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("RethWorkload")
+            .field("exe", &self.exe)
+            .field("stdin_buffer_len", &self.stdin.buffer.len())
+            .field("stdin_deferrals_len", &self.stdin.deferrals.len())
+            .finish()
+    }
+}
 
-    #[command(flatten)]
-    pub agg_tree_config: AggregationTreeConfig,
+pub fn build_reth_workload(
+    vm_config: &SdkVmConfig,
+    stateless_input: &StatelessExecutorInput,
+    openvm_client_eth_elf: &[u8],
+) -> Result<RethWorkload> {
+    let exe = build_reth_exe(vm_config, openvm_client_eth_elf)?;
+    let encoded_stateless_input: Vec<F> = {
+        let words = openvm::serde::to_vec(stateless_input)?;
+        words.into_iter().flat_map(|w| w.to_le_bytes()).map(F::from_u8).collect()
+    };
+    let stdin = vec![encoded_stateless_input].into();
+    Ok(RethWorkload { exe, stdin })
+}
 
-    /// Estimated proving-memory cap per VM segment, in bytes
-    #[arg(long, default_value_t = DEFAULT_MAX_MEMORY)]
-    pub segment_max_memory: usize,
+pub fn build_reth_exe(vm_config: &SdkVmConfig, openvm_client_eth_elf: &[u8]) -> Result<VmExe<F>> {
+    let transpiler = vm_config.transpiler().clone();
+    let elf = Elf::decode(openvm_client_eth_elf, MEM_SIZE as u32)?;
+    Ok(VmExe::from_elf(elf, transpiler)?)
 }
 
 pub fn reth_vm_config() -> SdkVmConfig {
@@ -225,8 +247,6 @@ pub fn reth_vm_config() -> SdkVmConfig {
     config
 }
 
-const VM_MAX_CONSTRAINT_DEGREE: usize = 4;
-
 fn override_system_params(
     params: SystemParams,
     log_blowup: usize,
@@ -260,6 +280,49 @@ fn override_log_blowup(params: SystemParams, log_blowup: usize) -> Result<System
     override_system_params(params, log_blowup, l_skip)
 }
 
+pub async fn load_reth_input(source: &RethInputSource) -> Result<StatelessExecutorInput> {
+    let block_number = source
+        .block_number
+        .ok_or_else(|| eyre::eyre!("--block-number is required to load reth input"))?;
+
+    if let Some(path) = &source.input_path {
+        return try_load_input_from_path(path);
+    }
+
+    let provider_config = source.resolve_provider().await?;
+
+    match provider_config.chain_id {
+        #[allow(non_snake_case)]
+        CHAIN_ID_ETH_MAINNET => (),
+        _ => {
+            eyre::bail!("unknown chain ID: {}", provider_config.chain_id);
+        }
+    };
+
+    if let Some(stateless_input) = try_load_input_from_cache(
+        source.cache_dir.as_deref(),
+        provider_config.chain_id,
+        block_number,
+    )? {
+        return Ok(stateless_input);
+    }
+
+    let Some(rpc_url) = provider_config.rpc_url else {
+        eyre::bail!("cache not found and RPC URL not provided");
+    };
+
+    let client = RpcClient::builder().layer(RetryBackoffLayer::new(5, 1000, 100)).http(rpc_url);
+    let provider = RootProvider::new(client);
+    let rpc_executor = RpcExecutor::new(provider, source.preimage_cache_nibbles);
+    let stateless_input = rpc_executor.execute(block_number).await?;
+
+    if let Some(cache_dir) = &source.cache_dir {
+        write_input_to_cache(cache_dir, provider_config.chain_id, block_number, &stateless_input)?;
+    }
+
+    Ok(stateless_input)
+}
+
 pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) -> Result<()> {
     // Initialize the environment variables.
     dotenv::dotenv().ok();
@@ -274,8 +337,6 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
         tracing::debug!("air_idx={air_idx} | {}", air.name());
     }
 
-    let transpiler = vm_config.transpiler().clone();
-
     let app_params = override_system_params(
         app_params_with_100_bits_security(MAX_APP_LOG_STACKED_HEIGHT),
         args.benchmark.app_log_blowup,
@@ -283,7 +344,7 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
     )?;
 
     // Setup: this can all be done once before receiving proof input
-    let app_config = AppConfig::new(vm_config, app_params);
+    let app_config = AppConfig::new(vm_config.clone(), app_params);
     let agg_params = AggregationSystemParams {
         leaf: override_log_blowup(
             leaf_params_with_100_bits_security(),
@@ -391,10 +452,8 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
         return Ok(());
     }
 
-    let elf = Elf::decode(openvm_client_eth_elf, MEM_SIZE as u32)?;
-    let exe = VmExe::from_elf(elf, transpiler)?;
-
     if matches!(args.mode, BenchMode::GenerateVmVkey) {
+        let exe = build_reth_exe(&vm_config, openvm_client_eth_elf)?;
         let prover = sdk.prover(exe)?;
         let vk = VmStarkVerifyingKey {
             mvk: (*sdk.agg_vk()).clone(),
@@ -407,72 +466,13 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
     }
 
     let block_number = args
+        .input
         .block_number
         .ok_or_else(|| eyre::eyre!("--block-number is required for mode {}", args.mode))?;
 
     let program_name = format!("reth.{}.block_{}", args.mode, block_number);
 
-    // Parse the command line arguments.
-    let stateless_input_from_path =
-        args.input_path.as_ref().map(|path| try_load_input_from_path(path).unwrap());
-
-    let stateless_input = if let Some(stateless_input_from_path) = stateless_input_from_path {
-        stateless_input_from_path
-    } else {
-        let provider_config = args.provider.into_provider().await?;
-        match provider_config.chain_id {
-            #[allow(non_snake_case)]
-            CHAIN_ID_ETH_MAINNET => (),
-            _ => {
-                eyre::bail!("unknown chain ID: {}", provider_config.chain_id);
-            }
-        };
-        let stateless_input_from_cache = try_load_input_from_cache(
-            args.cache_dir.as_ref(),
-            provider_config.chain_id,
-            block_number,
-        )?;
-
-        match (stateless_input_from_cache, provider_config.rpc_url) {
-            (Some(stateless_input_from_cache), _) => stateless_input_from_cache,
-            (None, Some(rpc_url)) => {
-                // Cache not found but we have RPC
-                // Setup the provider.
-                let client =
-                    RpcClient::builder().layer(RetryBackoffLayer::new(5, 1000, 100)).http(rpc_url);
-                let provider = RootProvider::new(client);
-
-                // Setup the host executor.
-                let rpc_executor = RpcExecutor::new(provider, args.preimage_cache_nibbles);
-
-                // Execute the host.
-                let stateless_input =
-                    rpc_executor.execute(block_number).await.expect("failed to execute host");
-
-                if let Some(cache_dir) = args.cache_dir {
-                    let input_folder =
-                        cache_dir.join(format!("input/{}", provider_config.chain_id));
-                    if !input_folder.exists() {
-                        std::fs::create_dir_all(&input_folder)?;
-                    }
-
-                    let input_path = input_folder.join(format!("{}.bin", block_number));
-                    let mut cache_file = std::fs::File::create(input_path)?;
-
-                    bincode::serde::encode_into_std_write(
-                        &stateless_input,
-                        &mut cache_file,
-                        bincode::config::standard(),
-                    )?;
-                }
-
-                stateless_input
-            }
-            (None, None) => {
-                eyre::bail!("cache not found and RPC URL not provided")
-            }
-        }
-    };
+    let stateless_input = load_reth_input(&args.input).await?;
 
     // MakeInput: encode stateless_input as JSON and write to disk.
     if matches!(args.mode, BenchMode::MakeInput) {
@@ -495,7 +495,6 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
 
     // Host execution: run the stateless executor natively, no VM.
     if matches!(args.mode, BenchMode::ExecuteHost) {
-        let program_name = format!("reth.{}.block_{}", args.mode, block_number);
         let executor = StatelessExecutor;
         let start = Instant::now();
         let header = info_span!("host.execute", group = program_name).in_scope(|| {
@@ -510,27 +509,22 @@ pub async fn run_reth_benchmark(args: HostArgs, openvm_client_eth_elf: &[u8]) ->
         return Ok(());
     }
 
-    let encoded_stateless_input: Vec<F> = {
-        let words = openvm::serde::to_vec(&stateless_input)?;
-        words.into_iter().flat_map(|w| w.to_le_bytes()).map(F::from_u8).collect()
-    };
-
-    let stdin = vec![encoded_stateless_input].into();
+    let RethWorkload { exe, stdin } =
+        build_reth_workload(&vm_config, &stateless_input, openvm_client_eth_elf)?;
 
     run_with_metric_collection("OUTPUT_PATH", move || {
         info_span!("reth-block", block_number = block_number).in_scope(|| -> Result<()> {
             match args.mode {
                 BenchMode::Execute => {
-                    let public_values = info_span!("sdk.compile_and_execute", group = program_name)
-                        .in_scope(|| sdk.compile_and_execute(exe, stdin))?;
+                    let compiled = sdk.compile(exe)?;
+                    let public_values = sdk.execute(&compiled, stdin)?;
                     let block_hash = hex::encode(&public_values);
                     info!("Execute completed, block hash: {}", block_hash);
                     println!("BENCH_BLOCK_HASH={block_hash}");
                 }
                 BenchMode::ExecuteMetered => {
-                    let (public_values, _) =
-                        info_span!("sdk.compile_and_execute_metered", group = program_name)
-                            .in_scope(|| sdk.compile_and_execute_metered(exe, stdin))?;
+                    let compiled = sdk.compile_metered(exe)?;
+                    let (public_values, _) = sdk.execute_metered(&compiled, stdin)?;
                     let block_hash = hex::encode(&public_values);
                     info!("Execute metered completed, block hash: {}", block_hash);
                     println!("BENCH_BLOCK_HASH={block_hash}");
@@ -756,7 +750,7 @@ fn max_rule_length<F>(dag: &SymbolicExpressionDag<F>) -> usize {
 }
 
 fn try_load_input_from_cache(
-    cache_dir: Option<&PathBuf>,
+    cache_dir: Option<&Path>,
     chain_id: u64,
     block_number: u64,
 ) -> Result<Option<StatelessExecutorInput>> {
@@ -778,7 +772,26 @@ fn try_load_input_from_cache(
     })
 }
 
-fn try_load_input_from_path(path: &PathBuf) -> Result<StatelessExecutorInput> {
+fn write_input_to_cache(
+    cache_dir: &Path,
+    chain_id: u64,
+    block_number: u64,
+    stateless_input: &StatelessExecutorInput,
+) -> Result<()> {
+    let input_folder = cache_dir.join(format!("input/{chain_id}"));
+    fs::create_dir_all(&input_folder)?;
+
+    let input_path = input_folder.join(format!("{block_number}.bin"));
+    let mut cache_file = fs::File::create(input_path)?;
+    bincode::serde::encode_into_std_write(
+        stateless_input,
+        &mut cache_file,
+        bincode::config::standard(),
+    )?;
+    Ok(())
+}
+
+fn try_load_input_from_path(path: &Path) -> Result<StatelessExecutorInput> {
     let ext = path.extension().and_then(|s| s.to_str()).unwrap_or("");
     if ext.eq_ignore_ascii_case("json") {
         let s = std::fs::read_to_string(path)?;

From a3bf3ed41891960847c7160784531d0627d979f3 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Mon, 22 Jun 2026 18:25:42 +0200
Subject: [PATCH 11/94] chore: improve ethproofs analyzer scripts

---
 .env.example                   |   1 +
 .gitignore                     |   3 +
 scripts/ethproofs_analyzer.py  | 768 ++++++++++++++++++---------------
 scripts/precompile_analyzer.py | 429 +++++++++---------
 4 files changed, 623 insertions(+), 578 deletions(-)
 mode change 100644 => 100755 scripts/ethproofs_analyzer.py

diff --git a/.env.example b/.env.example
index b2be7e35b..77bde451f 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1,2 @@
 RPC_1=
+RPC_2=
diff --git a/.gitignore b/.gitignore
index 120a592ae..abc5d637a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@ bin/stateless-guest/openvm/
 *.ncu-rep
 *.nsys-rep
 *.sqlite
+
+# ethproofs analyzer local page cache
+scripts/.cache/
diff --git a/scripts/ethproofs_analyzer.py b/scripts/ethproofs_analyzer.py
old mode 100644
new mode 100755
index 43f280c98..b60d96ad0
--- a/scripts/ethproofs_analyzer.py
+++ b/scripts/ethproofs_analyzer.py
@@ -1,51 +1,86 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S uv run --script
+# /// script
+# requires-python = ">=3.10"
+# dependencies = ["httpx", "hishel", "rich", "tenacity"]
+# ///
 """
 Fetches data from ethproofs.org API and analyzes proving times.
 
 Finds top K blocks by:
 - Gas used
-- Proving time (max, median, avg, min across provers)
+- Proving time (max, median, avg, min across that block's provers)
+- How far a single prover (default OpenVM 2.0 / Axiom) trails the fastest prover
+
+Run it directly (uv installs the dependencies on first use):
+    ./ethproofs_analyzer.py ...        # via the uv shebang
+    uv run ethproofs_analyzer.py ...   # equivalent
+
+Common recipes:
+    # Blocks where OpenVM trailed the fastest prover by the most, over the last day / week:
+    ./ethproofs_analyzer.py --last 1d --compare --top-k 20
+    ./ethproofs_analyzer.py --last 1w --compare --top-k 20
+
+    # Blocks that were hardest for EVERY prover (even the leader was slow), last day / week:
+    ./ethproofs_analyzer.py --last 1d --metric min --top-k 20
+    ./ethproofs_analyzer.py --last 1w --metric min --top-k 20
+
+    # Compare a different prover against the field:
+    ./ethproofs_analyzer.py --last 1w --compare --compare-zkvm pico --top-k 20
+
+    # Follow up on a slow block — inspect its precompile load (needs an RPC with `debug`):
+    ./precompile_analyzer.py <block_number>
 
 Usage:
-    python3 ethproofs_analyzer.py                         # Fetch 1 page (100 blocks), show all metrics
-    python3 ethproofs_analyzer.py --pages 5               # Fetch 5 pages (500 blocks)
-    python3 ethproofs_analyzer.py --pages 10 --size 50    # Fetch 10 pages of 50 blocks each
-    python3 ethproofs_analyzer.py --file data.json        # Load from file
-    python3 ethproofs_analyzer.py --top-k 5               # Show top 5 blocks per metric
-    python3 ethproofs_analyzer.py --metric median         # Show only median proving time
-    python3 ethproofs_analyzer.py --metric gas            # Show only gas used
-    python3 ethproofs_analyzer.py --cluster axiom         # Only proofs from the Axiom cluster (substring)
-    python3 ethproofs_analyzer.py --zkvm openvm2          # Only proofs from the OpenVM 2.0 zkVM
-    python3 ethproofs_analyzer.py --list-provers          # Print distinct provers seen in the data
+    ./ethproofs_analyzer.py                  # last 100 blocks, all metrics
+    ./ethproofs_analyzer.py --last 6h        # last 6 hours (also: 30m, 1d, 1w, 45s)
+    ./ethproofs_analyzer.py --last 500       # last 500 blocks
+    ./ethproofs_analyzer.py --file data.json # Load from a JSON file
+    ./ethproofs_analyzer.py --top-k 5        # Show top 5 blocks per metric
+    ./ethproofs_analyzer.py --metric median  # Show only median proving time
+    ./ethproofs_analyzer.py --metric min     # Blocks where even the fastest prover was slow
+    ./ethproofs_analyzer.py --metric gas     # Show only gas used
+    ./ethproofs_analyzer.py --cluster axiom  # Only proofs from the Axiom cluster
+    ./ethproofs_analyzer.py --zkvm openvm2   # Only proofs from the OpenVM 2.0 zkVM
+    ./ethproofs_analyzer.py --list-provers   # Print distinct provers in the data
+    ./ethproofs_analyzer.py --compare        # Where OpenVM was slowest, absolute & vs fastest
+    ./ethproofs_analyzer.py --no-cache       # Bypass the local page cache
+
+Cached responses live in scripts/.cache (1h TTL); reruns serve from there.
 """
 
 import argparse
 import json
+import os
+import statistics
 import sys
-import urllib.parse
-import urllib.request
+from datetime import datetime, timedelta
+
+import hishel
+import hishel.httpx
+import httpx
+import tenacity
+from rich.console import Console
+from rich.progress import Progress
 
 API_URL = "https://ethproofs.org/api/blocks"
 
-# Table column widths
-COL_RANK = 4
-COL_BLOCK = 10
-COL_GAS = 14
-COL_TXS = 5
-COL_TIME = 13
-COL_TIMESTAMP = 19
+# Directory of cached API responses, reused across runs within CACHE_TTL.
+CACHE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), ".cache")
+CACHE_TTL = 3600  # seconds a cached response stays fresh
 
-# Table headers and separators
-GAS_TABLE_HEADER = f"| {'Rank':>{COL_RANK}} | {'Block':<{COL_BLOCK}} | {'Gas':>{COL_GAS}} | {'Txs':>{COL_TXS}} | {'Timestamp':<{COL_TIMESTAMP}} |"
-GAS_TABLE_SEP = f"|{'-' * (COL_RANK + 2)}|{'-' * (COL_BLOCK + 2)}|{'-' * (COL_GAS + 2)}|{'-' * (COL_TXS + 2)}|{'-' * (COL_TIMESTAMP + 2)}|"
-TIME_TABLE_SEP = f"|{'-' * (COL_RANK + 2)}|{'-' * (COL_BLOCK + 2)}|{'-' * (COL_TIME + 2)}|{'-' * (COL_GAS + 2)}|{'-' * (COL_TXS + 2)}|"
+# Duration suffixes accepted by --last (e.g. "6h", "1w"), in seconds.
+UNITS = {"s": 1, "m": 60, "h": 3600, "d": 86400, "w": 604800}
 
+# Column widths (chars).
+COL_RANK, COL_BLOCK, COL_GAS, COL_TXS = 4, 10, 14, 5
+COL_TIME, COL_TIMESTAMP, COL_RATIO, COL_ZKVM = 13, 19, 8, 18
+REL_BLOCK, REL_TARGET_TIME, REL_FASTEST_TIME, REL_FASTEST_ZKVM, REL_SLOWDOWN = range(5)
+
+# Statistics available as proving-time metrics, keyed by their CLI name.
+STATS = {"min": min, "max": max, "median": statistics.median, "avg": statistics.mean}
 
-def fmt_timestamp(ts: str | None) -> str:
-    """Format timestamp without timezone."""
-    if ts and len(ts) > 19:
-        return ts[:19]  # Keep only YYYY-MM-DD HH:MM:SS
-    return ts or "N/A"
+
+# --- Formatting -------------------------------------------------------------
 
 
 def fmt_time(ms: float) -> str:
@@ -54,66 +89,39 @@ def fmt_time(ms: float) -> str:
 
 
 def fmt_gas(gas: int | None) -> str:
-    """Format gas with commas."""
+    """Format gas with thousands separators."""
     return f"{gas:,}" if gas else "N/A"
 
 
-def time_table_header(label: str) -> str:
-    """Generate header row for proving time tables."""
-    col = f"Time ({label})"
-    return f"| {'Rank':>{COL_RANK}} | {'Block':<{COL_BLOCK}} | {col:<{COL_TIME}} | {'Gas':>{COL_GAS}} | {'Txs':>{COL_TXS}} |"
-
+def fmt_timestamp(ts: str | None) -> str:
+    """Trim a timestamp to YYYY-MM-DD HH:MM:SS."""
+    return ts[:19] if ts else "N/A"
 
-def fetch_blocks(
-    page_index: int = 0, page_size: int = 100, machine_type: str = "multi"
-) -> dict:
-    """Fetch a single page of blocks from the ethproofs API."""
-    params = urllib.parse.urlencode(
-        {"page_index": page_index, "page_size": page_size, "machine_type": machine_type}
-    )
-    url = f"{API_URL}?{params}"
 
-    with urllib.request.urlopen(url, timeout=30) as response:
-        return json.loads(response.read().decode())
+def parse_ts(ts: str | None) -> datetime | None:
+    """Parse a block timestamp (e.g. '2026-06-20 21:58:23' or ISO 'T' form)."""
+    if not ts:
+        return None
+    try:
+        return datetime.strptime(ts.replace("T", " ")[:19], "%Y-%m-%d %H:%M:%S")
+    except ValueError:
+        return None
 
 
-def fetch_multiple_pages(
-    num_pages: int = 1, page_size: int = 100, machine_type: str = "multi"
-) -> dict:
-    """Fetch multiple pages and combine results."""
-    all_rows = []
-
-    for page_idx in range(num_pages):
-        # Show progress on same line
-        print(f"\r  Fetching page {page_idx + 1}/{num_pages}...", end="", flush=True)
-        try:
-            data = fetch_blocks(
-                page_index=page_idx, page_size=page_size, machine_type=machine_type
-            )
-            rows = data.get("rows", [])
-            all_rows.extend(rows)
-
-            # Stop if we got fewer blocks than requested (no more data)
-            if len(rows) < page_size:
-                print(
-                    f"\r  Fetched {len(all_rows):,} blocks ({page_idx + 1} pages, reached end of data)"
-                )
-                break
-        except Exception as e:
-            print(f"\r  Error on page {page_idx + 1}: {e}")
-            break
-    else:
-        print(
-            f"\r  Fetched {len(all_rows):,} blocks ({num_pages} pages)                    "
-        )
+def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
+    """Print a markdown table.
 
-    return {"rows": all_rows}
+    columns: (header, width, align) per column, align being '<' or '>'.
+    rows:    row tuples whose cells line up positionally with columns.
+    """
+    cell = lambda value, width, align: f"{value:{align}{width}}"
+    print("| " + " | ".join(cell(h, w, a) for h, w, a in columns) + " |")
+    print("|" + "|".join("-" * (w + 2) for _, w, _ in columns) + "|")
+    for row in rows:
+        print("| " + " | ".join(cell(v, w, a) for v, (_, w, a) in zip(row, columns)) + " |")
 
 
-def load_from_file(filepath: str) -> dict:
-    """Load JSON data from a file."""
-    with open(filepath, "r") as f:
-        return json.load(f)
+# --- Data access ------------------------------------------------------------
 
 
 def proof_prover_info(proof: dict) -> tuple[str | None, str | None, str | None, int | None]:
@@ -121,34 +129,156 @@ def proof_prover_info(proof: dict) -> tuple[str | None, str | None, str | None,
     cv = proof.get("cluster_version") or {}
     cluster = cv.get("cluster") or {}
     zkvm = (cv.get("zkvm_version") or {}).get("zkvm") or {}
-    return (
-        cluster.get("name"),
-        zkvm.get("slug"),
-        zkvm.get("name"),
-        cluster.get("num_gpus"),
-    )
+    return cluster.get("name"), zkvm.get("slug"), zkvm.get("name"), cluster.get("num_gpus")
+
 
+def proof_zkvm_label(proof: dict) -> str:
+    """Short label for the zkVM that produced a proof."""
+    _, zkvm_slug, zkvm_name, _ = proof_prover_info(proof)
+    return zkvm_slug or zkvm_name or "N/A"
 
-def proof_matches(proof: dict, cluster_filter: str | None, zkvm_filter: str | None) -> bool:
-    """Return True if the proof's cluster/zkvm matches the filters (substring, case-insensitive)."""
+
+def proof_matches(proof: dict, cluster: str | None, zkvm: str | None) -> bool:
+    """True if the proof's cluster/zkvm contain the given text (case-insensitive)."""
     cluster_name, zkvm_slug, zkvm_name, _ = proof_prover_info(proof)
-    if cluster_filter:
-        if not cluster_name or cluster_filter.lower() not in cluster_name.lower():
-            return False
-    if zkvm_filter:
-        zf = zkvm_filter.lower()
-        slug_match = zkvm_slug and zf in zkvm_slug.lower()
-        name_match = zkvm_name and zf in zkvm_name.lower()
-        if not (slug_match or name_match):
+    if cluster and (not cluster_name or cluster.lower() not in cluster_name.lower()):
+        return False
+    if zkvm:
+        z = zkvm.lower()
+        if not ((zkvm_slug and z in zkvm_slug.lower()) or (zkvm_name and z in zkvm_name.lower())):
             return False
     return True
 
 
+def proving_times(proofs) -> list[float]:
+    """Completed proving times (ms) from an iterable of proofs."""
+    return [p["proving_time"] for p in proofs if p.get("proving_time") is not None]
+
+
+# --- Fetching / loading -----------------------------------------------------
+
+
+def parse_last(spec: str) -> tuple[str, float]:
+    """Parse a --last value into ('seconds', n) for durations or ('blocks', n) for counts.
+
+    Durations end in a unit (s/m/h/d/w), e.g. '6h' or '1w'; a bare number means blocks.
+    """
+    spec = spec.strip().lower()
+    if spec and spec[-1] in UNITS:
+        return "seconds", float(spec[:-1]) * UNITS[spec[-1]]
+    return "blocks", int(spec)
+
+
+class CacheEverything(hishel.BaseFilter):
+    """Filter matching every request and response, so pages cache regardless of HTTP headers."""
+
+    def needs_body(self) -> bool:
+        return False
+
+    def apply(self, item, body) -> bool:
+        return True
+
+
+def make_client(ttl: float) -> httpx.Client:
+    """An HTTP client whose responses are cached on disk for ttl seconds (0 disables caching)."""
+    if not ttl:
+        return httpx.Client(timeout=30)
+    os.makedirs(CACHE_DIR, exist_ok=True)
+    storage = hishel.SyncSqliteStorage(
+        database_path=os.path.join(CACHE_DIR, "pages.db"), default_ttl=ttl
+    )
+    policy = hishel.FilterPolicy(
+        request_filters=[CacheEverything()], response_filters=[CacheEverything()]
+    )
+    return hishel.httpx.SyncCacheClient(storage=storage, policy=policy, timeout=30)
+
+
+def is_transient(exc: BaseException) -> bool:
+    """True for errors worth retrying: timeouts, connection drops, and 5xx responses."""
+    if isinstance(exc, httpx.TransportError):
+        return True
+    if isinstance(exc, httpx.HTTPStatusError):
+        return exc.response.status_code >= 500
+    return False
+
+
+@tenacity.retry(
+    retry=tenacity.retry_if_exception(is_transient),
+    wait=tenacity.wait_exponential(multiplier=0.5, max=5),
+    stop=tenacity.stop_after_attempt(4),
+    reraise=True,
+)
+def fetch_blocks(client: httpx.Client, page_index: int, page_size: int, machine_type: str) -> dict:
+    """Fetch one page of blocks, retrying transient errors with exponential backoff."""
+    resp = client.get(
+        API_URL,
+        params={"page_index": page_index, "page_size": page_size, "machine_type": machine_type},
+    )
+    resp.raise_for_status()
+    return resp.json()
+
+
+def fetch_window(
+    client: httpx.Client, mode: str, amount: float, page_size: int,
+    machine_type: str, max_pages: int = 4000,
+) -> dict:
+    """Page through blocks (newest first) until `amount` blocks or seconds are covered.
+
+    mode='blocks' keeps the most recent `amount` blocks; mode='seconds' keeps blocks
+    within `amount` seconds of the newest block.
+    """
+    rows, anchor, cutoff, page, warning = [], None, None, 0, None
+    total = int(amount)
+    with Progress(console=Console(stderr=True), transient=True) as progress:
+        task = progress.add_task("Fetching blocks", total=total)
+        for page in range(max_pages):
+            try:
+                page_rows = fetch_blocks(client, page, page_size, machine_type).get("rows", [])
+            except httpx.HTTPError as e:
+                warning = f"stopped at page {page + 1} after a failed request ({e})"
+                break
+            if not page_rows:
+                break
+            rows.extend(page_rows)
+
+            if mode == "blocks":
+                progress.update(task, completed=min(len(rows), total))
+                if len(rows) >= amount or len(page_rows) < page_size:
+                    break
+            else:
+                times = [t for t in (parse_ts(b.get("timestamp")) for b in page_rows) if t]
+                if times:
+                    if anchor is None:
+                        anchor = max(times)
+                        cutoff = anchor - timedelta(seconds=amount)
+                    progress.update(task, completed=min(int((anchor - min(times)).total_seconds()), total))
+                if len(page_rows) < page_size or (cutoff and times and min(times) < cutoff):
+                    break
+
+    if mode == "blocks":
+        rows = rows[:total]
+    elif cutoff is not None:
+        rows = [b for b in rows if (parse_ts(b.get("timestamp")) or cutoff) >= cutoff]
+    if warning:
+        print(f"  Warning: {warning}; keeping {len(rows):,} blocks fetched so far.")
+        print("  Tip: a smaller --size (e.g. 200) often avoids large-page server errors.")
+    print(f"  Fetched {len(rows):,} blocks ({page + 1} pages)")
+    return {"rows": rows}
+
+
+def load_from_file(filepath: str) -> dict:
+    """Load JSON data from a file."""
+    with open(filepath, "r") as f:
+        return json.load(f)
+
+
+# --- Analyses ---------------------------------------------------------------
+
+
 def list_provers(data: dict) -> None:
-    """Print distinct (zkvm, cluster, num_gpus) combinations present in the data."""
-    rows = data.get("rows", [])
+    """Print distinct (zkvm, slug, cluster, num_gpus) combinations and their counts."""
     seen: dict[tuple, int] = {}
-    for block in rows:
+    for block in data.get("rows", []):
         for p in block.get("proofs", []):
             cluster_name, zkvm_slug, zkvm_name, num_gpus = proof_prover_info(p)
             key = (zkvm_name, zkvm_slug, cluster_name, num_gpus)
@@ -159,14 +289,18 @@ def list_provers(data: dict) -> None:
         return
 
     print("## Provers seen\n")
-    print(f"| {'zkVM':<20} | {'slug':<12} | {'Cluster':<32} | {'GPUs':>4} | {'Proofs':>7} |")
-    print(f"|{'-' * 22}|{'-' * 14}|{'-' * 34}|{'-' * 6}|{'-' * 9}|")
-    for (zkvm_name, zkvm_slug, cluster_name, num_gpus), count in sorted(
-        seen.items(), key=lambda kv: (-kv[1], kv[0][0] or "", kv[0][2] or "")
-    ):
-        print(
-            f"| {(zkvm_name or 'N/A'):<20} | {(zkvm_slug or 'N/A'):<12} | {(cluster_name or 'N/A'):<32} | {(num_gpus if num_gpus is not None else 'N/A'):>4} | {count:>7} |"
+    rows = [
+        (zkvm_name or "N/A", slug or "N/A", cluster or "N/A",
+         num_gpus if num_gpus is not None else "N/A", count)
+        for (zkvm_name, slug, cluster, num_gpus), count in sorted(
+            seen.items(), key=lambda kv: (-kv[1], kv[0][0] or "", kv[0][2] or "")
         )
+    ]
+    print_table(
+        [("zkVM", 20, "<"), ("slug", 12, "<"), ("Cluster", 32, "<"),
+         ("GPUs", 4, ">"), ("Proofs", 7, ">")],
+        rows,
+    )
 
 
 def analyze_blocks(
@@ -176,284 +310,224 @@ def analyze_blocks(
     cluster_filter: str | None = None,
     zkvm_filter: str | None = None,
 ) -> None:
-    """Analyze blocks to find max gas used and proving time statistics."""
+    """Show top blocks by gas used and by proving-time statistics across provers."""
     rows = data.get("rows", [])
-
     if not rows:
         print("No blocks found in the response.")
         return
 
     filter_active = bool(cluster_filter or zkvm_filter)
 
-    # Track blocks with gas for sorting
-    blocks_with_gas_list = []
-    blocks_with_gas = 0
-
-    # For each block, calculate stats across its provers
-    block_stats = []
-
+    # Select blocks (those with a matching proof, when a filter is active) and the
+    # proving times of the proofs that count toward their stats.
+    selected = []  # (block, times)
     for block in rows:
-        gas_used = block.get("gas_used")
         proofs = block.get("proofs", [])
+        if filter_active:
+            proofs = [p for p in proofs if proof_matches(p, cluster_filter, zkvm_filter)]
+            if not proofs:
+                continue
+        selected.append((block, proving_times(proofs)))
 
-        # Apply prover filter: only count proofs (and gas) from blocks where at
-        # least one proof matches the filter.
-        matching_proofs = [
-            p for p in proofs if proof_matches(p, cluster_filter, zkvm_filter)
-        ]
-        if filter_active and not matching_proofs:
-            continue
-
-        if gas_used is not None:
-            blocks_with_gas += 1
-            blocks_with_gas_list.append((block, gas_used))
-
-        proofs_for_stats = matching_proofs if filter_active else proofs
-        proving_times = [
-            p.get("proving_time")
-            for p in proofs_for_stats
-            if p.get("proving_time") is not None
-        ]
-
-        if proving_times:
-            sorted_times = sorted(proving_times)
-            n = len(sorted_times)
-
-            block_min = sorted_times[0]
-            block_max = sorted_times[-1]
-            block_avg = sum(sorted_times) / n
-            if n % 2 == 0:
-                block_median = (sorted_times[n // 2 - 1] + sorted_times[n // 2]) / 2
-            else:
-                block_median = sorted_times[n // 2]
-
-            block_stats.append(
-                (block, block_median, block_avg, block_max, block_min, proving_times)
-            )
-
-    # Sort and get top K for each metric
-    top_gas = sorted(blocks_with_gas_list, key=lambda x: x[1], reverse=True)[:top_k]
-    top_median = sorted(block_stats, key=lambda x: x[1], reverse=True)[:top_k]
-    top_avg = sorted(block_stats, key=lambda x: x[2], reverse=True)[:top_k]
-    top_max = sorted(block_stats, key=lambda x: x[3], reverse=True)[:top_k]
-    top_min = sorted(block_stats, key=lambda x: x[4], reverse=True)[:top_k]
-
-    total_proofs = sum(len(entry[5]) for entry in block_stats)
+    with_gas = [(b, b["gas_used"]) for b, _ in selected if b.get("gas_used") is not None]
+    timed = [(b, t) for b, t in selected if t]
+    total_proofs = sum(len(t) for _, t in timed)
 
     if filter_active:
-        parts = []
-        if cluster_filter:
-            parts.append(f"cluster~'{cluster_filter}'")
-        if zkvm_filter:
-            parts.append(f"zkvm~'{zkvm_filter}'")
-        print(f"**Filter:** {', '.join(parts)}")
-        print(
-            f"Fetched {len(rows):,} blocks, {len(block_stats):,} match filter "
-            f"({blocks_with_gas:,} with gas, {total_proofs:,} matching proofs)\n"
+        parts = ([f"cluster~'{cluster_filter}'"] if cluster_filter else []) + (
+            [f"zkvm~'{zkvm_filter}'"] if zkvm_filter else []
         )
+        print(f"**Filter:** {', '.join(parts)}")
+        print(f"Fetched {len(rows):,} blocks, {len(selected):,} match filter "
+              f"({len(with_gas):,} with gas, {total_proofs:,} matching proofs)\n")
     else:
-        print(
-            f"Fetched {len(rows):,} blocks ({blocks_with_gas:,} with gas, {total_proofs:,} proofs)\n"
-        )
+        print(f"Fetched {len(rows):,} blocks "
+              f"({len(with_gas):,} with gas, {total_proofs:,} proofs)\n")
 
-    # Max gas section
     if metric in ("all", "gas"):
         print(f"## Top {top_k} by Gas Used\n")
-        if top_gas:
-            print(GAS_TABLE_HEADER)
-            print(GAS_TABLE_SEP)
-            for rank, (block, gas) in enumerate(top_gas, 1):
-                print(
-                    f"| {rank:>{COL_RANK}} | {block.get('block_number'):<{COL_BLOCK}} | {fmt_gas(gas):>{COL_GAS}} | {block.get('transaction_count'):>{COL_TXS}} | {fmt_timestamp(block.get('timestamp')):<{COL_TIMESTAMP}} |"
-                )
+        if with_gas:
+            top = sorted(with_gas, key=lambda bg: bg[1], reverse=True)[:top_k]
+            print_table(
+                [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"), ("Gas", COL_GAS, ">"),
+                 ("Txs", COL_TXS, ">"), ("Timestamp", COL_TIMESTAMP, "<")],
+                [(rank, b.get("block_number"), fmt_gas(gas),
+                  b.get("transaction_count") or "N/A", fmt_timestamp(b.get("timestamp")))
+                 for rank, (b, gas) in enumerate(top, 1)],
+            )
         else:
             print("No blocks with gas data found")
 
-    # Proving time sections
-    if not block_stats and metric in ("all", "max", "median", "avg", "min"):
+    time_metrics = [m for m in STATS if metric in ("all", m)]
+    if time_metrics and not timed:
         print("\nNo proofs with proving time data found")
         return
 
-    if metric in ("all", "max"):
-        print(f"\n## Top {top_k} by MAX Proving Time\n")
-        print(time_table_header("Max"))
-        print(TIME_TABLE_SEP)
-        for rank, entry in enumerate(top_max, 1):
-            block, _, _, time_ms, _, _ = entry
-            bn = block.get("block_number")
-            gas = block.get("gas_used")
-            txs = block.get("transaction_count") or "N/A"
-            print(
-                f"| {rank:>{COL_RANK}} | {bn:<{COL_BLOCK}} | {fmt_time(time_ms):<{COL_TIME}} | {fmt_gas(gas):>{COL_GAS}} | {txs:>{COL_TXS}} |"
-            )
+    for name in time_metrics:
+        stat = STATS[name]
+        top = sorted(timed, key=lambda bt: stat(bt[1]), reverse=True)[:top_k]
+        print(f"\n## Top {top_k} by {name.upper()} Proving Time\n")
+        print_table(
+            [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
+             (f"Time ({name})", COL_TIME, "<"), ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
+            [(rank, b.get("block_number"), fmt_time(stat(t)), fmt_gas(b.get("gas_used")),
+              b.get("transaction_count") or "N/A")
+             for rank, (b, t) in enumerate(top, 1)],
+        )
 
-    if metric in ("all", "median"):
-        print(f"\n## Top {top_k} by MEDIAN Proving Time\n")
-        print(time_table_header("Median"))
-        print(TIME_TABLE_SEP)
-        for rank, entry in enumerate(top_median, 1):
-            block, time_ms, _, _, _, _ = entry
-            bn = block.get("block_number")
-            gas = block.get("gas_used")
-            txs = block.get("transaction_count") or "N/A"
-            print(
-                f"| {rank:>{COL_RANK}} | {bn:<{COL_BLOCK}} | {fmt_time(time_ms):<{COL_TIME}} | {fmt_gas(gas):>{COL_GAS}} | {txs:>{COL_TXS}} |"
-            )
 
-    if metric in ("all", "avg"):
-        print(f"\n## Top {top_k} by AVG Proving Time\n")
-        print(time_table_header("Avg"))
-        print(TIME_TABLE_SEP)
-        for rank, entry in enumerate(top_avg, 1):
-            block, _, time_ms, _, _, _ = entry
-            bn = block.get("block_number")
-            gas = block.get("gas_used")
-            txs = block.get("transaction_count") or "N/A"
-            print(
-                f"| {rank:>{COL_RANK}} | {bn:<{COL_BLOCK}} | {fmt_time(time_ms):<{COL_TIME}} | {fmt_gas(gas):>{COL_GAS}} | {txs:>{COL_TXS}} |"
-            )
+def analyze_comparison(
+    data: dict,
+    top_k: int = 10,
+    target_zkvm: str = "openvm2",
+    target_cluster: str | None = None,
+) -> None:
+    """Find blocks where the target prover (default OpenVM 2.0 / Axiom) was slow.
 
-    if metric in ("all", "min"):
-        print(f"\n## Top {top_k} by MIN Proving Time\n")
-        print(time_table_header("Min"))
-        print(TIME_TABLE_SEP)
-        for rank, entry in enumerate(top_min, 1):
-            block, _, _, _, time_ms, _ = entry
-            bn = block.get("block_number")
-            gas = block.get("gas_used")
-            txs = block.get("transaction_count") or "N/A"
-            print(
-                f"| {rank:>{COL_RANK}} | {bn:<{COL_BLOCK}} | {fmt_time(time_ms):<{COL_TIME}} | {fmt_gas(gas):>{COL_GAS}} | {txs:>{COL_TXS}} |"
-            )
+    Two tables:
+      1. ABSOLUTE  - blocks where the target's own proving time was highest.
+      2. RELATIVE  - blocks where the target trailed the fastest *other* prover by
+                     the largest ratio (target time / fastest competitor).
+    """
+    rows = data.get("rows", [])
+    if not rows:
+        print("No blocks found in the response.")
+        return
+
+    absolute = []  # (block, target_time)
+    relative = []  # (block, target_time, fastest_other_time, fastest_other_zkvm, ratio)
+    for block in rows:
+        proofs = block.get("proofs", [])
+        target = proving_times(p for p in proofs if proof_matches(p, target_cluster, target_zkvm))
+        others = [
+            p for p in proofs
+            if not proof_matches(p, target_cluster, target_zkvm)
+            and p.get("proving_time") is not None
+        ]
+        if not target:
+            continue
+        t = min(target)  # target's fastest completed proof for this block
+        absolute.append((block, t))
+        if others:
+            fastest = min(others, key=lambda p: p["proving_time"])
+            fastest_time = fastest["proving_time"]
+            relative.append((block, t, fastest_time, proof_zkvm_label(fastest), t / fastest_time))
+
+    label = target_zkvm + (f" / {target_cluster}" if target_cluster else "")
+    print(f"**Target prover:** {label}")
+    print(f"Fetched {len(rows):,} blocks, {len(absolute):,} with a completed {target_zkvm} "
+          f"proof, {len(relative):,} comparable to other provers\n")
+
+    if not absolute:
+        print(f"No completed proofs found for {target_zkvm}.")
+        return
+
+    top_abs = sorted(absolute, key=lambda x: x[1], reverse=True)[:top_k]
+    print(f"## Top {top_k} blocks where {target_zkvm} was SLOWEST (absolute)\n")
+    print_table(
+        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"), ("Time", COL_TIME, "<"),
+         ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
+        [(rank, b.get("block_number"), fmt_time(t), fmt_gas(b.get("gas_used")),
+          b.get("transaction_count") or "N/A")
+         for rank, (b, t) in enumerate(top_abs, 1)],
+    )
+
+    if not relative:
+        print(f"\nNo blocks have both a {target_zkvm} proof and another prover to compare.")
+        return
+
+    top_rel = sorted(relative, key=lambda x: x[REL_SLOWDOWN], reverse=True)[:top_k]
+    print(f"\n## Top {top_k} blocks where {target_zkvm} trailed the FASTEST other prover\n")
+    print_table(
+        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
+         (f"{target_zkvm} Time", COL_TIME, "<"), ("Fastest Other", COL_TIME, "<"),
+         ("Fastest zkVM", COL_ZKVM, "<"), ("Slowdown", COL_RATIO, ">")],
+        [(rank, b.get("block_number"), fmt_time(t), fmt_time(fastest), fastest_zkvm,
+          f"{ratio:.2f}x")
+         for rank, (b, t, fastest, fastest_zkvm, ratio) in enumerate(top_rel, 1)],
+    )
+
+
+# --- CLI --------------------------------------------------------------------
+
+
+def load_data(args: argparse.Namespace) -> dict:
+    """Load block data from a file or the ethproofs API per the parsed args."""
+    if args.file:
+        print(f"**Source:** {args.file}\n")
+        return load_from_file(args.file)
+    mode, amount = parse_last(args.last)
+    ttl = 0 if args.no_cache else args.cache_ttl
+    print(f"**Source:** {API_URL}  ")
+    print(f"**Config:** last {args.last}, filter={args.machine_type}"
+          f"{'' if ttl else ', cache off'}\n")
+    data = fetch_window(make_client(ttl), mode, amount, args.size, args.machine_type)
+    print()
+    return data
 
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Analyze ethproofs.org block data to find top blocks by gas used and proving time",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Examples:
-  %(prog)s                         Fetch 1 page (100 blocks), show all metrics
-  %(prog)s --pages 5               Fetch 5 pages (500 blocks)
-  %(prog)s --pages 10 --size 50    Fetch 10 pages of 50 blocks each
-  %(prog)s --file data.json        Load from local JSON file
-  %(prog)s --top-k 10              Show top 10 blocks per metric
-  %(prog)s --metric median         Show only median proving time
-  %(prog)s --metric gas            Show only gas used
-        """,
-    )
-    parser.add_argument(
-        "--pages",
-        "-p",
-        type=int,
-        default=1,
-        help="Number of pages to fetch (default: 1)",
-    )
-    parser.add_argument(
-        "--size",
-        "-s",
-        type=int,
-        default=100,
-        help="Number of blocks per page (default: 100)",
-    )
-    parser.add_argument(
-        "--file", "-f", type=str, help="Load data from a JSON file instead of fetching"
-    )
-    parser.add_argument(
-        "--machine-type",
-        "-m",
-        type=str,
-        default="multi",
-        choices=["multi", "single"],
-        help="Machine type filter (default: multi)",
-    )
-    parser.add_argument(
-        "--top-k",
-        "-k",
-        type=int,
-        default=1,
-        help="Number of top blocks to show per metric (default: 1)",
-    )
-    parser.add_argument(
-        "--metric",
-        type=str,
-        default="all",
-        choices=["all", "gas", "max", "median", "avg", "min"],
-        help="Which metric to show (default: all)",
-    )
-    parser.add_argument(
-        "--cluster",
-        type=str,
-        default=None,
-        help="Filter to proofs whose cluster name contains this text (case-insensitive), e.g. 'Axiom 16x5090' or 'axiom'",
-    )
-    parser.add_argument(
-        "--zkvm",
-        type=str,
-        default=None,
-        help="Filter to proofs whose zkvm slug/name contains this text (case-insensitive), e.g. 'openvm2'",
-    )
-    parser.add_argument(
-        "--list-provers",
-        action="store_true",
-        help="List distinct provers (zkvm + cluster) seen in the fetched data and exit",
+        description="Analyze ethproofs.org block data: top blocks by gas, proving time, "
+        "and how far one prover trails the fastest.",
     )
+    parser.add_argument("--last", "-l", default="100",
+                        help="How much recent data to fetch: a duration (6h, 1d, 1w) or a "
+                        "block count (500). Default: 100")
+    parser.add_argument("--file", "-f", type=str,
+                        help="Load data from a JSON file instead of fetching")
+    parser.add_argument("--machine-type", "-m", default="multi", choices=["multi", "single"],
+                        help="Machine type filter (default: multi)")
+    parser.add_argument("--size", "-s", type=int, default=100,
+                        help="Blocks per API request, a fetch-tuning knob (default: 100)")
+    parser.add_argument("--no-cache", action="store_true",
+                        help="Bypass the local page cache and always hit the API")
+    parser.add_argument("--cache-ttl", type=int, default=CACHE_TTL,
+                        help=f"Seconds a cached page stays fresh (default: {CACHE_TTL})")
+    parser.add_argument("--top-k", "-k", type=int, default=None,
+                        help="Top blocks to show per metric (default: 1, or 10 with --compare)")
+    parser.add_argument("--metric", default="all", choices=["all", "gas", *STATS],
+                        help="Which metric to show (default: all)")
+    parser.add_argument("--cluster", default=None,
+                        help="Filter to proofs whose cluster name contains this text, e.g. 'axiom'")
+    parser.add_argument("--zkvm", default=None,
+                        help="Filter to proofs whose zkvm slug/name contains this text, e.g. 'openvm2'")
+    parser.add_argument("--list-provers", action="store_true",
+                        help="List distinct provers seen in the fetched data and exit")
+    parser.add_argument("--compare", action="store_true",
+                        help="Show where the target prover was slowest, absolute and vs the fastest other prover")
+    parser.add_argument("--compare-zkvm", default="openvm2",
+                        help="zkvm slug/name of the prover to compare in --compare mode (default: openvm2)")
+    parser.add_argument("--compare-cluster", default=None,
+                        help="Optional cluster substring to further pin the --compare target (e.g. 'axiom')")
 
     args = parser.parse_args()
+    top_k = args.top_k if args.top_k is not None else (10 if args.compare else 1)
 
     print("\n# ETHPROOFS ANALYZER\n")
 
-    if args.file:
-        print(f"**Source:** {args.file}\n")
-        try:
-            data = load_from_file(args.file)
-        except FileNotFoundError:
-            print(f"Error: File not found: {args.file}")
-            sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error parsing JSON: {e}")
-            sys.exit(1)
-
-        if args.list_provers:
-            list_provers(data)
-        else:
-            analyze_blocks(
-                data,
-                top_k=args.top_k,
-                metric=args.metric,
-                cluster_filter=args.cluster,
-                zkvm_filter=args.zkvm,
-            )
+    try:
+        data = load_data(args)
+    except ValueError:
+        print(f"Error: invalid --last value '{args.last}' (use e.g. 500, 6h, 1d, 1w)")
+        sys.exit(1)
+    except FileNotFoundError:
+        print(f"Error: File not found: {args.file}")
+        sys.exit(1)
+    except httpx.HTTPError as e:
+        print(f"\nError fetching data: {e}")
+        print("Try: ./ethproofs_analyzer.py --file data.json")
+        sys.exit(1)
+    except json.JSONDecodeError as e:
+        print(f"Error parsing JSON: {e}")
+        sys.exit(1)
+
+    if args.list_provers:
+        list_provers(data)
+    elif args.compare:
+        analyze_comparison(data, top_k, args.compare_zkvm, args.compare_cluster)
     else:
-        print(f"**Source:** {API_URL}  ")
-        print(
-            f"**Config:** {args.pages} × {args.size} blocks, filter={args.machine_type}\n"
-        )
-
-        try:
-            data = fetch_multiple_pages(
-                num_pages=args.pages,
-                page_size=args.size,
-                machine_type=args.machine_type,
-            )
-            print()
-            if args.list_provers:
-                list_provers(data)
-            else:
-                analyze_blocks(
-                    data,
-                    top_k=args.top_k,
-                    metric=args.metric,
-                    cluster_filter=args.cluster,
-                    zkvm_filter=args.zkvm,
-                )
-        except urllib.error.URLError as e:
-            print(f"\nError: {e}")
-            print("Try: python3 ethproofs_analyzer.py --file data.json")
-            sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error parsing response: {e}")
-            sys.exit(1)
+        analyze_blocks(data, top_k, args.metric, args.cluster, args.zkvm)
 
 
 if __name__ == "__main__":
diff --git a/scripts/precompile_analyzer.py b/scripts/precompile_analyzer.py
index d5a25bfbb..34c6a863e 100755
--- a/scripts/precompile_analyzer.py
+++ b/scripts/precompile_analyzer.py
@@ -1,26 +1,55 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S uv run --script
+# /// script
+# requires-python = ">=3.10"
+# dependencies = ["httpx", "tenacity", "rich", "python-dotenv"]
+# ///
 """
-Analyzes precompile calls in Ethereum blocks using debug_traceBlockByNumber.
+Analyzes precompile calls in an Ethereum block via debug_traceBlockByNumber.
+
+For a block it reports how many times each precompile (ecrecover, bn254_*, kzg, …)
+was called, and the transactions that called them most. Needs an RPC endpoint with
+the `debug` namespace enabled.
+
+RPC endpoints are read from .env as RPC_1, RPC_2, … and tried in order until one
+serves the trace (override with --rpc). Run --check to see which support tracing.
+
+Run it directly (uv installs the dependencies on first use):
+    ./precompile_analyzer.py <block_number>
+    uv run precompile_analyzer.py <block_number>   # equivalent
+
+Typical workflow — find a slow block with ethproofs_analyzer, then inspect it here:
+    ./ethproofs_analyzer.py --last 1d --metric min --top-k 20   # hardest blocks for every prover
+    ./ethproofs_analyzer.py --last 1d --compare --top-k 20      # blocks where OpenVM trailed most
+    ./precompile_analyzer.py <block_number>                     # why: that block's precompile load
 
 Usage:
-    python3 precompile_analyzer.py <block_number>
-    python3 precompile_analyzer.py <block_number> --rpc <url>
-    python3 precompile_analyzer.py <block_number> -v
-    python3 precompile_analyzer.py <block_number> --top-k 10
-    python3 precompile_analyzer.py <block_number> --filter bn254_add
-    python3 precompile_analyzer.py <block_number> --filter bn254_add,bn254_mul
-    python3 precompile_analyzer.py --check
+    ./precompile_analyzer.py 21000000                       # analyze a block
+    ./precompile_analyzer.py 21000000 --rpc http://host:8545 # against a specific RPC
+    ./precompile_analyzer.py 21000000 -v                    # also report tx and call-frame counts
+    ./precompile_analyzer.py 21000000 --top-k 10            # top 10 transactions
+    ./precompile_analyzer.py 21000000 --filter bn254_add,bn254_mul  # only these precompiles
+    ./precompile_analyzer.py --check                        # verify the RPC supports tracing
 """
 
 import argparse
-import json
+import os
+import re
 import sys
-import urllib.request
+from pathlib import Path
 
+import httpx
+import tenacity
+from dotenv import dotenv_values
+from rich.console import Console
+
+# Endpoint used when no --rpc and no RPC_N in the environment or .env.
 DEFAULT_RPC_URL = "http://localhost:8545"
 DEFAULT_TOP_K = 5
 
-# Precompile addresses
+# .env at the repository root (one level above scripts/).
+ENV_PATH = Path(__file__).resolve().parent.parent / ".env"
+
+# Precompile address -> name, by hardfork.
 PRECOMPILES = {
     # Frontier
     "0x0000000000000000000000000000000000000001": "ecrecover",
@@ -48,280 +77,213 @@
     "0x0000000000000000000000000000000000000100": "p256_verify",
 }
 
-# Case-insensitive lookup for filtering
+# Lower-cased precompile name -> canonical name, for case-insensitive --filter.
 PRECOMPILE_NAMES = {name.lower(): name for name in PRECOMPILES.values()}
 
-# Table column widths
-COL_RANK = 4
-COL_TX = 66
-COL_CALLS = 6
-COL_PRECOMPILE = 22
+# Column widths (chars).
+COL_RANK, COL_TX, COL_CALLS, COL_PRECOMPILE = 4, 66, 6, 22
+
+
+def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
+    """Print a markdown table.
+
+    columns: (header, width, align) per column, align being '<' or '>'.
+    rows:    row tuples whose cells line up positionally with columns.
+    """
+    cell = lambda value, width, align: f"{value:{align}{width}}"
+    print("| " + " | ".join(cell(h, w, a) for h, w, a in columns) + " |")
+    print("|" + "|".join("-" * (w + 2) for _, w, _ in columns) + "|")
+    for row in rows:
+        print("| " + " | ".join(cell(v, w, a) for v, (_, w, a) in zip(row, columns)) + " |")
+
+
+# --- RPC --------------------------------------------------------------------
+
+
+def resolve_rpcs(explicit: list[str] | None) -> list[tuple[str, str]]:
+    """(label, url) endpoints to try in order: explicit --rpc, else RPC_1, RPC_2, … , else default.
+
+    Labels are safe to print; URLs hold secrets and must not be logged.
+    """
+    if explicit:
+        return [(f"RPC #{i}", url) for i, url in enumerate(explicit, 1)]
+    values = {**dotenv_values(ENV_PATH), **os.environ}
+    keys = sorted((k for k in values if re.fullmatch(r"RPC_\d+", k)),
+                  key=lambda k: int(k.split("_")[1]))
+    pairs = [(k, values[k]) for k in keys if values[k]]
+    return pairs or [("default", DEFAULT_RPC_URL)]
+
 
-# Table formatting
-SUMMARY_HEADER = f"| {'Precompile':<{COL_PRECOMPILE}} | {'Calls':>{COL_CALLS}} |"
-SUMMARY_SEP = f"|{'-' * (COL_PRECOMPILE + 2)}|{'-' * (COL_CALLS + 2)}|"
+def redact(text) -> str:
+    """Strip the key-bearing path from any URL in text, leaving only scheme and host."""
+    return re.sub(r"(https?://[^/\s]+)/[^\s'\"]*", r"\1/…", str(text))
 
-TX_HEADER = (
-    f"| {'Rank':>{COL_RANK}} | {'Transaction':<{COL_TX}} | {'Calls':>{COL_CALLS}} |"
+
+def make_client(url: str) -> httpx.Client:
+    """An httpx client targeting one RPC endpoint."""
+    return httpx.Client(base_url=url, timeout=120, headers={"Content-Type": "application/json"})
+
+
+def is_transient(exc: BaseException) -> bool:
+    """True for errors worth retrying: timeouts, connection drops, and 5xx responses."""
+    if isinstance(exc, httpx.TransportError):
+        return True
+    if isinstance(exc, httpx.HTTPStatusError):
+        return exc.response.status_code >= 500
+    return False
+
+
+@tenacity.retry(
+    retry=tenacity.retry_if_exception(is_transient),
+    wait=tenacity.wait_exponential(multiplier=0.5, max=5),
+    stop=tenacity.stop_after_attempt(4),
+    reraise=True,
 )
-TX_SEP = f"|{'-' * (COL_RANK + 2)}|{'-' * (COL_TX + 2)}|{'-' * (COL_CALLS + 2)}|"
-
-
-def rpc_call(url: str, method: str, params: list) -> dict:
-    """Make a JSON-RPC call."""
-    payload = {
-        "jsonrpc": "2.0",
-        "method": method,
-        "params": params,
-        "id": 1,
-    }
-    req = urllib.request.Request(
-        url,
-        data=json.dumps(payload).encode(),
-        headers={"Content-Type": "application/json"},
-    )
-    with urllib.request.urlopen(req, timeout=120) as response:
-        return json.loads(response.read().decode())
+def rpc_call(client: httpx.Client, method: str, params: list) -> dict:
+    """Make a JSON-RPC call, retrying transient errors with exponential backoff."""
+    resp = client.post("", json={"jsonrpc": "2.0", "method": method, "params": params, "id": 1})
+    resp.raise_for_status()
+    result = resp.json()
+    if "error" in result:
+        raise RuntimeError(f"RPC error: {result['error']}")
+    return result
 
 
-def process_call_for_tx(call: dict, counts: dict[str, int]) -> None:
-    """Process a single call and its subcalls, counting precompile calls for a tx."""
-    to_addr = call.get("to", "").lower()
-    if to_addr in PRECOMPILES:
-        name = PRECOMPILES[to_addr]
-        counts[name] = counts.get(name, 0) + 1
+# --- Tracing ----------------------------------------------------------------
 
+
+def count_precompiles(call: dict, counts: dict[str, int]) -> None:
+    """Tally precompile calls in a call frame and its subcalls (recursive)."""
+    name = PRECOMPILES.get(call.get("to", "").lower())
+    if name:
+        counts[name] = counts.get(name, 0) + 1
     for subcall in call.get("calls", []):
-        process_call_for_tx(subcall, counts)
+        count_precompiles(subcall, counts)
 
 
 def count_call_frames(call: dict) -> int:
-    """Count total call frames in a call tree."""
-    n = 1
-    for sub in call.get("calls", []):
-        n += count_call_frames(sub)
-    return n
+    """Count the call frames in a call tree (recursive)."""
+    return 1 + sum(count_call_frames(sub) for sub in call.get("calls", []))
 
 
-def analyze_block(rpc_url: str, block_number: int, verbose: bool = False) -> list:
-    """Analyze a single block and return per-transaction precompile counts."""
-    block_hex = hex(block_number)
-    tracer_config = {"tracer": "callTracer"}
-
-    result = rpc_call(rpc_url, "debug_traceBlockByNumber", [block_hex, tracer_config])
-    if result is None:
-        raise Exception("RPC returned None")
-    if "error" in result:
-        raise Exception(f"RPC error: {result['error']}")
+def analyze_block(client: httpx.Client, block_number: int, verbose: bool = False) -> list:
+    """Trace a block and return [(tx_hash, {precompile: count})] for txs that used any."""
+    with Console(stderr=True).status(f"Tracing block {block_number}..."):
+        result = rpc_call(client, "debug_traceBlockByNumber",
+                          [hex(block_number), {"tracer": "callTracer"}])
 
     trace = result.get("result", [])
     if verbose:
-        total_calls = 0
-        for tx in trace:
-            if "result" in tx:
-                total_calls += count_call_frames(tx["result"])
-        print(f"  Transactions: {len(trace)}, Call frames: {total_calls}")
+        frames = sum(count_call_frames(tx["result"]) for tx in trace if "result" in tx)
+        print(f"  Transactions: {len(trace)}, Call frames: {frames}")
 
-    # Build per-transaction stats
     tx_stats = []
     for tx_trace in trace:
-        tx_hash = tx_trace.get("txHash", "unknown")
         counts: dict[str, int] = {}
         if "result" in tx_trace:
-            process_call_for_tx(tx_trace["result"], counts)
+            count_precompiles(tx_trace["result"], counts)
         if counts:
-            tx_stats.append((tx_hash, counts))
-
+            tx_stats.append((tx_trace.get("txHash", "unknown"), counts))
     return tx_stats
 
 
-def check_rpc(rpc_url: str) -> bool:
-    """Check if RPC endpoint supports debug_traceBlockByNumber."""
+def check_rpc(client: httpx.Client) -> bool:
+    """Report whether the RPC endpoint supports debug_traceBlockByNumber."""
     print("Checking for debug_traceBlockByNumber support...")
-
     try:
-        result = rpc_call(rpc_url, "eth_blockNumber", [])
-        if "error" in result:
-            print(f"  eth_blockNumber failed: {result['error']}")
-            return False
-        block_num = int(result["result"], 16)
+        block_num = int(rpc_call(client, "eth_blockNumber", [])["result"], 16)
         print(f"  eth_blockNumber: {block_num}")
-
-        # Use an older block for testing (100 blocks back)
-        test_block = block_num - 100
-        tracer_config = {"tracer": "callTracer"}
-
-        result = rpc_call(
-            rpc_url, "debug_traceBlockByNumber", [hex(test_block), tracer_config]
-        )
-
-        if "error" in result:
-            print(f"  debug_traceBlockByNumber failed: {result['error']}")
-            return False
-
-        trace = result.get("result", [])
+        trace = rpc_call(client, "debug_traceBlockByNumber",
+                         [hex(block_num - 100), {"tracer": "callTracer"}]).get("result", [])
         print(f"  debug_traceBlockByNumber: OK ({len(trace)} transactions)")
         return True
-    except Exception as e:
-        print(f"  Error: {e}")
+    except (httpx.HTTPError, RuntimeError, KeyError, ValueError) as e:
+        print(f"  Error: {redact(e)}")
         return False
 
 
-def normalize_precompile_name(name: str) -> str | None:
-    """Normalize precompile name (case-insensitive). Returns None if invalid."""
-    return PRECOMPILE_NAMES.get(name.lower())
+# --- Reporting --------------------------------------------------------------
 
 
 def parse_filter(filter_arg: str) -> list[str]:
-    """Parse comma-separated filter argument and normalize names."""
+    """Parse a comma-separated --filter value into canonical precompile names."""
     names = []
-    for part in filter_arg.split(","):
-        part = part.strip()
+    for part in (p.strip() for p in filter_arg.split(",")):
         if not part:
             continue
-        normalized = normalize_precompile_name(part)
-        if normalized is None:
+        canonical = PRECOMPILE_NAMES.get(part.lower())
+        if canonical is None:
             valid = ", ".join(sorted(PRECOMPILES.values()))
             raise ValueError(f"Invalid precompile name: {part}\nValid names: {valid}")
-        names.append(normalized)
+        names.append(canonical)
     return names
 
 
-def filter_tx_stats(
-    tx_stats: list, filter_names: list[str]
-) -> list[tuple[str, dict[str, int]]]:
-    """Filter transaction stats to only include specified precompiles."""
-    if not filter_names:
-        return tx_stats
-
-    filtered = []
-    for tx_hash, counts in tx_stats:
-        filtered_counts = {k: v for k, v in counts.items() if k in filter_names}
-        if filtered_counts:
-            filtered.append((tx_hash, filtered_counts))
-    return filtered
-
-
-def print_summary(
-    tx_stats: list, block_number: int, filter_names: list[str] | None
-) -> None:
-    """Print block-level precompile summary."""
-    # Aggregate counts across all transactions
+def print_summary(tx_stats: list, block_number: int, filter_names: list[str] | None) -> None:
+    """Print block-level precompile totals."""
     totals: dict[str, int] = {}
     for _, counts in tx_stats:
         for name, count in counts.items():
-            if filter_names and name not in filter_names:
-                continue
-            totals[name] = totals.get(name, 0) + count
-
-    total = sum(totals.values())
-
-    if filter_names:
-        filter_str = ", ".join(filter_names)
-        print(f"## Block {block_number} Summary (filtered: {filter_str})\n")
-    else:
-        print(f"## Block {block_number} Summary\n")
-
-    print(SUMMARY_HEADER)
-    print(SUMMARY_SEP)
-
-    for name, count in sorted(totals.items(), key=lambda x: -x[1]):
-        if count > 0:
-            print(f"| {name:<{COL_PRECOMPILE}} | {count:>{COL_CALLS}} |")
+            if not filter_names or name in filter_names:
+                totals[name] = totals.get(name, 0) + count
 
-    print(SUMMARY_SEP)
-    print(f"| {'Total':<{COL_PRECOMPILE}} | {total:>{COL_CALLS}} |")
+    suffix = f" (filtered: {', '.join(filter_names)})" if filter_names else ""
+    print(f"## Block {block_number} Summary{suffix}\n")
+    rows = [(name, count) for name, count in sorted(totals.items(), key=lambda x: -x[1]) if count]
+    rows.append(("Total", sum(totals.values())))
+    print_table([("Precompile", COL_PRECOMPILE, "<"), ("Calls", COL_CALLS, ">")], rows)
 
 
-def print_top_transactions(
-    tx_stats: list, top_k: int, filter_names: list[str] | None
-) -> None:
-    """Print top transactions by precompile calls."""
+def print_top_transactions(tx_stats: list, top_k: int, filter_names: list[str] | None) -> None:
+    """Print the transactions with the most precompile calls."""
     if filter_names:
-        # Filter and sort by matching precompiles
-        filtered = filter_tx_stats(tx_stats, filter_names)
-        sorted_stats = sorted(filtered, key=lambda x: -sum(x[1].values()))
-        top = sorted_stats[:top_k]
-
-        filter_str = ", ".join(filter_names)
-        print(f"\n## Top {len(top)} Transactions using {filter_str}\n")
+        stats = [(h, {k: v for k, v in c.items() if k in filter_names}) for h, c in tx_stats]
+        stats = [(h, c) for h, c in stats if c]
+        heading = f"Transactions using {', '.join(filter_names)}"
     else:
-        # Sort by total precompile calls
-        sorted_stats = sorted(tx_stats, key=lambda x: -sum(x[1].values()))
-        top = sorted_stats[:top_k]
+        stats, heading = tx_stats, "Transactions by Precompile Calls"
 
-        print(f"\n## Top {len(top)} Transactions by Precompile Calls\n")
+    top = sorted(stats, key=lambda x: -sum(x[1].values()))[:top_k]
+    print(f"\n## Top {len(top)} {heading}\n")
+    print_table(
+        [("Rank", COL_RANK, ">"), ("Transaction", COL_TX, "<"), ("Calls", COL_CALLS, ">")],
+        [(rank, tx_hash, sum(counts.values())) for rank, (tx_hash, counts) in enumerate(top, 1)],
+    )
 
-    print(TX_HEADER)
-    print(TX_SEP)
 
-    for rank, (tx_hash, counts) in enumerate(top, 1):
-        total = sum(counts.values())
-        print(f"| {rank:>{COL_RANK}} | {tx_hash:<{COL_TX}} | {total:>{COL_CALLS}} |")
+# --- CLI --------------------------------------------------------------------
 
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Analyze precompile calls in Ethereum blocks using debug_traceBlockByNumber",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Examples:
-  %(prog)s 21000000                              Analyze block 21000000
-  %(prog)s 21000000 --rpc http://localhost:8545
-  %(prog)s 21000000 -v                           Verbose output
-  %(prog)s 21000000 --top-k 10                   Show top 10 transactions
-  %(prog)s 21000000 --filter ecrecover           Filter by precompile
-  %(prog)s 21000000 --filter bn254_add,bn254_mul Filter by multiple precompiles
-  %(prog)s --check                               Check if RPC supports trace method
-        """,
-    )
-    parser.add_argument(
-        "block",
-        type=int,
-        nargs="?",
-        help="Block number to analyze",
-    )
-    parser.add_argument(
-        "--rpc",
-        type=str,
-        default=DEFAULT_RPC_URL,
-        help=f"RPC endpoint URL (default: {DEFAULT_RPC_URL})",
-    )
-    parser.add_argument(
-        "--check",
-        action="store_true",
-        help="Check if RPC endpoint supports debug_traceBlockByNumber",
-    )
-    parser.add_argument(
-        "--verbose",
-        "-v",
-        action="store_true",
-        help="Print debug information about the trace response",
-    )
-    parser.add_argument(
-        "--top-k",
-        "-k",
-        type=int,
-        default=DEFAULT_TOP_K,
-        help=f"Number of top transactions to show (default: {DEFAULT_TOP_K})",
-    )
-    parser.add_argument(
-        "--filter",
-        "-f",
-        type=str,
-        help="Filter by precompile name(s), comma-separated (e.g., bn254_add,bn254_mul)",
+        description="Analyze precompile calls in an Ethereum block via debug_traceBlockByNumber",
     )
+    parser.add_argument("block", type=int, nargs="?", help="Block number to analyze")
+    parser.add_argument("--rpc", nargs="+", metavar="URL",
+                        help="One or more RPC URLs to try in order "
+                        "(default: RPC_1, RPC_2, … from .env, then localhost)")
+    parser.add_argument("--check", action="store_true",
+                        help="Check whether the RPC endpoints support debug_traceBlockByNumber")
+    parser.add_argument("--verbose", "-v", action="store_true",
+                        help="Also report transaction and call-frame counts")
+    parser.add_argument("--top-k", "-k", type=int, default=DEFAULT_TOP_K,
+                        help=f"Number of top transactions to show (default: {DEFAULT_TOP_K})")
+    parser.add_argument("--filter", "-f",
+                        help="Only these precompiles, comma-separated (e.g. bn254_add,bn254_mul)")
 
     args = parser.parse_args()
+    rpcs = resolve_rpcs(args.rpc)
 
     if args.check:
-        success = check_rpc(args.rpc)
-        sys.exit(0 if success else 1)
+        ok = False
+        for label, url in rpcs:
+            print(f"\n{label}")
+            ok |= check_rpc(make_client(url))
+        sys.exit(0 if ok else 1)
 
     if args.block is None:
         parser.error("block number is required (or use --check)")
 
-    # Parse and validate filter if provided
     filter_names = None
     if args.filter:
         try:
@@ -332,22 +294,27 @@ def main():
     print("\n# PRECOMPILE ANALYZER\n")
     print(f"**Block:** {args.block}\n")
 
-    try:
-        tx_stats = analyze_block(args.rpc, args.block, args.verbose)
-
-        if not tx_stats:
-            print("No precompile calls found in this block.")
-            sys.exit(0)
+    # Try each endpoint until one serves the trace.
+    tx_stats, used = None, None
+    for label, url in rpcs:
+        try:
+            tx_stats = analyze_block(make_client(url), args.block, args.verbose)
+            used = label
+            break
+        except (httpx.HTTPError, RuntimeError) as e:
+            print(f"  {label} unavailable: {redact(e)}")
+
+    if used is None:
+        print("\nError: no working RPC (set RPC_1, RPC_2, … in .env, or pass --rpc).")
+        sys.exit(1)
+    print(f"**RPC:** {used}\n")
 
-        print_summary(tx_stats, args.block, filter_names)
-        print_top_transactions(tx_stats, args.top_k, filter_names)
+    if not tx_stats:
+        print("No precompile calls found in this block.")
+        sys.exit(0)
 
-    except urllib.error.URLError as e:
-        print(f"\nError: {e}")
-        sys.exit(1)
-    except Exception as e:
-        print(f"\nError: {e}")
-        sys.exit(1)
+    print_summary(tx_stats, args.block, filter_names)
+    print_top_transactions(tx_stats, args.top_k, filter_names)
 
 
 if __name__ == "__main__":

From a36dd95427bd93b507984fb062877eb606179eaf Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sun, 21 Jun 2026 22:25:35 +0000
Subject: [PATCH 12/94] fix(run): update reth nsys helper compatibility

---
 run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index dd07b8f37..7390b80ff 100755
--- a/run.sh
+++ b/run.sh
@@ -440,7 +440,7 @@ if [ "$USE_PERF" = "true" ]; then
     fi
 elif [ "$USE_NSYS" = "true" ]; then
     NSYS_OUTPUT="reth.nsys-rep"
-    NSYS_ARGS="--trace=cuda,nvtx,osrt --sample=cpu --cpuctxsw=true --cuda-memory-usage=true --force-overwrite=true -o $NSYS_OUTPUT"
+    NSYS_ARGS="--trace=cuda,nvtx,osrt --sample=cpu --cpuctxsw=process-tree --cuda-memory-usage=true --force-overwrite=true -o $NSYS_OUTPUT"
     if [ "$USE_NSYS_GPU_METRICS" = "true" ]; then
         NSYS_ARGS="$NSYS_ARGS --gpu-metrics-devices=all"
     fi

From 4915fc46ed3648ed6f44969c773d8ab3ff74ec26 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 15:28:49 +0200
Subject: [PATCH 13/94] fix: use valid nsys cpuctxsw mode

---
 .github/workflows/reth-benchmark.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index 44058b205..4998fafc3 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -683,7 +683,7 @@ jobs:
           elif [[ "${{ inputs.profiling || github.event.inputs.profiling }}" == "nsys" ]]; then
             nsys profile --trace=cuda,osrt,nvtx \
              --sample=cpu \
-             --cpuctxsw=true \
+             --cpuctxsw=process-tree \
              --cuda-memory-usage=true \
              --force-overwrite=true \
              -o reth.nsys-rep \

From 69df345d1797e8c04b3cb11765eaecec0dee9304 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 14 Jul 2026 22:45:11 +0200
Subject: [PATCH 14/94] chore: update lock files

---
 Cargo.lock                     | 170 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14b81979f..e156b930b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6824,7 +6824,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6834,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6850,7 +6850,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6862,7 +6862,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6876,7 +6876,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6886,7 +6886,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6915,7 +6915,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6924,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6939,7 +6939,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6961,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7008,7 +7008,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7019,7 +7019,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7039,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7061,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7180,7 +7180,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7190,12 +7190,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7228,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7237,7 +7237,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7253,7 +7253,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7290,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7309,7 +7309,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7319,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7337,7 +7337,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7354,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7363,7 +7363,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7373,7 +7373,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7403,7 +7403,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-platform",
 ]
@@ -7411,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7450,7 +7450,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7458,7 +7458,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7517,7 +7517,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7541,7 +7541,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7575,7 +7575,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7596,7 +7596,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7609,7 +7609,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7619,7 +7619,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7637,7 +7637,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7665,7 +7665,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7746,7 +7746,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7763,7 +7763,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7794,7 +7794,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7803,7 +7803,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7856,7 +7856,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7896,7 +7896,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7933,7 +7933,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7942,7 +7942,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7956,7 +7956,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7987,7 +7987,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-platform",
 ]
@@ -7995,7 +7995,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8132,7 +8132,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8156,7 +8156,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "elf",
  "eyre",
@@ -8171,7 +8171,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8201,7 +8201,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8240,7 +8240,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9121,7 +9121,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12609,7 +12609,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12668,7 +12668,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12689,7 +12689,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12731,7 +12731,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12747,12 +12747,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12769,7 +12769,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12784,7 +12784,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12799,7 +12799,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12813,7 +12813,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ffi-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12822,7 +12822,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12835,7 +12835,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12848,7 +12848,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12864,7 +12864,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12877,7 +12877,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "serde",
 ]
@@ -12885,7 +12885,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12899,7 +12899,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "nix",
  "thiserror 1.0.69",
@@ -13504,7 +13504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13761,7 +13761,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -15002,7 +15002,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 74c65649a..2afbe5dee 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#987f1fb4daebdebecc4e634204e0d3934cea6990"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From a06b5418c606914ada881620e4fe2cae313b21c4 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 15 Jul 2026 15:15:06 +0200
Subject: [PATCH 15/94] fix: update reth workload stdin encoding

---
 Cargo.lock                     | 170 ++++++++++++++++-----------------
 bin/reth-benchmark/src/lib.rs  |   5 +-
 bin/stateless-guest/Cargo.lock |  36 +++----
 3 files changed, 105 insertions(+), 106 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e156b930b..6726e5663 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6824,7 +6824,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6834,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6850,7 +6850,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6862,7 +6862,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6876,7 +6876,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6886,7 +6886,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6915,7 +6915,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6924,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6939,7 +6939,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6961,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7008,7 +7008,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7019,7 +7019,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7039,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7061,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7180,7 +7180,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7190,12 +7190,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7228,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7237,7 +7237,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7253,7 +7253,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7290,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7309,7 +7309,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7319,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7337,7 +7337,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7354,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7363,7 +7363,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7373,7 +7373,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7403,7 +7403,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-platform",
 ]
@@ -7411,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7450,7 +7450,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7458,7 +7458,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7517,7 +7517,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7541,7 +7541,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7575,7 +7575,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7596,7 +7596,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7609,7 +7609,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7619,7 +7619,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7637,7 +7637,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7665,7 +7665,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7746,7 +7746,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7763,7 +7763,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7794,7 +7794,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7803,7 +7803,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7856,7 +7856,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7896,7 +7896,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7933,7 +7933,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7942,7 +7942,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7956,7 +7956,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7987,7 +7987,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-platform",
 ]
@@ -7995,7 +7995,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8132,7 +8132,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8156,7 +8156,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "elf",
  "eyre",
@@ -8171,7 +8171,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8201,7 +8201,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8240,7 +8240,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9121,7 +9121,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12609,7 +12609,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12668,7 +12668,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12689,7 +12689,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12731,7 +12731,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12747,12 +12747,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12769,7 +12769,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12784,7 +12784,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12799,7 +12799,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12813,7 +12813,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ffi-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12822,7 +12822,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12835,7 +12835,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12848,7 +12848,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12864,7 +12864,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12877,7 +12877,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "serde",
 ]
@@ -12885,7 +12885,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12899,7 +12899,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "nix",
  "thiserror 1.0.69",
@@ -13504,7 +13504,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13761,7 +13761,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -15002,7 +15002,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/reth-benchmark/src/lib.rs b/bin/reth-benchmark/src/lib.rs
index 84bb2a3d8..3b05d8878 100644
--- a/bin/reth-benchmark/src/lib.rs
+++ b/bin/reth-benchmark/src/lib.rs
@@ -42,7 +42,6 @@ use openvm_stark_sdk::{
         air_builders::symbolic::{SymbolicExpressionDag, SymbolicExpressionNode},
         codec::Encode,
         keygen::types::MultiStarkProvingKey,
-        p3_field::PrimeCharacteristicRing,
         SystemParams,
     },
 };
@@ -223,9 +222,9 @@ pub fn build_reth_workload(
     openvm_client_eth_elf: &[u8],
 ) -> Result<RethWorkload> {
     let exe = build_reth_exe(vm_config, openvm_client_eth_elf)?;
-    let encoded_stateless_input: Vec<F> = {
+    let encoded_stateless_input: Vec<u8> = {
         let words = openvm::serde::to_vec(stateless_input)?;
-        words.into_iter().flat_map(|w| w.to_le_bytes()).map(F::from_u8).collect()
+        words.into_iter().flat_map(|w| w.to_le_bytes()).collect()
     };
     let stdin = vec![encoded_stateless_input].into();
     Ok(RethWorkload { exe, stdin })
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 2afbe5dee..f3218d04f 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#5acc51a70bcc6465a1568e18b685b8e26451e190"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 7768f605da5f6b041fc0d46da79eaad2178342bc Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 15 Jul 2026 15:31:41 +0200
Subject: [PATCH 16/94] chore: remove unused dependencies

---
 Cargo.lock                                      |  7 -------
 Cargo.toml                                      |  8 --------
 bin/reth-benchmark/Cargo.toml                   |  9 ++++++---
 crates/kzg/Cargo.toml                           |  3 +++
 crates/kzg/tests/programs/verify_kzg/Cargo.toml |  3 +++
 crates/mpt/Cargo.toml                           |  3 ---
 crates/revm-crypto/Cargo.toml                   | 10 +++-------
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6726e5663..d01bba3dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7481,7 +7481,6 @@ dependencies = [
  "alloy-trie 0.9.4",
  "bumpalo",
  "bytes",
- "hex-literal",
  "revm 40.0.3",
  "revm-primitives 24.0.1",
  "serde",
@@ -7675,13 +7674,11 @@ dependencies = [
 name = "openvm-reth-benchmark"
 version = "0.4.0"
 dependencies = [
- "alloy-primitives",
  "alloy-provider",
  "alloy-rpc-client",
  "alloy-transport",
  "alloy-transport-http",
  "bincode 2.0.1",
- "bitcode",
  "clap",
  "clap_builder",
  "dotenv",
@@ -7726,10 +7723,6 @@ version = "0.4.0"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
- "ark-bls12-381",
- "ark-bn254",
- "ark-ec",
- "ark-ff 0.5.0",
  "aurora-engine-modexp",
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-curve-utils",
diff --git a/Cargo.toml b/Cargo.toml
index 0ad5d937c..19968cdde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,8 +25,6 @@ edition = "2024"
 exclude = ["**/target"]
 
 [workspace.dependencies]
-# Not directly used, just to have rayon feature always
-hashbrown = { version = "0.15.4", features = ["rayon"] }
 eyre = "0.6"
 tracing = { version = "0.1", default-features = false }
 tracing-subscriber = "0.3"
@@ -50,7 +48,6 @@ toml = "0.9.2"
 smallvec = "1.13"
 bumpalo = { version = "3.19.0", default-features = false, features = ["collections"] }
 bytes = { version = "1", default-features = false }
-bitcode = { version = "0.6.5", default-features = false, features = ["serde"] }
 itertools = { version = "0.14", default-features = false }
 actix-web = "4"
 reqwest = "0.12.20"
@@ -71,7 +68,6 @@ openvm-chainspec = { path = "./crates/chainspec" }
 # workspace (host only)
 openvm-stateless-witness = { path = "./crates/stateless-witness", default-features = false }
 openvm-rpc-proxy = { path = "./crates/rpc-proxy" }
-openvm-reth-benchmark = { path = "./bin/reth-benchmark", default-features = false }
 
 # reth
 reth-primitives-traits = { version = "=0.4.1", default-features = false }
@@ -112,10 +108,6 @@ alloy-rpc-client = { version = "=2.0.5", default-features = false }
 alloy-rpc-types = { version = "=2.0.5", default-features = false }
 alloy-rpc-types-debug = { version = "=2.0.5", default-features = false }
 alloy-transport = { version = "=2.0.5", default-features = false }
-alloy-transport-http = { version = "=2.0.5", default-features = false, features = [
-    "reqwest-rustls-tls",
-] }
-
 openvm = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index c9490e031..00bc7d39f 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -20,7 +20,6 @@ dotenv = "0.15.0"
 clap = { version = "4.5.7", features = ["derive", "env"] }
 clap_builder = "4.5.34"
 bincode = { workspace = true, features = ["std"] }
-bitcode.workspace = true
 hex = "0.4.3"
 serde.workspace = true
 serde_json.workspace = true
@@ -34,11 +33,12 @@ openvm-stateless-executor.workspace = true
 openvm-rpc-proxy.workspace = true
 
 # alloy
-alloy-primitives.workspace = true
 alloy-provider.workspace = true
 alloy-rpc-client.workspace = true
 alloy-transport.workspace = true
-alloy-transport-http.workspace = true
+alloy-transport-http = { version = "=2.0.5", default-features = false, features = [
+    "reqwest-rustls-tls",
+] }
 
 # reth
 reth-ethereum-primitives.workspace = true
@@ -61,6 +61,9 @@ halo2-axiom = { git = "https://github.com/axiom-crypto/halo2.git", tag = "v0.5.2
 [package.metadata.cargo-machete]
 ignored = ["halo2-axiom"]
 
+[package.metadata.cargo-shear]
+ignored = ["alloy-transport-http", "halo2-axiom"]
+
 [features]
 default = ["parallel", "jemalloc", "metrics"]
 parallel = ["openvm-sdk/parallel"]
diff --git a/crates/kzg/Cargo.toml b/crates/kzg/Cargo.toml
index c02c97514..4da0c82ab 100644
--- a/crates/kzg/Cargo.toml
+++ b/crates/kzg/Cargo.toml
@@ -46,3 +46,6 @@ hex = { workspace = true, features = ["alloc"] }
 default = ["use-intrinsics"]
 test-utils = []
 use-intrinsics = []          # When enabled, uses OpenVM intrinsic functions
+
+[package.metadata.cargo-shear]
+ignored = ["openvm-circuit"]
diff --git a/crates/kzg/tests/programs/verify_kzg/Cargo.toml b/crates/kzg/tests/programs/verify_kzg/Cargo.toml
index ec7643741..ca2699bc2 100644
--- a/crates/kzg/tests/programs/verify_kzg/Cargo.toml
+++ b/crates/kzg/tests/programs/verify_kzg/Cargo.toml
@@ -14,5 +14,8 @@ openvm-kzg.workspace = true
 [package.metadata.cargo-machete]
 ignored = ["openvm-algebra-guest", "openvm-ecc-guest"]
 
+[package.metadata.cargo-shear]
+ignored = ["openvm-algebra-guest", "openvm-ecc-guest"]
+
 [features]
 default = ["openvm-kzg/use-intrinsics"]
diff --git a/crates/mpt/Cargo.toml b/crates/mpt/Cargo.toml
index 9aa7e7d97..3d8717404 100644
--- a/crates/mpt/Cargo.toml
+++ b/crates/mpt/Cargo.toml
@@ -21,9 +21,6 @@ revm-primitives.workspace = true
 alloy-rlp.workspace = true
 alloy-trie.workspace = true
 
-[dev-dependencies]
-hex-literal.workspace = true
-
 [lints]
 workspace = true
 
diff --git a/crates/revm-crypto/Cargo.toml b/crates/revm-crypto/Cargo.toml
index b7415432f..226cc5ef1 100644
--- a/crates/revm-crypto/Cargo.toml
+++ b/crates/revm-crypto/Cargo.toml
@@ -28,13 +28,6 @@ openvm-kzg = { workspace = true, features = ["use-intrinsics"] }
 openvm-keccak256 = { workspace = true }
 aurora-engine-modexp = { version = "1.2.0", default-features = false }
 
-[dev-dependencies]
-# arkworks-rs
-ark-ff = "0.5"
-ark-bn254 = "0.5"
-ark-bls12-381 = "0.5"
-ark-ec = "0.5"
-
 [target.'cfg(all(target_arch = "riscv64", any(target_os = "none", target_os = "openvm")))'.dependencies]
 revm-primitives = { workspace = true, features = ["hashbrown"] }
 alloy-primitives = { workspace = true, features = ["native-keccak"] }
@@ -46,3 +39,6 @@ openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
 [features]
 default = []
 std = []
+
+[package.metadata.cargo-shear]
+ignored = ["revm-primitives"]

From 1861d5460d3efceadb6a4e804767b07dc0dded90 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 15 Jul 2026 16:48:10 +0200
Subject: [PATCH 17/94] chore: update lock files

---
 Cargo.lock                     | 170 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d01bba3dc..3896b7be1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6824,7 +6824,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6834,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6850,7 +6850,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6862,7 +6862,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6876,7 +6876,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6886,7 +6886,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6915,7 +6915,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6924,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6939,7 +6939,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6961,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7008,7 +7008,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7019,7 +7019,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7039,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7061,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7180,7 +7180,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7190,12 +7190,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7228,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7237,7 +7237,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7253,7 +7253,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7290,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7309,7 +7309,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7319,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7337,7 +7337,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7354,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7363,7 +7363,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7373,7 +7373,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7403,7 +7403,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-platform",
 ]
@@ -7411,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7450,7 +7450,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7458,7 +7458,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7516,7 +7516,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7540,7 +7540,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7574,7 +7574,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7595,7 +7595,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7608,7 +7608,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7618,7 +7618,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7636,7 +7636,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7664,7 +7664,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7739,7 +7739,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7756,7 +7756,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7787,7 +7787,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7796,7 +7796,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7849,7 +7849,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7889,7 +7889,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7926,7 +7926,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7935,7 +7935,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7949,7 +7949,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7980,7 +7980,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-platform",
 ]
@@ -7988,7 +7988,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8125,7 +8125,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8149,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "elf",
  "eyre",
@@ -8164,7 +8164,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8194,7 +8194,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8233,7 +8233,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9114,7 +9114,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12602,7 +12602,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12661,7 +12661,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12682,7 +12682,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12724,7 +12724,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12740,12 +12740,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12762,7 +12762,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12792,7 +12792,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12806,7 +12806,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ffi-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12815,7 +12815,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12828,7 +12828,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12841,7 +12841,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12857,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12870,7 +12870,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "serde",
 ]
@@ -12878,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12892,7 +12892,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "nix",
  "thiserror 1.0.69",
@@ -13497,7 +13497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13754,7 +13754,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14995,7 +14995,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index f3218d04f..c9a5b3e5d 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec8553cae9ce1195380d41d87a6061ba94faf3bf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 54ba033d1404329906bc7f80a9003f146451898c Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 15 Jul 2026 21:15:37 +0200
Subject: [PATCH 18/94] chore: update lock files

---
 Cargo.lock                     | 178 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 103 insertions(+), 111 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3896b7be1..4aef481c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6824,7 +6824,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6834,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6850,7 +6850,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6862,7 +6862,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6876,7 +6876,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6886,7 +6886,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6915,7 +6915,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6924,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6939,7 +6939,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6961,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7008,7 +7008,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7019,7 +7019,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7039,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7061,7 +7061,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7180,7 +7180,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7190,12 +7190,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7228,7 +7228,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7237,7 +7237,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7253,7 +7253,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7290,7 +7290,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7309,7 +7309,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7319,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7337,7 +7337,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7354,7 +7354,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7363,7 +7363,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7373,7 +7373,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7403,7 +7403,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-platform",
 ]
@@ -7411,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7450,7 +7450,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7458,7 +7458,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7516,7 +7516,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7540,7 +7540,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7574,7 +7574,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7595,7 +7595,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7608,7 +7608,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7618,7 +7618,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7636,7 +7636,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7664,7 +7664,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7739,7 +7739,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7756,7 +7756,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7787,7 +7787,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7796,7 +7796,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7849,7 +7849,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7889,7 +7889,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7926,7 +7926,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7935,7 +7935,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7949,7 +7949,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7980,7 +7980,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-platform",
 ]
@@ -7988,7 +7988,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8125,7 +8125,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8149,7 +8149,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "elf",
  "eyre",
@@ -8164,7 +8164,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8194,7 +8194,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8233,7 +8233,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9114,7 +9114,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12602,7 +12602,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12661,7 +12661,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12682,7 +12682,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12724,12 +12724,11 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
  "openvm-riscv-guest",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
@@ -12740,18 +12739,17 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
  "openvm-algebra-utils",
  "openvm-instructions",
- "openvm-stark-backend",
  "rand 0.9.5",
  "rvr-openvm-build",
  "rvr-openvm-ir",
@@ -12762,12 +12760,11 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
  "openvm-riscv-transpiler",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12777,7 +12774,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12792,11 +12789,10 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12806,7 +12802,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ffi-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12815,11 +12811,10 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12828,11 +12823,10 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12841,13 +12835,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "libloading",
  "openvm-circuit",
  "openvm-instructions",
  "openvm-riscv-transpiler",
- "openvm-stark-backend",
  "rand 0.9.5",
  "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
@@ -12857,11 +12850,10 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
- "openvm-stark-backend",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12870,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "serde",
 ]
@@ -12878,7 +12870,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12892,7 +12884,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "nix",
  "thiserror 1.0.69",
@@ -13497,7 +13489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13754,7 +13746,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14995,7 +14987,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index c9a5b3e5d..9d8cab22e 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#a0c24b33f8123f0734bacf880fdcf39f302bd47f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From e7dcdec0ae815b071e60095f178084d0ab8754f5 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Thu, 16 Jul 2026 13:03:43 +0200
Subject: [PATCH 19/94] chore: update lock files

---
 Cargo.lock                     | 184 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 108 insertions(+), 112 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4aef481c7..d70ab1263 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6809,6 +6809,7 @@ dependencies = [
  "openvm-cuda-common",
  "openvm-instructions",
  "openvm-mod-circuit-builder",
+ "openvm-platform",
  "openvm-riscv-adapters",
  "openvm-riscv-circuit",
  "openvm-stark-backend",
@@ -6824,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6834,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6850,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6862,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6876,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6886,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6915,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6924,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6939,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6961,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -6976,6 +6977,7 @@ dependencies = [
  "libloading",
  "memmap2",
  "metrics 0.23.1",
+ "nix",
  "openvm-circuit-derive",
  "openvm-circuit-primitives",
  "openvm-circuit-primitives-derive",
@@ -6993,7 +6995,6 @@ dependencies = [
  "rand 0.9.5",
  "rustc-hash 2.1.3",
  "rvr-openvm",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
  "rvr-state",
@@ -7008,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7019,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7039,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7061,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7075,6 +7076,7 @@ dependencies = [
  "openvm-cpu-backend",
  "openvm-cuda-backend",
  "openvm-cuda-common",
+ "openvm-instructions",
  "openvm-poseidon2-air",
  "openvm-recursion-circuit",
  "openvm-recursion-circuit-derive",
@@ -7180,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7190,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7228,7 +7230,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7237,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7253,7 +7255,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7275,6 +7277,7 @@ dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
  "openvm-mod-circuit-builder",
+ "openvm-platform",
  "openvm-riscv-adapters",
  "openvm-riscv-circuit",
  "openvm-stark-backend",
@@ -7290,7 +7293,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7309,7 +7312,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7319,7 +7322,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7337,7 +7340,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7354,7 +7357,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7363,7 +7366,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7373,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7403,7 +7406,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-platform",
 ]
@@ -7411,7 +7414,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7450,7 +7453,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7458,7 +7461,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7516,7 +7519,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7540,7 +7543,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7574,7 +7577,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7595,7 +7598,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7608,7 +7611,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7618,7 +7621,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7636,7 +7639,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7664,7 +7667,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7739,7 +7742,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7756,7 +7759,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7773,6 +7776,7 @@ dependencies = [
  "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
+ "openvm-platform",
  "openvm-riscv-transpiler",
  "openvm-stark-backend",
  "openvm-stark-sdk",
@@ -7787,7 +7791,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7796,7 +7800,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7849,7 +7853,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7889,7 +7893,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7926,7 +7930,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7935,7 +7939,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7949,7 +7953,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7980,7 +7984,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-platform",
 ]
@@ -7988,7 +7992,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8125,7 +8129,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8149,7 +8153,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "elf",
  "eyre",
@@ -8164,7 +8168,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8194,7 +8198,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8233,7 +8237,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9114,7 +9118,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12602,7 +12606,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12661,7 +12665,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12682,7 +12686,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12724,13 +12728,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
  "openvm-riscv-guest",
  "rvr-openvm-build",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
  "thiserror 1.0.69",
@@ -12739,12 +12742,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12760,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12774,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12789,7 +12792,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12802,16 +12805,15 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ffi-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-instructions",
- "openvm-platform",
 ]
 
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12823,7 +12825,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12835,14 +12837,13 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "libloading",
  "openvm-circuit",
  "openvm-instructions",
  "openvm-riscv-transpiler",
  "rand 0.9.5",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
 ]
@@ -12850,7 +12851,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12862,7 +12863,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "serde",
 ]
@@ -12870,13 +12871,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "libloading",
  "openvm-instructions",
  "openvm-riscv-transpiler",
  "openvm-stark-backend",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
  "thiserror 1.0.69",
 ]
@@ -12884,11 +12884,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
-dependencies = [
- "nix",
- "thiserror 1.0.69",
-]
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 
 [[package]]
 name = "ryu"
@@ -13489,7 +13485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13746,7 +13742,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14987,7 +14983,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 9d8cab22e..d2db05107 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#f48df8e23437904fecbf0da544e85acdcc5bf492"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 07e96dbfb1f9ccd44999a97a359674cd634b4363 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Thu, 16 Jul 2026 22:13:23 +0200
Subject: [PATCH 20/94] chore: update lock files

---
 Cargo.lock                     | 178 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 102 insertions(+), 112 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d70ab1263..ad94732fe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7222,7 +7222,6 @@ dependencies = [
  "rand 0.9.5",
  "rustc-hash 2.1.3",
  "rvr-openvm-ext-deferral",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-lift",
  "serde",
 ]
@@ -7230,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7239,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7255,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7293,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7312,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7322,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7340,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7357,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7366,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7376,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7406,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-platform",
 ]
@@ -7414,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7453,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7461,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7519,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7543,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7577,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7598,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7611,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7621,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7639,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7667,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7742,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7759,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7791,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7800,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7853,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7893,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7930,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7939,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7953,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7984,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-platform",
 ]
@@ -7992,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8129,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8153,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "elf",
  "eyre",
@@ -8168,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8198,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8237,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9118,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12606,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12665,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12686,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12728,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12742,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12763,7 +12762,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,14 +12776,13 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "libloading",
  "openvm-circuit",
  "openvm-deferral-transpiler",
  "openvm-instructions",
  "openvm-stark-backend",
- "rvr-openvm-ext-ffi-common",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
 ]
@@ -12792,7 +12790,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12802,18 +12800,10 @@ dependencies = [
  "strum 0.26.3",
 ]
 
-[[package]]
-name = "rvr-openvm-ext-ffi-common"
-version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
-dependencies = [
- "openvm-instructions",
-]
-
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12825,7 +12815,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12837,7 +12827,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12851,7 +12841,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12863,7 +12853,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "serde",
 ]
@@ -12871,7 +12861,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12884,7 +12874,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 
 [[package]]
 name = "ryu"
@@ -13485,7 +13475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13742,7 +13732,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14983,7 +14973,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index d2db05107..c72cdc95e 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#d193688d7d7af90dd7ce9a4a49e3e820cd8c23f7"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 916f677cedd910cd787e74d5a854875bb5fe85ce Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 17 Jul 2026 08:41:22 +0200
Subject: [PATCH 21/94] chore: update lock files

---
 Cargo.lock                     | 168 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad94732fe..ce3eb5d3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12762,7 +12762,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12776,7 +12776,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12790,7 +12790,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12803,7 +12803,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12815,7 +12815,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12827,7 +12827,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12841,7 +12841,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12853,7 +12853,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "serde",
 ]
@@ -12861,7 +12861,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12874,7 +12874,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 
 [[package]]
 name = "ryu"
@@ -13475,7 +13475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13732,7 +13732,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14973,7 +14973,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index c72cdc95e..1fd4bc612 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#0c7cb33e3c958c6c1fddd53af5db4373cdabe7be"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 59c182c4ee0622ecb0cc3cb827a3557d16e5dcd0 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 17 Jul 2026 13:06:36 +0200
Subject: [PATCH 22/94] chore: update lock files

---
 Cargo.lock                     | 168 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce3eb5d3a..16d96c927 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12762,7 +12762,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12776,7 +12776,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12790,7 +12790,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12803,7 +12803,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12815,7 +12815,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12827,7 +12827,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12841,7 +12841,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12853,7 +12853,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "serde",
 ]
@@ -12861,7 +12861,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12874,7 +12874,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 
 [[package]]
 name = "ryu"
@@ -13475,7 +13475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13732,7 +13732,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14973,7 +14973,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 1fd4bc612..fd85551ef 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#103711322ca7bb7142e1455eb9f288b2b58b743f"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 8428211de6bf3cc5aaba37ab1c46d0ce7893a499 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sat, 18 Jul 2026 00:29:36 +0200
Subject: [PATCH 23/94] chore: remove aot support

---
 .github/workflows/reth-benchmark.yml |  22 +---
 Cargo.lock                           | 168 +++++++++++++--------------
 bin/reth-benchmark/Cargo.toml        |   2 -
 bin/stateless-guest/Cargo.lock       |  36 +++---
 run.sh                               |  21 +---
 5 files changed, 109 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index 4998fafc3..ea07a5ff7 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -71,11 +71,10 @@ on:
       exec_mode:
         type: choice
         required: false
-        description: OpenVM execution backend (aot is x86_64-only)
+        description: OpenVM execution backend
         options:
           - interpreter
           - rvr
-          - aot
           - tco
         default: rvr
       rpc_input_cache:
@@ -153,7 +152,7 @@ on:
       exec_mode:
         type: string
         required: false
-        description: OpenVM execution backend, one of {interpreter, rvr, aot, tco} (aot is x86_64-only)
+        description: OpenVM execution backend, one of {interpreter, rvr, tco}
         default: rvr
       num_children_leaf:
         type: number
@@ -377,26 +376,9 @@ jobs:
           echo "Resolved target CPU: ${TARGET_CPU}"
           RUSTFLAGS="-Ctarget-cpu=${TARGET_CPU}"
 
-          arch=$(uname -m)
-          case $arch in
-            arm64|aarch64)
-              if [[ "$EXEC_MODE" == "aot" ]]; then
-                # aot enables halo2curves-axiom/asm which is x86_64-only
-                echo "::error::exec_mode=aot is not supported on arm64; choose interpreter, rvr, or tco"
-                exit 1
-              fi
-              ;;
-            x86_64|amd64)
-              ;;
-            *)
-              echo "Unsupported architecture: $arch"
-              exit 1
-              ;;
-          esac
           case "$EXEC_MODE" in
             interpreter) ;; # default interpreted execution; no extra backend feature
             tco) FEATURES="${FEATURES},tco" ;;
-            aot) FEATURES="${FEATURES},aot" ;;
             rvr) FEATURES="${FEATURES},rvr" ;;
             *) echo "Unsupported exec_mode: $EXEC_MODE"; exit 1 ;;
           esac
diff --git a/Cargo.lock b/Cargo.lock
index 16d96c927..09eac1599 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "num-bigint",
  "openvm-algebra-transpiler",
@@ -12762,7 +12762,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12776,7 +12776,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12790,7 +12790,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12803,7 +12803,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12815,7 +12815,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12827,7 +12827,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12841,7 +12841,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12853,7 +12853,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "serde",
 ]
@@ -12861,7 +12861,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12874,7 +12874,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 
 [[package]]
 name = "ryu"
@@ -13475,7 +13475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13732,7 +13732,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14973,7 +14973,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index 00bc7d39f..5f8f8f96b 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -69,8 +69,6 @@ default = ["parallel", "jemalloc", "metrics"]
 parallel = ["openvm-sdk/parallel"]
 metrics = ["openvm-sdk/metrics", "openvm-circuit/metrics", "openvm-stark-sdk/metrics"]
 tco = ["openvm-sdk/tco"]
-aot = ["openvm-sdk/aot"]
-# Mutually exclusive with `aot`
 rvr = ["openvm-sdk/rvr"]
 evm-prove = ["openvm-sdk/evm-prove", "halo2-axiom"]
 evm-verify = ["evm-prove", "openvm-sdk/evm-verify", "halo2-axiom"]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index fd85551ef..845ecc1a1 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#b6977d5ca0747232df2f22d424c9c5825c3415bc"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
diff --git a/run.sh b/run.sh
index 7390b80ff..03fea66be 100755
--- a/run.sh
+++ b/run.sh
@@ -18,8 +18,8 @@
 #   --num-children-internal <N>
 #   --segment-max-memory <N>
 #   --cuda              Force CUDA acceleration (auto-detected if nvidia-smi available)
-#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | aot | rvr.
-#                       Defaults to rvr. aot is not supported on arm64.
+#   --exec-mode <MODE>  Select the OpenVM execution backend: interpreter | tco | rvr.
+#                       Defaults to rvr.
 #                       rvr requires clang-22 and lld on PATH.
 #   --perf              Run with perf + samply host profiling and upload to Firefox Profiler
 #   --nsys              Run with nsys profiling and output summary stats
@@ -143,11 +143,11 @@ while [[ $# -gt 0 ]]; do
             ;;
         --exec-mode)
             case "${2:-}" in
-                interpreter|tco|aot|rvr)
+                interpreter|tco|rvr)
                     EXEC_MODE="$2"
                     ;;
                 *)
-                    echo "Error: --exec-mode requires one of: interpreter, tco, aot, rvr (got '${2:-}')" >&2
+                    echo "Error: --exec-mode requires one of: interpreter, tco, rvr (got '${2:-}')" >&2
                     exit 1
                     ;;
             esac
@@ -302,10 +302,6 @@ arm64|aarch64)
     RUSTFLAGS="-Ctarget-cpu=native"
     if [ -z "$EXEC_MODE" ]; then
         EXEC_MODE="rvr"
-    elif [ "$EXEC_MODE" = "aot" ]; then
-        # aot enables halo2curves-axiom/asm which is x86_64-only
-        echo "Error: --exec-mode aot is not supported on arm64" >&2
-        exit 1
     fi
     ;;
 x86_64|amd64)
@@ -326,13 +322,6 @@ case "$EXEC_MODE" in
     tco)
         FEATURES="$FEATURES,tco"
         ;;
-    aot)
-        # aot enables halo2curves-axiom/asm which is x86_64-only
-        FEATURES="$FEATURES,aot"
-        if [ "$MODE" = "prove-evm" ]; then
-            FEATURES="$FEATURES,halo2-asm"
-        fi
-        ;;
     rvr)
         FEATURES="$FEATURES,rvr"
         missing=()
@@ -340,7 +329,7 @@ case "$EXEC_MODE" in
         command -v lld      >/dev/null 2>&1 || missing+=("lld")
         if [ "${#missing[@]}" -gt 0 ]; then
             echo "Error: --exec-mode rvr requires the following tools on PATH: ${missing[*]}" >&2
-            echo "       Install them or rerun with --exec-mode interpreter (or --exec-mode aot on x86_64)." >&2
+            echo "       Install them or rerun with --exec-mode interpreter." >&2
             exit 1
         fi
         ;;

From 14034ca631f82dae7bcefd96d4b806f0236a3fd9 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sun, 19 Jul 2026 12:01:38 +0200
Subject: [PATCH 24/94] fix: support benchmark runs without s3

---
 .github/workflows/reth-benchmark.yml | 98 +++++++++++++++++++++++-----
 1 file changed, 82 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index ea07a5ff7..be6280bfa 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -189,6 +189,9 @@ on:
 
 env:
   OPENVM_BRANCH: develop-v2.1.0
+  S3_FIXTURE_READ_ENABLED: ${{ vars.S3_PUBLIC_DATA_BUCKET != '' }}
+  S3_PUBLIC_UPLOAD_ENABLED: ${{ vars.S3_PUBLIC_DATA_BUCKET != '' && vars.S3_REGION != '' }}
+  S3_WORKFLOW_UPLOAD_ENABLED: ${{ vars.S3_WORKFLOW_DATA_BUCKET != '' }}
   S3_MD_PATH: s3://${{ vars.S3_WORKFLOW_DATA_BUCKET }}/benchmark/github/results
   S3_FIXTURE_PATH: s3://${{ vars.S3_PUBLIC_DATA_BUCKET }}/benchmark/github/fixtures
   S3_METRICS_PATH: s3://${{ vars.S3_WORKFLOW_DATA_BUCKET }}/benchmark/github/metrics
@@ -203,6 +206,8 @@ env:
 jobs:
   run-reth:
     name: Run Reth benchmark
+    permissions:
+      contents: write
     runs-on:
       - runs-on=${{ github.run_id }}/family=${{ inputs.instance_family || github.event.inputs.instance_family }}/volume=80gb/tag=bench-reth-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}/extras=s3-cache/spot=false/image=${{ startsWith(github.event.inputs.instance_family || inputs.instance_family, 'g') && 'ubuntu24-gpu-x64' || contains(github.event.inputs.instance_family || inputs.instance_family, 'g.') && 'ubuntu24-full-arm64' || 'ubuntu24-full-x64' }}
     outputs:
@@ -238,6 +243,12 @@ jobs:
         run: |
           echo '${{ toJSON(inputs || github.event.inputs) }}'
 
+      - name: Report S3-disabled mode
+        if: ${{ env.S3_PUBLIC_UPLOAD_ENABLED != 'true' && env.S3_WORKFLOW_UPLOAD_ENABLED != 'true' }}
+        run: |
+          echo "S3 uploads disabled; using GitHub artifacts and gh-pages."
+          echo "S3 uploads disabled; using GitHub artifacts and gh-pages." >> "$GITHUB_STEP_SUMMARY"
+
       - name: Get current commit hash
         run: |
           echo "current_sha=$(git rev-parse HEAD)" >> $GITHUB_ENV
@@ -255,7 +266,10 @@ jobs:
           echo "METRIC_PATH=${METRIC_PATH}" >> $GITHUB_ENV
           echo "name=${METRIC_NAME}" >> $GITHUB_OUTPUT
           # depends on add_metadata util function and openvm-prof file naming
-          GPU_MEMORY_SVG_URL="${S3_PUBLIC_URL_BASE}/charts/${CURRENT_SHA}/${METRIC_NAME}.memory.svg"
+          GPU_MEMORY_SVG_URL=""
+          if [[ "${S3_PUBLIC_UPLOAD_ENABLED}" == "true" ]]; then
+            GPU_MEMORY_SVG_URL="${S3_PUBLIC_URL_BASE}/charts/${CURRENT_SHA}/${METRIC_NAME}.memory.svg"
+          fi
           echo "memory_svg_url=${GPU_MEMORY_SVG_URL}" >> $GITHUB_OUTPUT
       - name: Load SSH key
         uses: webfactory/ssh-agent@v0.9.0
@@ -278,7 +292,9 @@ jobs:
       - name: Install architecture specific tools
         run: |
           source openvm/ci/scripts/utils.sh
-          install_s5cmd
+          if [[ "${S3_FIXTURE_READ_ENABLED}" == "true" || "${S3_PUBLIC_UPLOAD_ENABLED}" == "true" || "${S3_WORKFLOW_UPLOAD_ENABLED}" == "true" ]]; then
+            install_s5cmd
+          fi
           sudo apt update && sudo apt install -y gnuplot
           sudo apt install -y linux-tools-common linux-tools-generic linux-tools-$(uname -r) || \
             sudo apt install -y linux-tools-aws linux-cloud-tools-aws || true
@@ -494,8 +510,20 @@ jobs:
             echo ""
           } >> "$GITHUB_STEP_SUMMARY"
 
-          # Publish the raw report + soundcalc config to the public bucket (the workflow metrics
-          # bucket isn't web-accessible) and link them in the summary so they're viewable.
+      - name: Upload soundness artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.set-metric-name.outputs.name }}-soundness
+          path: |
+            soundness.json
+            openvm2.toml
+          retention-days: 1
+
+      - name: Publish soundness report
+        if: ${{ env.S3_PUBLIC_UPLOAD_ENABLED == 'true' }}
+        run: |
+          # The workflow metrics bucket isn't web-accessible, so publish this report to the
+          # public bucket when external publication is available.
           S3_BASE="${{ env.S3_PUBLIC_PATH_BASE }}/soundness/${METRIC_NAME}"
           URL_BASE="${{ env.S3_PUBLIC_URL_BASE }}/soundness/${METRIC_NAME}"
           s5cmd cp soundness.json "${S3_BASE}.soundness.json"
@@ -506,6 +534,7 @@ jobs:
           } >> "$GITHUB_STEP_SUMMARY"
 
       - name: Path to soundness result
+        if: ${{ env.S3_PUBLIC_UPLOAD_ENABLED == 'true' }}
         run: echo "${{ env.S3_PUBLIC_URL_BASE }}/soundness/${METRIC_NAME}.soundness.json"
 
       - name: Restore RPC input cache from S3
@@ -525,6 +554,7 @@ jobs:
           echo "mode=${RPC_INPUT_CACHE_MODE}" >> "$GITHUB_OUTPUT"
           echo "cache_file=${CACHE_FILE}" >> "$GITHUB_OUTPUT"
           echo "s3_cache_file=${S3_CACHE_FILE}" >> "$GITHUB_OUTPUT"
+          echo "s3-available=${S3_FIXTURE_READ_ENABLED}" >> "$GITHUB_OUTPUT"
 
           if [[ "${RPC_INPUT_CACHE_MODE}" == "disabled" ]]; then
             echo "RPC input cache disabled"
@@ -533,6 +563,13 @@ jobs:
             exit 0
           fi
 
+          if [[ "${S3_FIXTURE_READ_ENABLED}" != "true" ]]; then
+            echo "S3 fixture cache unavailable; continuing with RPC"
+            echo "cache-hit=false" >> "$GITHUB_OUTPUT"
+            echo "RPC input cache: unavailable; using RPC" >> "$GITHUB_STEP_SUMMARY"
+            exit 0
+          fi
+
           mkdir -p "$(dirname "$CACHE_FILE")"
 
           if [[ "${RPC_INPUT_CACHE_MODE}" == "refresh" ]]; then
@@ -713,7 +750,7 @@ jobs:
           fi
 
       - name: Save RPC input cache to S3
-        if: ${{ success() && steps.restore-rpc-input-cache.outputs.mode != 'disabled' && steps.restore-rpc-input-cache.outputs.cache-hit != 'true' }}
+        if: ${{ success() && env.S3_PUBLIC_UPLOAD_ENABLED == 'true' && steps.restore-rpc-input-cache.outputs.s3-available == 'true' && steps.restore-rpc-input-cache.outputs.mode != 'disabled' && steps.restore-rpc-input-cache.outputs.cache-hit != 'true' }}
         run: |
           CACHE_FILE="${{ steps.restore-rpc-input-cache.outputs.cache_file }}"
           S3_CACHE_FILE="${{ steps.restore-rpc-input-cache.outputs.s3_cache_file }}"
@@ -766,13 +803,18 @@ jobs:
           retention-days: 1
 
       - name: Upload Benchmark Metrics
+        if: ${{ env.S3_WORKFLOW_UPLOAD_ENABLED == 'true' }}
         run: s5cmd cp ${METRIC_PATH} ${{ env.S3_METRICS_PATH }}/${METRIC_NAME}.json
 
       - name: Generate markdown
         run: |
           openvm-prof --json-paths $METRIC_PATH --num-devices 16 --proofs-per-device 1
           MD_PATH=${METRIC_PATH%.json}.md
+          DETAILED_MD_PATH=${MD_PATH%.md}.detailed.md
+          GPU_MEMORY_SVG_PATH=${MD_PATH%.md}.memory.svg
           echo "MD_PATH=${MD_PATH}" >> $GITHUB_ENV
+          echo "DETAILED_MD_PATH=${DETAILED_MD_PATH}" >> $GITHUB_ENV
+          echo "GPU_MEMORY_SVG_PATH=${GPU_MEMORY_SVG_PATH}" >> $GITHUB_ENV
 
       - name: Add benchmark metadata to markdown
         run: |
@@ -824,6 +866,9 @@ jobs:
           echo "Saved profile: $SAMPLY_PROFILE_PATH/profile.json.gz"
           echo "SAMPLY_PROFILE_PATH=${SAMPLY_PROFILE_PATH}" >> $GITHUB_ENV
 
+      - name: Publish samply profile
+        if: ${{ (inputs.profiling == 'host' || github.event.inputs.profiling == 'host') && env.S3_PUBLIC_UPLOAD_ENABLED == 'true' }}
+        run: |
           s5cmd cp $SAMPLY_PROFILE_PATH/profile.json.gz ${{ env.S3_SAMPLY_PROFILE_PATH }}/${METRIC_NAME}/profile.json.gz
 
           FIREFOX_PROFILER_URL=$(python3 "$GITHUB_WORKSPACE/scripts/upload_firefox_profile.py" "$SAMPLY_PROFILE_PATH/profile.json.gz") || true
@@ -846,18 +891,14 @@ jobs:
           retention-days: 1
 
       - name: Upload markdown
+        if: ${{ env.S3_WORKFLOW_UPLOAD_ENABLED == 'true' }}
         run: |
           S3_MD_PATH="${{ env.S3_MD_PATH }}/${METRIC_NAME}.md"
           s5cmd cp $MD_PATH $S3_MD_PATH
 
-          DETAILED_MD_PATH=${MD_PATH%.md}.detailed.md
           s5cmd cp $DETAILED_MD_PATH "${{ env.S3_MD_PATH }}/${METRIC_NAME}.detailed.md"
 
-          GPU_MEMORY_SVG_PATH=${MD_PATH%.md}.memory.svg
-
           echo "S3_MD_PATH=${S3_MD_PATH}" >> $GITHUB_ENV
-          echo "DETAILED_MD_PATH=${DETAILED_MD_PATH}" >> $GITHUB_ENV
-          echo "GPU_MEMORY_SVG_PATH=${GPU_MEMORY_SVG_PATH}" >> $GITHUB_ENV
 
       - name: Upload metric artifacts
         id: upload-metric-artifact
@@ -866,6 +907,7 @@ jobs:
           name: ${{ steps.set-metric-name.outputs.name }}
           path: |
             ${{ env.METRIC_PATH }}
+            ${{ env.MD_PATH }}
             ${{ env.DETAILED_MD_PATH }}
             ${{ env.GPU_MEMORY_SVG_PATH }}
           if-no-files-found: warn
@@ -876,11 +918,30 @@ jobs:
         run: sccache --show-stats || true
 
       ### Update gh-pages
-      - uses: actions/checkout@v4
+      - name: Check for gh-pages branch
+        id: check-gh-pages
+        run: |
+          if git ls-remote --exit-code --heads origin gh-pages > /dev/null; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+            echo "ref=gh-pages" >> "$GITHUB_OUTPUT"
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+            echo "ref=${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Checkout gh-pages
+        uses: actions/checkout@v4
         with:
-          ref: gh-pages
+          ref: ${{ steps.check-gh-pages.outputs.ref }}
           path: gh-pages
 
+      - name: Initialize gh-pages branch
+        if: ${{ steps.check-gh-pages.outputs.exists != 'true' }}
+        working-directory: gh-pages
+        run: |
+          git checkout --orphan gh-pages
+          git rm -rf .
+
       - name: Set up git
         working-directory: gh-pages
         run: |
@@ -888,6 +949,8 @@ jobs:
           git config user.name "github-actions[bot]"
 
       - name: Commit to gh-pages branch
+        id: publish-gh-pages
+        continue-on-error: true
         working-directory: gh-pages
         env:
           REF_NAME: ${{ github.head_ref || github.ref }}
@@ -895,7 +958,7 @@ jobs:
           GH_PAGES_PATH="benchmarks-dispatch/${REF_NAME}"
           echo "GH_PAGES_PATH=${GH_PAGES_PATH}" >> $GITHUB_ENV
           mkdir -p ${GH_PAGES_PATH}
-          s5cmd cp $S3_MD_PATH "${GH_PAGES_PATH}/${METRIC_NAME}.md"
+          cp "$GITHUB_WORKSPACE/$MD_PATH" "${GH_PAGES_PATH}/${METRIC_NAME}.md"
 
           git add ${GH_PAGES_PATH}/${METRIC_NAME}.md
           git commit --allow-empty -m "Update benchmark result at ${GH_PAGES_PATH}/${METRIC_NAME}.md"
@@ -905,9 +968,10 @@ jobs:
           SUCCESS=false
           while [ $ATTEMPT -lt $MAX_RETRIES ]; do
               echo "Attempt $((ATTEMPT + 1)) to push of $MAX_RETRIES..."
-              git fetch origin gh-pages
-              git merge origin/gh-pages --no-edit
-              if git push origin gh-pages; then
+              if git fetch origin gh-pages; then
+                  git merge origin/gh-pages --no-edit
+              fi
+              if git push origin HEAD:gh-pages; then
                   SUCCESS=true
                   break
               else
@@ -922,6 +986,7 @@ jobs:
           fi
 
       - name: Update summary with results
+        if: ${{ steps.publish-gh-pages.outcome == 'success' }}
         working-directory: gh-pages
         run: |
           RESULT_URL="https://github.com/${{ github.repository }}/blob/gh-pages/${GH_PAGES_PATH}/${METRIC_NAME}.md"
@@ -931,6 +996,7 @@ jobs:
           cat "${GH_PAGES_PATH}/${METRIC_NAME}.md" >> $GITHUB_STEP_SUMMARY
 
       - name: Path to result
+        if: ${{ steps.publish-gh-pages.outcome == 'success' }}
         working-directory: gh-pages
         run: |
           echo "https://github.com/${{ github.repository }}/blob/gh-pages/${GH_PAGES_PATH}/${METRIC_NAME}.md"

From 07dc101af3a6aab7dd1f54c3269aef4c7c15f28e Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sun, 19 Jul 2026 14:41:54 +0200
Subject: [PATCH 25/94] fix: keep benchmark artifacts without s3

---
 .github/workflows/reth-benchmark.yml | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index be6280bfa..da3c4bed6 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -823,11 +823,24 @@ jobs:
 
           source openvm/ci/scripts/utils.sh
 
-          add_metadata $MD_PATH \
-            ${{ inputs.instance_family || github.event.inputs.instance_family }} \
-            ${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }} \
-            $COMMIT_URL \
-            $BENCHMARK_WORKFLOW_URL
+          if [[ "${S3_PUBLIC_UPLOAD_ENABLED}" == "true" ]]; then
+            add_metadata $MD_PATH \
+              ${{ inputs.instance_family || github.event.inputs.instance_family }} \
+              ${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }} \
+              $COMMIT_URL \
+              $BENCHMARK_WORKFLOW_URL
+          else
+            {
+              echo ""
+              echo "Commit: ${COMMIT_URL}"
+              echo ""
+              echo "Instance Type: ${{ inputs.instance_family || github.event.inputs.instance_family }}"
+              echo ""
+              echo "Memory Allocator: ${{ inputs.memory_allocator || github.event.inputs.memory_allocator || 'jemalloc' }}"
+              echo ""
+              echo "[Benchmark Workflow](${BENCHMARK_WORKFLOW_URL})"
+            } >> "$MD_PATH"
+          fi
 
           # Add GPU peak memory to the markdown if available
           if [[ -n "${GPU_PEAK_MEMORY_MIB}" && "${GPU_PEAK_MEMORY_MIB}" != "0" ]]; then
@@ -902,6 +915,7 @@ jobs:
 
       - name: Upload metric artifacts
         id: upload-metric-artifact
+        if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.set-metric-name.outputs.name }}

From c53e78c2d32890507b923c3d544e176bc0ce931b Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 21 Jul 2026 00:46:38 +0200
Subject: [PATCH 26/94] chore: update lock files

---
 Cargo.lock                     | 169 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 09eac1599..b94ee5ad1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,13 +12741,14 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
+ "cc",
  "num-bigint",
  "openvm-algebra-transpiler",
  "openvm-algebra-utils",
@@ -12762,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12776,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12790,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12803,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12815,7 +12816,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12827,7 +12828,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12841,7 +12842,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12853,7 +12854,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "serde",
 ]
@@ -12861,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12874,7 +12875,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 
 [[package]]
 name = "ryu"
@@ -13475,7 +13476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13732,7 +13733,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14973,7 +14974,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 845ecc1a1..ea6aef4f2 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1417e1f11c5578a2fa364e8553f3923ee498fbf8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 9e3020eba98a8529216d5874105d7c2855e1f847 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 21 Jul 2026 11:27:19 +0200
Subject: [PATCH 27/94] chore: fix precompile analyzer script

---
 Cargo.lock                     | 143 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  36 ++++-----
 scripts/precompile_analyzer.py |  30 +++++--
 3 files changed, 112 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b94ee5ad1..6a52cc528 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12816,7 +12816,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12828,11 +12828,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "libloading",
  "openvm-circuit",
  "openvm-instructions",
+ "openvm-platform",
  "openvm-riscv-transpiler",
  "rand 0.9.5",
  "rvr-openvm-ir",
@@ -12842,7 +12843,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12854,7 +12855,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "serde",
 ]
@@ -12862,7 +12863,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12875,7 +12876,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 
 [[package]]
 name = "ryu"
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index ea6aef4f2..393f86486 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#755541322bcf3a32edba3066d342bff7dd85a8bb"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
diff --git a/scripts/precompile_analyzer.py b/scripts/precompile_analyzer.py
index 34c6a863e..12fcea97f 100755
--- a/scripts/precompile_analyzer.py
+++ b/scripts/precompile_analyzer.py
@@ -11,7 +11,8 @@
 the `debug` namespace enabled.
 
 RPC endpoints are read from .env as RPC_1, RPC_2, … and tried in order until one
-serves the trace (override with --rpc). Run --check to see which support tracing.
+serves the trace (override with --rpc); public trace-capable fallbacks are tried
+last. Run --check to see which support tracing.
 
 Run it directly (uv installs the dependencies on first use):
     ./precompile_analyzer.py <block_number>
@@ -44,6 +45,8 @@
 
 # Endpoint used when no --rpc and no RPC_N in the environment or .env.
 DEFAULT_RPC_URL = "http://localhost:8545"
+# Public trace-capable endpoints, tried after the configured ones.
+FALLBACK_RPCS = ["https://eth.drpc.org"]
 DEFAULT_TOP_K = 5
 
 # .env at the repository root (one level above scripts/).
@@ -101,17 +104,21 @@ def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
 
 
 def resolve_rpcs(explicit: list[str] | None) -> list[tuple[str, str]]:
-    """(label, url) endpoints to try in order: explicit --rpc, else RPC_1, RPC_2, … , else default.
+    """(label, url) endpoints to try in order: explicit --rpc, else RPC_1, RPC_2, … , else
+    default — always followed by the public fallbacks.
 
     Labels are safe to print; URLs hold secrets and must not be logged.
     """
     if explicit:
-        return [(f"RPC #{i}", url) for i, url in enumerate(explicit, 1)]
-    values = {**dotenv_values(ENV_PATH), **os.environ}
-    keys = sorted((k for k in values if re.fullmatch(r"RPC_\d+", k)),
-                  key=lambda k: int(k.split("_")[1]))
-    pairs = [(k, values[k]) for k in keys if values[k]]
-    return pairs or [("default", DEFAULT_RPC_URL)]
+        pairs = [(f"RPC #{i}", url) for i, url in enumerate(explicit, 1)]
+    else:
+        values = {**dotenv_values(ENV_PATH), **os.environ}
+        keys = sorted((k for k in values if re.fullmatch(r"RPC_\d+", k)),
+                      key=lambda k: int(k.split("_")[1]))
+        pairs = [(k, values[k]) for k in keys if values[k]] or [("default", DEFAULT_RPC_URL)]
+    urls = {url for _, url in pairs}
+    pairs += [(f"fallback ({url})", url) for url in FALLBACK_RPCS if url not in urls]
+    return pairs
 
 
 def redact(text) -> str:
@@ -142,6 +149,13 @@ def is_transient(exc: BaseException) -> bool:
 def rpc_call(client: httpx.Client, method: str, params: list) -> dict:
     """Make a JSON-RPC call, retrying transient errors with exponential backoff."""
     resp = client.post("", json={"jsonrpc": "2.0", "method": method, "params": params, "id": 1})
+    if 400 <= resp.status_code < 500:
+        try:
+            error = resp.json()["error"]
+        except (ValueError, KeyError):
+            error = None
+        if error:
+            raise RuntimeError(f"RPC error: {error}")
     resp.raise_for_status()
     result = resp.json()
     if "error" in result:

From 143ef2ca9d640ad8fa843e96fbf4f3832758cca3 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 21 Jul 2026 13:48:16 +0200
Subject: [PATCH 28/94] chore: align v2.1 development dependencies

---
 Cargo.lock                     | 192 ++++++++++++++++-----------------
 Cargo.toml                     |   2 +-
 bin/reth-benchmark/Cargo.toml  |   4 +-
 bin/stateless-guest/Cargo.lock |  36 +++----
 4 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a52cc528..1fdd259ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4320,7 +4320,7 @@ dependencies = [
 [[package]]
 name = "halo2-axiom-gpu"
 version = "1.0.0"
-source = "git+https://github.com/axiom-crypto/halo2-gpu.git?tag=v1.0.0#97ef2d02aa3348fc04b520c3c2562a9c13b57126"
+source = "git+https://github.com/axiom-crypto/halo2-gpu.git?branch=develop-v2.1.0#85ad4c2a623ae520fc1454fcb5adf15ec1bb4410"
 dependencies = [
  "ahash",
  "anyhow",
@@ -4360,7 +4360,7 @@ dependencies = [
 [[package]]
 name = "halo2-base"
 version = "0.5.4"
-source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.5.4#a69fdee77f41bdd48ad658b69673dea5a0815db4"
+source = "git+https://github.com/axiom-crypto/halo2-lib.git?branch=develop-v2.1.0#d59f41ac884d18a985025090a227fa6733398ae8"
 dependencies = [
  "getset",
  "halo2-axiom",
@@ -4381,7 +4381,7 @@ dependencies = [
 [[package]]
 name = "halo2-ecc"
 version = "0.5.4"
-source = "git+https://github.com/axiom-crypto/halo2-lib.git?tag=v0.5.4#a69fdee77f41bdd48ad658b69673dea5a0815db4"
+source = "git+https://github.com/axiom-crypto/halo2-lib.git?branch=develop-v2.1.0#d59f41ac884d18a985025090a227fa6733398ae8"
 dependencies = [
  "halo2-base",
  "itertools 0.11.0",
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7051,7 +7051,7 @@ dependencies = [
 [[package]]
 name = "openvm-codec-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7094,7 +7094,7 @@ dependencies = [
 [[package]]
 name = "openvm-cpu-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.7.0",
@@ -7119,7 +7119,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "derive-new 0.7.0",
  "getset",
@@ -7146,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "cc",
  "glob",
@@ -7155,7 +7155,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "bytesize",
  "ctor",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8005,7 +8005,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -8040,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?tag=v2.0.0#16d60de724c21dcadfde7d8315a1db507e5832d7"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
 dependencies = [
  "dashmap",
  "derive-new 0.7.0",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12816,7 +12816,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12828,7 +12828,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12843,7 +12843,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12855,7 +12855,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "serde",
 ]
@@ -12863,7 +12863,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12876,7 +12876,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 
 [[package]]
 name = "ryu"
@@ -13420,7 +13420,7 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 [[package]]
 name = "snark-verifier"
 version = "0.2.6"
-source = "git+https://github.com/axiom-crypto/snark-verifier.git?tag=v0.2.6#364e82654c746b063aff528d8cb660890908278a"
+source = "git+https://github.com/axiom-crypto/snark-verifier.git?branch=develop-v2.1.0#369f98ff87dbdde689ec576aa9c5fd2609599481"
 dependencies = [
  "halo2-base",
  "halo2-ecc",
@@ -13441,7 +13441,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.2.6"
-source = "git+https://github.com/axiom-crypto/snark-verifier.git?tag=v0.2.6#364e82654c746b063aff528d8cb660890908278a"
+source = "git+https://github.com/axiom-crypto/snark-verifier.git?branch=develop-v2.1.0#369f98ff87dbdde689ec576aa9c5fd2609599481"
 dependencies = [
  "bincode 1.3.3",
  "ethereum-types",
@@ -13477,7 +13477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13734,7 +13734,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14975,7 +14975,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 19968cdde..2135ceaaf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,7 +126,7 @@ openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", branc
 openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-sdk-config = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-build = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2.1.0", default-features = false }
 
 # crates/kzg
 hex = { version = "0.4.3", default-features = false }
diff --git a/bin/reth-benchmark/Cargo.toml b/bin/reth-benchmark/Cargo.toml
index 5f8f8f96b..63306b14d 100644
--- a/bin/reth-benchmark/Cargo.toml
+++ b/bin/reth-benchmark/Cargo.toml
@@ -46,8 +46,8 @@ reth-ethereum-primitives.workspace = true
 # Note: the openvm-sdk commit does not need to be exactly the same as the `openvm` commit used in the guest program: as long as
 # the openvm-sdk commit doesn't change any guest libraries, they are compatible
 # This allows us to not update revm and openvm-kzg each time we change openvm-sdk
-openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false }
-openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v2.0.0", default-features = false, optional = true }
+openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2.1.0", default-features = false }
+openvm-cuda-backend = { git = "https://github.com/openvm-org/stark-backend.git", branch = "develop-v2.1.0", default-features = false, optional = true }
 openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm.workspace = true
 openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 393f86486..1a28cae23 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4268b8c5eb9d0818419b20fb9edf56d357c829cf"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 49c6aeab2169d7fce3b575bd5a701c3dfee1439b Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 21 Jul 2026 20:14:48 +0200
Subject: [PATCH 29/94] chore: update lock files

---
 Cargo.lock                     | 182 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fdd259ff..31793aa82 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7051,7 +7051,7 @@ dependencies = [
 [[package]]
 name = "openvm-codec-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7094,7 +7094,7 @@ dependencies = [
 [[package]]
 name = "openvm-cpu-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.7.0",
@@ -7119,7 +7119,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "derive-new 0.7.0",
  "getset",
@@ -7146,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "cc",
  "glob",
@@ -7155,7 +7155,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "bytesize",
  "ctor",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8005,7 +8005,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -8040,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#8f23bfc4b209869aab8cd57ac0100f3bd0277c6b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
 dependencies = [
  "dashmap",
  "derive-new 0.7.0",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12816,7 +12816,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12828,7 +12828,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12843,7 +12843,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-transpiler",
@@ -12855,7 +12855,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "serde",
 ]
@@ -12863,7 +12863,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12876,7 +12876,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 
 [[package]]
 name = "ryu"
@@ -13477,7 +13477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13734,7 +13734,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14975,7 +14975,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 1a28cae23..fdcaf121e 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#4c6f73dfe0b455b5e57d34da246ab5a7bd6d34ff"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 2e121357cc01a4f2227deb18e35d8e9482704485 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 21 Jul 2026 21:33:33 +0200
Subject: [PATCH 30/94] chore: update lock files

---
 Cargo.lock                     | 170 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 104 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 31793aa82..54d7a0d12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,10 +12804,11 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
+ "p3-keccak-air",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
@@ -12816,7 +12817,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12828,7 +12829,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12843,9 +12844,10 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-instructions",
+ "openvm-sha2-air",
  "openvm-sha2-transpiler",
  "rvr-openvm-build",
  "rvr-openvm-ir",
@@ -12855,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "serde",
 ]
@@ -12863,7 +12865,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12876,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 
 [[package]]
 name = "ryu"
@@ -13477,7 +13479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13734,7 +13736,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14975,7 +14977,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index fdcaf121e..b86cb5ed5 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#1bb0601a0ae9ecc5922bac7b9731926d0e9922a8"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 92bdb73ace910b8879ae42d5e89346d64f136f0a Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 22 Jul 2026 14:24:18 +0200
Subject: [PATCH 31/94] chore: update script

---
 scripts/ethproofs_analyzer.py | 49 +++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/scripts/ethproofs_analyzer.py b/scripts/ethproofs_analyzer.py
index b60d96ad0..d2840fc0f 100755
--- a/scripts/ethproofs_analyzer.py
+++ b/scripts/ethproofs_analyzer.py
@@ -74,6 +74,7 @@
 # Column widths (chars).
 COL_RANK, COL_BLOCK, COL_GAS, COL_TXS = 4, 10, 14, 5
 COL_TIME, COL_TIMESTAMP, COL_RATIO, COL_ZKVM = 13, 19, 8, 18
+ABS_BLOCK, ABS_TARGET_TIME, ABS_CLOSEST_TIME, ABS_CLOSEST_ZKVM = range(4)
 REL_BLOCK, REL_TARGET_TIME, REL_FASTEST_TIME, REL_FASTEST_ZKVM, REL_SLOWDOWN = range(5)
 
 # Statistics available as proving-time metrics, keyed by their CLI name.
@@ -121,6 +122,28 @@ def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
         print("| " + " | ".join(cell(v, w, a) for v, (_, w, a) in zip(row, columns)) + " |")
 
 
+def comparison_time_columns(target_zkvm: str, relationship: str) -> list[tuple[str, int, str]]:
+    """Consistent target/competitor columns for comparison tables."""
+    return [
+        (f"{target_zkvm} Time", COL_TIME, "<"),
+        (f"{relationship} Other", COL_TIME, "<"),
+        (f"{relationship} zkVM", COL_ZKVM, "<"),
+    ]
+
+
+def comparison_time_cells(
+    target_time: float,
+    other_time: float | None,
+    other_zkvm: str | None,
+) -> tuple[str, str, str]:
+    """Format the shared target/competitor cells, including missing competitors."""
+    return (
+        fmt_time(target_time),
+        fmt_time(other_time) if other_time is not None else "N/A",
+        other_zkvm or "N/A",
+    )
+
+
 # --- Data access ------------------------------------------------------------
 
 
@@ -385,7 +408,8 @@ def analyze_comparison(
     """Find blocks where the target prover (default OpenVM 2.0 / Axiom) was slow.
 
     Two tables:
-      1. ABSOLUTE  - blocks where the target's own proving time was highest.
+      1. ABSOLUTE  - blocks where the target's own proving time was highest,
+                     alongside the closest other completed proof.
       2. RELATIVE  - blocks where the target trailed the fastest *other* prover by
                      the largest ratio (target time / fastest competitor).
     """
@@ -394,7 +418,7 @@ def analyze_comparison(
         print("No blocks found in the response.")
         return
 
-    absolute = []  # (block, target_time)
+    absolute = []  # (block, target_time, closest_other_time, closest_other_zkvm)
     relative = []  # (block, target_time, fastest_other_time, fastest_other_zkvm, ratio)
     for block in rows:
         proofs = block.get("proofs", [])
@@ -407,11 +431,14 @@ def analyze_comparison(
         if not target:
             continue
         t = min(target)  # target's fastest completed proof for this block
-        absolute.append((block, t))
         if others:
+            closest = min(others, key=lambda p: abs(p["proving_time"] - t))
+            absolute.append((block, t, closest["proving_time"], proof_zkvm_label(closest)))
             fastest = min(others, key=lambda p: p["proving_time"])
             fastest_time = fastest["proving_time"]
             relative.append((block, t, fastest_time, proof_zkvm_label(fastest), t / fastest_time))
+        else:
+            absolute.append((block, t, None, None))
 
     label = target_zkvm + (f" / {target_cluster}" if target_cluster else "")
     print(f"**Target prover:** {label}")
@@ -422,14 +449,15 @@ def analyze_comparison(
         print(f"No completed proofs found for {target_zkvm}.")
         return
 
-    top_abs = sorted(absolute, key=lambda x: x[1], reverse=True)[:top_k]
+    top_abs = sorted(absolute, key=lambda x: x[ABS_TARGET_TIME], reverse=True)[:top_k]
     print(f"## Top {top_k} blocks where {target_zkvm} was SLOWEST (absolute)\n")
     print_table(
-        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"), ("Time", COL_TIME, "<"),
+        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
+         *comparison_time_columns(target_zkvm, "Closest"),
          ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
-        [(rank, b.get("block_number"), fmt_time(t), fmt_gas(b.get("gas_used")),
-          b.get("transaction_count") or "N/A")
-         for rank, (b, t) in enumerate(top_abs, 1)],
+        [(rank, b.get("block_number"), *comparison_time_cells(t, closest_time, closest_zkvm),
+          fmt_gas(b.get("gas_used")), b.get("transaction_count") or "N/A")
+         for rank, (b, t, closest_time, closest_zkvm) in enumerate(top_abs, 1)],
     )
 
     if not relative:
@@ -440,9 +468,8 @@ def analyze_comparison(
     print(f"\n## Top {top_k} blocks where {target_zkvm} trailed the FASTEST other prover\n")
     print_table(
         [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-         (f"{target_zkvm} Time", COL_TIME, "<"), ("Fastest Other", COL_TIME, "<"),
-         ("Fastest zkVM", COL_ZKVM, "<"), ("Slowdown", COL_RATIO, ">")],
-        [(rank, b.get("block_number"), fmt_time(t), fmt_time(fastest), fastest_zkvm,
+         *comparison_time_columns(target_zkvm, "Fastest"), ("Slowdown", COL_RATIO, ">")],
+        [(rank, b.get("block_number"), *comparison_time_cells(t, fastest, fastest_zkvm),
           f"{ratio:.2f}x")
          for rank, (b, t, fastest, fastest_zkvm, ratio) in enumerate(top_rel, 1)],
     )

From cdf731f6f98dab1366df285ed2b3c9575ce8465f Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 22 Jul 2026 19:58:25 +0200
Subject: [PATCH 32/94] chore: update lock files

---
 Cargo.lock                     | 172 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 54d7a0d12..72871b516 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12727,26 +12727,26 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
- "openvm-riscv-guest",
  "rvr-openvm-build",
  "rvr-openvm-ir",
  "rvr-openvm-lift",
+ "rvr-state",
  "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12817,7 +12817,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12829,7 +12829,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12844,7 +12844,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12857,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "serde",
 ]
@@ -12865,12 +12865,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "libloading",
  "openvm-instructions",
- "openvm-riscv-transpiler",
  "openvm-stark-backend",
+ "rustc-hash 2.1.3",
  "rvr-openvm-ir",
  "thiserror 1.0.69",
 ]
@@ -12878,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 
 [[package]]
 name = "ryu"
@@ -13479,7 +13479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13736,7 +13736,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14977,7 +14977,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index b86cb5ed5..b8c09a93f 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#fc1a0001e63d5685fb40c1ffb10c6ce0d55677ce"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From e494bcf83095e7f4dae6c1d1024258a51f46b5c9 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 22 Jul 2026 22:31:34 +0200
Subject: [PATCH 33/94] chore: update lock files

---
 Cargo.lock                     | 168 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72871b516..a7ee8438e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "blstrs",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12817,7 +12817,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12829,7 +12829,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12844,7 +12844,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12857,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "serde",
 ]
@@ -12865,7 +12865,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12878,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 
 [[package]]
 name = "ryu"
@@ -13479,7 +13479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13736,7 +13736,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14977,7 +14977,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index b8c09a93f..0cf0d85e1 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#6175c87882c37b8b0a4dba0cee773a97701c150d"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 1dd8ddf53f81ad3eb44720d9fb793bfca86631fc Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 24 Jul 2026 13:38:52 +0200
Subject: [PATCH 34/94] chore: update lock files

---
 Cargo.lock                     | 170 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7ee8438e..38750130c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,9 +7576,9 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
- "blstrs",
+ "blst",
  "halo2curves-axiom 0.7.3",
  "hex-literal",
  "itertools 0.14.0",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12817,7 +12817,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12829,7 +12829,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12844,7 +12844,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12857,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "serde",
 ]
@@ -12865,7 +12865,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12878,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 
 [[package]]
 name = "ryu"
@@ -13479,7 +13479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13736,7 +13736,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14977,7 +14977,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 0cf0d85e1..615da765e 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#839f7948e82a8aa7efd6f42e26b4b2cc8dd62125"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 1c92bd1d135cd0d78d99b78568c454ed748e12ff Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 24 Jul 2026 15:03:10 +0200
Subject: [PATCH 35/94] chore: install llvm deps

---
 .github/workflows/reth-benchmark.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/reth-benchmark.yml b/.github/workflows/reth-benchmark.yml
index da3c4bed6..d1a1ed9c6 100644
--- a/.github/workflows/reth-benchmark.yml
+++ b/.github/workflows/reth-benchmark.yml
@@ -322,6 +322,8 @@ jobs:
       - name: Install clang-22 and lld
         if: ${{ (inputs.exec_mode || github.event.inputs.exec_mode || 'rvr') == 'rvr' }}
         run: |
+          sudo apt-get update
+          sudo apt-get install -y lsb-release wget software-properties-common gnupg
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 22

From 90265cbcc8285625db4c775ea473c9ff05b4fe5b Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 24 Jul 2026 17:33:30 +0200
Subject: [PATCH 36/94] chore: update lock files

---
 Cargo.lock                     | 182 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  36 +++----
 2 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38750130c..37971507d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6787,7 +6787,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6825,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6835,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6877,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6916,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6962,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7020,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7051,7 +7051,7 @@ dependencies = [
 [[package]]
 name = "openvm-codec-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
@@ -7062,7 +7062,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7094,7 +7094,7 @@ dependencies = [
 [[package]]
 name = "openvm-cpu-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.7.0",
@@ -7119,7 +7119,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "derive-new 0.7.0",
  "getset",
@@ -7146,7 +7146,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "cc",
  "glob",
@@ -7155,7 +7155,7 @@ dependencies = [
 [[package]]
 name = "openvm-cuda-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "bytesize",
  "ctor",
@@ -7182,7 +7182,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7192,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7229,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7238,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7254,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7292,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7311,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,7 +7460,7 @@ dependencies = [
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7518,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7576,7 +7576,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7597,7 +7597,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7610,7 +7610,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7620,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7638,7 +7638,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7666,7 +7666,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7758,7 +7758,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7790,7 +7790,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7799,7 +7799,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7852,7 +7852,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7892,7 +7892,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7929,7 +7929,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7938,7 +7938,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7952,7 +7952,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7983,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-platform",
 ]
@@ -7991,7 +7991,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8005,7 +8005,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-backend"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -8040,7 +8040,7 @@ dependencies = [
 [[package]]
 name = "openvm-stark-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#7a425b64a7f037da3ee642f0dc7128494e2f458b"
+source = "git+https://github.com/openvm-org/stark-backend.git?branch=develop-v2.1.0#be2b6983cbd70976b37acbb72ceb1b3593dc67ae"
 dependencies = [
  "dashmap",
  "derive-new 0.7.0",
@@ -8128,7 +8128,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8152,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "elf",
  "eyre",
@@ -8167,7 +8167,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8197,7 +8197,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8236,7 +8236,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9117,7 +9117,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12605,7 +12605,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12664,7 +12664,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12685,7 +12685,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12727,7 +12727,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12741,12 +12741,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12763,7 +12763,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12777,7 +12777,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12791,7 +12791,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12804,7 +12804,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12817,7 +12817,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12829,7 +12829,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12844,7 +12844,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12857,7 +12857,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "serde",
 ]
@@ -12865,7 +12865,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12878,7 +12878,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 
 [[package]]
 name = "ryu"
@@ -13479,7 +13479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13736,7 +13736,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14977,7 +14977,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 615da765e..0ad676aa7 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2465,7 +2465,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2475,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2551,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2565,7 +2565,7 @@ version = "0.4.0"
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2575,7 +2575,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-platform",
 ]
@@ -2599,7 +2599,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2622,7 +2622,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "group",
  "hex-literal",
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2664,7 +2664,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2695,7 +2695,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2704,7 +2704,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2713,7 +2713,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "openvm-platform",
 ]
@@ -2772,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#421fdf15472f22f7f51c13b9655edf63c7c5c2c9"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 1cb5e1471381d91382a48cf7c6b36aaaa6cc88ef Mon Sep 17 00:00:00 2001
From: Ayush Shukla <shuklaayush247@gmail.com>
Date: Mon, 27 Jul 2026 20:51:39 +0200
Subject: [PATCH 37/94] chore: drop `openvm-guest-mem` in favour of
 `openvm-mem` (#682)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: drop openvm-guest-mem in favour of openvm-mem

`openvm-mem`, added upstream in openvm-org/openvm#feat/openvm-mem-intrinsics,
defines strong `memcpy`/`memset`/`memmove`/`memcmp`/`bcmp` for the guest.
Ours defined `memcmp`/`bcmp` too, so linking both fails:

    rust-lld: error: duplicate symbol: bcmp
    rust-lld: error: duplicate symbol: memcmp

The upstream implementation subsumes this crate. It is also faster,
because it does not require the two pointers to share an alignment —
instructions executed comparing 256 equal bytes:

    a%8  b%8   openvm-guest-mem   openvm-mem
      0    0                236          231
      3    3                306          231
      0    3               1798          231

This crate byte-walks whenever `a % 8 != b % 8`, which is common for
hashes and RLP node references read at arbitrary offsets.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

* chore: remove empty guest dependency table

---------

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 Cargo.lock                           |   5 --
 Cargo.toml                           |   2 -
 bin/stateless-guest/Cargo.lock       |   5 --
 crates/guest-mem/Cargo.toml          |  12 ---
 crates/guest-mem/src/lib.rs          | 126 ---------------------------
 crates/stateless-executor/Cargo.toml |   3 -
 crates/stateless-executor/src/lib.rs |   5 --
 7 files changed, 158 deletions(-)
 delete mode 100644 crates/guest-mem/Cargo.toml
 delete mode 100644 crates/guest-mem/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 37971507d..658156f5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7332,10 +7332,6 @@ dependencies = [
  "strum 0.26.3",
 ]
 
-[[package]]
-name = "openvm-guest-mem"
-version = "0.4.0"
-
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
@@ -8080,7 +8076,6 @@ dependencies = [
  "bumpalo",
  "itertools 0.14.0",
  "openvm-chainspec",
- "openvm-guest-mem",
  "openvm-mpt",
  "openvm-revm-crypto",
  "reth-consensus",
diff --git a/Cargo.toml b/Cargo.toml
index 2135ceaaf..19035c747 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,6 @@ members = [
     "crates/mpt",
     "crates/revm-crypto",
     "crates/stateless-executor",
-    "crates/guest-mem",
     "crates/chainspec",
     "crates/stateless-witness",
     "crates/mpt-tools",
@@ -62,7 +61,6 @@ openvm-curve-utils = { path = "./crates/curve-utils", default-features = false }
 openvm-kzg = { path = "./crates/kzg", default-features = false }
 openvm-mpt = { path = "./crates/mpt" }
 openvm-revm-crypto = { path = "./crates/revm-crypto" }
-openvm-guest-mem = { path = "./crates/guest-mem" }
 openvm-stateless-executor = { path = "./crates/stateless-executor" }
 openvm-chainspec = { path = "./crates/chainspec" }
 # workspace (host only)
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 0ad676aa7..6a040d285 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2558,10 +2558,6 @@ dependencies = [
  "syn 2.0.118",
 ]
 
-[[package]]
-name = "openvm-guest-mem"
-version = "0.4.0"
-
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
@@ -2729,7 +2725,6 @@ dependencies = [
  "bumpalo",
  "itertools 0.14.0",
  "openvm-chainspec",
- "openvm-guest-mem",
  "openvm-mpt",
  "openvm-revm-crypto",
  "reth-consensus",
diff --git a/crates/guest-mem/Cargo.toml b/crates/guest-mem/Cargo.toml
deleted file mode 100644
index a448912d4..000000000
--- a/crates/guest-mem/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "openvm-guest-mem"
-description = "Optimized mem* routines for the OpenVM guest target"
-version.workspace = true
-edition.workspace = true
-homepage.workspace = true
-repository.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
diff --git a/crates/guest-mem/src/lib.rs b/crates/guest-mem/src/lib.rs
deleted file mode 100644
index d936ab87e..000000000
--- a/crates/guest-mem/src/lib.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-//! Word-at-a-time `memcmp`/`bcmp` for the guest.
-//!
-//! `openvm` ships optimized `memcpy`/`memset` assembly, but `memcmp` falls
-//! back to compiler-builtins' byte-at-a-time loop, which costs several
-//! instructions per byte on rv32. Slice equality on byte-array types (`U256`
-//! words in the EVM interpreter, hashes, RLP node references) lowers to
-//! `memcmp`/`bcmp` calls, making this one of the hottest functions in the
-//! guest. The strong symbols defined here override compiler-builtins' weak
-//! definitions at link time.
-//!
-//! `#![no_builtins]` prevents LLVM from recognizing the comparison loop as a
-//! memcmp idiom and lowering it back into a `memcmp` libcall.
-
-#![no_std]
-#![no_builtins]
-
-// The word-compare path derives the first differing byte from the least
-// significant differing bits, which is only correct on little-endian targets.
-const _: () = assert!(cfg!(target_endian = "little"));
-
-const WORD: usize = core::mem::size_of::<usize>();
-
-/// Compares `n` bytes at `a` and `b` with C `memcmp` semantics, reading a
-/// word at a time when both pointers share the same alignment.
-///
-/// # Safety
-///
-/// `a` and `b` must be valid for reads of `n` bytes.
-pub unsafe fn compare_bytes(mut a: *const u8, mut b: *const u8, mut n: usize) -> i32 {
-    unsafe {
-        if a.addr() % WORD == b.addr() % WORD {
-            while a.addr() % WORD != 0 && n > 0 {
-                let (x, y) = (*a, *b);
-                if x != y {
-                    return i32::from(x) - i32::from(y);
-                }
-                a = a.add(1);
-                b = b.add(1);
-                n -= 1;
-            }
-            while n >= WORD {
-                let x = *a.cast::<usize>();
-                let y = *b.cast::<usize>();
-                if x != y {
-                    // Little-endian: the lowest differing byte address holds
-                    // the least significant differing byte of the word.
-                    let shift = ((x ^ y).trailing_zeros() / 8) * 8;
-                    return i32::from((x >> shift) as u8) - i32::from((y >> shift) as u8);
-                }
-                a = a.add(WORD);
-                b = b.add(WORD);
-                n -= WORD;
-            }
-        }
-        while n > 0 {
-            let (x, y) = (*a, *b);
-            if x != y {
-                return i32::from(x) - i32::from(y);
-            }
-            a = a.add(1);
-            b = b.add(1);
-            n -= 1;
-        }
-        0
-    }
-}
-
-#[cfg(target_os = "openvm")]
-mod c_exports {
-    #[unsafe(no_mangle)]
-    unsafe extern "C" fn memcmp(a: *const u8, b: *const u8, n: usize) -> i32 {
-        unsafe { super::compare_bytes(a, b, n) }
-    }
-
-    // Equality-only variant of `memcmp`; the compiler emits calls to it for
-    // slice `==` where the ordering is unused.
-    #[unsafe(no_mangle)]
-    unsafe extern "C" fn bcmp(a: *const u8, b: *const u8, n: usize) -> i32 {
-        unsafe { super::compare_bytes(a, b, n) }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::compare_bytes;
-
-    fn reference(a: &[u8], b: &[u8]) -> i32 {
-        for (x, y) in core::iter::zip(a, b) {
-            if x != y {
-                return i32::from(*x) - i32::from(*y);
-            }
-        }
-        0
-    }
-
-    #[test]
-    fn matches_reference_across_alignments_lengths_and_diff_positions() {
-        let mut base = [0u8; 96];
-        for (i, byte) in base.iter_mut().enumerate() {
-            *byte = (i * 37 % 251) as u8;
-        }
-        for a_off in 0..8 {
-            for b_off in 0..8 {
-                for len in 0..48 {
-                    let a = &base[a_off..a_off + len];
-                    let mut b_buf = [0u8; 96];
-                    b_buf[b_off..b_off + len].copy_from_slice(a);
-                    // diff_pos == len leaves the buffers equal.
-                    for diff_pos in 0..=len {
-                        let mut b_buf = b_buf;
-                        if diff_pos < len {
-                            b_buf[b_off + diff_pos] ^= 0x80;
-                        }
-                        let b = &b_buf[b_off..b_off + len];
-                        let got = unsafe { compare_bytes(a.as_ptr(), b.as_ptr(), len) };
-                        assert_eq!(
-                            got,
-                            reference(a, b),
-                            "a_off={a_off} b_off={b_off} len={len} diff_pos={diff_pos}"
-                        );
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/crates/stateless-executor/Cargo.toml b/crates/stateless-executor/Cargo.toml
index bac438196..0ae627d9f 100644
--- a/crates/stateless-executor/Cargo.toml
+++ b/crates/stateless-executor/Cargo.toml
@@ -41,9 +41,6 @@ alloy-consensus = { workspace = true, features = ["crypto-backend", "serde-binco
 alloy-rlp.workspace = true
 alloy-trie.workspace = true
 
-[target.'cfg(target_os = "openvm")'.dependencies]
-openvm-guest-mem.workspace = true
-
 [package.metadata.cargo-machete]
 ignored = ["reth-ethereum-primitives"]
 
diff --git a/crates/stateless-executor/src/lib.rs b/crates/stateless-executor/src/lib.rs
index 7b727eb74..41bb8e9b0 100644
--- a/crates/stateless-executor/src/lib.rs
+++ b/crates/stateless-executor/src/lib.rs
@@ -22,11 +22,6 @@ use reth_revm::db::CacheDB;
 
 use bumpalo::Bump;
 
-// Links the guest's optimized `memcmp`/`bcmp` overrides into every binary
-// that executes blocks inside the zkVM.
-#[cfg(target_os = "openvm")]
-use openvm_guest_mem as _;
-
 use crate::{
     error::StatelessExecutorError,
     io::{StatelessExecutorInput, StatelessExecutorInputWithState},

From b92f5b8cfad03335ca0601087a9bc411e8d7c511 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Mon, 27 Jul 2026 21:15:32 +0200
Subject: [PATCH 38/94] chore: update lock files

---
 Cargo.lock                     | 174 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  42 ++++----
 2 files changed, 114 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 658156f5a..b13b8cec5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,11 +6774,12 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "bytemuck",
  "num-bigint",
  "openvm-custom-insn",
+ "openvm-mem",
  "openvm-platform",
  "openvm-riscv-guest",
  "serde",
@@ -6787,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6825,7 +6826,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6835,7 +6836,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6851,7 +6852,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6863,7 +6864,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6877,7 +6878,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6887,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6916,7 +6917,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6925,7 +6926,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6940,7 +6941,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6962,7 +6963,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7009,7 +7010,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7020,7 +7021,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7040,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7062,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7182,7 +7183,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7192,12 +7193,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7229,7 +7230,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7238,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7254,7 +7255,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7292,7 +7293,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7311,7 +7312,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7321,7 +7322,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7335,7 +7336,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7352,7 +7353,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7361,7 +7362,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7371,7 +7372,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7401,7 +7402,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-platform",
 ]
@@ -7409,7 +7410,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7448,15 +7449,20 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "syn 2.0.118",
 ]
 
+[[package]]
+name = "openvm-mem"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7514,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7538,7 +7544,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7572,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7593,7 +7599,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7606,7 +7612,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7616,7 +7622,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7634,7 +7640,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7662,7 +7668,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7737,7 +7743,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7754,7 +7760,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7786,7 +7792,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7795,7 +7801,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7848,7 +7854,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7888,7 +7894,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7925,7 +7931,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7934,7 +7940,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7948,7 +7954,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7979,7 +7985,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-platform",
 ]
@@ -7987,7 +7993,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8123,7 +8129,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8147,7 +8153,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "elf",
  "eyre",
@@ -8162,7 +8168,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8192,7 +8198,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8231,7 +8237,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9112,7 +9118,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12600,7 +12606,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12659,7 +12665,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12680,7 +12686,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12722,7 +12728,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12736,12 +12742,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12758,7 +12764,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12772,7 +12778,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12786,7 +12792,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12799,7 +12805,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12812,7 +12818,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12824,7 +12830,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12839,7 +12845,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12852,7 +12858,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "serde",
 ]
@@ -12860,7 +12866,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12873,7 +12879,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 
 [[package]]
 name = "ryu"
@@ -13474,7 +13480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13731,7 +13737,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14972,7 +14978,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 6a040d285..d04a42535 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,13 +2450,14 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
  "getrandom 0.3.4",
  "num-bigint",
  "openvm-custom-insn",
+ "openvm-mem",
  "openvm-platform",
  "openvm-riscv-guest",
  "serde",
@@ -2465,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2475,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2491,7 +2492,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2522,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2532,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2551,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2561,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2571,7 +2572,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-platform",
 ]
@@ -2595,11 +2596,16 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "syn 2.0.118",
 ]
 
+[[package]]
+name = "openvm-mem"
+version = "2.0.0"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+
 [[package]]
 name = "openvm-mpt"
 version = "0.4.0"
@@ -2618,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "group",
  "hex-literal",
@@ -2641,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2660,7 +2666,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2691,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2700,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2709,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "openvm-platform",
 ]
@@ -2767,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#c9ef65abc10d18f3da62a8bcb6e52d62540d2f8e"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From 1c1e2eff888c7ca089153dc8f45550dcf312fe79 Mon Sep 17 00:00:00 2001
From: Valery <valery@intrinsictech.xyz>
Date: Sat, 25 Jul 2026 10:54:11 +0100
Subject: [PATCH 39/94] perf(mpt): compare node reference digests as words

The digest comparison during decoding ran a byte at a time, five instructions per byte, because
a slice comparison of unknown length becomes a `memcmp` call. Fixing the length to 32 at the
three sites where one side is a full digest lets it compile to four word loads per side and an
XOR chain instead. Shorter references keep the byte loop, which is still the cheaper form for
them.
---
 crates/mpt/src/tests.rs | 41 +++++++++++++++++++++++++++++++++++++++++
 crates/mpt/src/trie.rs  | 28 +++++++++++++++++++++++-----
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/crates/mpt/src/tests.rs b/crates/mpt/src/tests.rs
index 58f9a5231..9d4ebb82a 100644
--- a/crates/mpt/src/tests.rs
+++ b/crates/mpt/src/tests.rs
@@ -229,6 +229,47 @@ fn test_serde_keccak_trie() -> Result<(), Error> {
     Ok(())
 }
 
+/// A child reference that disagrees with the child's own encoding must be rejected. Decoding
+/// compares the two for their whole length, so accepting one would mean accepting a witness that
+/// does not hash to the claimed root. Every byte of the digest is checked, including the last,
+/// which is what a comparison that stopped short would miss.
+#[cfg(feature = "host")]
+#[test]
+fn test_serde_rejects_corrupted_digest_reference() -> Result<(), Error> {
+    const N: usize = 64;
+
+    let bump = bumpalo::Bump::new();
+    let mut trie = Mpt::new(&bump);
+    for i in 0..N {
+        assert!(trie.insert_rlp(keccak256(i.to_be_bytes()).as_slice(), i)?);
+    }
+    let encoded = trie.encode_trie();
+
+    // Sanity check that the unmodified encoding decodes, so a rejection below is the corruption
+    // and not an unrelated failure.
+    Mpt::decode_trie(&bump, &mut encoded.as_slice(), trie.num_nodes())?;
+
+    // The first 32-byte RLP string in the encoding is a digest reference. Corrupting a byte of
+    // its payload leaves every length in the encoding intact, so the reference comparison is the
+    // only thing that can catch it.
+    let digest_header = alloy_rlp::EMPTY_STRING_CODE + 32;
+    let header_at = encoded.iter().position(|&b| b == digest_header).expect("a digest reference");
+
+    for offset in [1, 16, 32] {
+        let mut corrupted = encoded.clone();
+        corrupted[header_at + offset] ^= 0x01;
+        assert!(
+            matches!(
+                Mpt::decode_trie(&bump, &mut corrupted.as_slice(), trie.num_nodes()),
+                Err(Error::NodeRefMismatch)
+            ),
+            "corrupting digest byte {offset} was not rejected"
+        );
+    }
+
+    Ok(())
+}
+
 /// Test that deleting a key that would cause branch collapse fails if sibling is unresolved Digest.
 /// This tests the soundness fix: we must not assume an unresolved Digest is a Branch node.
 #[test]
diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index d0d67f2ff..28dd05785 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -26,6 +26,9 @@ const MIN_ALIGN: usize = 4;
 /// Initial capacity of [`MptTrie`]'s `rlp_scratch`.
 const RLP_SCRATCH_INIT_CAPACITY: usize = 600;
 
+/// Length of a node reference that is a keccak digest rather than the node's own encoding.
+const DIGEST_LEN: usize = 32;
+
 /// Sentinel index representing the null node when decoding and in internal references.
 /// In a default MPT, `nodes[0]` starts as `Null`, but the root may later be changed to a
 /// non-null node (e.g. `Digest`) for convenience. `NULL_NODE_ID` is still used by the decoder
@@ -112,14 +115,29 @@ fn is_null_ref(slice: &[u8]) -> bool {
     matches!(slice, [byte] if *byte == alloy_rlp::EMPTY_STRING_CODE)
 }
 
-/// Byte-slice equality as an explicit loop. Slice `==` compiles to a `memcmp` call; the node
-/// references compared during decoding are at most 33 bytes, where the call overhead dominates
-/// an inline loop.
+/// Byte-slice equality as an explicit loop. Slice `==` on slices of unknown length compiles to a
+/// `memcmp` call; the node references compared during decoding are at most 33 bytes, where the
+/// call overhead dominates an inline loop. Prefer [`digest_eq`] whenever one side is a full-length
+/// digest, since a length known at compile time turns the comparison into whole-word loads.
 #[inline(always)]
 fn bytes_eq(a: &[u8], b: &[u8]) -> bool {
     a.len() == b.len() && core::iter::zip(a, b).all(|(x, y)| x == y)
 }
 
+/// Equality against a 32-byte node reference.
+///
+/// Fixing the length lets the comparison stay inline as four word loads per side and an XOR
+/// chain, where a loop over slices of unknown length pays several instructions for every byte.
+/// Slices of different lengths are never equal, so a reference that is not a full digest is
+/// inequality rather than a case to fall back on.
+#[inline(always)]
+fn digest_eq(a: &[u8], b: &[u8]) -> bool {
+    match (<&[u8; DIGEST_LEN]>::try_from(a), <&[u8; DIGEST_LEN]>::try_from(b)) {
+        (Ok(a), Ok(b)) => a == b,
+        _ => false,
+    }
+}
+
 /// Writes an RLP header with the given base code (`EMPTY_LIST_CODE` for lists,
 /// `EMPTY_STRING_CODE` for strings). Emits the same bytes as [`alloy_rlp::Header::encode`], but
 /// is generic over the output buffer: `alloy_rlp` encoding goes through `&mut dyn BufMut`, and
@@ -266,13 +284,13 @@ impl<'a> Mpt<'a> {
                 }
                 NodeRef::Bytes(rlp_node)
             } else if payload_length == 32 && !list {
-                if !bytes_eq(payload, expected_node_ref.as_slice()) {
+                if !digest_eq(payload, expected_node_ref.as_slice()) {
                     return Err(Error::NodeRefMismatch);
                 }
                 expected_node_ref
             } else {
                 let digest = keccak256(rlp_node);
-                if !bytes_eq(digest.as_slice(), expected_node_ref.as_slice()) {
+                if !digest_eq(digest.as_slice(), expected_node_ref.as_slice()) {
                     return Err(Error::NodeRefMismatch);
                 }
                 expected_node_ref

From 112b159c2ed0eccb400a4e1613c1890f3cdaf79b Mon Sep 17 00:00:00 2001
From: Valery <valery@intrinsictech.xyz>
Date: Sat, 25 Jul 2026 11:26:02 +0100
Subject: [PATCH 40/94] perf(mpt): copy digest references with a fixed length

---
 crates/mpt/src/trie.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index 28dd05785..fb6966232 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -138,6 +138,21 @@ fn digest_eq(a: &[u8], b: &[u8]) -> bool {
     }
 }
 
+/// Appends a 32-byte node reference to `out`.
+///
+/// Fixing the length keeps the copy inline as whole-word moves. Handing the buffer a slice whose
+/// length the compiler cannot see turns the copy into a `memcpy` call, and at this size the call
+/// costs more than the bytes it moves — encoding node references is the decoder's busiest copy.
+#[inline(always)]
+fn put_digest<B: alloy_rlp::BufMut>(digest: &[u8], out: &mut B) {
+    match <&[u8; DIGEST_LEN]>::try_from(digest) {
+        Ok(digest) => out.put_slice(digest),
+        // A digest reference always holds `DIGEST_LEN` bytes, so this arm exists only to keep the
+        // function total without a conversion that could panic.
+        Err(_) => out.put_slice(digest),
+    }
+}
+
 /// Writes an RLP header with the given base code (`EMPTY_LIST_CODE` for lists,
 /// `EMPTY_STRING_CODE` for strings). Emits the same bytes as [`alloy_rlp::Header::encode`], but
 /// is generic over the output buffer: `alloy_rlp` encoding goes through `&mut dyn BufMut`, and
@@ -508,7 +523,7 @@ impl<'a> Mpt<'a> {
             // if the reference is a digest, RLP-encode it with its fixed known length
             NodeRef::Digest(digest) => {
                 out.put_u8(alloy_rlp::EMPTY_STRING_CODE + 32);
-                out.put_slice(digest);
+                put_digest(digest, out);
             }
         }
     }

From 877af9109472e1d437daa9ddabb5624ef0576e5d Mon Sep 17 00:00:00 2001
From: Lun-Kai Hsu <lunkai@intrinsictech.xyz>
Date: Wed, 29 Jul 2026 07:10:51 +0000
Subject: [PATCH 41/94] update vk

---
 bin/reth-verify/reth.vm.vk | Bin 90334 -> 91033 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/reth-verify/reth.vm.vk b/bin/reth-verify/reth.vm.vk
index 327ba8cb4ffce69aa022e34c93d1b0af074b50bc..0c416a4bf629faeefa32a9a0475c65375430652f 100644
GIT binary patch
delta 12797
zcmc(GcVJXS*Y`OyyPG8hLhn+f1lUj#L<mwsXaUiLvUe9qAdspA!GgpD-CamFi;9RB
zjRir32qaO|h_N9GRxDs|C}4TSM}5GCC}qFj%-w{b@8|n{??3NMX3o?zXU@!=nRD*u
zix=(pylNli5RR5M5)SFGNe7MZ+Qy-LE8!5tL`AkJM{9?ze>7=V51cw@o3wURZyvBV
zdw|VBDP7E;dh}hp_kw|o!r@6_<!=4~(LGD6!kv7!6xodzi3@lIA7a71cnQxIeYiCG
zW3xGLZ{f@;NDac}gi=HPV5q=+k-M4)d9o-7nuA40bBu7Blf^JcX+bDARAz>NsH}FY
z2*q}CqE}WZ8NnI!W;tzM<x>m1!BXI8?MqGdPVkma@TyQ+R;D6kbcrg|8I><<aKK~N
zJ_P54^JW!<>_&YE1w%OnWqAdmP(eY+8>|l@6qJ?aI`hiC1;BtVIiX;I*Zi>6NS{47
z&q;RW+`(YTiy3%BWeuRr8&o;{cP>@m$f}9-h-8ALx!wYg+wERzFVbj%xYX+{k18uy
zrGIgyK5xU^RHB{*7CST(bSb!?Tv3^)sI)x4D5NsM986NpD>*1bS<YaGkUuM^*b)p;
zFv}SV2GfI-TX21Hd;d6lFePY<%5kD4J99(i^ak_%aMUG8+GjaS{r=<$WvOLlrMaF0
zr#t9fmR|cw>)FoUY8IgoQC{8>`%EH?Q06UlBl6-eghUx8Wv;b%_63~<nu3BHXI56$
zL_~Qu1ajm}3_3&pGJl!7Ks8s9w+wp)D9YSfisLE<G8KF6L9EfazvNseC3}P9^xOSl
zhJPt~M*teDtm1|@=pO|<xlV;U=+_0g*dOSU8?xF2z2z9g%Az#Yy9|U+u+L0(yT|+U
z&zphM4;Fb#6*h$#-8ACd0(+41ob|*hVo`bis06m!z201>s&EHM(W5e|D9iF8l)2S*
z@?!5`)<_~B6=mZbP|?Ml9@Vaam*@DP*EWK|8BA8Y-{}OafdYF@(V~!HG=#ETuOp~Z
z76kb^4{~$;sQ&Mp`~E-M|E0M@^DS31&WntqLs9rQZaK0-eh2oe^DhbC-;4ga1Oqnw
zIWUrT|3#vHXBDIt)Gvnxi%KVGw=~B_dC9(D&hXHAhbk)+$|}gp!}bRZfoh!$h9YM!
z`LF24TS7TUNxv+oGso$V95o!y)KHeqF)>Rork8@)l4_~c@~Oz{@aJ~R@_Wi1II!4F
z!Bn8|Lu^r&pB&CCzdg%uF0r@uS^F^g`l5o;CAp;&u6NHYjk319+5>7c0GT@Vm{71_
zd{#j)v=aL%6mUANc|cTzta$)cC~|rsv>`(r)>I?&E5PaVLpq(eem-Ci7Qi(yG9Bb%
z??c?F$U1Ii?s7#9w!q&GlkQu;Ac`=(MfBED^s8gh=**}Fc^FI$39k4<5Gfj#nF)?I
zzW@4ADRHRSR8+R~x*$7qhTDUsS$%Vyla^pzoLLQ$CNB@j(6C)F<j)C(aH>LCp`bI@
zS>S{e$b-kgK};_gEO07(QB80GH*)P%`mnxP!(kuN+p7Nbx!tut^|+ADT|GNS4L%*-
zIOz``3Ocj-d#~2nQ&v?~5!q})AsYGt(b@13xBalM?eeO3`xh0_$?(ke+_mdmfBELB
z=&GpE+p1!!`d8E3wtM!@b5~YTSASKs+wKonb)9*c`-bE@t3-D?9hRqePqGtbEqr+A
zhn;ZgyL_$z7t(WQW%>sp0jeAr>|`vtn^B9ye0cN4={$Pd9(j5U`Wz3Z%@ikNt73Od
zK^xpw_LIJ%qP6ZA3J=;gdSrh-9OkopHmb<KRnXx_q6zq_@aPEtwnolun|vn9-FBwC
z?E@$|K7ISl{&!C4T~ytF#-Loc8)I7Tg>841%hJ7`CWkl9r;}+mR?iqX0Wab0WH%@G
z85K2wCeTEhXs+(_bd!tdA{q*BtDO+%Ycl2n>Pp?HJN2LosVDUU0;z*Sp<EN{3?Bm+
zLpJzmAZ>~`iX7x5r#U~aqdB{ObX-U3gqmJ-KEB@6hvKL&^`rjeqIl|JCM8_f#0hNC
zz!FuvCgHHN3syPm7{Z_7@Sv07@R$?faN4io@VuYH;l*b8h_7oGUlOv}7KX!d=BY99
zw%KTAx{|N+T@els+Z+z(-*hG%yD1!AwjmsjEk<QI-el|0e;n!-E8J(pQD;%7rla7I
zGvQ@wy!x{5fmw}vIvnm+Plp=+d9?i)<*MCx7)!PJ0_hJyA5fW{#{OtKb|M^QHcj!{
z)IjE%l)>iSlmoW2XTz~(#kkko^yF^fuHs-%_~Fb{#^zPyyV^FZ#O>p|I=-S++)|i3
zAMDnb<G`aqG=zrHB{YV{(ImQ*(r5;GXb#PzZ0g7TxQzSNo*JL;^p$~xRTQAxX&v1|
z_apZ(jptOJ%ITcT1zd<{=XG4f%Q=N^K<&+ZD_7Gx-b(lJX4=e~s2ZCkfSQ%Gi+Ayx
zJdNMw%UIB7JQ?v<JOTCJ^GxBvPO#G)kuP#ZwwN#GiA?cxEAb18Pa*7;uS#^6ADZu7
zHZ*D|s7@!Nw%O%bPG2ufxStN4v8gWMHgpTGVUsKPKHkWic`H}*4zA@oewKIhUVfF|
zz!cx%5BL-QoR9D~{2l+uKk;w;2cKaUcF{yM6Fq^ejp!h{i0-17=quvIU~!QcE=G!E
zF<zvKsUlq{s%KvaLbE_}p1493ipAm@u~Za^5^<9V2(>C$jasJ%yd+8mA8w_!h>14P
zBUDQhz=g}elRR)?5yDc08xev$8MDw0&x_XaGrSIbdWm1xwb_X0>(o3QXCgMht}?m;
zabq_<1_f*Av=|^?mamzg&KqTCnntO$ow5emq8_0g^e8=6o1U{%b{ytXE=tFZBQ}4^
zZ(TdMU?%(G)BFKcxf5Jz@dF}l+zS#CRC0hT-sMVEwTUhxKFu(YZE%75*1DvkrlG>+
z(w$u{Uy|WZN{e?JMgT6YQ3IC&r}I85PSPOFi1%k20Z*}_sNNYyqASf%B*3YDsz3!7
z5W9?Yg-6%9k#e6miiN@#0J^|5Ydkdt)z3l)8m%^I*^OLDhDRf`s<tOvuu+WpCAcvE
z_zfCQBd&l@jHNiEQ?3l7flb3)X|A+{v?v>H9f(2)Vxs2esVi4^YmP(Tmpjt{9>_zu
zC&lx{h?BTK$_8@0`QpNk=7ELLJ>q!AKYNo4JDM#DodX5}(?5BlQtYpC4q=Qo=AgnP
zGr7=dK2n&%-OQ^CFERav4&MO&XHPVPUly;5*Tfs*O)(tl*ZxOPN}IIHDCv~1i8yX1
zn<IyGqKG8^-(l_6MP`SdWi$e(rVLlf8pyg4G?nhA9*}(x(nC~*l1Jz<(;b{)Uqf}Y
z-dsDVr}<^Do%!aVR=#T5N}FjDJsI&M0M8Foflc`*seo0@5*-)mcm$=ur-G|#fYk`u
zd<O^U4#?0Hob7wzHzPHVAB5k8R3=x!S3}}HhLAm)=kq+yL~<QH&(HHzz^NcWiP{u;
zkKc!YNuf{pQ;3=rI>KK<<fhPf{BOih>8Z3f-wpQBQ&|N8JVz{o5MGRM4Z`(e83b}M
z!i@-igi=ukX%|Ac1>rV?wFq~LyCAghL0FHl5#d3EN`&pA3c~zhghvr-5uQYN8sRyF
z7sQK@pD!W2Dl*f>J|x~kIDqgT!iNZ-iqAxb_yXYw!q*7jBK#ZSM}*^Ix;P;e7uRFu
z>ZqGsL;09~{W=XY_YCUdT8}czN6VfvAAGjftQwq70ju7SyTPu@z@iD}noxG9E@b&}
zIB%V?I(S?mHJ!X<cE7b(ZQoVzHy^N>o}=xw3z(j#O4?1YBfksj-Sl2V>R^4!3>S^5
zEx7xSCOvv{9F9*s4%%RZi*Q(n;rNcg(e2NDc?^yckMAM+>x<h=9^c*9^S`~a$Kt|P
zNLS(ZUCp=iT3*L@^4)w7ujl*u0p7%0xRST=cCO)v`B8q1pWvPR6hF<+;ZA;mU*wng
zWqu8J%A5Qa@5c@O9)HLmVat5RUnIi5^d*1A|Ke}4XTInE@G<_Gf8i7SJO9b2@VX4M
z5EACCC=o51ismBLyleB&rW3_vF-2S^E*H}(e(1v;+g>kj5X*&6tPpK5<$Or5t<?FB
zEkmcRq`f409PQ^}xTwo;6<>s#a~KzjT3pJ*u@~!bHIKx8d=?jUGVa&i%(#S$#9p@J
zDlQSPauZz0H;Fg68Ls6(t$&Nzp*Pfcx|vqvnR5r-Nq1pS+>6t_5odKP);}LNUVxr3
z2k)BZJ48q58#+qg!yl(#=mf$qbcTqJlbw&^zK!8n-a&2o2zBB!)D2JIPO6+wK<c(d
zOsL&~_ypS8DVZ%lk*DzGJY7p)H@n#bKMQ^ij_W)e+icF~EBHzuFXpTH8eYaXa54MX
z51ZZyx)R%N6_#@i7Bq#{;M%_vPnx@tUXR7yh-FQoEl6#}!lqCSQZ?XSAw7-<n6<f|
z#nP$=&&yckS9zaa+5>32UoUP79po>twkhQMS}$%2{lGu49W&nn4#Z%dcCh<63A~8D
zr>0^pIMhnC<@TZzcjK<22i`?-qQ4k`m(daMVVD>pM&WfdPN=2-hAtODo+Yltqi7gi
zDb(BU7g~z+4&+WC7sL7D46PKyd>H6TafauJ<CHH1WQ<*`LqkI8_h{G@a%e5(ildY*
zT8V9_X^WcnkW`(3q8sOmu8=@IAZvPw-KdSjp#4!h0R097+Y$7O=lNn7<jn~230jOo
zi)6GIhZYlsFBkM?gW~zvtn)y%k|uwMKSe%ukwAi-(?|A}>2er448}ks(54s2If}R3
zFd*oKev9Qba-vu!?ciXX@XKZLIF-v=WU{zjt|h;Ou~pm$Z1Fq_t#+WNT~y0Q<aSxr
zQ$7Lj0{R}9r$Vq2PiQ;6C7;JZ`~*+b@7Nr>y_dOq_vnrn({SwQQTn+*i6-Om-Uf2X
zLn*Zfcb{tRdI6fy9)y<=UZs5qFChOCQZGf)`*a@VX7cti=AznmwVwUiO&oy?k0)b`
zx$EPBzT%9MdXE=aAmAzSYp5cL=VkMmsX7?N#ommPVgt3A))NbHqi2nJ&UiK$8Af%E
z$6H(<l^7dxN{Ta<XZSrvO<+Z)QMIBxprXo}=`|`VR+O7FKLHs=#+EG^4TwDke6fL2
zc>jt3d}XAGdpI0Oo(2cfRTtGLL-#0NzC41+qmf1M7^+eu^cva57I=l*!mhjeR7Mey
zkzs%%nvRCP3k>DGh6XC3x)d8mWkC7zh(~>62YRxzJ;e<KWf<;~<%-h*LowWwk&zLZ
zm!jWS-&hmjxo$y;ClD|)KuW`6U}-FLY7|95hB3rtQC$pTKo<N4!}1Gs0WykcV}Z;4
z7jo2a8E&I^IjB~heTrKiyuvd<+5-!g2ax?s7b6p#@s!kfBWze62$a-3P=khO*}$7b
zh0mG<hCq2eqcvOAq}7Bn&$TI095T8jq$i{|YO9mhBr^>2#zP&=%Fo&lR``qv7l6ug
zp5jK{Z<N$1XDx==<KSd-@WEz0&Aj^HB-3}$(fo$<ocYedG3MceF}?H@)Szy~bG1I;
zshS2hfxoyoW239sTXA&{Zd>8+!S(@xKxO$u*#>aAjf|27CCj&DWLKhnq_ZNk!Fd|`
zIUI(ubgm!s`MkH!FfyyLBlYajHo||bg~c$8-he?TtlgLfJ;^!^dYa(IxgFNf9zE;P
zS)0?Fn2?a*o?~2RBzh99UF)k>2y!r7Mr1AO7u;B`$jQ#mSn$Ax1q-aLU=1EYrWz`b
z)v##wdyPP)Q5?uN0@=le*L#j~HH(Jxi`M6IzRH^A*$^bwCfksa;lTz-NOuPs@0t2>
ztl|BU$u96rOGvk>^x@FELQP&1q)@6qm5UTa&KVk8tW&*WD-o6JqJVdSQLGlJ&3KCy
z>Tsa%0}J%HN^Dq%Dri9U{EIM{9^u|{91n{o?AC5R%p{U+z@fOReSHZ|LWF@Jx8ay5
znHmqLCS(*VJm*|wEEH^s&#>flrqAyNLL3DpZ}eeGbh{@)#;94=iwwP!v$Kb!Cp2Dz
z%Bmdb#>H-9nu;P^avQ@9t6*BOIsZu8OB5N}Th!}yk4&V|<~vV*)l+P~cDTDQ6Rh+=
zR)YEE*dpiiAR`0k40ll@urXu#f{o=5S>C{&HPR#VZaju&3#4%5?1Nn%NcQ^085p6U
z_=aNNIcd~zR3Zxux{9%)s;dWd6<hmT%f3cp)Y?t;i&wvgs&foCWF4Hf+db0^+;bjb
zi@{U(6{t3Ei+7;Zd?03g44vknI0Sv>EAcOJ6uQih;+XhJ{0dFxq&Owch%i1MN6Q%5
zQnr?DWe3?wc9Gp=59ls^WMA1|4v>Rng1ksxEQiZW<S03&w%?bTEqwRTCa5CYVahp7
zU(wg}E&ZE*q+|3m{YEG0PdZIu5^UorZo*BuIk)82+=kn8NAAL1xd-=TrJeL+m)1@a
zp`BdJ!=amu<k38iQ+O<N$H{yZ6s7B-F5Lu`wOSeapiVpqb>c-I3O|FYP)En1BK!&!
z;UrXq(@+pt*q|Obp&&F9v7)7DBif0MqO-UF*0r9ZkLU;c+8~h#3){sa2{yJdB1KHV
z)BaK@5b0tixuNOJg_&)E$bq4)KwKrR7S}cC6XoJ&v0B_Ne5SZt+$T1OO=64KDr&?I
z@wnJ2o)XWB=fz&}ig+EShW+AQtii|Pb8%R+|2y#mnE#tdfsr!|#y9p(EJ1VGLbj4^
zWIH)sbdVRw&Ugy0A(xEDA`HYb48}qv${|>cp+2m~Fsw+D9D!9CiFFw*$H-(kR;I{t
za=e@%C(21ORZf;u<fU?|yi8s$r^y*|rZl8i&XyT+uFR4PWRA>}1@cN+D6f)N%j@Lz
z@&;KVZ<Ic{LYB&)TqSRotK}Mbhg>J`l6T8{<^6J_+$1M&mX&fVo|L`iOT0_&mM_Xe
zIw0Sb?@Jf#y$tJm8`yluQft^x$3mr@34a+%#!!~_V^KPmX49D3D}MbbD&av`KOUsT
z@O$YMdJ+26+w=|{fK}up`h-4%c6FG(#5TKyp2b@jzV_<V>*c)Hp~5RJzYq2O6DaSB
z(_cby|5kh_z8C+2%KkI>{k!->oEB&C4WWr_Dq|x&?g;)~AiK*8WiJ^g`{7kQ5FAdF
zL&4Z2uynLc-dV`l>g#C>ZKE1`927i7|Dx~c2l@~FM8DGS^aq`yv&1af!A_3mX54~X
z@jhzD9k?@Jz}@*m{9vLF)b0MTRt@3=DBwe(d?xWFJPIoKB)*i>w2oE)Eo}+(v?A!%
zmQuA7cI2mdkIym|Ko|ZAy6|t%h5yjHFlkMgp^wHu6K)||i?%Q#cY+zYo48Q)h9TJ{
z28skRL=1&7`4TZ&jD;pU37Ya$ktU`=*|?T6p@htbLXr#ZWR6%Ou5GX<2gNFJt5_rM
z5Q{3rz2biHfY>Y^64l}n@tAl*)QM-rF0n@_o7x*%+`KP7(vs#&@eSmRV*XEH{GYIw
zC~NyUO)sCKA#cukLcS}O!48XxWhClsK02tE?;w3nU(j@UjNQ^BXURD-Q_hp~Wwy+f
z`SJ?6P%e^7<h63CERw}?xx7gR<Vsm4L((N~mAA>Y(v)|~3VDxQFE_{s<b!gHd`NDS
zRZ`LOynI3KkuS-2<a_c1slGGW5ZY5R^f7!{qN!c5e;J8cI##J{oytaoE9z=m@dr^Z
z^-<5RjqG-MnO>te=uO&B@6!A90ewuL>Iocybo_??RaeuAtE98J<r3@WcI9UUdn!8h
z;2ss9cjee<qZn3MAD+POh9{e?S>k}SL|6Q^u7NJsz;opeAFRvjf?ZLGXB6tRi`><?
z5m2Kp7N|?Uq`=Y@OZ96l(h7<aDk3fP6@oWrW^usd4;X=@`uiSc;RYN?MQp_AYB{_g
z;S@#%VGf5&irBtYiRCOxRNXnJhKFrDt$rY_!_{XD>rPWGEZr_$B_l3A0f|UQHNHz#
zD%(9?5tg%h>!L`Bk*-Fz4C^k}wVDiNUB|Vl(`o7&9j>&>021lQsW~;qS&vAmTuR$o
zQK@e0S-7oNRI2wTn1@7pz>9~hR{Dx-Y96YosjdmBg-P@KBRoyiSQR!kN@UD><eC65
zkZolZvwQNcxZSV|oWTK&mMPRz3#S^nLq0Bd$~yUs9Eok$9A7|ZRE+M$$J&2#vFOlm
z;K;FK2Y2i?es2F6GsErNtz_$p@x8e^wht~?C3S}4Vjab!E86wp-W8+z@JQb^d@a7G
zEyeY^3^GTVgG%si?M7U+$}ALsVQ3`>`DVTiHsZTr8QuV!@I$Z$Kf;gW3VsIW-#z>a
zOg(S&0T_Ni=7W5gzviQ`>m0{@d=hst;U;!MI4RN89yf3|+`n-UN`oMhhE;sghoj;q
z;o40TGlU^#;o6;tOE(u+?!w5WyA0Og8(|4vS!avmZcPfyA^vY8lPc&wdVqG)Og7ld
zvpIw3auzS(9A1b?m4Nt_T*_tmcyJpGlqSf(2gb<_Fiuut3fp0rd<3S+T9_nXfhqD0
zOhJ93`xu|-4&xKuQGBBN4_C~`hlh&$2lGWy!(f#eNu%oy4Cd2OZ6<c*xR%YEN8=-a
zjA|C`Y$+U<R~#OWr;Vt9SRY=|B8j6bl9Kp9opS^T^!21t5krZb$lY)&CgSs9zJ~pH
zp@!vRv4$aWt%j?_G7WDQB^ur$d>WSGaiaR)D#|rnEpE~9HnB#-HNw>Jc2S|>T5+F(
zKE6Y2)CH#4tl>JbRl_?)wT5?z9U4}MS`F_ObsF9yp4ISPv0KCY#9j^8i&r(gU%a8=
z2C-kmjp98G9}pjDxJi5l=u6}W#UWj=S$w787V)iym9V*~89gM9X}A?;JC)xie%Elj
zIHh5g2y0j^B&+%w5vAe7qN#?Dh*%AGh}IfDD%xxKnCQ$gK6H2-raRTKR`k^H34C)^
z`JEz8!zYDH!#XiY!>7a$4WEVqPqlkST%zH#VvL5*iE$e45|cE1UR<i-Zjq+p3u1<b
zFA5J$QV8~lIl5r4n5W@OA{($=s9kXY7v~qaG=IPs=syKZ)xHgCTgdjf7<=ROHw2Ho
zv32*4;;_Rx8?UEaSZwRIjEB|QH(hvP;rvzD*`Sl+b~5m^%*Rh13_LK^PaX^+X+e%a
zyc%@5j6hoi+9S{rfnjVn)!&InlY%j_nTE~rfKvGu&={~Y4T7xE1#O@{sET%=Tfq*p
zqlTTJOc+3Ap|P_Ci7a$y@Ig(rwv&bScm)1JK#y`EEVzTLQS8EkCrFLv!~ED9HioTX
zzb6ZxA#3=i!h$z|gz3US$Ol^W3xZ_u>;?>+CilXcuF`v9`d$fJy-F)C?dDo~48*I}
z_cY`L(yA7|VpS@~LKmuUsH&QPQLzzqsy%q1h7|NP*!b6Sh2rm}e=nIXIzuJf1bgjf
zgslkG2$R^3$D^Io(h%h#EJ9d{a3jJiawWYA3-Rj+Z%Z}1+o=%0i+B@rR?yI4y4bI0
zw_g@&ZY-gX(7qyXGWYR~$8TyZ`)>>$?w8|-Fx~K#vM2S%k6#8*0ybzW%45ilM|=#P
z^{w&1C!NZqB*3}&iHA}HvhXED!TI>fjDibjpoTe=sNq<QquS?UGzIfua|Y~-Z9GaB
z6f_K7|9g@cJ>-?N5JME!4Vl8N?NK9Ppq@Zu>n=;f%i8xKKD`L^-U1y}!H4jjLcwj&
zSQTu7xC$C&4Sr;jgbz2x_~@#CmVjI_9{RQP1n!q4s3TA6_D|8%nA|gnI|C*`328!Y
z!H)XRaBtCvbO<`|EXu@0bK}wEC@NLc@9?Eg!GGg>or2%vtDS;P>O0pBna2AhezOr2
z|BJp^!{87QvaZ~XThli~%ob&I78i76zk?Z;kAfm~z8^tKk@}~gtO-%_VSE#P6rmQ!
zSJ0F4Dd+;v;+^xH9D#fGJfEVo>ZA2OG)Tb!DcBWJIz0+ZBs|w+vFhqKMRO?QJfDVA
z__~80d<~1OgK~jicOllkB6$|y!YwP_nZ+Y34$opoMYGwsuMf_~w=y4oG8H})KIH>A
z7Csd|x*UmccyBn2-&4V*9|(s}oYKiibawZd@Y(R8xjK6Y@$biCqr~B#e}4OipMU-i
z>V|f(ehh%3*vw&rsEe{gPsFz+?$Eu9tpzug(am}`b@qzE@6#%t$>8Bl9r&3X;rDv#
zS6Dywh_7&Ea??S(kyY-HjvGgc=JOqXzEP2z$!l6SZPq-tMax#L+jQ#EyH8x-e*InX
zb+L0{lli~DWPJGPMG;M%uxLIt{q!At0{Zgic~n;VW`B|+9uw62w+&Nh@AeZ@=&57v
za_Q}T<?ZOB!>N7f@~KzNrJ>gyD<E6O;2HGwpm~M##)r$J>BECN4E&QqM@M&ha8KtM
z6g}uaX>@VB^?j+TYIPx%pL%-^C9dAHm^Oa<#cZ1B3mU!X+nZKRpiO;$j-~vx<-MqO
z_3;igc>Rnfw55E%jjowfGmWP0n7ov}t`1*Cl{dehL{Uqh=tP~aKRT9PKDur^y?*&^
z?Py5zg-O(<=DFFlZ_-=SsPov{1jQcipGr+OcV9xiXSSO_A34@Zx-n|^VComMzXz4~
zneMxUzB$vf6^)X+rc#%JgaT@}`D_Y3eA6p~sqgd+Bgxa^i}rNUeOE4{OIzPHi1r_c
z>}#{~#5Ah5zrBzyYJX`KJ!k9EgtqV8)QKKn+)mQ`%&+H@Iq#0X^xlRkaWw0yZA)mM
YCubS;JXGSLrd^NDZN%@c|IG0J1D~^&*#H0l

delta 11739
zcmc(Fd3=;b(tlMwlgV%fNRXQV31<=@K_CHy5Uzk=0whmHm_Q%|vWlW|59rJQnGE2H
z_@EI{&VUetSHP$!hsUa`>wPPiuDTuw0tyN`@3(tq0=mD?zVG|{{qgIb?&`C;s=B+X
zyPsMAa@5hoQP<eT-qc27H|#dUPQ%*A*_Cf5b|EHOWQ(>pv)g*qC+#A@p>wtoYp?0d
z$!m*K?4gRaYsOqv8VrsKD!1w+qV@Buf~`Ha^tGp2aEcYpyP`|8{eFL-)H=)^tm8b&
z2>AV0s<g5)#bJ$+{+3swIbfAbJ1Gg&Y?nYx^FXG*DB$q>okb3tQ~4GCl5F&k^Q>5r
zzhZ=QMH#{fr&C8O%2ci_Uljr>r>ep(5GZnLA5hK<7p3r)MM7yH+i#YFK2Q}X2}A-C
zK;SPbcb0;XqSC;OfWOq~w?1h$&{LG{^p`Ejhb!<F<c8dcK-v67xr-L5(m%Sg{0J!;
zYO;}15WIv*4UrAX3l^1)TC~Vt9zePzTgeS=?K9H7AR^#%IA#U{*<dN)D029{rKOG%
zN3MTn^gK?_E9y2Q`xeM8-P_We>vwp)C8c%;Tv6EP<vGZk=gf94DD&r*1m;KQ)%1#+
z<mi$I2D||W70t94WJZxU5O4-YILn-YvV0JMgwvUyA7vemjvG)~1Th6l1717G2n0s@
z$!?#yg6uO#BG`+HX3hwB9ZrYS3F(HSK)%zjFj?HXd0GH8*ZnBZPqd=M;Uy=bvBO!8
zI0P_k6tV!;<BqtVPCw=hb^cHpNLO^}tSVhGzW@Ty%Z$p)A7NW$SA@p=iBRighn6uW
z1mUMJ0p5T@Z6}Ar=`FKvt>3P-l5+`IFU$8U^hhGV=$6b(jnR6rUUO@3dxxiv`8r05
zlqd+8l`nFvP)p3~9qIQ5Ft`3PAXC8!%)sdMmlWw#2$qHOWhG9#8t}huo)_--KW+b~
z<|SSXuKI!?KQf9QEs9uADfu0xUPn=&=>ILDMu_}MykK6r|3jiqe*P6oa-OgNl@Lcc
z^Ryc^l8Wpzvi-|1uYD|ihaVf#K2xnkXo!F#GS_NrsA`SwN^CZ*xialD9DeMXOh1)|
zcLY$aaEvS}vf2HVfgVvskcXNky#iEJLQcDV(fm?uE9@jF0iY<w=wx>kdCBg?Z-v#{
z9_I-ys~P3xBOL`JoihqXj97$45EYtrC2fTH3JVwtjI{Y@2GSKLEdyS?r4)mK5F<Jn
z-e6EWfud5<yh06W2JK$L2E)eDgklN<NOl3K&|m(`Y?tVjjX^PRD8^)4gWI+8sAeH@
z!*M_{s#d;Q^H70mRj6rDUdy{wbpU#$P9SvURHG0HD#mtEF?NnB{_`f%v!cc-aE_YQ
z@;c1G#G-76Kg)lMEgAx)nMxAsS31)V)PU0hj%+{lGSrg4G?44}`ZJ-5;k~FV#YB__
z{9g1}7|m<9v}yOznJZkbp6$JZo;-Ty%%CR+Nlj{}PHbg%+HFltXcg@b2G4d2#-Ok@
zTX!YK7WWvR-<-VO%ns<bc}HtH6ddww6<vCCSx)|>sF)ZEZd%pn&<ig#IDJcA{?MNe
zMd#l;G{2<zq1{=FF6^$#YktVc&EHZ*r>DNZylPjEn4J^y$>t4uyutH3fpGSoeIHCR
ztkh0DJVo21_;_<~)yO!a%)Y2Q<e{B6ke6a8exI-Y>7mWr9}jjXLg%f`4ta8KUz9I&
z=wMY<k3+#1URYf{oi2EW{&Zq|JqpI0jyXN#kTIw^(ZYOcLX?|Nbm37?+s#$<?U0>S
zo2#k_CEkiL+b8VG>v4E;{`ww$c2@}o4Y`qf2DR<b_P`hlHZ%@-#Ky|(!wI|re>Hqx
z>T4b8d`+~CY!pRNR>v++8$_wr;gpV6RqrO&>6G3z*<D-Li)l;ks6E9~2kJ<jD8ah5
zcWm?4)S4PlJp|RgJ`hBc-CC30u45cEr>m$1wS;el@<i%PU8pN{qwds$lBkXKUGH)A
zqRD~Y^{GM4(A47&D|O%uYvq9ZZ8%&+*K`~hu-R@323uHrh9uiu!C<^~WXQb4ZNcEI
zJAMnsYzzitwgiI<-N9h5a-2)n1%p$Eq3*U|aE`S&vu)yc!C==5!QhZf=y?hV73066
z@i{a+fX<&FUGsFNjcv`&qs!r;UYqVaBCEG;4%%Duv)-~XMzBT?d$my;Y6ITmA;7s@
zY+b)C-Zq!Fk+pPNd;3CO$X}2(dw4vPb?5N*^*VEBo{P}Are^po2Nd2aT7$vwMc7UQ
zc?b{VQS9QWT+FlhMxKMlS+p3nK3)!_t9cXM!yD)UUQb&wVLn<;dwDNE&)NJ64`-pb
zITP{6JP5TXcsY7bz@)b{+8TSgqmhL9b6`r;6vR`a_4K%|QA24A<<@*XuE;TosWYn(
zM~nG(_Hh}n<iGM-zL(eYL%fBz^Df@QkMll$8ay227x-m<jo;*V`9uDckMS4$HGjva
z_$;62iyD(n9MVvlh_%IR-F1|Vk#UkM6UCJ4#U)c^x|B$%+$cB8t)hgeM7Xf#UnWFT
z4$_IT={|_4iUxtL;b5{5Y|TKJjW7@4b{<X30RQY(gUTp+1~jS~Fh)+DGIgAXc#M?M
zL|GxNjdsRt-Cb<~re-?sZ2d5`yKyaL)wC_@Ws8249;3(U3G0^0?P})CxZk*^G%B`p
zl5&YU4n<`BI4icMPiY=|au)kgmY<rGGf&m!T%DW@FgGa&g(`0*<)<Z?W}2!DJ5NR=
zrD1i?%USeNZmuui?Mq6_F-@<}=Sxu-BQD=G&CB_@9yL0gnYP$xdJ9coN+_>lG(|-+
zNC;)n6V#|eAWqItQ+O1O$R;P{Xu4JIvYU&slRO!r@xX@e7eW_l<VmW$!nu~X^kAXd
zit0$KItc!9fH5gGzo){JT34Y6O;R;*dc4J^HzKCFNlD2`xk<?|?KUiGJ7S{7fN>OO
z)xWVkwGAb5JatFt#wpzEzx4^$V>fn;@52Al-!r?p6*JqeLIa}Pu#o2S0`6jE&K|~X
ztT$$7SjT49H-a2*-95X%wP|*JPj~*$o@gl7%G2_UJSPXF8y}YEr53pZ{}=GQT##Sn
zqFj=oQsZJ6wshkcWXZ7oZ(+?-H(4#)bfGeAzyUOt?n2y=EP8-8(pHr1v~KoKj4Go?
zXr0xrSAvz*tD9#VZK4gdp7w<O0Kh+nvB0GK9-7LkW|ofU=y(8S!DrJQoCCNGVG<OO
zk5)qKWnlxah2Mab33UXIR34Pl7TyXSxf5YhE<4%eJS0IL{8+%TAV8_dEP9py4jqz3
zZ}MBvCRy|$e*`s|MaTF!;zwy+Xp>V7?WKM6B-PSWR%)+|R@qQminMhQ#Ur!;dSe!F
zhS=_9UDvB^@;a1+{4{aPERY@&!&VTVh0!}0`#`~Pj5>&|ri&A;<tqm_&A@_fgX-Z}
zwl<JCq2`m7zcfy%r01aT4uJZDw1W=O-;qCn^dWk$E_Ec5dSZQg{g?!-*lyedaSu+!
zB7A&UM_ZSW1sW1EJDy&!BdXa#cJmUxgFU<q_QcQSyoy)zUA%_xVT<qM3Vwh$@J8MQ
znQr49{4iJXZhnLx<tMm?pX6G8hWGPxe25S8i~JI7&a3=7{{sSjo8RO2A<&QcGd===
zp5TA-m;5jOhQH^NiF}%W<a7KJU*KQ(68{ELNJOIW+)z*IOCxD4O|2U%`$lKWwQ`+|
zw+@*tTEx+lQVbDogJJjr;Ymq=lpnS}uIzj5bNr+{1g4IGr9@eXoJ+RA{&a&;*$yj|
z4AZg;wx~A@%pO>zt6^pyhh0jCvDpXfGzcc=Y1pVtxwU5McB^H(ffS(CbSEbEZn_7@
zkqWHiO&EFyZ0v5U#ewmj59lNMjE>Rg@L$unbQ0lPI!EV`yM*#6GT6>Ls3CtuP5B&M
z#peN!q3$Fla6>+cmOJ3jBahP*_2-bkhKKS99?fIm$HHF+p9?<$3)#eip2SnQh^KjY
zCYSPG_-4L^Z-vTP$cwRQZoqc&@(MkbS>)$cbf=!qEVB4cJ)v2&0Vy@5*iuNTX`M~G
zus%X-^a)I>vgiA8j8GH%0;ctEX#0|$*erTSPiz)>KG8FqMW6HMFs<K$lat{19QZrS
zU(*E$^K)V;ha_O~xsf#Gt2j<tNNc?5bdUt;A|F8xDbic|NI%JtK{7->qv3Kp*vO(>
z8IO%K7wy#Mx?Pq^3fgo*|K4cPT8`ZS#O0KNZmngwyeKat^`cyYAlu1%@}Yc9pUH6`
z{t_g-2h=HY8psm359)TH=S3#NFn)((tY_3SmZ81{TB`obajc4>PR34Xh&OSPIcBYW
zCBf=;IJ2ob*$t&(Gy*ndERCo18sFiIjgt=Ju=)bRO9-#fYY2yte+j9V!s*v^9_3bi
z)evj!-m7XZy;WS#C|t79D*2?RCk+-c?3E?=`P{Ao4ON6A{biTusx+6lTqep3l%dw{
z3iAk4?KY>I1@7vl8%=LGa=Xl`r7qVdAT>7zwxegYZ&{&=c2_@C?JKZ)eA?3UhpMV&
z<vtV9_UZ}MQ(R_2adF*fZc}*|d;$D+pYp|_CTZq)I54spP8oSP)u=%CsH_Yla-+!9
zSQMUc!s9Y4O}Eo5hF8c#=yhL}Rs<9jm|>(58cfrv{6?UQB-D5=(_QXUep$$GSA<;Q
z3f%6cOHEfDK?P~<N{^ZVZ=qWOj8qV23=GsYRz$eX$xFR%U!hrm)^$^a2@9c9gD46L
z+{rm1sxepQM(w9#UX*vL0uu>Ew0U(>Xar9kJxdgEeN3~m5-pSrAuTt4K2WxC`evNo
zt|Ur}#;qjduB?uT0hCo%SIs~})j1-YT!l_Ep+<m<$XSWCy<%E3RB*YG7ExMmYHq%D
z!;ub_>qN|GjZ!gKH-RB6OB6zPSPVd=-4fG#g)an!%Bhy7+d6zC$9n5XwAK4)PwU#F
zu?USCrC;gL;@SiyO*ogCu0*b92O<R*OF%&364&4)SH+10ZkeVJ!8^)#n7LSkrW>oh
zc*)XAuM^XU9iwLTN|#>lF0h6j>+Eqanem6YQ=(Q<4{?Q&uIv@&IUUFD(E8Y|_?dy?
z%ZsV5J$mA&(0TPb+-@err4^Wy&3Wd$&;qUYC<IsruCUb6I<(+6s+nK1)LF23`gEsL
z&w5DY5o8Lxo`(pn+p$E7aT9R5eNNZLjaN{vxTxEz;Oug4x2M{>R1vBd`SgM%W-4Yo
z)$LPUM3zT*obaYA3^Tjbjb#z4(#uBmP%bP#HGGKuNI^(q<-V}!kns7+8zWk#ihSF#
zOkLKAqj7^m)2r5~+uS%^#mc+F+h>Xi{T12m;Y7afQn1nGw#J@__k??-=cd*PDS`t8
z{*fIY_Hu;L%L#S)QBHHD@#vI}LSw09an2H#=Dkm0h8h5CUdhp;7ejIy7U2?IeR+AP
zy$u0hIR(X-{(P)%w~E60bcktU35QBU!zsKPZ5^$3#D@8aFy=O`4qvorQAaOS6+8sI
z3<|N>@_ydI^G6936u4a2xL1Pdn_Nr%*h|V6n^>@BSi*XlC_1nKp`zdl>Na?e61$!l
zrI9y=WM`V`q3wEEjha@!&tp8wd?}eJ1flJr6<c_cu_H9@Pz-t_8?L<CnPx(fMQYvd
ze76gG+tv`K`6+o;4#`V63cM<>%Nz2Ryesd++<zjU$x%5WU*ItCFZou!ms3~Ek8)Oi
zmET2-XxRS-Mq{Ii(adOWv@lxXaiqP`!ALMV8(obaMzYb<NHzKxeQSRFqOgf)4em1!
z(H44`KBQ0RQ#wi~=%4fzeM8^VDf*Gl($Dk@U8LU$#~+Sj2iNBY+?bniEH~$t+?v~R
zd+xxU@MO{zcfllm8BOIr+?NM%2B+gvkjW*u9^8aW!hGC)w&9KE0i3({;M`s7LE+mt
zRzE^t;W+&*j?+KjG<^nV>GS+6PSU^QByHd%9gTBzLy3{55-V3pD`_k7(n&f?H|ZhC
z(o52$ucXUB87xC(n2eOMg7YGoc#65wPnBYvm}kjfa8ABSvSp5V=E-e1jg`?dS&rwD
zGVx2f1Z1VGlGSpj{8jFfHFCGCm3zdJb#kxVClzwPtd|F5gFGk?$wt{En`Mh^m2FZf
z+vP*rDZ6C1?2$+1ajB7gxa~eI`*Hg{D2L?*`5R{QHTj3UDQ{ywKk&%M@+qeCn0zk(
zl&|F*`A$yCDLEtO<Y!!Wf5q+gcM$jtH#6dltMHbiX0f}GME&uS(-0@OzDUL59M>Pm
zs_WoKsfSIPtbKo!_NP4LJ5f)h2IAQ>8)v-{IFjb$t5gBiRR4S+I&~W+WgE?bf016M
z=W$thlis1XX(cWNpWs@s3X9?k`Vv=&XR$EgYc~A;pfPnncv2j_B7YBa^qzbmAAzAG
zVTQg6Gjv)r^qa5|WjKubMnfaUXllfQp_YbvqKY><8i__1qZ{7vQjA_knsK$!ul7D+
ztk8AzAZ?~f+C?AZ8heC}Yf}D2-_Z|rn$FNqbb)@Q-zZ4THjd_ce3%+>3^(IAZo#d%
z4Y%WX?ug4{=pvcSJ-Iih@zvaq2XhvW)Hji-xQoofZDbC6aUWN={A%0`ALFMy;hXK3
zxOaVnJJ(6vx72O#XMNYZKtUF<>6=~y-1C}9Gifd@rH!<gj*=){rMo0aPf3-lrN0c2
zYa~;$WQ2@T_dwjc2`BW+myKC8O|JBWe1rM2P@-@l#}ytg5pAqNy%Ig|;=24kJuF{x
zl~l_k@|Zj!d*w-a3NI_q;%(&+URPey^Age=??7{W1kG^-L@CYjRakTUpcThYa$diy
z{HESjKu~O0aj5y|VW?+A8$t`}N9mLaKe8>>9V0PO$0{{Nr>3C6jN0_({C;%OR?XX5
z9siA9rPt{n^cKAfvOmB?Dn+9%n@ZJuU7OyHtBla+ccR4FZ#(dQVY6aK0(W$HaUbyc
zmZa-*QDf7bmz1BJlhnT=DXAh!mszKeMtPF)YzMomPB4-CgI23bBfC)r{R|V6;hXQ<
z=G&%DDVdRGcpG#@TIeorm}IZd^cA{&DPbH+V@Gfx;S0Y%s%OcN^8l#VPGu(C`u)<E
z5-}O!CJ{<>|45Xfo+j}w3DX{OnyN@9Y#LNnm*-p_5GBfPL^^uRG+l{DS6DX{!G#Qq
zE(#Tx=3)$77<rcUC@L~^z2?uCf#=a&*lJabMCh>;Pm^#FoDoDgqT^Pw43{Nk^t=T~
zmE)iW=2c?Zb{ua*7b6^!cUK3ht9Pi0$uGp?sz#AqN7m&r)m0$m6k&LUwau?M-<hB5
zx(|2gJlve8L8-gt4)H>d*kI^FdSnomSYsMO<0?Mw!lzoi-%nb0?>T7b(B7@$hfnD-
zF)w)4gl0xe#fh%GyK7h2r_laSg$C#Y9ncqApg*is2CUUU*s5!w6NXf5=mv8(vEpDi
zzQ!|;7x7YPg%upY1H;|Cj_>COc{5k?POgTA*vn7xvwQ$wDgK5hxHtG6{(wK>qj*R7
z3I^>57_*;Y%6?~tA&Zs<Fk-Q|oVS4iOMrSvg7NAD)i4m3dS$pq!*u1y1j!etOqMA!
z&8n?zR9n@Z+t({uNq?oabU#(owLFe<csx(!d@kVYc`{Gu8~8R*s$RgB;svY>)ULwk
z4Mp$0n&O8v&D-^>SB<7vy>h8f9B<$g#|QYtaTHHX|E%~iiCa{R>BDKYEBf%o=%f+t
zxogwLjq5{o8_|vGJDQ4poQ-4KH;=xmQS+vbsQB2ZMmAfcC=sf793reZG?48TCkOId
zwFd@)K2JlMC-d+DL_wxv4LkEJ4HwFd8ZMGK8ZMT(8oFhnhD&6LhD*hx;q9_q!#nW0
zq40TRwT50<qoGeM4VOuUhRbC`sN)LRqzlSqn}&XQSi^GJtzkeO)o`WMXt+vhHC!$G
zHM~;}YWP=qLBqS`WewNJYZ~4yZ)&(!-qr9PoCFksmUuqZiFI;J!+Yfm4e!I7j%rXL
z-)VTioYHW;oYn9FIj`Xcxv1fT64dY^F<AB6h`$smxJeplxLIN}+#<0WZj}}qZu3YR
zov4&}4Yy0YMzjMDjtarU(pAHqlBD4->7`+n^wDs)^w+Rj25PuRhG_VR4AbyY8KvQ4
za;=7sOOA$5$V3f?)kuL(?3KwH?vts23$Z5V;f?Dxc?V~p<2d{LAU}yBC=RuDqY=(K
zZH!Jh>-0AI*P59ev^&0qu_qirYYRv5Z1Je))RSaVj^L<=<K8TM-8FIOQ(t*aDhNYo
z7+xQSlfrOv7`no+FbqvBG1Y&n6rseVVws^~iOke+79Lww`CmM8gHGHivo*X4udb?M
zj@+W*t+Gf=pbDY66o&Z1r)$r02u4u|?bl)WErrlu;1JwFp;0b!2%e<SXy?fjN*Ej(
z_Hzosa}*k$!(=Q53E3bd8yeKqUt9aLf>E>skHkuTi|J`RtuDt~uu3cG?c*v;L8$eb
zx}4x^uBr|DiZR!616&{?ja79Kgf$Zax&bn|83d?dg&G_GUapY*d+EQIWaEIoK-S|e
za|6OAgl!0e`4VLzjLbn)h%f_THo`oFHpX&lYh0rC2nmMb&`-1RCHZ;qt)Qtxwj^o}
z6OGw;tv2ZvN=EyNgt6SkGXO{BL39lb#!?)GBXc`E(08N+>Wq*0DU^!RER;8-92~A2
z;&>g4gE#3^0glxT>3W)k15ra9!n<hb!l!?gFT^oi!Ksv{p*oVQ_C**?!D$#1up3Rs
z(5j%gZs@M~??5k7TT%^KLNhVMtlHCKIW{V~5{JWQ=*8Ol6JW#enW_@9&A=!39U4B2
zuPrLS3twIotcQ3vjL04wDl=eG+~}=803+wF`#zL`+d!>u|1@wD?MK`OFavjhdicQJ
zG4hp$-oVxIIQ<Ju7lMJ3iq|J{o2K96la6X!FVd{`^hEx<;aPym{Qu}1ga`i_x2xKb
zPJBb~jE2d`huy7P*I-)tDfr0pM?ZiT%M$rd!6QD{Y%yk06oSK0cp5;JO_L@@7Bw{n
z;PwAczM^mvM`y&N8h?e5EGV%lh_kQ|l*`1wXNJ&d8i)HDRNEDPG)m!XADRRk8}k%B
zg|Ea8#M)QjUlyw?*1C9b#by`VD&BO#8gDMdw-(QN{Kw=}@VA2i=Yzj_=HVY9a3_ME
z-xVAZcP@DFH=R^jxP!qt2*KJ9bx!sE?V=Ga$IqO3<NGsbzQJEELN1O|Z~<#%w?$D*
zbQInPs2y|54sC5sxPei>Q9=VpVnd>O6}M02^oE|$e{0n^>d!+d72i+g2EC5yAryK4
z=G3@<a2`8VbSdIBZR$5{)HtR|(`K=)+O%!gKE6Z8P6>&fyL9c=y+=~*D@Ay#@cb_h
zF!<oTh>|8Xm`__~PAj1YCVUo6Kl+Z2r`Y|k_M;sWKFg$2>rc$5jLE;`(&#y>C)257
z{JmmZ!!`pbW$SJIschZZPULNUX&k+@yhkE++tu0h;9tnCDRbCIO-Z(7^`xY)_s^%v
zFE^S?oi0`u)ASCr+tb@uKi`59w-nw)k4%}|jH>o^txvbRIxnE}cf8sVy5Z45lv{i*
zpSrF6W(2iZR}GER&p(&$HP23_w@SGWMIUIjfRc~Bw}4(5{bB;eE^fv2eLpLkR^9Ar
z*_={-`K2Z8IQ057+9;LNXlwDWakSv6EGLyev(BW)=XP+?(p^0}(mgY-?@cw^_qU?A
zH;))c=Wl&|9A%^hd()hz%@)$&e>|8<>-X9w(37{$oJr+lzGzKJH=gZ65B}W0C6z6{
zV-U@leD^4N_xL>yns?;fFuHrq{jO0o{-a5~C~4)vDYRlly?ol=uh%%5I{WQj^!<jH
JJO7Wx{a=LD(~bZD


From fd0f53f73be7daaaf586514420060b87eac41c20 Mon Sep 17 00:00:00 2001
From: Valery Cherepanov <valery@intrinsictech.xyz>
Date: Wed, 29 Jul 2026 08:27:03 +0100
Subject: [PATCH 42/94] perf: traverse trie keys with a nibble cursor instead
 of materializing nibbles (#647)

---
 crates/mpt/src/hp.rs   | 351 +++++++++++++++++++++++++----------------
 crates/mpt/src/trie.rs |  70 ++++----
 2 files changed, 251 insertions(+), 170 deletions(-)

diff --git a/crates/mpt/src/hp.rs b/crates/mpt/src/hp.rs
index 5aff8090c..31b528738 100644
--- a/crates/mpt/src/hp.rs
+++ b/crates/mpt/src/hp.rs
@@ -1,5 +1,5 @@
 //! Hex-prefix (HP) helpers and nibble utilities for MPT paths.
-use core::{cmp, iter};
+use core::cmp;
 use smallvec::SmallVec;
 
 /// Compact vector for nibble sequences used in key traversal.
@@ -7,30 +7,77 @@ pub(crate) type Nibbles = SmallVec<[u8; 64]>;
 
 // Hex-prefix (HP) encoding flags for MPT paths
 pub(crate) const HP_FLAG_ODD: u8 = 0x10; // path has odd number of nibbles; low nibble of first byte is data
-#[allow(dead_code)]
 pub(crate) const HP_FLAG_LEAF: u8 = 0x20; // node is a leaf (vs extension)
 
-/// Returns the length of the common prefix (in nibbles) between two nibble slices.
-#[inline]
-pub(crate) fn lcp(a: &[u8], b: &[u8]) -> usize {
-    for (i, (a, b)) in iter::zip(a, b).enumerate() {
-        if a != b {
-            return i;
+/// A cursor over the nibbles of a lookup key. Trie traversal tracks a nibble offset into the raw
+/// key bytes and computes nibbles by shift/mask on demand, instead of materializing the nibble
+/// array up front.
+#[derive(Copy, Clone, Debug)]
+pub(crate) struct KeyNibbles<'k> {
+    key: &'k [u8],
+    /// Position of the cursor, in nibbles from the start of `key`.
+    offset: usize,
+}
+
+impl<'k> KeyNibbles<'k> {
+    #[inline(always)]
+    pub(crate) fn new(key: &'k [u8]) -> Self {
+        Self { key, offset: 0 }
+    }
+
+    /// Number of nibbles remaining after the cursor. Since the key is a whole number of bytes,
+    /// this always has the same parity as `offset`.
+    #[inline(always)]
+    pub(crate) fn remaining(&self) -> usize {
+        2 * self.key.len() - self.offset
+    }
+
+    #[inline(always)]
+    pub(crate) fn is_empty(&self) -> bool {
+        self.remaining() == 0
+    }
+
+    /// The `i`-th nibble after the cursor.
+    #[inline(always)]
+    pub(crate) fn nib(&self, i: usize) -> u8 {
+        let j = self.offset + i;
+        let byte = self.key[j / 2];
+        if j % 2 == 0 {
+            byte >> 4
+        } else {
+            byte & 0x0f
+        }
+    }
+
+    /// Splits off the first nibble, like `slice::split_first`.
+    #[inline(always)]
+    pub(crate) fn split_first(&self) -> Option<(u8, Self)> {
+        if self.is_empty() {
+            None
+        } else {
+            Some((self.nib(0), self.advanced(1)))
         }
     }
-    cmp::min(a.len(), b.len())
+
+    /// The cursor advanced by `n` nibbles.
+    #[inline(always)]
+    pub(crate) fn advanced(&self, n: usize) -> Self {
+        debug_assert!(n <= self.remaining());
+        Self { key: self.key, offset: self.offset + n }
+    }
 }
 
-/// Converts a byte slice into a vector of nibbles.
-/// Uses `SmallVec` to avoid heap allocation for typical key sizes (≤32 bytes = 64 nibbles).
+/// Returns the length of the common prefix (in nibbles) between a nibble slice and the key
+/// nibbles at the cursor.
 #[inline]
-pub(crate) fn to_nibs(slice: &[u8]) -> Nibbles {
-    let mut result = SmallVec::with_capacity(2 * slice.len());
-    for byte in slice {
-        result.push(byte >> 4);
-        result.push(byte & 0x0f);
+pub(crate) fn lcp_key(nibs: &[u8], key: KeyNibbles<'_>) -> usize {
+    let max = cmp::min(nibs.len(), key.remaining());
+    for (i, &nib) in nibs[..max].iter().enumerate() {
+        if nib != key.nib(i) {
+            return i;
+        }
     }
-    result
+    max
 }
 
 /// Decodes a compact hex-prefix-encoded path (as used in MPT leaf/extension nodes)
@@ -72,139 +119,112 @@ pub(crate) fn encoded_path_nibble_count(encoded_path: &[u8]) -> usize {
     2 * (encoded_path.len() - 1) + if is_odd { 1 } else { 0 }
 }
 
-/// Compares a compact hex-prefix path with a nibble slice for equality without allocating.
+/// Compares a compact hex-prefix path with the key nibbles at the cursor for equality, without
+/// allocating.
 #[inline]
-pub(crate) fn encoded_path_eq_nibs(encoded_path: &[u8], nibs: &[u8]) -> bool {
+pub(crate) fn encoded_path_eq_key(encoded_path: &[u8], key: KeyNibbles<'_>) -> bool {
     let nib_count = encoded_path_nibble_count(encoded_path);
-    if nib_count != nibs.len() {
+    if nib_count != key.remaining() {
         return false;
     }
-    if nib_count == 0 {
-        return true;
-    }
-
-    let first = encoded_path[0];
-    let is_odd = (first & HP_FLAG_ODD) != 0;
-    let mut i = 0usize; // index in nibs
-    let mut j = 1usize; // index in encoded_path bytes
-
-    if is_odd {
-        if nibs[i] != (first & 0x0f) {
-            return false;
-        }
-        i += 1;
-    }
-
-    while i + 1 < nibs.len() {
-        let b = encoded_path[j];
-        if nibs[i] != (b >> 4) {
-            return false;
-        }
-        if nibs[i + 1] != (b & 0x0f) {
-            return false;
-        }
-        i += 2;
-        j += 1;
-    }
-
-    if i < nibs.len() {
-        // one last high nibble remains
-        let b = encoded_path[j];
-        if nibs[i] != (b >> 4) {
-            return false;
-        }
-    }
-    true
+    encoded_path_matches_key(encoded_path, nib_count, key)
 }
 
-/// If `encoded_path` is a prefix of `nibs`, returns the tail `&nibs[matched_len..]`.
+/// If `encoded_path` is a prefix of the key nibbles at the cursor, returns the cursor advanced
+/// past it.
 #[inline]
-pub(crate) fn encoded_path_strip_prefix<'a>(
+pub(crate) fn encoded_path_strip_prefix_key<'k>(
     encoded_path: &[u8],
-    nibs: &'a [u8],
-) -> Option<&'a [u8]> {
+    key: KeyNibbles<'k>,
+) -> Option<KeyNibbles<'k>> {
     let nib_count = encoded_path_nibble_count(encoded_path);
-    if nib_count > nibs.len() {
+    if nib_count > key.remaining() {
         return None;
     }
+    encoded_path_matches_key(encoded_path, nib_count, key).then(|| key.advanced(nib_count))
+}
+
+/// Whether the first `nib_count` key nibbles at the cursor equal the path's nibbles.
+///
+/// After the path's optional odd leading nibble its data is whole bytes, so a cursor that is
+/// byte-aligned there can be compared as a whole byte slice. That is always the case when the path
+/// spans the entire remaining key: a cursor's parity matches its remaining length's, and a path's
+/// parity matches its nibble count's, so equal lengths force equal parity. Only a path shorter
+/// than the remaining key — an extension — can land misaligned and need the nibble-wise loop.
+#[inline]
+fn encoded_path_matches_key(encoded_path: &[u8], nib_count: usize, key: KeyNibbles<'_>) -> bool {
+    debug_assert!(nib_count <= key.remaining(), "caller must bound the path by the key");
     if nib_count == 0 {
-        return Some(nibs);
+        return true;
     }
 
     let first = encoded_path[0];
     let is_odd = (first & HP_FLAG_ODD) != 0;
-    let mut i = 0usize; // index in nibs
-    let mut j = 1usize; // index in encoded_path bytes
-
-    if is_odd {
-        if nibs[i] != (first & 0x0f) {
-            return None;
-        }
-        i += 1;
+    let start = usize::from(is_odd);
+    if is_odd && key.nib(0) != (first & 0x0f) {
+        return false;
     }
 
-    while i + 1 < nib_count {
-        let b = encoded_path[j];
-        if nibs[i] != (b >> 4) {
-            return None;
-        }
-        if nibs[i + 1] != (b & 0x0f) {
-            return None;
-        }
-        i += 2;
-        j += 1;
+    let path_data = &encoded_path[1..];
+    if (key.offset + start) % 2 == 0 {
+        let key_start = (key.offset + start) / 2;
+        return key.key[key_start..key_start + path_data.len()] == *path_data;
     }
 
-    if i < nib_count {
-        let b = encoded_path[j];
-        if nibs[i] != (b >> 4) {
-            return None;
+    // The path's byte boundaries are misaligned with the key's (possible for extension paths);
+    // compare nibble by nibble.
+    for (j, &byte) in path_data.iter().enumerate() {
+        let i = start + 2 * j;
+        if key.nib(i) != (byte >> 4) || key.nib(i + 1) != (byte & 0x0f) {
+            return false;
         }
-        i += 1;
     }
-    Some(&nibs[i..])
+    true
 }
 
-/// Encodes nibbles into the standard hex-prefix format directly into the bump arena.
+/// Encodes the key nibbles remaining after the cursor into hex-prefix format in the bump arena.
+///
+/// The cursor's offset and its remaining length always share a parity, so after the encoding's
+/// optional odd leading nibble the cursor sits on a byte boundary and the rest of the path is a
+/// direct copy of the key's remaining bytes. See [`to_encoded_path_with_bump`] for paths rebuilt
+/// from a stored node's nibbles, which have no such alignment to exploit.
 #[inline]
-pub(crate) fn to_encoded_path_with_bump<'a>(
+pub(crate) fn encoded_path_from_key<'a>(
     bump: &'a bumpalo::Bump,
-    nibs: &[u8],
+    key: KeyNibbles<'_>,
     is_leaf: bool,
 ) -> &'a [u8] {
-    let is_odd = !nibs.len().is_multiple_of(2);
-    let encoded_len = 1 + (nibs.len() / 2);
-    let mut encoded = bumpalo::collections::Vec::with_capacity_in(encoded_len, bump);
+    let remaining = key.remaining();
+    let is_odd = !remaining.is_multiple_of(2);
+    let start = usize::from(is_odd);
 
-    let mut prefix = if is_leaf { 0x20 } else { 0x00 };
+    let mut prefix = if is_leaf { HP_FLAG_LEAF } else { 0x00 };
     if is_odd {
-        prefix |= 0x10;
-        encoded.push(prefix | nibs[0]);
-        for i in (1..nibs.len()).step_by(2) {
-            encoded.push((nibs[i] << 4) | nibs[i + 1]);
-        }
-    } else {
-        encoded.push(prefix);
-        for i in (0..nibs.len()).step_by(2) {
-            encoded.push((nibs[i] << 4) | nibs[i + 1]);
-        }
+        prefix |= HP_FLAG_ODD | key.nib(0);
     }
 
-    encoded.into_bump_slice()
+    let encoded = bump.alloc_slice_fill_copy(1 + remaining / 2, 0);
+    encoded[0] = prefix;
+    encoded[1..].copy_from_slice(&key.key[(key.offset + start) / 2..]);
+    encoded
 }
 
-/// Encodes nibbles into the standard hex-prefix format.
-#[cfg(feature = "host")]
-#[allow(dead_code)]
+/// Encodes a materialized nibble sequence into the standard hex-prefix format directly into the
+/// bump arena. This is the form used for paths rebuilt from a stored node's nibbles; paths built
+/// from a lookup key go through [`encoded_path_from_key`], which needs no nibble array.
 #[inline]
-pub(crate) fn to_encoded_path(nibs: &[u8], is_leaf: bool) -> Vec<u8> {
+pub(crate) fn to_encoded_path_with_bump<'a>(
+    bump: &'a bumpalo::Bump,
+    nibs: &[u8],
+    is_leaf: bool,
+) -> &'a [u8] {
     let is_odd = !nibs.len().is_multiple_of(2);
     let encoded_len = 1 + (nibs.len() / 2);
-    let mut encoded = Vec::with_capacity(encoded_len);
+    let mut encoded = bumpalo::collections::Vec::with_capacity_in(encoded_len, bump);
 
-    let mut prefix = if is_leaf { 0x20 } else { 0x00 };
+    let mut prefix = if is_leaf { HP_FLAG_LEAF } else { 0x00 };
     if is_odd {
-        prefix |= 0x10;
+        prefix |= HP_FLAG_ODD;
         encoded.push(prefix | nibs[0]);
         for i in (1..nibs.len()).step_by(2) {
             encoded.push((nibs[i] << 4) | nibs[i + 1]);
@@ -216,7 +236,7 @@ pub(crate) fn to_encoded_path(nibs: &[u8], is_leaf: bool) -> Vec<u8> {
         }
     }
 
-    encoded
+    encoded.into_bump_slice()
 }
 
 #[cfg(test)]
@@ -232,19 +252,95 @@ mod tests {
         assert_eq!(encoded_path_nibble_count(&[0x00, 0xab, 0xcd]), 4);
     }
 
+    /// Collects the nibbles remaining after a cursor, for assertions.
+    fn nibs_of(key: KeyNibbles<'_>) -> Vec<u8> {
+        (0..key.remaining()).map(|i| key.nib(i)).collect()
+    }
+
+    #[test]
+    fn test_key_nibbles_cursor() {
+        let key = KeyNibbles::new(&[0x12, 0x34]);
+        assert_eq!(key.remaining(), 4);
+        assert_eq!(nibs_of(key), vec![1, 2, 3, 4]);
+
+        let (first, rest) = key.split_first().unwrap();
+        assert_eq!(first, 1);
+        assert_eq!(nibs_of(rest), vec![2, 3, 4]);
+
+        let empty = key.advanced(4);
+        assert!(empty.is_empty());
+        assert!(empty.split_first().is_none());
+    }
+
+    /// The byte-slice fast paths in `encoded_path_matches_key` and `encoded_path_from_key` rely on
+    /// this: a cursor into a whole number of bytes sits at an odd offset only when an odd number
+    /// of nibbles remains, so skipping a path's odd leading nibble always lands on a byte boundary.
+    #[test]
+    fn test_cursor_offset_and_remaining_share_parity() {
+        for key_len in 0..4usize {
+            let bytes = vec![0xab; key_len];
+            let key = KeyNibbles::new(&bytes);
+            for offset in 0..=2 * key_len {
+                assert_eq!(offset % 2, key.advanced(offset).remaining() % 2);
+            }
+        }
+    }
+
     #[test]
     fn test_eq_and_strip_prefix() {
         // path [1, 2, 3] as HP: ODD + EXT, first byte 0x10 | 0x1, then 0x23
         let path = [HP_FLAG_ODD | 0x01, 0x23];
-        let key = [1, 2, 3];
-        assert!(encoded_path_eq_nibs(&path, &key));
-        assert_eq!(encoded_path_strip_prefix(&path, &key), Some(&[][..]));
+        // key nibbles [1, 2, 3]: cursor at offset 1 into bytes [0x01, 0x23]
+        let key = KeyNibbles::new(&[0x01, 0x23]).advanced(1);
+        assert!(encoded_path_eq_key(&path, key));
+        assert!(encoded_path_strip_prefix_key(&path, key).unwrap().is_empty());
+
+        // key nibbles [1, 2, 3, 4, 5]: cursor at offset 1 into bytes [0x01, 0x23, 0x45]
+        let key_longer = KeyNibbles::new(&[0x01, 0x23, 0x45]).advanced(1);
+        assert!(!encoded_path_eq_key(&path, key_longer));
+        let tail = encoded_path_strip_prefix_key(&path, key_longer).unwrap();
+        assert_eq!(nibs_of(tail), vec![4, 5]);
+
+        // key nibbles [1, 2, 4]
+        let key_mismatch = KeyNibbles::new(&[0x01, 0x24]).advanced(1);
+        assert!(encoded_path_strip_prefix_key(&path, key_mismatch).is_none());
+
+        // even-length path [2, 3] against a misaligned (odd-offset) cursor
+        let even_path = [0x00, 0x23];
+        let key_misaligned = KeyNibbles::new(&[0x02, 0x34]).advanced(1);
+        let tail = encoded_path_strip_prefix_key(&even_path, key_misaligned).unwrap();
+        assert_eq!(nibs_of(tail), vec![4]);
+        assert!(encoded_path_strip_prefix_key(
+            &even_path,
+            KeyNibbles::new(&[0x02, 0x44]).advanced(1)
+        )
+        .is_none());
+    }
 
-        let key_longer = [1, 2, 3, 4, 5];
-        assert_eq!(encoded_path_strip_prefix(&path, &key_longer), Some(&key_longer[3..]));
+    #[test]
+    fn test_encoded_path_from_key() {
+        let bump = bumpalo::Bump::new();
 
-        let key_mismatch = [1, 2, 4];
-        assert!(encoded_path_strip_prefix(&path, &key_mismatch).is_none());
+        let key = KeyNibbles::new(&[0xab, 0xcd]);
+        // leaf with an even remainder
+        assert_eq!(encoded_path_from_key(&bump, key, true), &[0x20, 0xab, 0xcd]);
+        // extension with an odd remainder
+        assert_eq!(encoded_path_from_key(&bump, key.advanced(1), false), &[0x1b, 0xcd]);
+        // leaf with an odd remainder
+        assert_eq!(encoded_path_from_key(&bump, key.advanced(3), true), &[0x3d]);
+        // empty remainder
+        assert_eq!(encoded_path_from_key(&bump, key.advanced(4), true), &[0x20]);
+    }
+
+    #[test]
+    fn test_lcp_key() {
+        let key = KeyNibbles::new(&[0xab, 0xcd]);
+        assert_eq!(lcp_key(&[], key), 0);
+        assert_eq!(lcp_key(&[0xa], key), 1);
+        assert_eq!(lcp_key(&[0xa, 0xb, 0xd], key), 2);
+        assert_eq!(lcp_key(&[0xa, 0xb, 0xc, 0xd], key), 4);
+        assert_eq!(lcp_key(&[0xa, 0xb, 0xc, 0xd, 0xe], key), 4);
+        assert_eq!(lcp_key(&[0xb, 0xc], key.advanced(1)), 2);
     }
 
     #[test]
@@ -264,21 +360,4 @@ mod tests {
         let nibbles = vec![0x0a, 0x0b, 0x0c];
         assert_eq!(to_encoded_path_with_bump(&bump, &nibbles, true), vec![0x3a, 0xbc]);
     }
-
-    #[test]
-    fn test_lcp() {
-        let cases = [
-            (vec![], vec![], 0),
-            (vec![0xa], vec![0xa], 1),
-            (vec![0xa, 0xb], vec![0xa, 0xc], 1),
-            (vec![0xa, 0xb], vec![0xa, 0xb], 2),
-            (vec![0xa, 0xb], vec![0xa, 0xb, 0xc], 2),
-            (vec![0xa, 0xb, 0xc], vec![0xa, 0xb, 0xc], 3),
-            (vec![0xa, 0xb, 0xc], vec![0xa, 0xb, 0xc, 0xd], 3),
-            (vec![0xa, 0xb, 0xc, 0xd], vec![0xa, 0xb, 0xc, 0xd], 4),
-        ];
-        for (a, b, cpl) in cases {
-            assert_eq!(lcp(&a, &b), cpl)
-        }
-    }
 }
diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index fb6966232..0f2b12388 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -14,8 +14,8 @@ use smallvec::SmallVec;
 use crate::{
     bump_bufmut::BumpBytesMut,
     hp::{
-        encoded_path_eq_nibs, encoded_path_strip_prefix, lcp, prefix_to_nibs,
-        to_encoded_path_with_bump, to_nibs,
+        encoded_path_eq_key, encoded_path_from_key, encoded_path_strip_prefix_key, lcp_key,
+        prefix_to_nibs, to_encoded_path_with_bump, KeyNibbles,
     },
     node::{BranchChildren, NodeData, NodeId, NodeRef},
 };
@@ -594,7 +594,7 @@ impl<'a> Mpt<'a> {
     /// Retrieves the value associated with a given key in the trie.
     #[inline]
     pub fn get<'s>(&'s self, key: &[u8]) -> Result<Option<&'a [u8]>, Error> {
-        self.get_internal(self.root_id, &to_nibs(key))
+        self.get_internal(self.root_id, KeyNibbles::new(key))
     }
 
     /// Retrieves the RLP-decoded value corresponding to the key.
@@ -612,8 +612,7 @@ impl<'a> Mpt<'a> {
     /// Inserts a key-value pair into the trie.
     #[inline]
     pub fn insert(&mut self, key: &[u8], value: &'a [u8]) -> Result<bool, Error> {
-        let key_nibs = &to_nibs(key);
-        self.insert_internal(self.root_id, key_nibs, value)
+        self.insert_internal(self.root_id, KeyNibbles::new(key), value)
     }
 
     /// Inserts an RLP-encoded value into the trie.
@@ -634,8 +633,7 @@ impl<'a> Mpt<'a> {
     /// present, it returns `true`. Otherwise, it returns `false`.
     #[inline]
     pub fn delete(&mut self, key: &[u8]) -> Result<bool, Error> {
-        let key_nibs = &to_nibs(key);
-        self.delete_internal(self.root_id, key_nibs)
+        self.delete_internal(self.root_id, KeyNibbles::new(key))
     }
 
     #[inline]
@@ -703,12 +701,16 @@ impl<'a> Mpt<'a> {
     }
 
     #[inline]
-    fn get_internal(&self, node_id: NodeId, key_nibs: &[u8]) -> Result<Option<&'a [u8]>, Error> {
+    fn get_internal(
+        &self,
+        node_id: NodeId,
+        key: KeyNibbles<'_>,
+    ) -> Result<Option<&'a [u8]>, Error> {
         match &self.nodes[node_id as usize] {
             NodeData::Null => Ok(None),
             NodeData::Branch(children) => {
-                if let Some((i, tail)) = key_nibs.split_first() {
-                    match children[*i as usize].get() {
+                if let Some((i, tail)) = key.split_first() {
+                    match children[usize::from(i)].get() {
                         Some(id) => self.get_internal(id, tail),
                         None => Ok(None),
                     }
@@ -718,7 +720,7 @@ impl<'a> Mpt<'a> {
             }
             NodeData::Leaf(path_bytes, value) => {
                 // Compare compact path to key nibbles without allocating
-                if encoded_path_eq_nibs(path_bytes, key_nibs) {
+                if encoded_path_eq_key(path_bytes, key) {
                     Ok(Some(value))
                 } else {
                     Ok(None)
@@ -726,7 +728,7 @@ impl<'a> Mpt<'a> {
             }
             NodeData::Extension(path_bytes, child_id) => {
                 // Strip compact path prefix without allocating
-                if let Some(tail) = encoded_path_strip_prefix(path_bytes, key_nibs) {
+                if let Some(tail) = encoded_path_strip_prefix_key(path_bytes, key) {
                     self.get_internal(*child_id, tail)
                 } else {
                     Ok(None)
@@ -740,23 +742,23 @@ impl<'a> Mpt<'a> {
     fn insert_internal(
         &mut self,
         node_id: NodeId,
-        key_nibs: &[u8],
+        key: KeyNibbles<'_>,
         value: &'a [u8],
     ) -> Result<bool, Error> {
         let updated = match self.nodes[node_id as usize] {
             NodeData::Null => {
-                let path = to_encoded_path_with_bump(self.bump, key_nibs, true);
+                let path = encoded_path_from_key(self.bump, key, true);
                 self.nodes[node_id as usize] = NodeData::Leaf(path, value);
                 true
             }
             NodeData::Branch(children) => {
-                if let Some((i, tail)) = key_nibs.split_first() {
-                    match children[*i as usize].get() {
+                if let Some((i, tail)) = key.split_first() {
+                    match children[usize::from(i)].get() {
                         Some(id) => self.insert_internal(id, tail, value)?,
                         None => {
-                            let path = to_encoded_path_with_bump(self.bump, tail, true);
+                            let path = encoded_path_from_key(self.bump, tail, true);
                             let new_leaf_id = self.add_node(NodeData::Leaf(path, value), None);
-                            children[*i as usize].set(Some(new_leaf_id));
+                            children[usize::from(i)].set(Some(new_leaf_id));
                             true
                         }
                     }
@@ -765,7 +767,7 @@ impl<'a> Mpt<'a> {
                 }
             }
             NodeData::Leaf(prefix, old_value) => {
-                if encoded_path_eq_nibs(prefix, key_nibs) {
+                if encoded_path_eq_key(prefix, key) {
                     // update the value if it is different
                     if old_value == value {
                         return Ok(false);
@@ -774,9 +776,9 @@ impl<'a> Mpt<'a> {
                     true
                 } else {
                     let self_nibs = prefix_to_nibs(prefix);
-                    let common_len = lcp(&self_nibs, key_nibs);
+                    let common_len = lcp_key(&self_nibs, key);
 
-                    if common_len == self_nibs.len() || common_len == key_nibs.len() {
+                    if common_len == self_nibs.len() || common_len == key.remaining() {
                         return Err(Error::ValueInBranch);
                     } else {
                         // otherwise, create a branch with two children
@@ -788,11 +790,11 @@ impl<'a> Mpt<'a> {
                         let leaf1_id = self.add_node(NodeData::Leaf(leaf1_path, old_value), None);
 
                         let leaf2_path =
-                            to_encoded_path_with_bump(self.bump, &key_nibs[split_point..], true);
+                            encoded_path_from_key(self.bump, key.advanced(split_point), true);
                         let leaf2_id = self.add_node(NodeData::Leaf(leaf2_path, value), None);
 
                         children[self_nibs[common_len] as usize] = Some(leaf1_id);
-                        children[key_nibs[common_len] as usize] = Some(leaf2_id);
+                        children[usize::from(key.nib(common_len))] = Some(leaf2_id);
 
                         let branch_children = self.alloc_branch(children);
                         let new_node_data = if common_len > 0 {
@@ -813,13 +815,13 @@ impl<'a> Mpt<'a> {
                 }
             }
             NodeData::Extension(prefix, child_id) => {
-                if let Some(tail) = encoded_path_strip_prefix(prefix, key_nibs) {
+                if let Some(tail) = encoded_path_strip_prefix_key(prefix, key) {
                     self.insert_internal(child_id, tail, value)?
                 } else {
                     let self_nibs = prefix_to_nibs(prefix);
-                    let common_len = lcp(&self_nibs, key_nibs);
+                    let common_len = lcp_key(&self_nibs, key);
 
-                    if common_len == key_nibs.len() {
+                    if common_len == key.remaining() {
                         return Err(Error::ValueInBranch);
                     }
                     let split_point = common_len + 1;
@@ -835,9 +837,9 @@ impl<'a> Mpt<'a> {
                     }
 
                     let leaf_path =
-                        to_encoded_path_with_bump(self.bump, &key_nibs[split_point..], true);
+                        encoded_path_from_key(self.bump, key.advanced(split_point), true);
                     let leaf_id = self.add_node(NodeData::Leaf(leaf_path, value), None);
-                    children[key_nibs[common_len] as usize] = Some(leaf_id);
+                    children[usize::from(key.nib(common_len))] = Some(leaf_id);
 
                     let branch_children = self.alloc_branch(children);
                     let new_node_data = if common_len > 0 {
@@ -865,12 +867,12 @@ impl<'a> Mpt<'a> {
     }
 
     #[inline]
-    fn delete_internal(&mut self, node_id: NodeId, key_nibs: &[u8]) -> Result<bool, Error> {
+    fn delete_internal(&mut self, node_id: NodeId, key: KeyNibbles<'_>) -> Result<bool, Error> {
         let updated = match self.nodes[node_id as usize] {
             NodeData::Null => false,
             NodeData::Branch(children) => {
-                if let Some((i, tail)) = key_nibs.split_first() {
-                    match children[*i as usize].get() {
+                if let Some((i, tail)) = key.split_first() {
+                    match children[usize::from(i)].get() {
                         Some(id) => {
                             if !self.delete_internal(id, tail)? {
                                 return Ok(false);
@@ -878,7 +880,7 @@ impl<'a> Mpt<'a> {
 
                             // if the node is now empty, remove it
                             if matches!(self.nodes[id as usize], NodeData::Null) {
-                                children[*i as usize].set(None);
+                                children[usize::from(i)].set(None);
                             }
                         }
                         None => return Ok(false),
@@ -935,14 +937,14 @@ impl<'a> Mpt<'a> {
                 true
             }
             NodeData::Leaf(prefix, _) => {
-                if !encoded_path_eq_nibs(prefix, key_nibs) {
+                if !encoded_path_eq_key(prefix, key) {
                     return Ok(false);
                 }
                 self.nodes[node_id as usize] = NodeData::Null;
                 true
             }
             NodeData::Extension(prefix, child_id) => {
-                let tail = match encoded_path_strip_prefix(prefix, key_nibs) {
+                let tail = match encoded_path_strip_prefix_key(prefix, key) {
                     Some(tail) => tail,
                     None => return Ok(false),
                 };

From eaad32af5a2d7a195fc15b0ebf62dea866e5032e Mon Sep 17 00:00:00 2001
From: Valery Cherepanov <valery@intrinsictech.xyz>
Date: Wed, 29 Jul 2026 08:33:00 +0100
Subject: [PATCH 43/94] perf: shrink branch child slots to 4 bytes via NonZero
 node ids (#658)

---
 crates/mpt/src/node.rs     |  9 +++--
 crates/mpt/src/resolver.rs |  7 ++--
 crates/mpt/src/tests.rs    | 11 ++++---
 crates/mpt/src/trie.rs     | 67 +++++++++++++++++++++++---------------
 4 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/crates/mpt/src/node.rs b/crates/mpt/src/node.rs
index bea884605..a1d9bf259 100644
--- a/crates/mpt/src/node.rs
+++ b/crates/mpt/src/node.rs
@@ -1,11 +1,16 @@
-use core::cell::Cell;
+use core::{cell::Cell, num::NonZeroU32};
 
 use revm_primitives::hex;
 
 pub(crate) type NodeId = u32;
 
+/// Id of a branch child node. `NonZero` so that a child slot (`Option<BranchChildId>`) fits in
+/// 4 bytes — `Option<u32>` has no niche and takes 8. Node id 0 is the null-node sentinel
+/// (`NULL_NODE_ID`) and is never stored as a branch child.
+pub(crate) type BranchChildId = NonZeroU32;
+
 /// Children slots of a branch node, allocated in the trie's bump arena.
-pub(crate) type BranchChildren<'a> = &'a [Cell<Option<NodeId>>; 16];
+pub(crate) type BranchChildren<'a> = &'a [Cell<Option<BranchChildId>>; 16];
 
 /// Node data for arena-based trie with zero-copy optimization.
 ///
diff --git a/crates/mpt/src/resolver.rs b/crates/mpt/src/resolver.rs
index 94cb0358e..add478b02 100644
--- a/crates/mpt/src/resolver.rs
+++ b/crates/mpt/src/resolver.rs
@@ -1,5 +1,5 @@
 use crate::{
-    node::{NodeData, NodeId},
+    node::{BranchChildId, NodeData, NodeId},
     trie::{NULL_NODE_ID, NULL_NODE_REF_SLICE},
     Error, Mpt,
 };
@@ -77,10 +77,11 @@ impl MptResolver {
                         return Err(Error::ValueInBranch);
                     }
 
-                    let mut childs: [Option<NodeId>; 16] = Default::default();
+                    let mut childs: [Option<BranchChildId>; 16] = Default::default();
                     for (i, mut item) in items.into_iter().take(16).enumerate() {
                         let child_id = self.resolve_internal(&mut item, mpt)?;
-                        childs[i] = if child_id == NULL_NODE_ID { None } else { Some(child_id) };
+                        // `BranchChildId::new` maps the `NULL_NODE_ID` sentinel (0) to `None`.
+                        childs[i] = BranchChildId::new(child_id);
                     }
                     // The children array is allocated in `mpt`'s own bump, so no copy is needed.
                     let children = mpt.alloc_branch(childs);
diff --git a/crates/mpt/src/tests.rs b/crates/mpt/src/tests.rs
index 9d4ebb82a..477d6f8c4 100644
--- a/crates/mpt/src/tests.rs
+++ b/crates/mpt/src/tests.rs
@@ -1,6 +1,9 @@
 use revm_primitives::{b256, keccak256, B256};
 
-use crate::{node::NodeData, Error, Mpt};
+use crate::{
+    node::{BranchChildId, NodeData},
+    Error, Mpt,
+};
 
 trait RlpBytes {
     /// Returns the RLP-encoding.
@@ -299,9 +302,9 @@ fn test_delete_with_unresolved_sibling_errors() {
     let digest_id = trie.add_node(NodeData::Digest(fake_digest), None);
 
     // Create a branch with these two children
-    let mut children: [Option<u32>; 16] = Default::default();
-    children[0] = Some(leaf_id);
-    children[1] = Some(digest_id);
+    let mut children: [Option<BranchChildId>; 16] = Default::default();
+    children[0] = BranchChildId::new(leaf_id);
+    children[1] = BranchChildId::new(digest_id);
     let branch_children = trie.alloc_branch(children);
     let branch_node_id = trie.add_node(NodeData::Branch(branch_children), None);
 
diff --git a/crates/mpt/src/trie.rs b/crates/mpt/src/trie.rs
index 0f2b12388..b9b654130 100644
--- a/crates/mpt/src/trie.rs
+++ b/crates/mpt/src/trie.rs
@@ -17,7 +17,7 @@ use crate::{
         encoded_path_eq_key, encoded_path_from_key, encoded_path_strip_prefix_key, lcp_key,
         prefix_to_nibs, to_encoded_path_with_bump, KeyNibbles,
     },
-    node::{BranchChildren, NodeData, NodeId, NodeRef},
+    node::{BranchChildId, BranchChildren, NodeData, NodeId, NodeRef},
 };
 
 /// OpenVM memory alignment word size.
@@ -153,6 +153,14 @@ fn put_digest<B: alloy_rlp::BufMut>(digest: &[u8], out: &mut B) {
     }
 }
 
+/// Converts a node id to a branch child slot id.
+/// The only zero id is the null-node sentinel ([`NULL_NODE_ID`]), which is never stored as a
+/// branch child.
+#[inline(always)]
+fn branch_child_id(node_id: NodeId) -> BranchChildId {
+    BranchChildId::new(node_id).expect("the null-node sentinel is never a branch child")
+}
+
 /// Writes an RLP header with the given base code (`EMPTY_LIST_CODE` for lists,
 /// `EMPTY_STRING_CODE` for strings). Emits the same bytes as [`alloy_rlp::Header::encode`], but
 /// is generic over the output buffer: `alloy_rlp` encoding goes through `&mut dyn BufMut`, and
@@ -210,7 +218,7 @@ impl<'a> Mpt<'a> {
         match self.nodes[node_id as usize] {
             NodeData::Branch(children) => {
                 for child_id in children.iter().filter_map(Cell::get) {
-                    self.encode_trie_internal(child_id, out);
+                    self.encode_trie_internal(child_id.get(), out);
                 }
             }
             NodeData::Extension(_, ext_id) => {
@@ -364,7 +372,7 @@ impl<'a> Mpt<'a> {
             if is_null_ref(child0_expected_node_ref.as_slice()) {
                 None
             } else {
-                Some(self.decode_trie_internal(bytes, child0_expected_node_ref)?)
+                Some(branch_child_id(self.decode_trie_internal(bytes, child0_expected_node_ref)?))
             }
         };
 
@@ -373,7 +381,7 @@ impl<'a> Mpt<'a> {
             if is_null_ref(child1_expected_node_ref.as_slice()) {
                 None
             } else {
-                Some(self.decode_trie_internal(bytes, child1_expected_node_ref)?)
+                Some(branch_child_id(self.decode_trie_internal(bytes, child1_expected_node_ref)?))
             }
         };
 
@@ -385,8 +393,8 @@ impl<'a> Mpt<'a> {
         let childs = unsafe {
             &mut *self
                 .bump
-                .alloc_layout(Layout::new::<[Cell<Option<NodeId>>; 16]>())
-                .cast::<[MaybeUninit<Option<NodeId>>; 16]>()
+                .alloc_layout(Layout::new::<[Cell<Option<BranchChildId>>; 16]>())
+                .cast::<[MaybeUninit<Option<BranchChildId>>; 16]>()
                 .as_ptr()
         };
 
@@ -410,7 +418,9 @@ impl<'a> Mpt<'a> {
                 if is_null_ref(child_expected_node_ref.as_slice()) {
                     None
                 } else {
-                    Some(self.decode_trie_internal(bytes, child_expected_node_ref)?)
+                    Some(branch_child_id(
+                        self.decode_trie_internal(bytes, child_expected_node_ref)?,
+                    ))
                 }
             });
         }
@@ -423,8 +433,8 @@ impl<'a> Mpt<'a> {
         // SAFETY: all elements of the array were initialized above, and `Cell<T>` is
         // `repr(transparent)` over `T`.
         let children: BranchChildren<'a> = unsafe {
-            &*(childs as *const [MaybeUninit<Option<NodeId>>; 16]
-                as *const [Cell<Option<NodeId>>; 16])
+            &*(childs as *const [MaybeUninit<Option<BranchChildId>>; 16]
+                as *const [Cell<Option<BranchChildId>>; 16])
         };
         let node_id = self.add_node(NodeData::Branch(children), Some(node_ref));
         Ok(node_id)
@@ -483,7 +493,7 @@ impl<'a> Mpt<'a> {
                 encode_header(alloy_rlp::EMPTY_LIST_CODE, payload_length, out);
                 for child_id in children.iter() {
                     match child_id.get() {
-                        Some(id) => self.reference_encode(id, out),
+                        Some(id) => self.reference_encode(id.get(), out),
                         None => out.put_u8(alloy_rlp::EMPTY_STRING_CODE),
                     }
                 }
@@ -536,7 +546,7 @@ impl<'a> Mpt<'a> {
             NodeData::Branch(children) => {
                 1 + children
                     .iter()
-                    .map(|child| child.get().map_or(1, |id| self.reference_length(id)))
+                    .map(|child| child.get().map_or(1, |id| self.reference_length(id.get())))
                     .sum::<usize>()
             }
             NodeData::Leaf(encoded_path, value) => encoded_path.length() + value.length(),
@@ -662,7 +672,7 @@ impl<'a> Mpt<'a> {
     /// Allocates a branch children array in the bump arena, to be stored in a
     /// [`NodeData::Branch`].
     #[inline]
-    pub(crate) fn alloc_branch(&self, children: [Option<NodeId>; 16]) -> BranchChildren<'a> {
+    pub(crate) fn alloc_branch(&self, children: [Option<BranchChildId>; 16]) -> BranchChildren<'a> {
         self.bump.alloc(children.map(Cell::new))
     }
 
@@ -711,7 +721,7 @@ impl<'a> Mpt<'a> {
             NodeData::Branch(children) => {
                 if let Some((i, tail)) = key.split_first() {
                     match children[usize::from(i)].get() {
-                        Some(id) => self.get_internal(id, tail),
+                        Some(id) => self.get_internal(id.get(), tail),
                         None => Ok(None),
                     }
                 } else {
@@ -754,11 +764,11 @@ impl<'a> Mpt<'a> {
             NodeData::Branch(children) => {
                 if let Some((i, tail)) = key.split_first() {
                     match children[usize::from(i)].get() {
-                        Some(id) => self.insert_internal(id, tail, value)?,
+                        Some(id) => self.insert_internal(id.get(), tail, value)?,
                         None => {
                             let path = encoded_path_from_key(self.bump, tail, true);
                             let new_leaf_id = self.add_node(NodeData::Leaf(path, value), None);
-                            children[usize::from(i)].set(Some(new_leaf_id));
+                            children[usize::from(i)].set(Some(branch_child_id(new_leaf_id)));
                             true
                         }
                     }
@@ -783,7 +793,7 @@ impl<'a> Mpt<'a> {
                     } else {
                         // otherwise, create a branch with two children
                         let split_point = common_len + 1;
-                        let mut children: [Option<NodeId>; 16] = Default::default();
+                        let mut children: [Option<BranchChildId>; 16] = Default::default();
 
                         let leaf1_path =
                             to_encoded_path_with_bump(self.bump, &self_nibs[split_point..], true);
@@ -793,8 +803,9 @@ impl<'a> Mpt<'a> {
                             encoded_path_from_key(self.bump, key.advanced(split_point), true);
                         let leaf2_id = self.add_node(NodeData::Leaf(leaf2_path, value), None);
 
-                        children[self_nibs[common_len] as usize] = Some(leaf1_id);
-                        children[usize::from(key.nib(common_len))] = Some(leaf2_id);
+                        children[self_nibs[common_len] as usize] = Some(branch_child_id(leaf1_id));
+                        children[usize::from(key.nib(common_len))] =
+                            Some(branch_child_id(leaf2_id));
 
                         let branch_children = self.alloc_branch(children);
                         let new_node_data = if common_len > 0 {
@@ -825,21 +836,21 @@ impl<'a> Mpt<'a> {
                         return Err(Error::ValueInBranch);
                     }
                     let split_point = common_len + 1;
-                    let mut children: [Option<NodeId>; 16] = Default::default();
+                    let mut children: [Option<BranchChildId>; 16] = Default::default();
 
                     if split_point < self_nibs.len() {
                         let ext_path =
                             to_encoded_path_with_bump(self.bump, &self_nibs[split_point..], false);
                         let ext_id = self.add_node(NodeData::Extension(ext_path, child_id), None);
-                        children[self_nibs[common_len] as usize] = Some(ext_id);
+                        children[self_nibs[common_len] as usize] = Some(branch_child_id(ext_id));
                     } else {
-                        children[self_nibs[common_len] as usize] = Some(child_id);
+                        children[self_nibs[common_len] as usize] = Some(branch_child_id(child_id));
                     }
 
                     let leaf_path =
                         encoded_path_from_key(self.bump, key.advanced(split_point), true);
                     let leaf_id = self.add_node(NodeData::Leaf(leaf_path, value), None);
-                    children[usize::from(key.nib(common_len))] = Some(leaf_id);
+                    children[usize::from(key.nib(common_len))] = Some(branch_child_id(leaf_id));
 
                     let branch_children = self.alloc_branch(children);
                     let new_node_data = if common_len > 0 {
@@ -874,6 +885,7 @@ impl<'a> Mpt<'a> {
                 if let Some((i, tail)) = key.split_first() {
                     match children[usize::from(i)].get() {
                         Some(id) => {
+                            let id = id.get();
                             if !self.delete_internal(id, tail)? {
                                 return Ok(false);
                             }
@@ -892,7 +904,7 @@ impl<'a> Mpt<'a> {
                 let mut remaining_iter = children
                     .iter()
                     .enumerate()
-                    .filter_map(|(index, n)| n.get().map(|id| (index, id)));
+                    .filter_map(|(index, n)| n.get().map(|id| (index, id.get())));
 
                 // there will always be at least one remaining node
                 let (index, child_id) = remaining_iter.next().unwrap();
@@ -1040,10 +1052,11 @@ impl<'a> Mpt<'a> {
                         return Err(Error::ValueInBranch);
                     }
 
-                    let mut childs: [Option<NodeId>; 16] = Default::default();
+                    let mut childs: [Option<BranchChildId>; 16] = Default::default();
                     for (i, mut item) in items.into_iter().take(16).enumerate() {
                         let child_id = self.decode_from_proof_rlp_internal(&mut item)?;
-                        childs[i] = if child_id == NULL_NODE_ID { None } else { Some(child_id) };
+                        // `BranchChildId::new` maps the `NULL_NODE_ID` sentinel (0) to `None`.
+                        childs[i] = BranchChildId::new(child_id);
                     }
                     let children = self.alloc_branch(childs);
                     self.add_node(NodeData::Branch(children), None)
@@ -1076,7 +1089,7 @@ impl<'a> Mpt<'a> {
         match &self.nodes[node_id as usize] {
             NodeData::Branch(children) => {
                 for child_id in children.iter().filter_map(Cell::get) {
-                    self.payloads_internal(child_id, payloads);
+                    self.payloads_internal(child_id.get(), payloads);
                 }
             }
             NodeData::Extension(_, ext_id) => {
@@ -1105,7 +1118,7 @@ impl Mpt<'_> {
                 for (i, child) in children.iter().enumerate() {
                     if let Some(child_id) = child.get() {
                         println!("{}  [{}]:", indent, hex::encode([i as u8]));
-                        self.print_trie_internal(child_id, depth + 2);
+                        self.print_trie_internal(child_id.get(), depth + 2);
                     }
                 }
             }

From 2b4b18bc3ca229e40a1f702c8d718b6727ec7bf4 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 29 Jul 2026 12:14:49 +0200
Subject: [PATCH 44/94] chore: update lock files

---
 Cargo.lock                     | 144 +++---
 bin/stateless-guest/Cargo.lock |  38 +-
 scripts/ethproofs_analyzer.py  | 784 ++++++++++++++++++++++++++-------
 scripts/precompile_analyzer.py |  22 +-
 4 files changed, 723 insertions(+), 265 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b13b8cec5..ce3b03acd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6788,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6826,7 +6826,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6836,7 +6836,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6852,7 +6852,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6864,7 +6864,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6878,7 +6878,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6888,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6917,7 +6917,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6926,7 +6926,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6941,7 +6941,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6963,7 +6963,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "backtrace",
  "bytesize",
@@ -7010,7 +7010,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7021,7 +7021,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7183,7 +7183,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7193,12 +7193,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7230,7 +7230,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7239,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7255,7 +7255,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7293,7 +7293,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7312,7 +7312,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7322,7 +7322,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7336,7 +7336,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7353,7 +7353,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7362,7 +7362,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7372,7 +7372,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7402,7 +7402,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-platform",
 ]
@@ -7410,7 +7410,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7449,7 +7449,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7457,12 +7457,12 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7520,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7544,7 +7544,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7578,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7599,7 +7599,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7612,7 +7612,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7622,7 +7622,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7640,7 +7640,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7668,7 +7668,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7743,7 +7743,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7760,7 +7760,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7792,7 +7792,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7801,7 +7801,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7854,7 +7854,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7894,7 +7894,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7931,7 +7931,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7940,7 +7940,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7954,7 +7954,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7985,7 +7985,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-platform",
 ]
@@ -7993,7 +7993,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8129,7 +8129,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8153,7 +8153,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "elf",
  "eyre",
@@ -8168,7 +8168,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8198,7 +8198,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8237,7 +8237,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -12728,7 +12728,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12742,12 +12742,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12764,7 +12764,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12778,7 +12778,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12792,7 +12792,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12805,7 +12805,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12818,7 +12818,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12830,7 +12830,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12845,7 +12845,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12858,7 +12858,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "serde",
 ]
@@ -12866,7 +12866,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12879,7 +12879,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 
 [[package]]
 name = "ryu"
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index d04a42535..9185b3cd9 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2466,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2476,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2492,7 +2492,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2523,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2533,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2552,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2562,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2572,7 +2572,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-platform",
 ]
@@ -2596,7 +2596,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 
 [[package]]
 name = "openvm-mpt"
@@ -2624,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "group",
  "hex-literal",
@@ -2647,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2666,7 +2666,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2697,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2706,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2715,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "openvm-platform",
 ]
@@ -2773,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#530eb47efa03690c44c0529e9cc598e77ed0fb67"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
diff --git a/scripts/ethproofs_analyzer.py b/scripts/ethproofs_analyzer.py
index d2840fc0f..fcefb43ae 100755
--- a/scripts/ethproofs_analyzer.py
+++ b/scripts/ethproofs_analyzer.py
@@ -6,54 +6,62 @@
 """
 Fetches data from ethproofs.org API and analyzes proving times.
 
-Finds top K blocks by:
-- Gas used
-- Proving time (max, median, avg, min across that block's provers)
-- How far a single prover (default OpenVM 2.0 / Axiom) trails the fastest prover
+Reports:
+- Top K blocks by gas used
+- Range-wide proving-time statistics across completed proofs
+- Legacy per-block proving-time rankings
+- How a single prover (default OpenVM 2.0) compares with the fastest other prover
 
 Run it directly (uv installs the dependencies on first use):
-    ./ethproofs_analyzer.py ...        # via the uv shebang
-    uv run ethproofs_analyzer.py ...   # equivalent
+    ./scripts/ethproofs_analyzer.py ...        # via the uv shebang
+    uv run scripts/ethproofs_analyzer.py ...   # equivalent
 
 Common recipes:
-    # Blocks where OpenVM trailed the fastest prover by the most, over the last day / week:
-    ./ethproofs_analyzer.py --last 1d --compare --top-k 20
-    ./ethproofs_analyzer.py --last 1w --compare --top-k 20
+    # Blocks with the highest OpenVM / fastest-other ratio, over the last day / week:
+    ./scripts/ethproofs_analyzer.py --last 1d --compare --top-k 20
+    ./scripts/ethproofs_analyzer.py --last 1w --compare --top-k 20
 
-    # Blocks that were hardest for EVERY prover (even the leader was slow), last day / week:
-    ./ethproofs_analyzer.py --last 1d --metric min --top-k 20
-    ./ethproofs_analyzer.py --last 1w --metric min --top-k 20
+    # Median OpenVM proving time across the last day / week:
+    ./scripts/ethproofs_analyzer.py --last 1d --metric median --zkvm openvm2
+    ./scripts/ethproofs_analyzer.py --last 1w --metric median --zkvm openvm2
+
+    # Fastest completed multi-machine proof across all zkVMs in the last week:
+    ./scripts/ethproofs_analyzer.py --last 1w --metric min
 
     # Compare a different prover against the field:
-    ./ethproofs_analyzer.py --last 1w --compare --compare-zkvm pico --top-k 20
+    ./scripts/ethproofs_analyzer.py --last 1w --compare --compare-zkvm pico --top-k 20
 
     # Follow up on a slow block — inspect its precompile load (needs an RPC with `debug`):
-    ./precompile_analyzer.py <block_number>
+    ./scripts/precompile_analyzer.py <block_number>
 
 Usage:
-    ./ethproofs_analyzer.py                  # last 100 blocks, all metrics
-    ./ethproofs_analyzer.py --last 6h        # last 6 hours (also: 30m, 1d, 1w, 45s)
-    ./ethproofs_analyzer.py --last 500       # last 500 blocks
-    ./ethproofs_analyzer.py --file data.json # Load from a JSON file
-    ./ethproofs_analyzer.py --top-k 5        # Show top 5 blocks per metric
-    ./ethproofs_analyzer.py --metric median  # Show only median proving time
-    ./ethproofs_analyzer.py --metric min     # Blocks where even the fastest prover was slow
-    ./ethproofs_analyzer.py --metric gas     # Show only gas used
-    ./ethproofs_analyzer.py --cluster axiom  # Only proofs from the Axiom cluster
-    ./ethproofs_analyzer.py --zkvm openvm2   # Only proofs from the OpenVM 2.0 zkVM
-    ./ethproofs_analyzer.py --list-provers   # Print distinct provers in the data
-    ./ethproofs_analyzer.py --compare        # Where OpenVM was slowest, absolute & vs fastest
-    ./ethproofs_analyzer.py --no-cache       # Bypass the local page cache
-
-Cached responses live in scripts/.cache (1h TTL); reruns serve from there.
+    ./scripts/ethproofs_analyzer.py                  # last 100 blocks, all metrics
+    ./scripts/ethproofs_analyzer.py --last 6h        # last 6 wall-clock hours
+    ./scripts/ethproofs_analyzer.py --last 500       # last 500 blocks
+    ./scripts/ethproofs_analyzer.py --file data.json # load from a JSON file
+    ./scripts/ethproofs_analyzer.py --top-k 5        # top 5 gas and per-block time rows
+    ./scripts/ethproofs_analyzer.py --metric median  # range median
+    ./scripts/ethproofs_analyzer.py --top-k 5 --no-block-rankings  # rank gas only
+    ./scripts/ethproofs_analyzer.py --cluster axiom  # only proofs from the Axiom cluster
+    ./scripts/ethproofs_analyzer.py --zkvm openvm2   # only OpenVM 2.0 proofs
+    ./scripts/ethproofs_analyzer.py --list-provers   # print distinct provers
+    ./scripts/ethproofs_analyzer.py --compare        # compare OpenVM with other provers
+    ./scripts/ethproofs_analyzer.py --cache-ttl 600  # override the cache TTL
+    ./scripts/ethproofs_analyzer.py --no-cache       # require fresh API pages
+    ./scripts/ethproofs_analyzer.py --require-complete  # fail instead of using partial results
+
+Successful API pages are cached for one hour by default so long queries can resume
+after a failure. Pagination consistency checks reject incompatible cached snapshots.
+Cached responses live in scripts/.cache.
 """
 
 import argparse
 import json
+import math
 import os
 import statistics
 import sys
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 import hishel
 import hishel.httpx
@@ -64,16 +72,19 @@
 
 API_URL = "https://ethproofs.org/api/blocks"
 
-# Directory of cached API responses, reused across runs within CACHE_TTL.
+# Directory of cached successful API responses.
 CACHE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), ".cache")
-CACHE_TTL = 3600  # seconds a cached response stays fresh
+CACHE_TTL = 3600
+INITIAL_FETCH_ATTEMPTS = 4
+CONTINUATION_FETCH_ATTEMPTS = 2
 
 # Duration suffixes accepted by --last (e.g. "6h", "1w"), in seconds.
 UNITS = {"s": 1, "m": 60, "h": 3600, "d": 86400, "w": 604800}
 
 # Column widths (chars).
 COL_RANK, COL_BLOCK, COL_GAS, COL_TXS = 4, 10, 14, 5
-COL_TIME, COL_TIMESTAMP, COL_RATIO, COL_ZKVM = 13, 19, 8, 18
+COL_TIME, COL_TIMESTAMP, COL_RATIO = 13, 19, 16
+COL_ZKVM, COL_CLUSTER, COL_PROVER = 18, 32, 40
 ABS_BLOCK, ABS_TARGET_TIME, ABS_CLOSEST_TIME, ABS_CLOSEST_ZKVM = range(4)
 REL_BLOCK, REL_TARGET_TIME, REL_FASTEST_TIME, REL_FASTEST_ZKVM, REL_SLOWDOWN = range(5)
 
@@ -89,24 +100,44 @@ def fmt_time(ms: float) -> str:
     return f"{ms / 1000:.2f}s"
 
 
-def fmt_gas(gas: int | None) -> str:
+def numeric_value(value) -> int | float | None:
+    """Return a finite numeric value while rejecting bools and malformed JSON fields."""
+    if isinstance(value, bool) or not isinstance(value, (int, float)):
+        return None
+    return value if math.isfinite(value) else None
+
+
+def fmt_gas(gas) -> str:
     """Format gas with thousands separators."""
-    return f"{gas:,}" if gas else "N/A"
+    value = numeric_value(gas)
+    return f"{value:,}" if value is not None else "N/A"
 
 
 def fmt_timestamp(ts: str | None) -> str:
-    """Trim a timestamp to YYYY-MM-DD HH:MM:SS."""
-    return ts[:19] if ts else "N/A"
+    """Format a timestamp as UTC without an offset."""
+    parsed = parse_ts(ts)
+    return parsed.strftime("%Y-%m-%d %H:%M:%S") if parsed else "N/A"
 
 
 def parse_ts(ts: str | None) -> datetime | None:
-    """Parse a block timestamp (e.g. '2026-06-20 21:58:23' or ISO 'T' form)."""
-    if not ts:
+    """Parse a block timestamp and normalize it to UTC."""
+    if not isinstance(ts, str) or not ts.strip():
         return None
     try:
-        return datetime.strptime(ts.replace("T", " ")[:19], "%Y-%m-%d %H:%M:%S")
+        value = ts.strip()
+        if value.endswith("Z"):
+            value = value[:-1] + "+00:00"
+        parsed = datetime.fromisoformat(value)
     except ValueError:
         return None
+    if parsed.tzinfo is None:
+        parsed = parsed.replace(tzinfo=timezone.utc)
+    return parsed.astimezone(timezone.utc)
+
+
+def value_or_na(value):
+    """Preserve zero and other false-y values while formatting missing data."""
+    return "N/A" if value is None else value
 
 
 def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
@@ -115,7 +146,12 @@ def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
     columns: (header, width, align) per column, align being '<' or '>'.
     rows:    row tuples whose cells line up positionally with columns.
     """
-    cell = lambda value, width, align: f"{value:{align}{width}}"
+    def cell(value, width, align):
+        text = str(value_or_na(value)).replace("\r", " ").replace("\n", " ").replace("|", "\\|")
+        if len(text) > width:
+            text = text[: max(width - 1, 0)] + "…"
+        return f"{text:{align}{width}}"
+
     print("| " + " | ".join(cell(h, w, a) for h, w, a in columns) + " |")
     print("|" + "|".join("-" * (w + 2) for _, w, _ in columns) + "|")
     for row in rows:
@@ -127,7 +163,7 @@ def comparison_time_columns(target_zkvm: str, relationship: str) -> list[tuple[s
     return [
         (f"{target_zkvm} Time", COL_TIME, "<"),
         (f"{relationship} Other", COL_TIME, "<"),
-        (f"{relationship} zkVM", COL_ZKVM, "<"),
+        (f"{relationship} Prover", COL_PROVER, "<"),
     ]
 
 
@@ -150,9 +186,25 @@ def comparison_time_cells(
 def proof_prover_info(proof: dict) -> tuple[str | None, str | None, str | None, int | None]:
     """Extract (cluster_name, zkvm_slug, zkvm_name, num_gpus) from a proof."""
     cv = proof.get("cluster_version") or {}
+    if not isinstance(cv, dict):
+        return None, None, None, None
     cluster = cv.get("cluster") or {}
-    zkvm = (cv.get("zkvm_version") or {}).get("zkvm") or {}
-    return cluster.get("name"), zkvm.get("slug"), zkvm.get("name"), cluster.get("num_gpus")
+    zkvm_version = cv.get("zkvm_version") or {}
+    if not isinstance(cluster, dict) or not isinstance(zkvm_version, dict):
+        return None, None, None, None
+    zkvm = zkvm_version.get("zkvm") or {}
+    if not isinstance(zkvm, dict):
+        zkvm = {}
+
+    def text_or_none(value):
+        return None if value is None else str(value)
+
+    return (
+        text_or_none(cluster.get("name")),
+        text_or_none(zkvm.get("slug")),
+        text_or_none(zkvm.get("name")),
+        cluster.get("num_gpus"),
+    )
 
 
 def proof_zkvm_label(proof: dict) -> str:
@@ -161,6 +213,13 @@ def proof_zkvm_label(proof: dict) -> str:
     return zkvm_slug or zkvm_name or "N/A"
 
 
+def proof_prover_label(proof: dict) -> str:
+    """Short zkVM/cluster label for a proof."""
+    cluster_name, _, _, _ = proof_prover_info(proof)
+    zkvm = proof_zkvm_label(proof)
+    return f"{zkvm} / {cluster_name}" if cluster_name else zkvm
+
+
 def proof_matches(proof: dict, cluster: str | None, zkvm: str | None) -> bool:
     """True if the proof's cluster/zkvm contain the given text (case-insensitive)."""
     cluster_name, zkvm_slug, zkvm_name, _ = proof_prover_info(proof)
@@ -173,27 +232,102 @@ def proof_matches(proof: dict, cluster: str | None, zkvm: str | None) -> bool:
     return True
 
 
+def proof_time(proof: dict) -> float | int | None:
+    """Return a finite positive proving time, or None for pending/invalid records."""
+    value = proof.get("proving_time")
+    if isinstance(value, bool) or not isinstance(value, (int, float)):
+        return None
+    return value if math.isfinite(value) and value > 0 else None
+
+
 def proving_times(proofs) -> list[float]:
     """Completed proving times (ms) from an iterable of proofs."""
-    return [p["proving_time"] for p in proofs if p.get("proving_time") is not None]
+    return [time for p in proofs if (time := proof_time(p)) is not None]
 
 
 # --- Fetching / loading -----------------------------------------------------
 
 
+class InvalidLastError(ValueError):
+    """Raised when --last is not a finite positive duration or block count."""
+
+
 def parse_last(spec: str) -> tuple[str, float]:
     """Parse a --last value into ('seconds', n) for durations or ('blocks', n) for counts.
 
     Durations end in a unit (s/m/h/d/w), e.g. '6h' or '1w'; a bare number means blocks.
     """
-    spec = spec.strip().lower()
-    if spec and spec[-1] in UNITS:
-        return "seconds", float(spec[:-1]) * UNITS[spec[-1]]
-    return "blocks", int(spec)
+    try:
+        spec = spec.strip().lower()
+        if spec and spec[-1] in UNITS:
+            amount = float(spec[:-1]) * UNITS[spec[-1]]
+            if (
+                not math.isfinite(amount)
+                or amount <= 0
+                or amount > timedelta.max.total_seconds()
+            ):
+                raise InvalidLastError
+            return "seconds", amount
+        amount = int(spec)
+        if amount <= 0:
+            raise InvalidLastError
+        return "blocks", amount
+    except (TypeError, ValueError, OverflowError) as exc:
+        if isinstance(exc, InvalidLastError):
+            raise
+        raise InvalidLastError from exc
+
+
+def positive_int_arg(value: str) -> int:
+    """argparse type for strictly positive integers."""
+    try:
+        parsed = int(value)
+    except ValueError as exc:
+        raise argparse.ArgumentTypeError("must be an integer") from exc
+    if parsed <= 0:
+        raise argparse.ArgumentTypeError("must be greater than zero")
+    return parsed
+
+
+def nonnegative_int_arg(value: str) -> int:
+    """argparse type for nonnegative integers."""
+    try:
+        parsed = int(value)
+    except ValueError as exc:
+        raise argparse.ArgumentTypeError("must be an integer") from exc
+    if parsed < 0:
+        raise argparse.ArgumentTypeError("must be zero or greater")
+    return parsed
+
+
+class AnalyzerDataError(ValueError):
+    """Raised when input or paginated API data cannot support a correct report."""
+
+
+def data_rows(data: dict, source: str = "input") -> list[dict]:
+    """Validate and return the top-level block rows."""
+    if not isinstance(data, dict):
+        raise AnalyzerDataError(f"{source} must be a JSON object")
+    rows = data.get("rows", [])
+    if rows is None or not isinstance(rows, list):
+        raise AnalyzerDataError(f"{source} field 'rows' must be a list")
+    if any(not isinstance(block, dict) for block in rows):
+        raise AnalyzerDataError(f"{source} contains a non-object block row")
+    return rows
+
+
+def block_proofs(block: dict) -> list[dict]:
+    """Return a block's proof objects, treating a null proof list as empty."""
+    proofs = block.get("proofs", [])
+    if proofs is None:
+        proofs = []
+    if not isinstance(proofs, list) or any(not isinstance(proof, dict) for proof in proofs):
+        raise AnalyzerDataError("block field 'proofs' must be a list of objects or null")
+    return proofs
 
 
 class CacheEverything(hishel.BaseFilter):
-    """Filter matching every request and response, so pages cache regardless of HTTP headers."""
+    """Filter matching every request, regardless of request cache headers."""
 
     def needs_body(self) -> bool:
         return False
@@ -202,6 +336,16 @@ def apply(self, item, body) -> bool:
         return True
 
 
+class CacheSuccessfulResponses(hishel.BaseFilter):
+    """Cache only successful responses so retries never replay a cached failure."""
+
+    def needs_body(self) -> bool:
+        return False
+
+    def apply(self, item, body) -> bool:
+        return 200 <= item.status_code < 300
+
+
 def make_client(ttl: float) -> httpx.Client:
     """An HTTP client whose responses are cached on disk for ttl seconds (0 disables caching)."""
     if not ttl:
@@ -211,98 +355,266 @@ def make_client(ttl: float) -> httpx.Client:
         database_path=os.path.join(CACHE_DIR, "pages.db"), default_ttl=ttl
     )
     policy = hishel.FilterPolicy(
-        request_filters=[CacheEverything()], response_filters=[CacheEverything()]
+        request_filters=[CacheEverything()], response_filters=[CacheSuccessfulResponses()]
     )
     return hishel.httpx.SyncCacheClient(storage=storage, policy=policy, timeout=30)
 
 
 def is_transient(exc: BaseException) -> bool:
-    """True for errors worth retrying: timeouts, connection drops, and 5xx responses."""
+    """True for errors worth retrying: transport errors, rate limits, and 5xx responses."""
     if isinstance(exc, httpx.TransportError):
         return True
     if isinstance(exc, httpx.HTTPStatusError):
-        return exc.response.status_code >= 500
+        return exc.response.status_code == 429 or exc.response.status_code >= 500
     return False
 
 
-@tenacity.retry(
-    retry=tenacity.retry_if_exception(is_transient),
-    wait=tenacity.wait_exponential(multiplier=0.5, max=5),
-    stop=tenacity.stop_after_attempt(4),
-    reraise=True,
-)
 def fetch_blocks(client: httpx.Client, page_index: int, page_size: int, machine_type: str) -> dict:
     """Fetch one page of blocks, retrying transient errors with exponential backoff."""
-    resp = client.get(
-        API_URL,
-        params={"page_index": page_index, "page_size": page_size, "machine_type": machine_type},
+    retryer = tenacity.Retrying(
+        retry=tenacity.retry_if_exception(is_transient),
+        wait=tenacity.wait_exponential(multiplier=0.5, max=5),
+        stop=tenacity.stop_after_attempt(
+            INITIAL_FETCH_ATTEMPTS if page_index == 0 else CONTINUATION_FETCH_ATTEMPTS
+        ),
+        reraise=True,
     )
-    resp.raise_for_status()
-    return resp.json()
+
+    def request():
+        response = client.get(
+            API_URL,
+            params={
+                "page_index": page_index,
+                "page_size": page_size,
+                "machine_type": machine_type,
+            },
+        )
+        response.raise_for_status()
+        return response.json()
+
+    return retryer(request)
 
 
 def fetch_window(
     client: httpx.Client, mode: str, amount: float, page_size: int,
-    machine_type: str, max_pages: int = 4000,
+    machine_type: str, max_pages: int = 4000, now: datetime | None = None,
+    require_complete: bool = False,
 ) -> dict:
-    """Page through blocks (newest first) until `amount` blocks or seconds are covered.
+    """Page through blocks (newest first) until the requested window is covered.
 
     mode='blocks' keeps the most recent `amount` blocks; mode='seconds' keeps blocks
-    within `amount` seconds of the newest block.
+    within `amount` seconds of the current wall clock. After at least one successful
+    page, an HTTP failure returns the fetched prefix unless require_complete is true.
     """
-    rows, anchor, cutoff, page, warning = [], None, None, 0, None
+    if mode not in ("blocks", "seconds") or amount <= 0 or page_size <= 0 or max_pages <= 0:
+        raise ValueError("invalid fetch window parameters")
+
+    current_time = (now or datetime.now(timezone.utc)).astimezone(timezone.utc)
+    cutoff = current_time - timedelta(seconds=amount) if mode == "seconds" else None
+    rows: list[dict] = []
+    seen_block_numbers = set()
+    previous_block_number = None
+    previous_timestamp = None
+    duplicate_count = 0
+    gap_count = 0
+    unknown_timestamp_count = 0
+    coverage_reached = False
+    partial_reason = None
+    page_count = 0
     total = int(amount)
     with Progress(console=Console(stderr=True), transient=True) as progress:
         task = progress.add_task("Fetching blocks", total=total)
         for page in range(max_pages):
             try:
-                page_rows = fetch_blocks(client, page, page_size, machine_type).get("rows", [])
-            except httpx.HTTPError as e:
-                warning = f"stopped at page {page + 1} after a failed request ({e})"
+                payload = fetch_blocks(client, page, page_size, machine_type)
+            except KeyboardInterrupt:
+                if not rows or require_complete:
+                    raise
+                partial_reason = f"fetch interrupted while requesting API page {page + 1}"
+                break
+            except httpx.HTTPError as exc:
+                if not rows or require_complete:
+                    raise
+                if isinstance(exc, httpx.TimeoutException):
+                    failure = "request timed out after retries"
+                elif isinstance(exc, httpx.HTTPStatusError):
+                    failure = f"HTTP {exc.response.status_code} after retries"
+                else:
+                    failure = f"{type(exc).__name__} after retries: {exc}"
+                partial_reason = f"API page {page + 1} failed: {failure}"
                 break
+            try:
+                page_rows = data_rows(payload, f"API page {page + 1}")
+            except AnalyzerDataError as exc:
+                if not rows or require_complete:
+                    raise
+                partial_reason = str(exc)
+                break
+            page_count += 1
             if not page_rows:
                 break
-            rows.extend(page_rows)
 
+            unique_page_rows = []
+            page_problem = None
+            for block in page_rows:
+                raw_number = block.get("block_number")
+                if raw_number is None:
+                    page_problem = (
+                        f"API page {page + 1} has a block without 'block_number'"
+                    )
+                    break
+                try:
+                    block_number = int(raw_number)
+                except (TypeError, ValueError):
+                    page_problem = (
+                        f"API page {page + 1} has invalid block number {raw_number!r}"
+                    )
+                    break
+
+                if block_number is not None and block_number in seen_block_numbers:
+                    duplicate_count += 1
+                    continue
+                if block_number is not None:
+                    if previous_block_number is not None:
+                        if block_number >= previous_block_number:
+                            page_problem = (
+                                f"API pages are out of order near block {block_number}; "
+                                "remaining pages were not used"
+                            )
+                            break
+                        if block_number != previous_block_number - 1:
+                            missing = previous_block_number - block_number - 1
+                            if require_complete:
+                                raise AnalyzerDataError(
+                                    f"API pages have a block gap between "
+                                    f"{previous_block_number} and {block_number}; "
+                                    f"{missing:,} block numbers are missing"
+                                )
+                            gap_count += missing
+                    seen_block_numbers.add(block_number)
+                    previous_block_number = block_number
+
+                timestamp = parse_ts(block.get("timestamp"))
+                if timestamp is None:
+                    unknown_timestamp_count += 1
+                else:
+                    if previous_timestamp is not None and timestamp > previous_timestamp:
+                        page_problem = (
+                            f"API timestamps are out of order near block {raw_number}; "
+                            "remaining pages were not used"
+                        )
+                        break
+                    previous_timestamp = timestamp
+                unique_page_rows.append(block)
+
+            if page_problem:
+                if not rows or require_complete:
+                    raise AnalyzerDataError(page_problem)
+                partial_reason = page_problem
+                break
+
+            page_times = None
+            if mode == "seconds":
+                page_times = [
+                    timestamp
+                    for block in unique_page_rows
+                    if (timestamp := parse_ts(block.get("timestamp"))) is not None
+                ]
+                if not page_times:
+                    problem = (
+                        f"API page {page + 1} has no valid timestamps; "
+                        "remaining pages were not used"
+                    )
+                    if not rows or require_complete:
+                        raise AnalyzerDataError(problem)
+                    partial_reason = problem
+                    break
+
+            rows.extend(unique_page_rows)
             if mode == "blocks":
                 progress.update(task, completed=min(len(rows), total))
-                if len(rows) >= amount or len(page_rows) < page_size:
+                if len(rows) >= amount:
+                    coverage_reached = True
                     break
             else:
-                times = [t for t in (parse_ts(b.get("timestamp")) for b in page_rows) if t]
-                if times:
-                    if anchor is None:
-                        anchor = max(times)
-                        cutoff = anchor - timedelta(seconds=amount)
-                    progress.update(task, completed=min(int((anchor - min(times)).total_seconds()), total))
-                if len(page_rows) < page_size or (cutoff and times and min(times) < cutoff):
+                progress.update(
+                    task,
+                    completed=min(
+                        max(int((current_time - min(page_times)).total_seconds()), 0),
+                        total,
+                    ),
+                )
+                if min(page_times) <= cutoff:
+                    coverage_reached = True
                     break
+            if len(page_rows) < page_size:
+                break
+        else:
+            partial_reason = (
+                f"reached the {max_pages:,}-page safety limit before covering the request"
+            )
 
+    if not coverage_reached:
+        unit = "blocks" if mode == "blocks" else "seconds"
+        incomplete = (
+            f"API ended after {len(rows):,} unique blocks without covering the requested "
+            f"{amount:g} {unit}"
+        )
+        partial_reason = partial_reason or incomplete
+        if not rows or require_complete:
+            raise AnalyzerDataError(partial_reason)
     if mode == "blocks":
         rows = rows[:total]
-    elif cutoff is not None:
-        rows = [b for b in rows if (parse_ts(b.get("timestamp")) or cutoff) >= cutoff]
-    if warning:
-        print(f"  Warning: {warning}; keeping {len(rows):,} blocks fetched so far.")
-        print("  Tip: a smaller --size (e.g. 200) often avoids large-page server errors.")
-    print(f"  Fetched {len(rows):,} blocks ({page + 1} pages)")
-    return {"rows": rows}
+    else:
+        rows = [
+            block for block in rows
+            if (timestamp := parse_ts(block.get("timestamp"))) is not None and timestamp >= cutoff
+        ]
+    details = []
+    if duplicate_count:
+        details.append(f"{duplicate_count:,} duplicate rows ignored")
+    if gap_count:
+        label = "block number" if gap_count == 1 else "block numbers"
+        details.append(f"{gap_count:,} missing {label} observed")
+    if unknown_timestamp_count:
+        action = "excluded" if mode == "seconds" else "retained"
+        details.append(f"{unknown_timestamp_count:,} rows with unknown timestamps {action}")
+    if gap_count:
+        gap_warning = (
+            f"{gap_count:,} block number{' is' if gap_count == 1 else 's are'} "
+            "missing between API pages"
+        )
+        partial_reason = f"{partial_reason}; {gap_warning}" if partial_reason else gap_warning
+    suffix = f"; {', '.join(details)}" if details else ""
+    print(f"  Fetched {len(rows):,} unique blocks ({page_count} pages{suffix})")
+    result = {"rows": rows}
+    if partial_reason:
+        result["_partial_reason"] = partial_reason
+    return result
 
 
 def load_from_file(filepath: str) -> dict:
     """Load JSON data from a file."""
     with open(filepath, "r") as f:
-        return json.load(f)
+        data = json.load(f)
+    data_rows(data, filepath)
+    return data
 
 
 # --- Analyses ---------------------------------------------------------------
 
 
-def list_provers(data: dict) -> None:
+def list_provers(
+    data: dict,
+    cluster_filter: str | None = None,
+    zkvm_filter: str | None = None,
+) -> None:
     """Print distinct (zkvm, slug, cluster, num_gpus) combinations and their counts."""
     seen: dict[tuple, int] = {}
-    for block in data.get("rows", []):
-        for p in block.get("proofs", []):
+    for block in data_rows(data):
+        for p in block_proofs(block):
+            if not proof_matches(p, cluster_filter, zkvm_filter):
+                continue
             cluster_name, zkvm_slug, zkvm_name, num_gpus = proof_prover_info(p)
             key = (zkvm_name, zkvm_slug, cluster_name, num_gpus)
             seen[key] = seen.get(key, 0) + 1
@@ -332,29 +644,39 @@ def analyze_blocks(
     metric: str = "all",
     cluster_filter: str | None = None,
     zkvm_filter: str | None = None,
+    show_block_rankings: bool = True,
 ) -> None:
-    """Show top blocks by gas used and by proving-time statistics across provers."""
-    rows = data.get("rows", [])
+    """Show range-wide proof stats plus legacy per-block rankings."""
+    rows = data_rows(data)
     if not rows:
         print("No blocks found in the response.")
         return
 
     filter_active = bool(cluster_filter or zkvm_filter)
 
-    # Select blocks (those with a matching proof, when a filter is active) and the
-    # proving times of the proofs that count toward their stats.
-    selected = []  # (block, times)
+    # Select blocks (those with a matching proof, when a filter is active) and retain
+    # completed proofs so extrema can identify their block and prover.
+    selected = []  # (block, completed proofs)
     for block in rows:
-        proofs = block.get("proofs", [])
+        proofs = block_proofs(block)
         if filter_active:
             proofs = [p for p in proofs if proof_matches(p, cluster_filter, zkvm_filter)]
             if not proofs:
                 continue
-        selected.append((block, proving_times(proofs)))
+        selected.append(
+            (block, [p for p in proofs if proof_time(p) is not None])
+        )
 
-    with_gas = [(b, b["gas_used"]) for b, _ in selected if b.get("gas_used") is not None]
-    timed = [(b, t) for b, t in selected if t]
-    total_proofs = sum(len(t) for _, t in timed)
+    with_gas = [
+        (block, gas)
+        for block, _ in selected
+        if (gas := numeric_value(block.get("gas_used"))) is not None
+    ]
+    timed_by_block = [(b, proofs) for b, proofs in selected if proofs]
+    timed = [(b, p) for b, proofs in timed_by_block for p in proofs]
+    all_times = [proof_time(p) for _, p in timed]
+    timed_blocks = len(timed_by_block)
+    total_proofs = len(all_times)
 
     if filter_active:
         parts = ([f"cluster~'{cluster_filter}'"] if cluster_filter else []) + (
@@ -362,10 +684,10 @@ def analyze_blocks(
         )
         print(f"**Filter:** {', '.join(parts)}")
         print(f"Fetched {len(rows):,} blocks, {len(selected):,} match filter "
-              f"({len(with_gas):,} with gas, {total_proofs:,} matching proofs)\n")
+              f"({len(with_gas):,} with gas, {total_proofs:,} completed matching proofs)\n")
     else:
         print(f"Fetched {len(rows):,} blocks "
-              f"({len(with_gas):,} with gas, {total_proofs:,} proofs)\n")
+              f"({len(with_gas):,} with gas, {total_proofs:,} completed proofs)\n")
 
     if metric in ("all", "gas"):
         print(f"## Top {top_k} by Gas Used\n")
@@ -374,30 +696,83 @@ def analyze_blocks(
             print_table(
                 [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"), ("Gas", COL_GAS, ">"),
                  ("Txs", COL_TXS, ">"), ("Timestamp", COL_TIMESTAMP, "<")],
-                [(rank, b.get("block_number"), fmt_gas(gas),
-                  b.get("transaction_count") or "N/A", fmt_timestamp(b.get("timestamp")))
+                [(rank, value_or_na(b.get("block_number")), fmt_gas(gas),
+                  value_or_na(b.get("transaction_count")), fmt_timestamp(b.get("timestamp")))
                  for rank, (b, gas) in enumerate(top, 1)],
             )
         else:
             print("No blocks with gas data found")
 
     time_metrics = [m for m in STATS if metric in ("all", m)]
-    if time_metrics and not timed:
+    if time_metrics and not all_times:
         print("\nNo proofs with proving time data found")
         return
 
-    for name in time_metrics:
-        stat = STATS[name]
-        top = sorted(timed, key=lambda bt: stat(bt[1]), reverse=True)[:top_k]
-        print(f"\n## Top {top_k} by {name.upper()} Proving Time\n")
+    if time_metrics:
+        sample_label = f"{timed_blocks:,} blocks"
+        if total_proofs != timed_blocks:
+            sample_label += f", {total_proofs:,} proofs"
+        print(f"\n## Proof-weighted Proving Time Across {sample_label}\n")
+        print("Each completed proof is one sample.\n")
+
+        extrema = {
+            "min": min(timed, key=lambda bp: proof_time(bp[1])),
+            "max": max(timed, key=lambda bp: proof_time(bp[1])),
+        }
+        show_source = any(name in extrema for name in time_metrics)
+        summary_rows = []
+        for name in time_metrics:
+            summary = [name.upper(), fmt_time(STATS[name](all_times))]
+            if show_source:
+                if name in extrema:
+                    block, proof = extrema[name]
+                    cluster_name, _, _, _ = proof_prover_info(proof)
+                    summary.extend([
+                        value_or_na(block.get("block_number")),
+                        proof_zkvm_label(proof),
+                        cluster_name or "N/A",
+                    ])
+                else:
+                    summary.extend(["N/A", "N/A", "N/A"])
+            summary_rows.append(tuple(summary))
+
+        columns = [("Metric", 8, "<"), ("Time", COL_TIME, "<")]
+        if show_source:
+            columns.extend([
+                ("Block", COL_BLOCK, "<"),
+                ("zkVM", COL_ZKVM, "<"),
+                ("Cluster", COL_CLUSTER, "<"),
+            ])
         print_table(
-            [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-             (f"Time ({name})", COL_TIME, "<"), ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
-            [(rank, b.get("block_number"), fmt_time(stat(t)), fmt_gas(b.get("gas_used")),
-              b.get("transaction_count") or "N/A")
-             for rank, (b, t) in enumerate(top, 1)],
+            columns,
+            summary_rows,
         )
 
+    if show_block_rankings:
+        for name in time_metrics:
+            stat = STATS[name]
+            top = sorted(
+                timed_by_block,
+                key=lambda bp: stat(proving_times(bp[1])),
+                reverse=True,
+            )[:top_k]
+            print(f"\n## Top {top_k} Blocks by Per-block {name.upper()} Proving Time\n")
+            print_table(
+                [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
+                 (f"Time ({name})", COL_TIME, "<"), ("Gas", COL_GAS, ">"),
+                 ("Txs", COL_TXS, ">")],
+                [
+                    (
+                        rank,
+                        value_or_na(block.get("block_number")),
+                        fmt_time(stat(proving_times(proofs))),
+                        fmt_gas(block.get("gas_used")),
+                        value_or_na(block.get("transaction_count")),
+                    )
+                    for rank, (block, proofs) in enumerate(top, 1)
+                ],
+            )
+
 
 def analyze_comparison(
     data: dict,
@@ -405,15 +780,15 @@ def analyze_comparison(
     target_zkvm: str = "openvm2",
     target_cluster: str | None = None,
 ) -> None:
-    """Find blocks where the target prover (default OpenVM 2.0 / Axiom) was slow.
+    """Compare the target prover (default OpenVM 2.0) with other completed proofs.
 
     Two tables:
       1. ABSOLUTE  - blocks where the target's own proving time was highest,
                      alongside the closest other completed proof.
-      2. RELATIVE  - blocks where the target trailed the fastest *other* prover by
-                     the largest ratio (target time / fastest competitor).
+      2. RELATIVE  - blocks with the largest target-time / fastest-other-time ratio.
+      When several target proofs match a block, the fastest target proof is used.
     """
-    rows = data.get("rows", [])
+    rows = data_rows(data)
     if not rows:
         print("No blocks found in the response.")
         return
@@ -421,26 +796,26 @@ def analyze_comparison(
     absolute = []  # (block, target_time, closest_other_time, closest_other_zkvm)
     relative = []  # (block, target_time, fastest_other_time, fastest_other_zkvm, ratio)
     for block in rows:
-        proofs = block.get("proofs", [])
+        proofs = block_proofs(block)
         target = proving_times(p for p in proofs if proof_matches(p, target_cluster, target_zkvm))
         others = [
             p for p in proofs
             if not proof_matches(p, target_cluster, target_zkvm)
-            and p.get("proving_time") is not None
+            and proof_time(p) is not None
         ]
         if not target:
             continue
         t = min(target)  # target's fastest completed proof for this block
         if others:
-            closest = min(others, key=lambda p: abs(p["proving_time"] - t))
-            absolute.append((block, t, closest["proving_time"], proof_zkvm_label(closest)))
-            fastest = min(others, key=lambda p: p["proving_time"])
-            fastest_time = fastest["proving_time"]
-            relative.append((block, t, fastest_time, proof_zkvm_label(fastest), t / fastest_time))
+            closest = min(others, key=lambda p: abs(proof_time(p) - t))
+            absolute.append((block, t, proof_time(closest), proof_prover_label(closest)))
+            fastest = min(others, key=lambda p: proof_time(p))
+            fastest_time = proof_time(fastest)
+            relative.append((block, t, fastest_time, proof_prover_label(fastest), t / fastest_time))
         else:
             absolute.append((block, t, None, None))
 
-    label = target_zkvm + (f" / {target_cluster}" if target_cluster else "")
+    label = target_zkvm + (f" / {target_cluster}" if target_cluster else " / any cluster")
     print(f"**Target prover:** {label}")
     print(f"Fetched {len(rows):,} blocks, {len(absolute):,} with a completed {target_zkvm} "
           f"proof, {len(relative):,} comparable to other provers\n")
@@ -450,13 +825,14 @@ def analyze_comparison(
         return
 
     top_abs = sorted(absolute, key=lambda x: x[ABS_TARGET_TIME], reverse=True)[:top_k]
-    print(f"## Top {top_k} blocks where {target_zkvm} was SLOWEST (absolute)\n")
+    print(f"## Top {top_k} {target_zkvm} Blocks by Absolute Proving Time\n")
     print_table(
         [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
          *comparison_time_columns(target_zkvm, "Closest"),
          ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
-        [(rank, b.get("block_number"), *comparison_time_cells(t, closest_time, closest_zkvm),
-          fmt_gas(b.get("gas_used")), b.get("transaction_count") or "N/A")
+        [(rank, value_or_na(b.get("block_number")),
+          *comparison_time_cells(t, closest_time, closest_zkvm),
+          fmt_gas(b.get("gas_used")), value_or_na(b.get("transaction_count")))
          for rank, (b, t, closest_time, closest_zkvm) in enumerate(top_abs, 1)],
     )
 
@@ -465,10 +841,11 @@ def analyze_comparison(
         return
 
     top_rel = sorted(relative, key=lambda x: x[REL_SLOWDOWN], reverse=True)[:top_k]
-    print(f"\n## Top {top_k} blocks where {target_zkvm} trailed the FASTEST other prover\n")
+    print(f"\n## Top {top_k} Blocks by {target_zkvm} / FASTEST Other Prover\n")
     print_table(
         [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-         *comparison_time_columns(target_zkvm, "Fastest"), ("Slowdown", COL_RATIO, ">")],
+         *comparison_time_columns(target_zkvm, "Fastest"),
+         ("Target / Fastest", COL_RATIO, ">")],
         [(rank, b.get("block_number"), *comparison_time_cells(t, fastest, fastest_zkvm),
           f"{ratio:.2f}x")
          for rank, (b, t, fastest, fastest_zkvm, ratio) in enumerate(top_rel, 1)],
@@ -484,19 +861,50 @@ def load_data(args: argparse.Namespace) -> dict:
         print(f"**Source:** {args.file}\n")
         return load_from_file(args.file)
     mode, amount = parse_last(args.last)
-    ttl = 0 if args.no_cache else args.cache_ttl
+    ttl = 0 if args.no_cache else (
+        CACHE_TTL if args.cache_ttl is None else args.cache_ttl
+    )
     print(f"**Source:** {API_URL}  ")
     print(f"**Config:** last {args.last}, filter={args.machine_type}"
-          f"{'' if ttl else ', cache off'}\n")
-    data = fetch_window(make_client(ttl), mode, amount, args.size, args.machine_type)
+          f"{f', cache TTL={ttl}s' if ttl else ', cache off'}\n")
+    with make_client(ttl) as client:
+        data = fetch_window(
+            client,
+            mode,
+            amount,
+            args.size,
+            args.machine_type,
+            require_complete=args.require_complete,
+        )
+    timestamps = [
+        timestamp
+        for block in data_rows(data)
+        if (timestamp := parse_ts(block.get("timestamp"))) is not None
+    ]
+    if timestamps:
+        print(
+            f"  Window: {min(timestamps):%Y-%m-%d %H:%M:%S} to "
+            f"{max(timestamps):%Y-%m-%d %H:%M:%S} UTC"
+        )
+    else:
+        print("  Window: no timestamped blocks in the requested range")
+    if partial_reason := data.get("_partial_reason"):
+        print(f"\n**WARNING: PARTIAL RESULTS:** {partial_reason}")
+        print("Statistics below cover only the successfully fetched UTC window.")
     print()
     return data
 
 
 def main():
     parser = argparse.ArgumentParser(
-        description="Analyze ethproofs.org block data: top blocks by gas, proving time, "
-        "and how far one prover trails the fastest.",
+        description="Analyze ethproofs.org block data: top blocks by gas, proving-time "
+        "statistics across the selected range, and target-vs-fastest comparisons.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""Examples:
+  %(prog)s --last 2h --metric all --zkvm openvm2
+  %(prog)s --last 1w --metric min
+  %(prog)s --last 1d --compare --compare-zkvm openvm2 --top-k 20
+""",
     )
     parser.add_argument("--last", "-l", default="100",
                         help="How much recent data to fetch: a duration (6h, 1d, 1w) or a "
@@ -505,56 +913,106 @@ def main():
                         help="Load data from a JSON file instead of fetching")
     parser.add_argument("--machine-type", "-m", default="multi", choices=["multi", "single"],
                         help="Machine type filter (default: multi)")
-    parser.add_argument("--size", "-s", type=int, default=100,
-                        help="Blocks per API request, a fetch-tuning knob (default: 100)")
+    parser.add_argument("--size", "-s", type=positive_int_arg, default=1000,
+                        help="Blocks per API request, a fetch-tuning knob (default: 1000)")
     parser.add_argument("--no-cache", action="store_true",
                         help="Bypass the local page cache and always hit the API")
-    parser.add_argument("--cache-ttl", type=int, default=CACHE_TTL,
-                        help=f"Seconds a cached page stays fresh (default: {CACHE_TTL})")
-    parser.add_argument("--top-k", "-k", type=int, default=None,
-                        help="Top blocks to show per metric (default: 1, or 10 with --compare)")
+    parser.add_argument("--cache-ttl", type=nonnegative_int_arg, default=None,
+                        help=f"Cache successful API pages for this many seconds "
+                        f"(default: {CACHE_TTL})")
+    parser.add_argument("--require-complete", action="store_true",
+                        help="Fail if the API cannot cover the full requested window")
+    parser.add_argument("--top-k", "-k", type=positive_int_arg, default=None,
+                        help="Top gas, per-block time, or comparison rows to show "
+                        "(default: 1, or 10 with --compare)")
     parser.add_argument("--metric", default="all", choices=["all", "gas", *STATS],
                         help="Which metric to show (default: all)")
     parser.add_argument("--cluster", default=None,
                         help="Filter to proofs whose cluster name contains this text, e.g. 'axiom'")
     parser.add_argument("--zkvm", default=None,
                         help="Filter to proofs whose zkvm slug/name contains this text, e.g. 'openvm2'")
-    parser.add_argument("--list-provers", action="store_true",
-                        help="List distinct provers seen in the fetched data and exit")
-    parser.add_argument("--compare", action="store_true",
-                        help="Show where the target prover was slowest, absolute and vs the fastest other prover")
-    parser.add_argument("--compare-zkvm", default="openvm2",
+    mode_group = parser.add_mutually_exclusive_group()
+    mode_group.add_argument("--list-provers", action="store_true",
+                            help="List distinct provers seen in the fetched data and exit")
+    mode_group.add_argument("--compare", action="store_true",
+                            help="Compare a target prover with the fastest other prover")
+    parser.add_argument("--compare-zkvm", default=None,
                         help="zkvm slug/name of the prover to compare in --compare mode (default: openvm2)")
     parser.add_argument("--compare-cluster", default=None,
                         help="Optional cluster substring to further pin the --compare target (e.g. 'axiom')")
+    parser.add_argument("--no-block-rankings", action="store_true",
+                        help="With --top-k, omit legacy per-block time rankings")
 
     args = parser.parse_args()
-    top_k = args.top_k if args.top_k is not None else (10 if args.compare else 1)
+    if args.no_cache and args.cache_ttl is not None:
+        parser.error("--no-cache cannot be combined with --cache-ttl")
+    if args.compare:
+        if args.metric != "all" or args.cluster or args.zkvm:
+            parser.error(
+                "--compare cannot be combined with --metric, --cluster, or --zkvm; "
+                "use --compare-zkvm/--compare-cluster"
+            )
+        if args.no_block_rankings:
+            parser.error("--no-block-rankings is not used with --compare")
+    elif args.compare_cluster is not None or args.compare_zkvm is not None:
+        parser.error("--compare-zkvm and --compare-cluster require --compare")
+    if args.list_provers:
+        if args.metric != "all" or args.top_k is not None:
+            parser.error("--list-provers cannot be combined with --metric or --top-k")
+        if args.no_block_rankings:
+            parser.error("--no-block-rankings is not used with --list-provers")
+
+    top_k_explicit = args.top_k is not None
+    top_k = args.top_k if top_k_explicit else (10 if args.compare else 1)
+
+    def report(data):
+        if args.list_provers:
+            list_provers(data, args.cluster, args.zkvm)
+        elif args.compare:
+            analyze_comparison(
+                data,
+                top_k,
+                args.compare_zkvm or "openvm2",
+                args.compare_cluster,
+            )
+        else:
+            analyze_blocks(
+                data,
+                top_k,
+                args.metric,
+                args.cluster,
+                args.zkvm,
+                show_block_rankings=top_k_explicit and not args.no_block_rankings,
+            )
 
     print("\n# ETHPROOFS ANALYZER\n")
 
+    data = None
     try:
         data = load_data(args)
-    except ValueError:
+        report(data)
+    except json.JSONDecodeError as e:
+        print(f"Error parsing JSON: {e}")
+        sys.exit(1)
+    except AnalyzerDataError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+    except InvalidLastError:
         print(f"Error: invalid --last value '{args.last}' (use e.g. 500, 6h, 1d, 1w)")
         sys.exit(1)
-    except FileNotFoundError:
-        print(f"Error: File not found: {args.file}")
+    except (OSError, UnicodeError) as e:
+        print(f"Error reading {args.file or 'data'}: {e}")
         sys.exit(1)
     except httpx.HTTPError as e:
         print(f"\nError fetching data: {e}")
-        print("Try: ./ethproofs_analyzer.py --file data.json")
+        print("Try again, lower --size, or use: ./scripts/ethproofs_analyzer.py --file data.json")
         sys.exit(1)
-    except json.JSONDecodeError as e:
-        print(f"Error parsing JSON: {e}")
-        sys.exit(1)
-
-    if args.list_provers:
-        list_provers(data)
-    elif args.compare:
-        analyze_comparison(data, top_k, args.compare_zkvm, args.compare_cluster)
-    else:
-        analyze_blocks(data, top_k, args.metric, args.cluster, args.zkvm)
+    except KeyboardInterrupt:
+        if data is None:
+            print("\nCancelled before any usable API pages were fetched.")
+            sys.exit(130)
+        print("\nFetch stopped; reporting the usable pages collected so far.\n")
+        report(data)
 
 
 if __name__ == "__main__":
diff --git a/scripts/precompile_analyzer.py b/scripts/precompile_analyzer.py
index 12fcea97f..9d6cc775f 100755
--- a/scripts/precompile_analyzer.py
+++ b/scripts/precompile_analyzer.py
@@ -15,21 +15,21 @@
 last. Run --check to see which support tracing.
 
 Run it directly (uv installs the dependencies on first use):
-    ./precompile_analyzer.py <block_number>
-    uv run precompile_analyzer.py <block_number>   # equivalent
+    ./scripts/precompile_analyzer.py <block_number>
+    uv run scripts/precompile_analyzer.py <block_number>   # equivalent
 
 Typical workflow — find a slow block with ethproofs_analyzer, then inspect it here:
-    ./ethproofs_analyzer.py --last 1d --metric min --top-k 20   # hardest blocks for every prover
-    ./ethproofs_analyzer.py --last 1d --compare --top-k 20      # blocks where OpenVM trailed most
-    ./precompile_analyzer.py <block_number>                     # why: that block's precompile load
+    ./scripts/ethproofs_analyzer.py --last 1d --metric min --top-k 20  # hardest blocks for every prover
+    ./scripts/ethproofs_analyzer.py --last 1d --compare --top-k 20     # highest OpenVM/fastest ratio
+    ./scripts/precompile_analyzer.py <block_number>                    # inspect its precompile load
 
 Usage:
-    ./precompile_analyzer.py 21000000                       # analyze a block
-    ./precompile_analyzer.py 21000000 --rpc http://host:8545 # against a specific RPC
-    ./precompile_analyzer.py 21000000 -v                    # also report tx and call-frame counts
-    ./precompile_analyzer.py 21000000 --top-k 10            # top 10 transactions
-    ./precompile_analyzer.py 21000000 --filter bn254_add,bn254_mul  # only these precompiles
-    ./precompile_analyzer.py --check                        # verify the RPC supports tracing
+    ./scripts/precompile_analyzer.py 21000000                       # analyze a block
+    ./scripts/precompile_analyzer.py 21000000 --rpc http://host:8545 # against a specific RPC
+    ./scripts/precompile_analyzer.py 21000000 -v                    # include tx and call-frame counts
+    ./scripts/precompile_analyzer.py 21000000 --top-k 10            # top 10 transactions
+    ./scripts/precompile_analyzer.py 21000000 --filter bn254_add,bn254_mul
+    ./scripts/precompile_analyzer.py --check                        # verify tracing support
 """
 
 import argparse

From d957979ed36639e502f85b899360e378460823e5 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sat, 1 Aug 2026 00:56:50 +0200
Subject: [PATCH 45/94] chore: update lock files

---
 Cargo.lock                     | 152 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  38 ++++-----
 2 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce3b03acd..6e7664b73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6788,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6807,6 +6807,7 @@ dependencies = [
  "openvm-circuit-primitives-derive",
  "openvm-cpu-backend",
  "openvm-cuda-backend",
+ "openvm-cuda-builder",
  "openvm-cuda-common",
  "openvm-instructions",
  "openvm-mod-circuit-builder",
@@ -6826,7 +6827,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6836,7 +6837,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6852,7 +6853,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6864,7 +6865,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6878,7 +6879,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6888,7 +6889,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6917,7 +6918,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6926,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6941,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6963,9 +6964,10 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "backtrace",
+ "bytemuck",
  "bytesize",
  "cfg-if 1.0.4",
  "dashmap",
@@ -7001,6 +7003,7 @@ dependencies = [
  "rvr-state",
  "serde",
  "serde-big-array",
+ "sha2 0.10.9",
  "static_assertions",
  "tempfile",
  "thiserror 1.0.69",
@@ -7010,7 +7013,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7021,7 +7024,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7041,7 +7044,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7063,7 +7066,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7183,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7193,12 +7196,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7230,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7239,7 +7242,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7255,7 +7258,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7293,7 +7296,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7312,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7322,7 +7325,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7336,7 +7339,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7353,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7362,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7372,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7402,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-platform",
 ]
@@ -7410,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7449,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7457,19 +7460,18 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
  "num-traits",
  "openvm-circuit",
  "openvm-circuit-primitives",
- "openvm-instructions",
  "openvm-stark-backend",
  "openvm-stark-sdk",
  "rand 0.8.7",
@@ -7520,7 +7522,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7544,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7578,7 +7580,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7599,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7612,7 +7614,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7622,7 +7624,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7640,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7668,7 +7670,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7743,7 +7745,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7760,7 +7762,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7784,6 +7786,7 @@ dependencies = [
  "rand 0.9.5",
  "rvr-openvm-ext-riscv",
  "rvr-openvm-lift",
+ "rvr-state",
  "serde",
  "strum 0.26.3",
  "tracing",
@@ -7792,7 +7795,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7801,7 +7804,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7854,7 +7857,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7894,7 +7897,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7926,12 +7929,13 @@ dependencies = [
  "rvr-openvm-lift",
  "serde",
  "toml 0.8.23",
+ "tracing",
 ]
 
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7940,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7954,7 +7958,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7985,7 +7989,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-platform",
 ]
@@ -7993,7 +7997,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8129,7 +8133,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8153,7 +8157,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "elf",
  "eyre",
@@ -8168,7 +8172,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8198,7 +8202,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8237,7 +8241,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -12728,7 +12732,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12742,12 +12746,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12764,7 +12768,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12778,7 +12782,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12792,7 +12796,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12805,7 +12809,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12818,7 +12822,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12830,7 +12834,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12845,7 +12849,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12858,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "serde",
 ]
@@ -12866,7 +12870,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12879,7 +12883,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 
 [[package]]
 name = "ryu"
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 9185b3cd9..a6bd65df6 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2466,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2476,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2492,7 +2492,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2523,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2533,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2552,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2562,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2572,7 +2572,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-platform",
 ]
@@ -2596,7 +2596,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 
 [[package]]
 name = "openvm-mpt"
@@ -2624,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "group",
  "hex-literal",
@@ -2647,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2666,7 +2666,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2697,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2706,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2715,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "openvm-platform",
 ]
@@ -2773,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#369ad35f1a9a15847fd89e2a294535644d8a1f59"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From e61e82d6645637317efe106ae90bc740043ff81c Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Sat, 1 Aug 2026 09:28:17 +0200
Subject: [PATCH 46/94] chore: update lock files

---
 Cargo.lock                     | 170 ++++++++++++++++-----------------
 bin/stateless-guest/Cargo.lock |  38 ++++----
 2 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e7664b73..a80f7a30c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6788,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6827,7 +6827,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6837,7 +6837,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6853,7 +6853,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6865,7 +6865,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6879,7 +6879,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6889,7 +6889,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6918,7 +6918,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6927,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6942,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6964,7 +6964,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "backtrace",
  "bytemuck",
@@ -7013,7 +7013,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7024,7 +7024,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7044,7 +7044,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7066,7 +7066,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7186,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7196,12 +7196,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7233,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7242,7 +7242,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7258,7 +7258,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7296,7 +7296,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7315,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7325,7 +7325,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,12 +7460,12 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7522,7 +7522,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7546,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7580,7 +7580,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7601,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7614,7 +7614,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7624,7 +7624,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7642,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7670,7 +7670,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7745,7 +7745,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7762,7 +7762,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7795,7 +7795,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7804,7 +7804,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7857,7 +7857,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7897,7 +7897,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7935,7 +7935,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7944,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7958,7 +7958,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7989,7 +7989,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-platform",
 ]
@@ -7997,7 +7997,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8133,7 +8133,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8157,7 +8157,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "elf",
  "eyre",
@@ -8172,7 +8172,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8202,7 +8202,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8241,7 +8241,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9122,7 +9122,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12610,7 +12610,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12669,7 +12669,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12690,7 +12690,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12732,7 +12732,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12746,12 +12746,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12768,7 +12768,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12782,7 +12782,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12796,7 +12796,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12809,7 +12809,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12822,7 +12822,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12834,7 +12834,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12849,7 +12849,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12862,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "serde",
 ]
@@ -12870,7 +12870,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12883,7 +12883,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 
 [[package]]
 name = "ryu"
@@ -13484,7 +13484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -13741,7 +13741,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14982,7 +14982,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index a6bd65df6..17237d61d 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2466,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2476,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2492,7 +2492,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2523,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2533,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2552,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2562,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2572,7 +2572,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-platform",
 ]
@@ -2596,7 +2596,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 
 [[package]]
 name = "openvm-mpt"
@@ -2624,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "group",
  "hex-literal",
@@ -2647,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2666,7 +2666,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2697,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2706,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2715,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "openvm-platform",
 ]
@@ -2773,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#496cd4be32abe3f0cd1219dda3b1c292212e79d4"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
 dependencies = [
  "ecdsa",
  "elliptic-curve",

From fbe8dd5441d3e76a4da34b6864b1d880f2526228 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Fri, 7 Aug 2026 10:56:12 +0200
Subject: [PATCH 47/94] chore: update lock files

---
 Cargo.lock                     |  170 +++---
 bin/stateless-guest/Cargo.lock |   38 +-
 scripts/ethproofs_analyzer.py  | 1019 --------------------------------
 3 files changed, 104 insertions(+), 1123 deletions(-)
 delete mode 100755 scripts/ethproofs_analyzer.py

diff --git a/Cargo.lock b/Cargo.lock
index a80f7a30c..d07466a53 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,7 +1279,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1290,7 +1290,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.20.11",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6404,7 +6404,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6788,7 +6788,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6827,7 +6827,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6837,7 +6837,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6853,7 +6853,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6865,7 +6865,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6879,7 +6879,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6889,7 +6889,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6918,7 +6918,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6927,7 +6927,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6942,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6964,7 +6964,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "backtrace",
  "bytemuck",
@@ -7013,7 +7013,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7024,7 +7024,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7044,7 +7044,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7066,7 +7066,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7186,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7196,12 +7196,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7233,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7242,7 +7242,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7258,7 +7258,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7296,7 +7296,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7315,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7325,7 +7325,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7339,7 +7339,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7356,7 +7356,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7365,7 +7365,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-platform",
 ]
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7452,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7460,12 +7460,12 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7522,7 +7522,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7546,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7580,7 +7580,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7601,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7614,7 +7614,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "libm",
  "openvm-custom-insn",
@@ -7624,7 +7624,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7642,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7670,7 +7670,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7745,7 +7745,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7762,7 +7762,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7795,7 +7795,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7804,7 +7804,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7857,7 +7857,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7897,7 +7897,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7935,7 +7935,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7944,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7958,7 +7958,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7989,7 +7989,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-platform",
 ]
@@ -7997,7 +7997,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8133,7 +8133,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8157,7 +8157,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "elf",
  "eyre",
@@ -8172,7 +8172,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8202,7 +8202,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8241,7 +8241,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9122,7 +9122,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12610,7 +12610,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12669,7 +12669,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12690,7 +12690,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -12732,7 +12732,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12746,12 +12746,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12768,7 +12768,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12782,7 +12782,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12796,7 +12796,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12809,7 +12809,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12822,7 +12822,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12834,7 +12834,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12849,7 +12849,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12862,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "serde",
 ]
@@ -12870,7 +12870,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12883,7 +12883,7 @@ dependencies = [
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 
 [[package]]
 name = "ryu"
@@ -13484,7 +13484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -13741,7 +13741,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14982,7 +14982,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 17237d61d..46c3bb510 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2466,7 +2466,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2476,7 +2476,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2492,7 +2492,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2523,7 +2523,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2533,7 +2533,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2552,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2562,7 +2562,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2572,7 +2572,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-platform",
 ]
@@ -2596,7 +2596,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 
 [[package]]
 name = "openvm-mpt"
@@ -2624,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "group",
  "hex-literal",
@@ -2647,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "hex-literal",
  "itertools 0.14.0",
@@ -2666,7 +2666,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2697,7 +2697,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2706,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2715,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "openvm-platform",
 ]
@@ -2773,7 +2773,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#eda402d09f23f94c1a871251781e67dd672e9956"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
diff --git a/scripts/ethproofs_analyzer.py b/scripts/ethproofs_analyzer.py
deleted file mode 100755
index fcefb43ae..000000000
--- a/scripts/ethproofs_analyzer.py
+++ /dev/null
@@ -1,1019 +0,0 @@
-#!/usr/bin/env -S uv run --script
-# /// script
-# requires-python = ">=3.10"
-# dependencies = ["httpx", "hishel", "rich", "tenacity"]
-# ///
-"""
-Fetches data from ethproofs.org API and analyzes proving times.
-
-Reports:
-- Top K blocks by gas used
-- Range-wide proving-time statistics across completed proofs
-- Legacy per-block proving-time rankings
-- How a single prover (default OpenVM 2.0) compares with the fastest other prover
-
-Run it directly (uv installs the dependencies on first use):
-    ./scripts/ethproofs_analyzer.py ...        # via the uv shebang
-    uv run scripts/ethproofs_analyzer.py ...   # equivalent
-
-Common recipes:
-    # Blocks with the highest OpenVM / fastest-other ratio, over the last day / week:
-    ./scripts/ethproofs_analyzer.py --last 1d --compare --top-k 20
-    ./scripts/ethproofs_analyzer.py --last 1w --compare --top-k 20
-
-    # Median OpenVM proving time across the last day / week:
-    ./scripts/ethproofs_analyzer.py --last 1d --metric median --zkvm openvm2
-    ./scripts/ethproofs_analyzer.py --last 1w --metric median --zkvm openvm2
-
-    # Fastest completed multi-machine proof across all zkVMs in the last week:
-    ./scripts/ethproofs_analyzer.py --last 1w --metric min
-
-    # Compare a different prover against the field:
-    ./scripts/ethproofs_analyzer.py --last 1w --compare --compare-zkvm pico --top-k 20
-
-    # Follow up on a slow block — inspect its precompile load (needs an RPC with `debug`):
-    ./scripts/precompile_analyzer.py <block_number>
-
-Usage:
-    ./scripts/ethproofs_analyzer.py                  # last 100 blocks, all metrics
-    ./scripts/ethproofs_analyzer.py --last 6h        # last 6 wall-clock hours
-    ./scripts/ethproofs_analyzer.py --last 500       # last 500 blocks
-    ./scripts/ethproofs_analyzer.py --file data.json # load from a JSON file
-    ./scripts/ethproofs_analyzer.py --top-k 5        # top 5 gas and per-block time rows
-    ./scripts/ethproofs_analyzer.py --metric median  # range median
-    ./scripts/ethproofs_analyzer.py --top-k 5 --no-block-rankings  # rank gas only
-    ./scripts/ethproofs_analyzer.py --cluster axiom  # only proofs from the Axiom cluster
-    ./scripts/ethproofs_analyzer.py --zkvm openvm2   # only OpenVM 2.0 proofs
-    ./scripts/ethproofs_analyzer.py --list-provers   # print distinct provers
-    ./scripts/ethproofs_analyzer.py --compare        # compare OpenVM with other provers
-    ./scripts/ethproofs_analyzer.py --cache-ttl 600  # override the cache TTL
-    ./scripts/ethproofs_analyzer.py --no-cache       # require fresh API pages
-    ./scripts/ethproofs_analyzer.py --require-complete  # fail instead of using partial results
-
-Successful API pages are cached for one hour by default so long queries can resume
-after a failure. Pagination consistency checks reject incompatible cached snapshots.
-Cached responses live in scripts/.cache.
-"""
-
-import argparse
-import json
-import math
-import os
-import statistics
-import sys
-from datetime import datetime, timedelta, timezone
-
-import hishel
-import hishel.httpx
-import httpx
-import tenacity
-from rich.console import Console
-from rich.progress import Progress
-
-API_URL = "https://ethproofs.org/api/blocks"
-
-# Directory of cached successful API responses.
-CACHE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), ".cache")
-CACHE_TTL = 3600
-INITIAL_FETCH_ATTEMPTS = 4
-CONTINUATION_FETCH_ATTEMPTS = 2
-
-# Duration suffixes accepted by --last (e.g. "6h", "1w"), in seconds.
-UNITS = {"s": 1, "m": 60, "h": 3600, "d": 86400, "w": 604800}
-
-# Column widths (chars).
-COL_RANK, COL_BLOCK, COL_GAS, COL_TXS = 4, 10, 14, 5
-COL_TIME, COL_TIMESTAMP, COL_RATIO = 13, 19, 16
-COL_ZKVM, COL_CLUSTER, COL_PROVER = 18, 32, 40
-ABS_BLOCK, ABS_TARGET_TIME, ABS_CLOSEST_TIME, ABS_CLOSEST_ZKVM = range(4)
-REL_BLOCK, REL_TARGET_TIME, REL_FASTEST_TIME, REL_FASTEST_ZKVM, REL_SLOWDOWN = range(5)
-
-# Statistics available as proving-time metrics, keyed by their CLI name.
-STATS = {"min": min, "max": max, "median": statistics.median, "avg": statistics.mean}
-
-
-# --- Formatting -------------------------------------------------------------
-
-
-def fmt_time(ms: float) -> str:
-    """Format milliseconds as seconds."""
-    return f"{ms / 1000:.2f}s"
-
-
-def numeric_value(value) -> int | float | None:
-    """Return a finite numeric value while rejecting bools and malformed JSON fields."""
-    if isinstance(value, bool) or not isinstance(value, (int, float)):
-        return None
-    return value if math.isfinite(value) else None
-
-
-def fmt_gas(gas) -> str:
-    """Format gas with thousands separators."""
-    value = numeric_value(gas)
-    return f"{value:,}" if value is not None else "N/A"
-
-
-def fmt_timestamp(ts: str | None) -> str:
-    """Format a timestamp as UTC without an offset."""
-    parsed = parse_ts(ts)
-    return parsed.strftime("%Y-%m-%d %H:%M:%S") if parsed else "N/A"
-
-
-def parse_ts(ts: str | None) -> datetime | None:
-    """Parse a block timestamp and normalize it to UTC."""
-    if not isinstance(ts, str) or not ts.strip():
-        return None
-    try:
-        value = ts.strip()
-        if value.endswith("Z"):
-            value = value[:-1] + "+00:00"
-        parsed = datetime.fromisoformat(value)
-    except ValueError:
-        return None
-    if parsed.tzinfo is None:
-        parsed = parsed.replace(tzinfo=timezone.utc)
-    return parsed.astimezone(timezone.utc)
-
-
-def value_or_na(value):
-    """Preserve zero and other false-y values while formatting missing data."""
-    return "N/A" if value is None else value
-
-
-def print_table(columns: list[tuple[str, int, str]], rows: list[tuple]) -> None:
-    """Print a markdown table.
-
-    columns: (header, width, align) per column, align being '<' or '>'.
-    rows:    row tuples whose cells line up positionally with columns.
-    """
-    def cell(value, width, align):
-        text = str(value_or_na(value)).replace("\r", " ").replace("\n", " ").replace("|", "\\|")
-        if len(text) > width:
-            text = text[: max(width - 1, 0)] + "…"
-        return f"{text:{align}{width}}"
-
-    print("| " + " | ".join(cell(h, w, a) for h, w, a in columns) + " |")
-    print("|" + "|".join("-" * (w + 2) for _, w, _ in columns) + "|")
-    for row in rows:
-        print("| " + " | ".join(cell(v, w, a) for v, (_, w, a) in zip(row, columns)) + " |")
-
-
-def comparison_time_columns(target_zkvm: str, relationship: str) -> list[tuple[str, int, str]]:
-    """Consistent target/competitor columns for comparison tables."""
-    return [
-        (f"{target_zkvm} Time", COL_TIME, "<"),
-        (f"{relationship} Other", COL_TIME, "<"),
-        (f"{relationship} Prover", COL_PROVER, "<"),
-    ]
-
-
-def comparison_time_cells(
-    target_time: float,
-    other_time: float | None,
-    other_zkvm: str | None,
-) -> tuple[str, str, str]:
-    """Format the shared target/competitor cells, including missing competitors."""
-    return (
-        fmt_time(target_time),
-        fmt_time(other_time) if other_time is not None else "N/A",
-        other_zkvm or "N/A",
-    )
-
-
-# --- Data access ------------------------------------------------------------
-
-
-def proof_prover_info(proof: dict) -> tuple[str | None, str | None, str | None, int | None]:
-    """Extract (cluster_name, zkvm_slug, zkvm_name, num_gpus) from a proof."""
-    cv = proof.get("cluster_version") or {}
-    if not isinstance(cv, dict):
-        return None, None, None, None
-    cluster = cv.get("cluster") or {}
-    zkvm_version = cv.get("zkvm_version") or {}
-    if not isinstance(cluster, dict) or not isinstance(zkvm_version, dict):
-        return None, None, None, None
-    zkvm = zkvm_version.get("zkvm") or {}
-    if not isinstance(zkvm, dict):
-        zkvm = {}
-
-    def text_or_none(value):
-        return None if value is None else str(value)
-
-    return (
-        text_or_none(cluster.get("name")),
-        text_or_none(zkvm.get("slug")),
-        text_or_none(zkvm.get("name")),
-        cluster.get("num_gpus"),
-    )
-
-
-def proof_zkvm_label(proof: dict) -> str:
-    """Short label for the zkVM that produced a proof."""
-    _, zkvm_slug, zkvm_name, _ = proof_prover_info(proof)
-    return zkvm_slug or zkvm_name or "N/A"
-
-
-def proof_prover_label(proof: dict) -> str:
-    """Short zkVM/cluster label for a proof."""
-    cluster_name, _, _, _ = proof_prover_info(proof)
-    zkvm = proof_zkvm_label(proof)
-    return f"{zkvm} / {cluster_name}" if cluster_name else zkvm
-
-
-def proof_matches(proof: dict, cluster: str | None, zkvm: str | None) -> bool:
-    """True if the proof's cluster/zkvm contain the given text (case-insensitive)."""
-    cluster_name, zkvm_slug, zkvm_name, _ = proof_prover_info(proof)
-    if cluster and (not cluster_name or cluster.lower() not in cluster_name.lower()):
-        return False
-    if zkvm:
-        z = zkvm.lower()
-        if not ((zkvm_slug and z in zkvm_slug.lower()) or (zkvm_name and z in zkvm_name.lower())):
-            return False
-    return True
-
-
-def proof_time(proof: dict) -> float | int | None:
-    """Return a finite positive proving time, or None for pending/invalid records."""
-    value = proof.get("proving_time")
-    if isinstance(value, bool) or not isinstance(value, (int, float)):
-        return None
-    return value if math.isfinite(value) and value > 0 else None
-
-
-def proving_times(proofs) -> list[float]:
-    """Completed proving times (ms) from an iterable of proofs."""
-    return [time for p in proofs if (time := proof_time(p)) is not None]
-
-
-# --- Fetching / loading -----------------------------------------------------
-
-
-class InvalidLastError(ValueError):
-    """Raised when --last is not a finite positive duration or block count."""
-
-
-def parse_last(spec: str) -> tuple[str, float]:
-    """Parse a --last value into ('seconds', n) for durations or ('blocks', n) for counts.
-
-    Durations end in a unit (s/m/h/d/w), e.g. '6h' or '1w'; a bare number means blocks.
-    """
-    try:
-        spec = spec.strip().lower()
-        if spec and spec[-1] in UNITS:
-            amount = float(spec[:-1]) * UNITS[spec[-1]]
-            if (
-                not math.isfinite(amount)
-                or amount <= 0
-                or amount > timedelta.max.total_seconds()
-            ):
-                raise InvalidLastError
-            return "seconds", amount
-        amount = int(spec)
-        if amount <= 0:
-            raise InvalidLastError
-        return "blocks", amount
-    except (TypeError, ValueError, OverflowError) as exc:
-        if isinstance(exc, InvalidLastError):
-            raise
-        raise InvalidLastError from exc
-
-
-def positive_int_arg(value: str) -> int:
-    """argparse type for strictly positive integers."""
-    try:
-        parsed = int(value)
-    except ValueError as exc:
-        raise argparse.ArgumentTypeError("must be an integer") from exc
-    if parsed <= 0:
-        raise argparse.ArgumentTypeError("must be greater than zero")
-    return parsed
-
-
-def nonnegative_int_arg(value: str) -> int:
-    """argparse type for nonnegative integers."""
-    try:
-        parsed = int(value)
-    except ValueError as exc:
-        raise argparse.ArgumentTypeError("must be an integer") from exc
-    if parsed < 0:
-        raise argparse.ArgumentTypeError("must be zero or greater")
-    return parsed
-
-
-class AnalyzerDataError(ValueError):
-    """Raised when input or paginated API data cannot support a correct report."""
-
-
-def data_rows(data: dict, source: str = "input") -> list[dict]:
-    """Validate and return the top-level block rows."""
-    if not isinstance(data, dict):
-        raise AnalyzerDataError(f"{source} must be a JSON object")
-    rows = data.get("rows", [])
-    if rows is None or not isinstance(rows, list):
-        raise AnalyzerDataError(f"{source} field 'rows' must be a list")
-    if any(not isinstance(block, dict) for block in rows):
-        raise AnalyzerDataError(f"{source} contains a non-object block row")
-    return rows
-
-
-def block_proofs(block: dict) -> list[dict]:
-    """Return a block's proof objects, treating a null proof list as empty."""
-    proofs = block.get("proofs", [])
-    if proofs is None:
-        proofs = []
-    if not isinstance(proofs, list) or any(not isinstance(proof, dict) for proof in proofs):
-        raise AnalyzerDataError("block field 'proofs' must be a list of objects or null")
-    return proofs
-
-
-class CacheEverything(hishel.BaseFilter):
-    """Filter matching every request, regardless of request cache headers."""
-
-    def needs_body(self) -> bool:
-        return False
-
-    def apply(self, item, body) -> bool:
-        return True
-
-
-class CacheSuccessfulResponses(hishel.BaseFilter):
-    """Cache only successful responses so retries never replay a cached failure."""
-
-    def needs_body(self) -> bool:
-        return False
-
-    def apply(self, item, body) -> bool:
-        return 200 <= item.status_code < 300
-
-
-def make_client(ttl: float) -> httpx.Client:
-    """An HTTP client whose responses are cached on disk for ttl seconds (0 disables caching)."""
-    if not ttl:
-        return httpx.Client(timeout=30)
-    os.makedirs(CACHE_DIR, exist_ok=True)
-    storage = hishel.SyncSqliteStorage(
-        database_path=os.path.join(CACHE_DIR, "pages.db"), default_ttl=ttl
-    )
-    policy = hishel.FilterPolicy(
-        request_filters=[CacheEverything()], response_filters=[CacheSuccessfulResponses()]
-    )
-    return hishel.httpx.SyncCacheClient(storage=storage, policy=policy, timeout=30)
-
-
-def is_transient(exc: BaseException) -> bool:
-    """True for errors worth retrying: transport errors, rate limits, and 5xx responses."""
-    if isinstance(exc, httpx.TransportError):
-        return True
-    if isinstance(exc, httpx.HTTPStatusError):
-        return exc.response.status_code == 429 or exc.response.status_code >= 500
-    return False
-
-
-def fetch_blocks(client: httpx.Client, page_index: int, page_size: int, machine_type: str) -> dict:
-    """Fetch one page of blocks, retrying transient errors with exponential backoff."""
-    retryer = tenacity.Retrying(
-        retry=tenacity.retry_if_exception(is_transient),
-        wait=tenacity.wait_exponential(multiplier=0.5, max=5),
-        stop=tenacity.stop_after_attempt(
-            INITIAL_FETCH_ATTEMPTS if page_index == 0 else CONTINUATION_FETCH_ATTEMPTS
-        ),
-        reraise=True,
-    )
-
-    def request():
-        response = client.get(
-            API_URL,
-            params={
-                "page_index": page_index,
-                "page_size": page_size,
-                "machine_type": machine_type,
-            },
-        )
-        response.raise_for_status()
-        return response.json()
-
-    return retryer(request)
-
-
-def fetch_window(
-    client: httpx.Client, mode: str, amount: float, page_size: int,
-    machine_type: str, max_pages: int = 4000, now: datetime | None = None,
-    require_complete: bool = False,
-) -> dict:
-    """Page through blocks (newest first) until the requested window is covered.
-
-    mode='blocks' keeps the most recent `amount` blocks; mode='seconds' keeps blocks
-    within `amount` seconds of the current wall clock. After at least one successful
-    page, an HTTP failure returns the fetched prefix unless require_complete is true.
-    """
-    if mode not in ("blocks", "seconds") or amount <= 0 or page_size <= 0 or max_pages <= 0:
-        raise ValueError("invalid fetch window parameters")
-
-    current_time = (now or datetime.now(timezone.utc)).astimezone(timezone.utc)
-    cutoff = current_time - timedelta(seconds=amount) if mode == "seconds" else None
-    rows: list[dict] = []
-    seen_block_numbers = set()
-    previous_block_number = None
-    previous_timestamp = None
-    duplicate_count = 0
-    gap_count = 0
-    unknown_timestamp_count = 0
-    coverage_reached = False
-    partial_reason = None
-    page_count = 0
-    total = int(amount)
-    with Progress(console=Console(stderr=True), transient=True) as progress:
-        task = progress.add_task("Fetching blocks", total=total)
-        for page in range(max_pages):
-            try:
-                payload = fetch_blocks(client, page, page_size, machine_type)
-            except KeyboardInterrupt:
-                if not rows or require_complete:
-                    raise
-                partial_reason = f"fetch interrupted while requesting API page {page + 1}"
-                break
-            except httpx.HTTPError as exc:
-                if not rows or require_complete:
-                    raise
-                if isinstance(exc, httpx.TimeoutException):
-                    failure = "request timed out after retries"
-                elif isinstance(exc, httpx.HTTPStatusError):
-                    failure = f"HTTP {exc.response.status_code} after retries"
-                else:
-                    failure = f"{type(exc).__name__} after retries: {exc}"
-                partial_reason = f"API page {page + 1} failed: {failure}"
-                break
-            try:
-                page_rows = data_rows(payload, f"API page {page + 1}")
-            except AnalyzerDataError as exc:
-                if not rows or require_complete:
-                    raise
-                partial_reason = str(exc)
-                break
-            page_count += 1
-            if not page_rows:
-                break
-
-            unique_page_rows = []
-            page_problem = None
-            for block in page_rows:
-                raw_number = block.get("block_number")
-                if raw_number is None:
-                    page_problem = (
-                        f"API page {page + 1} has a block without 'block_number'"
-                    )
-                    break
-                try:
-                    block_number = int(raw_number)
-                except (TypeError, ValueError):
-                    page_problem = (
-                        f"API page {page + 1} has invalid block number {raw_number!r}"
-                    )
-                    break
-
-                if block_number is not None and block_number in seen_block_numbers:
-                    duplicate_count += 1
-                    continue
-                if block_number is not None:
-                    if previous_block_number is not None:
-                        if block_number >= previous_block_number:
-                            page_problem = (
-                                f"API pages are out of order near block {block_number}; "
-                                "remaining pages were not used"
-                            )
-                            break
-                        if block_number != previous_block_number - 1:
-                            missing = previous_block_number - block_number - 1
-                            if require_complete:
-                                raise AnalyzerDataError(
-                                    f"API pages have a block gap between "
-                                    f"{previous_block_number} and {block_number}; "
-                                    f"{missing:,} block numbers are missing"
-                                )
-                            gap_count += missing
-                    seen_block_numbers.add(block_number)
-                    previous_block_number = block_number
-
-                timestamp = parse_ts(block.get("timestamp"))
-                if timestamp is None:
-                    unknown_timestamp_count += 1
-                else:
-                    if previous_timestamp is not None and timestamp > previous_timestamp:
-                        page_problem = (
-                            f"API timestamps are out of order near block {raw_number}; "
-                            "remaining pages were not used"
-                        )
-                        break
-                    previous_timestamp = timestamp
-                unique_page_rows.append(block)
-
-            if page_problem:
-                if not rows or require_complete:
-                    raise AnalyzerDataError(page_problem)
-                partial_reason = page_problem
-                break
-
-            page_times = None
-            if mode == "seconds":
-                page_times = [
-                    timestamp
-                    for block in unique_page_rows
-                    if (timestamp := parse_ts(block.get("timestamp"))) is not None
-                ]
-                if not page_times:
-                    problem = (
-                        f"API page {page + 1} has no valid timestamps; "
-                        "remaining pages were not used"
-                    )
-                    if not rows or require_complete:
-                        raise AnalyzerDataError(problem)
-                    partial_reason = problem
-                    break
-
-            rows.extend(unique_page_rows)
-            if mode == "blocks":
-                progress.update(task, completed=min(len(rows), total))
-                if len(rows) >= amount:
-                    coverage_reached = True
-                    break
-            else:
-                progress.update(
-                    task,
-                    completed=min(
-                        max(int((current_time - min(page_times)).total_seconds()), 0),
-                        total,
-                    ),
-                )
-                if min(page_times) <= cutoff:
-                    coverage_reached = True
-                    break
-            if len(page_rows) < page_size:
-                break
-        else:
-            partial_reason = (
-                f"reached the {max_pages:,}-page safety limit before covering the request"
-            )
-
-    if not coverage_reached:
-        unit = "blocks" if mode == "blocks" else "seconds"
-        incomplete = (
-            f"API ended after {len(rows):,} unique blocks without covering the requested "
-            f"{amount:g} {unit}"
-        )
-        partial_reason = partial_reason or incomplete
-        if not rows or require_complete:
-            raise AnalyzerDataError(partial_reason)
-    if mode == "blocks":
-        rows = rows[:total]
-    else:
-        rows = [
-            block for block in rows
-            if (timestamp := parse_ts(block.get("timestamp"))) is not None and timestamp >= cutoff
-        ]
-    details = []
-    if duplicate_count:
-        details.append(f"{duplicate_count:,} duplicate rows ignored")
-    if gap_count:
-        label = "block number" if gap_count == 1 else "block numbers"
-        details.append(f"{gap_count:,} missing {label} observed")
-    if unknown_timestamp_count:
-        action = "excluded" if mode == "seconds" else "retained"
-        details.append(f"{unknown_timestamp_count:,} rows with unknown timestamps {action}")
-    if gap_count:
-        gap_warning = (
-            f"{gap_count:,} block number{' is' if gap_count == 1 else 's are'} "
-            "missing between API pages"
-        )
-        partial_reason = f"{partial_reason}; {gap_warning}" if partial_reason else gap_warning
-    suffix = f"; {', '.join(details)}" if details else ""
-    print(f"  Fetched {len(rows):,} unique blocks ({page_count} pages{suffix})")
-    result = {"rows": rows}
-    if partial_reason:
-        result["_partial_reason"] = partial_reason
-    return result
-
-
-def load_from_file(filepath: str) -> dict:
-    """Load JSON data from a file."""
-    with open(filepath, "r") as f:
-        data = json.load(f)
-    data_rows(data, filepath)
-    return data
-
-
-# --- Analyses ---------------------------------------------------------------
-
-
-def list_provers(
-    data: dict,
-    cluster_filter: str | None = None,
-    zkvm_filter: str | None = None,
-) -> None:
-    """Print distinct (zkvm, slug, cluster, num_gpus) combinations and their counts."""
-    seen: dict[tuple, int] = {}
-    for block in data_rows(data):
-        for p in block_proofs(block):
-            if not proof_matches(p, cluster_filter, zkvm_filter):
-                continue
-            cluster_name, zkvm_slug, zkvm_name, num_gpus = proof_prover_info(p)
-            key = (zkvm_name, zkvm_slug, cluster_name, num_gpus)
-            seen[key] = seen.get(key, 0) + 1
-
-    if not seen:
-        print("No provers found in the data.")
-        return
-
-    print("## Provers seen\n")
-    rows = [
-        (zkvm_name or "N/A", slug or "N/A", cluster or "N/A",
-         num_gpus if num_gpus is not None else "N/A", count)
-        for (zkvm_name, slug, cluster, num_gpus), count in sorted(
-            seen.items(), key=lambda kv: (-kv[1], kv[0][0] or "", kv[0][2] or "")
-        )
-    ]
-    print_table(
-        [("zkVM", 20, "<"), ("slug", 12, "<"), ("Cluster", 32, "<"),
-         ("GPUs", 4, ">"), ("Proofs", 7, ">")],
-        rows,
-    )
-
-
-def analyze_blocks(
-    data: dict,
-    top_k: int = 1,
-    metric: str = "all",
-    cluster_filter: str | None = None,
-    zkvm_filter: str | None = None,
-    show_block_rankings: bool = True,
-) -> None:
-    """Show range-wide proof stats plus legacy per-block rankings."""
-    rows = data_rows(data)
-    if not rows:
-        print("No blocks found in the response.")
-        return
-
-    filter_active = bool(cluster_filter or zkvm_filter)
-
-    # Select blocks (those with a matching proof, when a filter is active) and retain
-    # completed proofs so extrema can identify their block and prover.
-    selected = []  # (block, completed proofs)
-    for block in rows:
-        proofs = block_proofs(block)
-        if filter_active:
-            proofs = [p for p in proofs if proof_matches(p, cluster_filter, zkvm_filter)]
-            if not proofs:
-                continue
-        selected.append(
-            (block, [p for p in proofs if proof_time(p) is not None])
-        )
-
-    with_gas = [
-        (block, gas)
-        for block, _ in selected
-        if (gas := numeric_value(block.get("gas_used"))) is not None
-    ]
-    timed_by_block = [(b, proofs) for b, proofs in selected if proofs]
-    timed = [(b, p) for b, proofs in timed_by_block for p in proofs]
-    all_times = [proof_time(p) for _, p in timed]
-    timed_blocks = len(timed_by_block)
-    total_proofs = len(all_times)
-
-    if filter_active:
-        parts = ([f"cluster~'{cluster_filter}'"] if cluster_filter else []) + (
-            [f"zkvm~'{zkvm_filter}'"] if zkvm_filter else []
-        )
-        print(f"**Filter:** {', '.join(parts)}")
-        print(f"Fetched {len(rows):,} blocks, {len(selected):,} match filter "
-              f"({len(with_gas):,} with gas, {total_proofs:,} completed matching proofs)\n")
-    else:
-        print(f"Fetched {len(rows):,} blocks "
-              f"({len(with_gas):,} with gas, {total_proofs:,} completed proofs)\n")
-
-    if metric in ("all", "gas"):
-        print(f"## Top {top_k} by Gas Used\n")
-        if with_gas:
-            top = sorted(with_gas, key=lambda bg: bg[1], reverse=True)[:top_k]
-            print_table(
-                [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"), ("Gas", COL_GAS, ">"),
-                 ("Txs", COL_TXS, ">"), ("Timestamp", COL_TIMESTAMP, "<")],
-                [(rank, value_or_na(b.get("block_number")), fmt_gas(gas),
-                  value_or_na(b.get("transaction_count")), fmt_timestamp(b.get("timestamp")))
-                 for rank, (b, gas) in enumerate(top, 1)],
-            )
-        else:
-            print("No blocks with gas data found")
-
-    time_metrics = [m for m in STATS if metric in ("all", m)]
-    if time_metrics and not all_times:
-        print("\nNo proofs with proving time data found")
-        return
-
-    if time_metrics:
-        sample_label = f"{timed_blocks:,} blocks"
-        if total_proofs != timed_blocks:
-            sample_label += f", {total_proofs:,} proofs"
-        print(f"\n## Proof-weighted Proving Time Across {sample_label}\n")
-        print("Each completed proof is one sample.\n")
-
-        extrema = {
-            "min": min(timed, key=lambda bp: proof_time(bp[1])),
-            "max": max(timed, key=lambda bp: proof_time(bp[1])),
-        }
-        show_source = any(name in extrema for name in time_metrics)
-        summary_rows = []
-        for name in time_metrics:
-            summary = [name.upper(), fmt_time(STATS[name](all_times))]
-            if show_source:
-                if name in extrema:
-                    block, proof = extrema[name]
-                    cluster_name, _, _, _ = proof_prover_info(proof)
-                    summary.extend([
-                        value_or_na(block.get("block_number")),
-                        proof_zkvm_label(proof),
-                        cluster_name or "N/A",
-                    ])
-                else:
-                    summary.extend(["N/A", "N/A", "N/A"])
-            summary_rows.append(tuple(summary))
-
-        columns = [("Metric", 8, "<"), ("Time", COL_TIME, "<")]
-        if show_source:
-            columns.extend([
-                ("Block", COL_BLOCK, "<"),
-                ("zkVM", COL_ZKVM, "<"),
-                ("Cluster", COL_CLUSTER, "<"),
-            ])
-        print_table(
-            columns,
-            summary_rows,
-        )
-
-    if show_block_rankings:
-        for name in time_metrics:
-            stat = STATS[name]
-            top = sorted(
-                timed_by_block,
-                key=lambda bp: stat(proving_times(bp[1])),
-                reverse=True,
-            )[:top_k]
-            print(f"\n## Top {top_k} Blocks by Per-block {name.upper()} Proving Time\n")
-            print_table(
-                [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-                 (f"Time ({name})", COL_TIME, "<"), ("Gas", COL_GAS, ">"),
-                 ("Txs", COL_TXS, ">")],
-                [
-                    (
-                        rank,
-                        value_or_na(block.get("block_number")),
-                        fmt_time(stat(proving_times(proofs))),
-                        fmt_gas(block.get("gas_used")),
-                        value_or_na(block.get("transaction_count")),
-                    )
-                    for rank, (block, proofs) in enumerate(top, 1)
-                ],
-            )
-
-
-def analyze_comparison(
-    data: dict,
-    top_k: int = 10,
-    target_zkvm: str = "openvm2",
-    target_cluster: str | None = None,
-) -> None:
-    """Compare the target prover (default OpenVM 2.0) with other completed proofs.
-
-    Two tables:
-      1. ABSOLUTE  - blocks where the target's own proving time was highest,
-                     alongside the closest other completed proof.
-      2. RELATIVE  - blocks with the largest target-time / fastest-other-time ratio.
-      When several target proofs match a block, the fastest target proof is used.
-    """
-    rows = data_rows(data)
-    if not rows:
-        print("No blocks found in the response.")
-        return
-
-    absolute = []  # (block, target_time, closest_other_time, closest_other_zkvm)
-    relative = []  # (block, target_time, fastest_other_time, fastest_other_zkvm, ratio)
-    for block in rows:
-        proofs = block_proofs(block)
-        target = proving_times(p for p in proofs if proof_matches(p, target_cluster, target_zkvm))
-        others = [
-            p for p in proofs
-            if not proof_matches(p, target_cluster, target_zkvm)
-            and proof_time(p) is not None
-        ]
-        if not target:
-            continue
-        t = min(target)  # target's fastest completed proof for this block
-        if others:
-            closest = min(others, key=lambda p: abs(proof_time(p) - t))
-            absolute.append((block, t, proof_time(closest), proof_prover_label(closest)))
-            fastest = min(others, key=lambda p: proof_time(p))
-            fastest_time = proof_time(fastest)
-            relative.append((block, t, fastest_time, proof_prover_label(fastest), t / fastest_time))
-        else:
-            absolute.append((block, t, None, None))
-
-    label = target_zkvm + (f" / {target_cluster}" if target_cluster else " / any cluster")
-    print(f"**Target prover:** {label}")
-    print(f"Fetched {len(rows):,} blocks, {len(absolute):,} with a completed {target_zkvm} "
-          f"proof, {len(relative):,} comparable to other provers\n")
-
-    if not absolute:
-        print(f"No completed proofs found for {target_zkvm}.")
-        return
-
-    top_abs = sorted(absolute, key=lambda x: x[ABS_TARGET_TIME], reverse=True)[:top_k]
-    print(f"## Top {top_k} {target_zkvm} Blocks by Absolute Proving Time\n")
-    print_table(
-        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-         *comparison_time_columns(target_zkvm, "Closest"),
-         ("Gas", COL_GAS, ">"), ("Txs", COL_TXS, ">")],
-        [(rank, value_or_na(b.get("block_number")),
-          *comparison_time_cells(t, closest_time, closest_zkvm),
-          fmt_gas(b.get("gas_used")), value_or_na(b.get("transaction_count")))
-         for rank, (b, t, closest_time, closest_zkvm) in enumerate(top_abs, 1)],
-    )
-
-    if not relative:
-        print(f"\nNo blocks have both a {target_zkvm} proof and another prover to compare.")
-        return
-
-    top_rel = sorted(relative, key=lambda x: x[REL_SLOWDOWN], reverse=True)[:top_k]
-    print(f"\n## Top {top_k} Blocks by {target_zkvm} / FASTEST Other Prover\n")
-    print_table(
-        [("Rank", COL_RANK, ">"), ("Block", COL_BLOCK, "<"),
-         *comparison_time_columns(target_zkvm, "Fastest"),
-         ("Target / Fastest", COL_RATIO, ">")],
-        [(rank, b.get("block_number"), *comparison_time_cells(t, fastest, fastest_zkvm),
-          f"{ratio:.2f}x")
-         for rank, (b, t, fastest, fastest_zkvm, ratio) in enumerate(top_rel, 1)],
-    )
-
-
-# --- CLI --------------------------------------------------------------------
-
-
-def load_data(args: argparse.Namespace) -> dict:
-    """Load block data from a file or the ethproofs API per the parsed args."""
-    if args.file:
-        print(f"**Source:** {args.file}\n")
-        return load_from_file(args.file)
-    mode, amount = parse_last(args.last)
-    ttl = 0 if args.no_cache else (
-        CACHE_TTL if args.cache_ttl is None else args.cache_ttl
-    )
-    print(f"**Source:** {API_URL}  ")
-    print(f"**Config:** last {args.last}, filter={args.machine_type}"
-          f"{f', cache TTL={ttl}s' if ttl else ', cache off'}\n")
-    with make_client(ttl) as client:
-        data = fetch_window(
-            client,
-            mode,
-            amount,
-            args.size,
-            args.machine_type,
-            require_complete=args.require_complete,
-        )
-    timestamps = [
-        timestamp
-        for block in data_rows(data)
-        if (timestamp := parse_ts(block.get("timestamp"))) is not None
-    ]
-    if timestamps:
-        print(
-            f"  Window: {min(timestamps):%Y-%m-%d %H:%M:%S} to "
-            f"{max(timestamps):%Y-%m-%d %H:%M:%S} UTC"
-        )
-    else:
-        print("  Window: no timestamped blocks in the requested range")
-    if partial_reason := data.get("_partial_reason"):
-        print(f"\n**WARNING: PARTIAL RESULTS:** {partial_reason}")
-        print("Statistics below cover only the successfully fetched UTC window.")
-    print()
-    return data
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Analyze ethproofs.org block data: top blocks by gas, proving-time "
-        "statistics across the selected range, and target-vs-fastest comparisons.",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""Examples:
-  %(prog)s --last 2h --metric all --zkvm openvm2
-  %(prog)s --last 1w --metric min
-  %(prog)s --last 1d --compare --compare-zkvm openvm2 --top-k 20
-""",
-    )
-    parser.add_argument("--last", "-l", default="100",
-                        help="How much recent data to fetch: a duration (6h, 1d, 1w) or a "
-                        "block count (500). Default: 100")
-    parser.add_argument("--file", "-f", type=str,
-                        help="Load data from a JSON file instead of fetching")
-    parser.add_argument("--machine-type", "-m", default="multi", choices=["multi", "single"],
-                        help="Machine type filter (default: multi)")
-    parser.add_argument("--size", "-s", type=positive_int_arg, default=1000,
-                        help="Blocks per API request, a fetch-tuning knob (default: 1000)")
-    parser.add_argument("--no-cache", action="store_true",
-                        help="Bypass the local page cache and always hit the API")
-    parser.add_argument("--cache-ttl", type=nonnegative_int_arg, default=None,
-                        help=f"Cache successful API pages for this many seconds "
-                        f"(default: {CACHE_TTL})")
-    parser.add_argument("--require-complete", action="store_true",
-                        help="Fail if the API cannot cover the full requested window")
-    parser.add_argument("--top-k", "-k", type=positive_int_arg, default=None,
-                        help="Top gas, per-block time, or comparison rows to show "
-                        "(default: 1, or 10 with --compare)")
-    parser.add_argument("--metric", default="all", choices=["all", "gas", *STATS],
-                        help="Which metric to show (default: all)")
-    parser.add_argument("--cluster", default=None,
-                        help="Filter to proofs whose cluster name contains this text, e.g. 'axiom'")
-    parser.add_argument("--zkvm", default=None,
-                        help="Filter to proofs whose zkvm slug/name contains this text, e.g. 'openvm2'")
-    mode_group = parser.add_mutually_exclusive_group()
-    mode_group.add_argument("--list-provers", action="store_true",
-                            help="List distinct provers seen in the fetched data and exit")
-    mode_group.add_argument("--compare", action="store_true",
-                            help="Compare a target prover with the fastest other prover")
-    parser.add_argument("--compare-zkvm", default=None,
-                        help="zkvm slug/name of the prover to compare in --compare mode (default: openvm2)")
-    parser.add_argument("--compare-cluster", default=None,
-                        help="Optional cluster substring to further pin the --compare target (e.g. 'axiom')")
-    parser.add_argument("--no-block-rankings", action="store_true",
-                        help="With --top-k, omit legacy per-block time rankings")
-
-    args = parser.parse_args()
-    if args.no_cache and args.cache_ttl is not None:
-        parser.error("--no-cache cannot be combined with --cache-ttl")
-    if args.compare:
-        if args.metric != "all" or args.cluster or args.zkvm:
-            parser.error(
-                "--compare cannot be combined with --metric, --cluster, or --zkvm; "
-                "use --compare-zkvm/--compare-cluster"
-            )
-        if args.no_block_rankings:
-            parser.error("--no-block-rankings is not used with --compare")
-    elif args.compare_cluster is not None or args.compare_zkvm is not None:
-        parser.error("--compare-zkvm and --compare-cluster require --compare")
-    if args.list_provers:
-        if args.metric != "all" or args.top_k is not None:
-            parser.error("--list-provers cannot be combined with --metric or --top-k")
-        if args.no_block_rankings:
-            parser.error("--no-block-rankings is not used with --list-provers")
-
-    top_k_explicit = args.top_k is not None
-    top_k = args.top_k if top_k_explicit else (10 if args.compare else 1)
-
-    def report(data):
-        if args.list_provers:
-            list_provers(data, args.cluster, args.zkvm)
-        elif args.compare:
-            analyze_comparison(
-                data,
-                top_k,
-                args.compare_zkvm or "openvm2",
-                args.compare_cluster,
-            )
-        else:
-            analyze_blocks(
-                data,
-                top_k,
-                args.metric,
-                args.cluster,
-                args.zkvm,
-                show_block_rankings=top_k_explicit and not args.no_block_rankings,
-            )
-
-    print("\n# ETHPROOFS ANALYZER\n")
-
-    data = None
-    try:
-        data = load_data(args)
-        report(data)
-    except json.JSONDecodeError as e:
-        print(f"Error parsing JSON: {e}")
-        sys.exit(1)
-    except AnalyzerDataError as e:
-        print(f"Error: {e}")
-        sys.exit(1)
-    except InvalidLastError:
-        print(f"Error: invalid --last value '{args.last}' (use e.g. 500, 6h, 1d, 1w)")
-        sys.exit(1)
-    except (OSError, UnicodeError) as e:
-        print(f"Error reading {args.file or 'data'}: {e}")
-        sys.exit(1)
-    except httpx.HTTPError as e:
-        print(f"\nError fetching data: {e}")
-        print("Try again, lower --size, or use: ./scripts/ethproofs_analyzer.py --file data.json")
-        sys.exit(1)
-    except KeyboardInterrupt:
-        if data is None:
-            print("\nCancelled before any usable API pages were fetched.")
-            sys.exit(130)
-        print("\nFetch stopped; reporting the usable pages collected so far.\n")
-        report(data)
-
-
-if __name__ == "__main__":
-    main()

From c12efe05434408908b9bfda5f07285863ec58f8d Mon Sep 17 00:00:00 2001
From: Ayush Shukla <shuklaayush247@gmail.com>
Date: Tue, 11 Aug 2026 19:40:27 +0200
Subject: [PATCH 48/94] perf(kzg): execute test vectors instead of proving each
 one (#672)

* perf(kzg): execute test vectors instead of proving each one

test_multiple_valid_verify_kzg proved all 54 vectors end-to-end,
rebuilding the guest and regenerating the app proving key per vector
(~24 min in CI). The guest asserts the verification result, so pure
execution carries the same pass/fail signal per vector; the proving
pipeline stays covered by test_single_valid_verify_kzg.

Build and compile the guest once per test, run each vector through
sdk.execute, and assert invalid vectors fail via execution error. This
makes test_multiple_invalid_verify_kzg cheap enough to un-ignore, so
all 68 invalid vectors now run in CI.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* test(kzg): add label-gated prove-all test for full circuit coverage

Executing the vectors covers guest logic but not the circuits: trace
generation and proving can fail on operand edge cases that execute
fine. Add test_prove_multiple_valid_verify_kzg, which proves all 54
valid vectors with a shared prover (keygen once). Proving costs ~25s
per vector on the 64-core runner, so the test is ignored by default
and CI runs it on pushes to main and on PRs with the
run-kzg-prove-all label.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore(kzg): rename proving label to run-full-proving

Crate-agnostic name so the same label can gate ignored proving tests
in other workflows.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* chore(kzg): rename proving label to run-kzg-proving

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* ci(kzg): trigger label runs through a label-overrides workflow

Adding the run-kzg-proving label invokes tests-kzg.yml via
workflow_call, starting only the prove-all job. Other label additions
no longer re-run the workflow, and the fast test job is skipped on
label events.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* test(kzg): clarify ignored proving test

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
---
 .github/workflows/label-overrides.yml | 14 +++++
 .github/workflows/tests-kzg.yml       | 35 ++++++++++++
 crates/kzg/README.md                  |  9 ++--
 crates/kzg/tests/integration_tests.rs | 78 +++++++++++++++++++--------
 4 files changed, 110 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/label-overrides.yml

diff --git a/.github/workflows/label-overrides.yml b/.github/workflows/label-overrides.yml
new file mode 100644
index 000000000..f6ffb8869
--- /dev/null
+++ b/.github/workflows/label-overrides.yml
@@ -0,0 +1,14 @@
+name: Label overrides
+
+on:
+  pull_request:
+    types: [labeled]
+
+permissions:
+  contents: read
+
+jobs:
+  kzg-proving:
+    if: ${{ github.event.label.name == 'run-kzg-proving' }}
+    uses: ./.github/workflows/tests-kzg.yml
+    secrets: inherit
diff --git a/.github/workflows/tests-kzg.yml b/.github/workflows/tests-kzg.yml
index 56d52593a..e4a1dcb36 100644
--- a/.github/workflows/tests-kzg.yml
+++ b/.github/workflows/tests-kzg.yml
@@ -1,6 +1,7 @@
 name: OpenVM KZG Tests
 
 on:
+  workflow_call:
   push:
     branches: ["main"]
     paths:
@@ -29,6 +30,7 @@ env:
 
 jobs:
   test:
+    if: ${{ github.event.action != 'labeled' }}
     runs-on:
       - runs-on=${{ github.run_id }}
       - runner=64cpu-linux-arm64
@@ -59,3 +61,36 @@ jobs:
 
       - name: Run tests
         run: cargo nextest run -p openvm-kzg --release
+
+  # Proves every valid test vector. Runs on pushes to main and on PRs with
+  # the run-kzg-proving label (see label-overrides.yml).
+  prove-all:
+    if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-kzg-proving') }}
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - runner=64cpu-linux-arm64
+      - extras=s3-cache
+
+    steps:
+      - uses: runs-on/action@v2
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - uses: taiki-e/install-action@nextest
+      - name: Restore openvm toolchain from cache
+        uses: runs-on/cache@v4
+        with:
+          path: ~/.openvm/toolchains
+          key: openvm-toolchain-openvm-1.94.0-${{ runner.os }}-${{ runner.arch }}
+
+      - name: Install OpenVM guest toolchain
+        run: |
+          rustup install nightly-2026-01-18
+          rustup component add rust-src --toolchain nightly-2026-01-18
+          cargo install --git https://github.com/openvm-org/openvm.git --branch "$OPENVM_BRANCH" --locked --force cargo-openvm
+          cargo openvm toolchain install
+
+      - name: Prove all test vectors
+        run: cargo nextest run -p openvm-kzg --release --run-ignored only test_prove_multiple_valid_verify_kzg
diff --git a/crates/kzg/README.md b/crates/kzg/README.md
index 4d6201ffc..0d622c2cb 100644
--- a/crates/kzg/README.md
+++ b/crates/kzg/README.md
@@ -2,14 +2,17 @@
 
 ## Quickstart
 
-To run guest tests with OpenVM proving, run:
+To run the guest tests, run:
 
 ```bash
+# Prove a single test vector:
 cargo test --release test_single_valid_verify_kzg -- --show-output
+# Execute (without proving) all valid and invalid test vectors:
 cargo test --release test_multiple_valid_verify_kzg -- --show-output
+cargo test --release test_multiple_invalid_verify_kzg -- --show-output
 cargo test --release test_single_invalid_verify_kzg -- --show-output
-# The following takes longer:
-cargo test --release --ignored test_multiple_invalid_verify_kzg -- --show-output
+# Prove all valid test vectors (expensive):
+cargo test --release test_prove_multiple_valid_verify_kzg -- --ignored --show-output
 ```
 
 ## Crates
diff --git a/crates/kzg/tests/integration_tests.rs b/crates/kzg/tests/integration_tests.rs
index f46f93fcf..a57c033a8 100644
--- a/crates/kzg/tests/integration_tests.rs
+++ b/crates/kzg/tests/integration_tests.rs
@@ -10,7 +10,7 @@ use openvm_kzg::{
 };
 use openvm_sdk::{
     config::{AggregationSystemParams, AppConfig},
-    Sdk, StdIn,
+    CompiledExePure, ExecutableFormat, Sdk, StdIn,
 };
 use openvm_sdk_config::SdkVmConfig;
 use openvm_stark_sdk::utils::setup_tracing;
@@ -19,35 +19,69 @@ use serde_yaml::from_str;
 #[test]
 fn test_single_valid_verify_kzg() {
     let (_, data) = SINGLE_VALID_KZG_PROOF_TEST[0];
-    run_test_from_yaml_str(data);
+    let sdk = create_sdk();
+    let elf = build_guest(&sdk);
+    let input = parse_inputs(data).expect("Invalid test inputs");
+    sdk.app_prover(elf).unwrap().prove(stdin(&input)).unwrap();
 }
 
 #[test]
 fn test_multiple_valid_verify_kzg() {
+    let sdk = create_sdk();
+    let elf = build_guest(&sdk);
+    let compiled = sdk.compile(elf).unwrap();
     for (test_file, data) in ONLY_VALID_KZG_PROOF_TESTS {
         println!("Running test: {}", test_file);
-        run_test_from_yaml_str(data);
+        let input = parse_inputs(data).expect("Invalid test inputs");
+        sdk.execute(&compiled, stdin(&input))
+            .unwrap_or_else(|err| panic!("Test {} failed: {}", test_file, err));
+    }
+}
+
+/// Proves every valid vector with a shared prover so keygen runs once.
+#[test]
+#[ignore = "expensive: proves every valid KZG vector"]
+fn test_prove_multiple_valid_verify_kzg() {
+    let sdk = create_sdk();
+    let elf = build_guest(&sdk);
+    let mut prover = sdk.app_prover(elf).unwrap();
+    for (test_file, data) in ONLY_VALID_KZG_PROOF_TESTS {
+        println!("Proving test: {}", test_file);
+        let input = parse_inputs(data).expect("Invalid test inputs");
+        prover.prove(stdin(&input)).unwrap();
     }
 }
 
 #[test]
 fn test_single_invalid_verify_kzg() {
     let (test_file, data) = ONLY_INVALID_KZG_PROOF_TESTS[0];
-    let result = std::panic::catch_unwind(|| run_test_from_yaml_str(data));
-    assert!(result.is_err(), "Test {} should have panicked", test_file);
+    let sdk = create_sdk();
+    let elf = build_guest(&sdk);
+    let compiled = sdk.compile(elf).unwrap();
+    assert_rejected(&sdk, &compiled, test_file, data);
 }
 
-#[ignore = "takes too long"]
 #[test]
 fn test_multiple_invalid_verify_kzg() {
+    let sdk = create_sdk();
+    let elf = build_guest(&sdk);
+    let compiled = sdk.compile(elf).unwrap();
     for (test_file, data) in ONLY_INVALID_KZG_PROOF_TESTS {
         println!("Running test: {}", test_file);
-        let result = std::panic::catch_unwind(|| run_test_from_yaml_str(data));
-        assert!(result.is_err(), "Test {} should have panicked", test_file);
+        assert_rejected(&sdk, &compiled, test_file, data);
     }
 }
 
-pub fn run_test_from_yaml_str(data: &str) {
+/// Passes if the vector is rejected at input parsing or by the guest trapping.
+fn assert_rejected(sdk: &Sdk, compiled: &CompiledExePure<'_>, test_file: &str, data: &str) {
+    let Some(input) = parse_inputs(data) else {
+        return;
+    };
+    let result = sdk.execute(compiled, stdin(&input));
+    assert!(result.is_err(), "Test {} should have failed", test_file);
+}
+
+fn parse_inputs(data: &str) -> Option<KzgInputs> {
     let test: Test<Input<'_>> = from_str(data).unwrap();
     let (Ok(commitment), Ok(z), Ok(y), Ok(proof)) = (
         test.input.get_commitment(),
@@ -55,21 +89,25 @@ pub fn run_test_from_yaml_str(data: &str) {
         test.input.get_y(),
         test.input.get_proof(),
     ) else {
-        panic!("Invalid test inputs");
+        return None;
     };
+    Some(KzgInputs { commitment_bytes: commitment, z_bytes: z, y_bytes: y, proof_bytes: proof })
+}
 
-    let input =
-        KzgInputs { commitment_bytes: commitment, z_bytes: z, y_bytes: y, proof_bytes: proof };
-
-    run_guest_program(input);
+fn stdin(input: &KzgInputs) -> StdIn {
+    let mut io = StdIn::default();
+    io.write(input);
+    io
 }
 
-pub fn run_guest_program(input: KzgInputs) {
+fn create_sdk() -> Sdk {
     setup_tracing();
     let app_config: AppConfig<SdkVmConfig> =
         toml::from_str(include_str!("programs/verify_kzg/openvm.toml")).unwrap();
-    let sdk = Sdk::new(app_config, AggregationSystemParams::default()).unwrap();
+    Sdk::new(app_config, AggregationSystemParams::default()).unwrap()
+}
 
+fn build_guest(sdk: &Sdk) -> ExecutableFormat {
     let guest_opts = GuestOptions::default();
     let target_filter =
         Some(TargetFilter { name: "verify-kzg-program".to_string(), kind: "bin".to_string() });
@@ -77,11 +115,5 @@ pub fn run_guest_program(input: KzgInputs) {
     pkg_dir.push("tests");
     pkg_dir.push("programs");
     pkg_dir.push("verify_kzg");
-
-    let elf = sdk.build(guest_opts, &pkg_dir, &target_filter, None).unwrap();
-
-    let mut io = StdIn::default();
-    io.write(&input);
-
-    sdk.app_prover(elf).unwrap().prove(io).unwrap();
+    sdk.build(guest_opts, &pkg_dir, &target_filter, None).unwrap().into()
 }

From 23bd3a0be3ea5685c190fe8af7b7172ec074b710 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 17:08:45 -0400
Subject: [PATCH 49/94] feat: openvm accelerators crate

---
 Cargo.lock                         |  4 ++++
 Cargo.toml                         |  1 +
 crates/accelerators/Cargo.toml     | 14 ++++++++++++++
 crates/accelerators/src/lib.rs     |  5 +++++
 crates/accelerators/src/ops/mod.rs | 19 +++++++++++++++++++
 5 files changed, 43 insertions(+)
 create mode 100644 crates/accelerators/Cargo.toml
 create mode 100644 crates/accelerators/src/lib.rs
 create mode 100644 crates/accelerators/src/ops/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index d07466a53..f6cabdd38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6785,6 +6785,10 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "openvm-accelerators"
+version = "0.4.0"
+
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 19035c747..761b39e61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ members = [
     "crates/curve-utils",
     "crates/kzg",
     "crates/kzg/tests/programs/verify_kzg",
+    "crates/accelerators",
 ]
 exclude = []
 resolver = "3"
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
new file mode 100644
index 000000000..1c2161b92
--- /dev/null
+++ b/crates/accelerators/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "openvm-accelerators"
+description = "OpenVM implementation of the zkVM Cryptographic Accelerators C Interface"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[lints]
+workspace = true
+
+[features]
+default = []
+std = []
diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
new file mode 100644
index 000000000..25926c35b
--- /dev/null
+++ b/crates/accelerators/src/lib.rs
@@ -0,0 +1,5 @@
+//! OpenVM implementation of the zkVM Cryptographic Accelerators C Interface.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+pub mod ops;
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
new file mode 100644
index 000000000..102b7d077
--- /dev/null
+++ b/crates/accelerators/src/ops/mod.rs
@@ -0,0 +1,19 @@
+//! OpenVM-accelerated implementations of the zkVM accelerator operations.
+//!
+//! All functions operate on fixed-size big-endian byte encodings; BLS12-381
+//! G2 is `x_c0 || x_c1 || y_c0 || y_c1`, BN254 G2 uses the EIP-197
+//! `x_c1 || x_c0 || y_c1 || y_c0` order).
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Error {
+    /// A field element is out of range or otherwise not a field member.
+    FieldElementInvalid,
+    /// A point encoding does not satisfy the curve equation.
+    PointNotOnCurve,
+    /// A point is on the curve but not in the prime-order subgroup.
+    PointNotInSubgroup,
+    /// A signature could not be parsed or key recovery failed.
+    InvalidSignature,
+    /// KZG commitment/proof/field-element inputs are malformed.
+    KzgInvalidInput,
+}

From b7cf3721e64bbb863ee3850a8ae7cc9edf616fcd Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 17:37:50 -0400
Subject: [PATCH 50/94] feat: standard interface types

---
 crates/accelerators/src/lib.rs   |   1 +
 crates/accelerators/src/types.rs | 172 +++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)
 create mode 100644 crates/accelerators/src/types.rs

diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
index 25926c35b..49808c622 100644
--- a/crates/accelerators/src/lib.rs
+++ b/crates/accelerators/src/lib.rs
@@ -3,3 +3,4 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 pub mod ops;
+pub mod types;
diff --git a/crates/accelerators/src/types.rs b/crates/accelerators/src/types.rs
new file mode 100644
index 000000000..56c2694ef
--- /dev/null
+++ b/crates/accelerators/src/types.rs
@@ -0,0 +1,172 @@
+//! Types mirroring the complete interface standard header.
+
+/// Status code returned by every accelerator function (`zkvm_status`).
+///
+/// Pinned to `i32` so the layout does not depend on target conventions.
+#[repr(i32)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ZkvmStatus {
+    /// Success (`ZKVM_EOK`).
+    Ok = 0,
+    /// Failure (`ZKVM_EFAIL`).
+    Fail = -1,
+}
+
+/// 16-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes16 {
+    pub data: [u8; 16],
+}
+
+/// 32-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes32 {
+    pub data: [u8; 32],
+}
+
+/// 48-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes48 {
+    pub data: [u8; 48],
+}
+
+/// 64-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes64 {
+    pub data: [u8; 64],
+}
+
+/// 96-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes96 {
+    pub data: [u8; 96],
+}
+
+/// 128-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes128 {
+    pub data: [u8; 128],
+}
+
+/// 192-byte buffer.
+#[repr(C, align(8))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBytes192 {
+    pub data: [u8; 192],
+}
+
+/* Hash types */
+pub type ZkvmKeccak256Hash = ZkvmBytes32;
+pub type ZkvmSha256Hash = ZkvmBytes32;
+/// 20-byte hash padded to 32 bytes, first 12 bytes zero.
+pub type ZkvmRipemd160Hash = ZkvmBytes32;
+
+/* secp256k1 types */
+pub type ZkvmSecp256k1Hash = ZkvmBytes32;
+/// `r || s`, 32 bytes each, big-endian.
+pub type ZkvmSecp256k1Signature = ZkvmBytes64;
+/// uncompressed `x || y`, 32 bytes each, big-endian.
+pub type ZkvmSecp256k1Pubkey = ZkvmBytes64;
+
+/* secp256r1 (P-256) types */
+pub type ZkvmSecp256r1Hash = ZkvmBytes32;
+/// `r || s`, 32 bytes each, big-endian.
+pub type ZkvmSecp256r1Signature = ZkvmBytes64;
+/// uncompressed `x || y`, 32 bytes each, big-endian.
+pub type ZkvmSecp256r1Pubkey = ZkvmBytes64;
+
+/* BN254 types */
+/// `x || y`, 32 bytes each, big-endian.
+pub type ZkvmBn254G1Point = ZkvmBytes64;
+/// `x_c1 || x_c0 || y_c1 || y_c0` (EIP-197 order).
+pub type ZkvmBn254G2Point = ZkvmBytes128;
+pub type ZkvmBn254Scalar = ZkvmBytes32;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBn254PairingPair {
+    pub g1: ZkvmBn254G1Point,
+    pub g2: ZkvmBn254G2Point,
+}
+
+/* BLS12-381 types */
+/// `x || y`, 48 bytes each, big-endian.
+pub type ZkvmBls12381G1Point = ZkvmBytes96;
+/// `x_c0 || x_c1 || y_c0 || y_c1` (EIP-2537 order).
+pub type ZkvmBls12381G2Point = ZkvmBytes192;
+pub type ZkvmBls12381Scalar = ZkvmBytes32;
+pub type ZkvmBls12381Fp = ZkvmBytes48;
+/// `c0 || c1`, 48 bytes each, big-endian.
+pub type ZkvmBls12381Fp2 = ZkvmBytes96;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBls12381G1MsmPair {
+    pub point: ZkvmBls12381G1Point,
+    pub scalar: ZkvmBls12381Scalar,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBls12381G2MsmPair {
+    pub point: ZkvmBls12381G2Point,
+    pub scalar: ZkvmBls12381Scalar,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct ZkvmBls12381PairingPair {
+    pub g1: ZkvmBls12381G1Point,
+    pub g2: ZkvmBls12381G2Point,
+}
+
+/* BLAKE2f types */
+/// 8 × u64 little-endian.
+pub type ZkvmBlake2fState = ZkvmBytes64;
+/// 16 × u64 little-endian.
+pub type ZkvmBlake2fMessage = ZkvmBytes128;
+/// 2 × u64 little-endian.
+pub type ZkvmBlake2fOffset = ZkvmBytes16;
+
+/* KZG types */
+pub type ZkvmKzgCommitment = ZkvmBytes48;
+pub type ZkvmKzgProof = ZkvmBytes48;
+pub type ZkvmKzgFieldElement = ZkvmBytes32;
+
+// Assert 8-byte alignment and sizes.
+const _: () = {
+    use core::mem::{align_of, size_of};
+
+    assert!(size_of::<ZkvmStatus>() == 4);
+    assert!(align_of::<ZkvmStatus>() == 4);
+
+    assert!(size_of::<ZkvmBytes16>() == 16);
+    assert!(size_of::<ZkvmBytes32>() == 32);
+    assert!(size_of::<ZkvmBytes48>() == 48);
+    assert!(size_of::<ZkvmBytes64>() == 64);
+    assert!(size_of::<ZkvmBytes96>() == 96);
+    assert!(size_of::<ZkvmBytes128>() == 128);
+    assert!(size_of::<ZkvmBytes192>() == 192);
+    assert!(size_of::<ZkvmBn254PairingPair>() == 192);
+    assert!(size_of::<ZkvmBls12381G1MsmPair>() == 128);
+    assert!(size_of::<ZkvmBls12381G2MsmPair>() == 224);
+    assert!(size_of::<ZkvmBls12381PairingPair>() == 288);
+
+    assert!(align_of::<ZkvmBytes16>() == 8);
+    assert!(align_of::<ZkvmBytes32>() == 8);
+    assert!(align_of::<ZkvmBytes48>() == 8);
+    assert!(align_of::<ZkvmBytes64>() == 8);
+    assert!(align_of::<ZkvmBytes96>() == 8);
+    assert!(align_of::<ZkvmBytes128>() == 8);
+    assert!(align_of::<ZkvmBytes192>() == 8);
+    assert!(align_of::<ZkvmBn254PairingPair>() == 8);
+    assert!(align_of::<ZkvmBls12381G1MsmPair>() == 8);
+    assert!(align_of::<ZkvmBls12381G2MsmPair>() == 8);
+    assert!(align_of::<ZkvmBls12381PairingPair>() == 8);
+};

From 6e10550fa3d844c7c13801c93f3a3df0f52b76e1 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 17:40:34 -0400
Subject: [PATCH 51/94] feat(ops): keccak256

---
 Cargo.lock                                    |  4 ++++
 crates/accelerators/Cargo.toml                | 11 ++++++++++
 crates/accelerators/src/ops/hash.rs           |  9 ++++++++
 crates/accelerators/src/ops/mod.rs            |  6 +++++-
 crates/accelerators/tests/conformance/hash.rs | 21 +++++++++++++++++++
 crates/accelerators/tests/conformance/main.rs |  6 ++++++
 6 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 crates/accelerators/src/ops/hash.rs
 create mode 100644 crates/accelerators/tests/conformance/hash.rs
 create mode 100644 crates/accelerators/tests/conformance/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index f6cabdd38..dc028e27f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6788,6 +6788,10 @@ dependencies = [
 [[package]]
 name = "openvm-accelerators"
 version = "0.4.0"
+dependencies = [
+ "hex-literal",
+ "openvm-keccak256",
+]
 
 [[package]]
 name = "openvm-algebra-circuit"
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 1c2161b92..02fc36661 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -9,6 +9,17 @@ repository.workspace = true
 [lints]
 workspace = true
 
+[dependencies]
+# openvm
+openvm-keccak256.workspace = true
+
+# Host implementations when not building for the zkVM guest.
+[target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
+openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
+
+[dev-dependencies]
+hex-literal.workspace = true
+
 [features]
 default = []
 std = []
diff --git a/crates/accelerators/src/ops/hash.rs b/crates/accelerators/src/ops/hash.rs
new file mode 100644
index 000000000..383680008
--- /dev/null
+++ b/crates/accelerators/src/ops/hash.rs
@@ -0,0 +1,9 @@
+//! Hash operations.
+
+use crate::types::ZkvmKeccak256Hash;
+
+/// Compute the Keccak-256 hash of `data` into `output`.
+#[inline]
+pub fn keccak256(data: &[u8], output: &mut ZkvmKeccak256Hash) {
+    openvm_keccak256::set_keccak256(data, &mut output.data);
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 102b7d077..284cf97ec 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -2,7 +2,11 @@
 //!
 //! All functions operate on fixed-size big-endian byte encodings; BLS12-381
 //! G2 is `x_c0 || x_c1 || y_c0 || y_c1`, BN254 G2 uses the EIP-197
-//! `x_c1 || x_c0 || y_c1 || y_c0` order).
+//! `x_c1 || x_c0 || y_c1 || y_c0` order.
+
+mod hash;
+
+pub use hash::keccak256;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
new file mode 100644
index 000000000..a5d47585d
--- /dev/null
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -0,0 +1,21 @@
+//! Hash conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{ops::keccak256, types::ZkvmKeccak256Hash};
+
+#[test]
+fn keccak256_vectors() {
+    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
+
+    keccak256(b"", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
+    );
+
+    keccak256(b"abc", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
+    );
+}
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
new file mode 100644
index 000000000..12e61b30d
--- /dev/null
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -0,0 +1,6 @@
+//! Conformance tests for the accelerator operations, using official test
+//! vectors and reference implementations.
+//!
+//! Modules mirror the `src/ops` layout: one file per domain.
+
+mod hash;

From 5dc7c180d92005f2467f0ee39559d14c258bbd6c Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 17:58:32 -0400
Subject: [PATCH 52/94] feat(ffi): keccak256 interface

---
 crates/accelerators/Cargo.toml                |  5 ++-
 crates/accelerators/src/ffi/hash.rs           | 33 ++++++++++++++++
 crates/accelerators/src/ffi/mod.rs            |  9 +++++
 crates/accelerators/src/lib.rs                |  2 +
 crates/accelerators/tests/conformance/hash.rs | 38 ++++++++++++++++++-
 5 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 crates/accelerators/src/ffi/hash.rs
 create mode 100644 crates/accelerators/src/ffi/mod.rs

diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 02fc36661..d7e345fd9 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -21,5 +21,8 @@ openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
 hex-literal.workspace = true
 
 [features]
-default = []
+default = ["ffi"]
+# The extern "C" `zkvm_*` symbols. Rust consumers that only need `ops` can
+# disable this.
+ffi = []
 std = []
diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
new file mode 100644
index 000000000..421326bd6
--- /dev/null
+++ b/crates/accelerators/src/ffi/hash.rs
@@ -0,0 +1,33 @@
+//! C ABI for the hash accelerators.
+
+use crate::{
+    ops,
+    types::{ZkvmKeccak256Hash, ZkvmStatus},
+};
+
+/// Compute the Keccak-256 hash of `data[..len]` into `output`.
+///
+/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
+/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
+/// input.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_keccak256(
+    data: *const u8,
+    len: usize,
+    output: *mut ZkvmKeccak256Hash,
+) -> ZkvmStatus {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let output = unsafe { &mut *output };
+    ops::keccak256(data, output);
+    ZkvmStatus::Ok
+}
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
new file mode 100644
index 000000000..34441d5b6
--- /dev/null
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -0,0 +1,9 @@
+//! The `extern "C"` layer: `zkvm_*` symbols matching `zkvm_accelerators.h`.
+//!
+//! Every function is a thin wrapper over [`crate::ops`]: it checks pointers,
+//! converts them to references, calls the operation, and maps the result to
+//! [`crate::types::ZkvmStatus`]. No other logic lives here.
+
+mod hash;
+
+pub use hash::*;
diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
index 49808c622..10a85ec01 100644
--- a/crates/accelerators/src/lib.rs
+++ b/crates/accelerators/src/lib.rs
@@ -2,5 +2,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+#[cfg(feature = "ffi")]
+pub mod ffi;
 pub mod ops;
 pub mod types;
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
index a5d47585d..68fa8437f 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -1,7 +1,11 @@
 //! Hash conformance vectors.
 
 use hex_literal::hex;
-use openvm_accelerators::{ops::keccak256, types::ZkvmKeccak256Hash};
+use openvm_accelerators::{
+    ffi::zkvm_keccak256,
+    ops::keccak256,
+    types::{ZkvmKeccak256Hash, ZkvmStatus},
+};
 
 #[test]
 fn keccak256_vectors() {
@@ -19,3 +23,35 @@ fn keccak256_vectors() {
         hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
     );
 }
+
+#[test]
+fn zkvm_keccak256_smoke() {
+    let data = *b"abc";
+    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
+    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
+    );
+}
+
+#[test]
+fn zkvm_keccak256_null_pointers() {
+    let data = *b"abc";
+    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_keccak256(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
+    );
+
+    let status = unsafe { zkvm_keccak256(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 5f05e55e60017ac1a0cb7eb300aa3b0aec8c6630 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:03:55 -0400
Subject: [PATCH 53/94] feat(ops): sha256

---
 Cargo.lock                                    |  1 +
 crates/accelerators/Cargo.toml                |  2 ++
 crates/accelerators/src/ops/hash.rs           | 14 ++++++++++++-
 crates/accelerators/src/ops/mod.rs            |  2 +-
 crates/accelerators/tests/conformance/hash.rs | 21 +++++++++++++++++--
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc028e27f..e108c1021 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6791,6 +6791,7 @@ version = "0.4.0"
 dependencies = [
  "hex-literal",
  "openvm-keccak256",
+ "openvm-sha2",
 ]
 
 [[package]]
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index d7e345fd9..77b2f6e63 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -12,10 +12,12 @@ workspace = true
 [dependencies]
 # openvm
 openvm-keccak256.workspace = true
+openvm-sha2.workspace = true
 
 # Host implementations when not building for the zkVM guest.
 [target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
 openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
+openvm-sha2 = { workspace = true, features = ["import_sha2"] }
 
 [dev-dependencies]
 hex-literal.workspace = true
diff --git a/crates/accelerators/src/ops/hash.rs b/crates/accelerators/src/ops/hash.rs
index 383680008..620e4112e 100644
--- a/crates/accelerators/src/ops/hash.rs
+++ b/crates/accelerators/src/ops/hash.rs
@@ -1,9 +1,21 @@
 //! Hash operations.
 
-use crate::types::ZkvmKeccak256Hash;
+// `Digest` provides the sha2 method resolution on the host; under
+// `openvm_intrinsics` the methods are inherent and the re-export does not
+// exist.
+#[cfg(not(openvm_intrinsics))]
+use openvm_sha2::Digest as _;
+
+use crate::types::{ZkvmKeccak256Hash, ZkvmSha256Hash};
 
 /// Compute the Keccak-256 hash of `data` into `output`.
 #[inline]
 pub fn keccak256(data: &[u8], output: &mut ZkvmKeccak256Hash) {
     openvm_keccak256::set_keccak256(data, &mut output.data);
 }
+
+/// Compute the SHA-256 hash of `data` into `output`.
+#[inline]
+pub fn sha256(data: &[u8], output: &mut ZkvmSha256Hash) {
+    output.data = openvm_sha2::Sha256::digest(data).into();
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 284cf97ec..4d56babf0 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -6,7 +6,7 @@
 
 mod hash;
 
-pub use hash::keccak256;
+pub use hash::{keccak256, sha256};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
index 68fa8437f..72a4cbac2 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -3,8 +3,8 @@
 use hex_literal::hex;
 use openvm_accelerators::{
     ffi::zkvm_keccak256,
-    ops::keccak256,
-    types::{ZkvmKeccak256Hash, ZkvmStatus},
+    ops::{keccak256, sha256},
+    types::{ZkvmKeccak256Hash, ZkvmSha256Hash, ZkvmStatus},
 };
 
 #[test]
@@ -55,3 +55,20 @@ fn zkvm_keccak256_null_pointers() {
     let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
     assert_eq!(status, ZkvmStatus::Fail);
 }
+
+#[test]
+fn sha256_vectors() {
+    let mut output = ZkvmSha256Hash { data: [0; 32] };
+
+    sha256(b"", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
+    );
+
+    sha256(b"abc", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+    );
+}

From 6ff341a9646d30f1043220881625b088f3c2f78f Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:05:23 -0400
Subject: [PATCH 54/94] feat(ffi): sha256 interface

---
 crates/accelerators/src/ffi/hash.rs           | 29 +++++++++++++++-
 crates/accelerators/tests/conformance/hash.rs | 34 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
index 421326bd6..072f58065 100644
--- a/crates/accelerators/src/ffi/hash.rs
+++ b/crates/accelerators/src/ffi/hash.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     ops,
-    types::{ZkvmKeccak256Hash, ZkvmStatus},
+    types::{ZkvmKeccak256Hash, ZkvmSha256Hash, ZkvmStatus},
 };
 
 /// Compute the Keccak-256 hash of `data[..len]` into `output`.
@@ -31,3 +31,30 @@ pub unsafe extern "C" fn zkvm_keccak256(
     ops::keccak256(data, output);
     ZkvmStatus::Ok
 }
+
+/// Compute the SHA-256 hash of `data[..len]` into `output`.
+///
+/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
+/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
+/// input.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_sha256(
+    data: *const u8,
+    len: usize,
+    output: *mut ZkvmSha256Hash,
+) -> ZkvmStatus {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let output = unsafe { &mut *output };
+    ops::sha256(data, output);
+    ZkvmStatus::Ok
+}
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
index 72a4cbac2..ae0fdae5d 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -2,7 +2,7 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::zkvm_keccak256,
+    ffi::{zkvm_keccak256, zkvm_sha256},
     ops::{keccak256, sha256},
     types::{ZkvmKeccak256Hash, ZkvmSha256Hash, ZkvmStatus},
 };
@@ -72,3 +72,35 @@ fn sha256_vectors() {
         hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
     );
 }
+
+#[test]
+fn zkvm_sha256_smoke() {
+    let data = *b"abc";
+    let mut output = ZkvmSha256Hash { data: [0; 32] };
+    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+    );
+}
+
+#[test]
+fn zkvm_sha256_null_pointers() {
+    let data = *b"abc";
+    let mut output = ZkvmSha256Hash { data: [0; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_sha256(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
+    );
+
+    let status = unsafe { zkvm_sha256(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 154303d735b32ffb0a054e420f75f5d05934ad9c Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:11:08 -0400
Subject: [PATCH 55/94] feat(ops): ripemd160

---
 Cargo.lock                                    |  1 +
 crates/accelerators/Cargo.toml                |  3 +++
 crates/accelerators/src/ops/hash.rs           | 23 +++++++++++++------
 crates/accelerators/src/ops/mod.rs            |  2 +-
 crates/accelerators/tests/conformance/hash.rs | 22 ++++++++++++++++--
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e108c1021..1833a04ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6792,6 +6792,7 @@ dependencies = [
  "hex-literal",
  "openvm-keccak256",
  "openvm-sha2",
+ "ripemd",
 ]
 
 [[package]]
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 77b2f6e63..c353aa641 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -14,6 +14,9 @@ workspace = true
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
+# crypto
+ripemd = { version = "0.1.3", default-features = false }
+
 # Host implementations when not building for the zkVM guest.
 [target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
 openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
diff --git a/crates/accelerators/src/ops/hash.rs b/crates/accelerators/src/ops/hash.rs
index 620e4112e..3bae39f29 100644
--- a/crates/accelerators/src/ops/hash.rs
+++ b/crates/accelerators/src/ops/hash.rs
@@ -1,12 +1,6 @@
 //! Hash operations.
 
-// `Digest` provides the sha2 method resolution on the host; under
-// `openvm_intrinsics` the methods are inherent and the re-export does not
-// exist.
-#[cfg(not(openvm_intrinsics))]
-use openvm_sha2::Digest as _;
-
-use crate::types::{ZkvmKeccak256Hash, ZkvmSha256Hash};
+use crate::types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash};
 
 /// Compute the Keccak-256 hash of `data` into `output`.
 #[inline]
@@ -17,5 +11,20 @@ pub fn keccak256(data: &[u8], output: &mut ZkvmKeccak256Hash) {
 /// Compute the SHA-256 hash of `data` into `output`.
 #[inline]
 pub fn sha256(data: &[u8], output: &mut ZkvmSha256Hash) {
+    #[cfg(not(openvm_intrinsics))]
+    use openvm_sha2::Digest;
     output.data = openvm_sha2::Sha256::digest(data).into();
 }
+
+/// Compute the RIPEMD-160 hash of `data` into `output`.
+///
+/// The 20-byte digest is written to `output.data[12..]`; the first 12 bytes
+/// are zeroed, matching the EVM word layout.
+#[inline]
+pub fn ripemd160(data: &[u8], output: &mut ZkvmRipemd160Hash) {
+    use ripemd::Digest;
+    let mut hasher = ripemd::Ripemd160::new();
+    hasher.update(data);
+    output.data[..12].fill(0);
+    hasher.finalize_into((&mut output.data[12..]).into());
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 4d56babf0..72a5da521 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -6,7 +6,7 @@
 
 mod hash;
 
-pub use hash::{keccak256, sha256};
+pub use hash::{keccak256, ripemd160, sha256};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
index ae0fdae5d..4b0a09c53 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -3,8 +3,8 @@
 use hex_literal::hex;
 use openvm_accelerators::{
     ffi::{zkvm_keccak256, zkvm_sha256},
-    ops::{keccak256, sha256},
-    types::{ZkvmKeccak256Hash, ZkvmSha256Hash, ZkvmStatus},
+    ops::{keccak256, ripemd160, sha256},
+    types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus},
 };
 
 #[test]
@@ -104,3 +104,21 @@ fn zkvm_sha256_null_pointers() {
     let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
     assert_eq!(status, ZkvmStatus::Fail);
 }
+
+#[test]
+fn ripemd160_vectors() {
+    // Start from a dirty buffer to check the 12-byte zero padding is written.
+    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
+
+    ripemd160(b"", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
+    );
+
+    ripemd160(b"abc", &mut output);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
+    );
+}

From 01e52c805935fe79bb341dd56d51582a4ecae83b Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:12:52 -0400
Subject: [PATCH 56/94] feat(ffi): ripemd160 interface

---
 crates/accelerators/src/ffi/hash.rs           | 32 ++++++++++++++++-
 crates/accelerators/tests/conformance/hash.rs | 34 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
index 072f58065..0deb16129 100644
--- a/crates/accelerators/src/ffi/hash.rs
+++ b/crates/accelerators/src/ffi/hash.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     ops,
-    types::{ZkvmKeccak256Hash, ZkvmSha256Hash, ZkvmStatus},
+    types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus},
 };
 
 /// Compute the Keccak-256 hash of `data[..len]` into `output`.
@@ -58,3 +58,33 @@ pub unsafe extern "C" fn zkvm_sha256(
     ops::sha256(data, output);
     ZkvmStatus::Ok
 }
+
+/// Compute the RIPEMD-160 hash of `data[..len]` into `output`.
+///
+/// The 20-byte digest is written to `output.data[12..]`; the first 12 bytes
+/// are zeroed.
+///
+/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
+/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
+/// input.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_ripemd160(
+    data: *const u8,
+    len: usize,
+    output: *mut ZkvmRipemd160Hash,
+) -> ZkvmStatus {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let output = unsafe { &mut *output };
+    ops::ripemd160(data, output);
+    ZkvmStatus::Ok
+}
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/conformance/hash.rs
index 4b0a09c53..339bc3f79 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/conformance/hash.rs
@@ -2,7 +2,7 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::{zkvm_keccak256, zkvm_sha256},
+    ffi::{zkvm_keccak256, zkvm_ripemd160, zkvm_sha256},
     ops::{keccak256, ripemd160, sha256},
     types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus},
 };
@@ -122,3 +122,35 @@ fn ripemd160_vectors() {
         hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
     );
 }
+
+#[test]
+fn zkvm_ripemd160_smoke() {
+    let data = *b"abc";
+    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
+    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
+    );
+}
+
+#[test]
+fn zkvm_ripemd160_null_pointers() {
+    let data = *b"abc";
+    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_ripemd160(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
+    );
+
+    let status = unsafe { zkvm_ripemd160(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 9af87e262e3472299c0e434771ec66f27a46bec4 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:15:39 -0400
Subject: [PATCH 57/94] ci: accelerators tests and guest build

---
 .github/workflows/tests-accelerators.yml | 67 ++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 .github/workflows/tests-accelerators.yml

diff --git a/.github/workflows/tests-accelerators.yml b/.github/workflows/tests-accelerators.yml
new file mode 100644
index 000000000..e4907dafa
--- /dev/null
+++ b/.github/workflows/tests-accelerators.yml
@@ -0,0 +1,67 @@
+name: OpenVM Accelerators Tests
+
+on:
+  pull_request:
+    paths:
+      - "crates/accelerators/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".github/workflows/tests-accelerators.yml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_NET_GIT_FETCH_WITH_CLI: "true"
+
+jobs:
+  test:
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - runner=64cpu-linux-arm64
+      - extras=s3-cache
+
+    steps:
+      - uses: runs-on/action@v2
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - uses: taiki-e/install-action@nextest
+
+      - name: Run tests
+        run: cargo nextest run -p openvm-accelerators
+
+  guest-build:
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - runner=64cpu-linux-arm64
+      - extras=s3-cache
+
+    steps:
+      - uses: runs-on/action@v2
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: "1.91.1"
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Cache openvm toolchain
+        uses: actions/cache@v4
+        with:
+          path: ~/.openvm/toolchains
+          key: openvm-toolchain-openvm-1.94.0-${{ runner.os }}-${{ runner.arch }}
+
+      - name: Install OpenVM CLI
+        run: |
+          cargo install --git https://github.com/openvm-org/openvm.git --branch develop-v2.1.0 --locked --force cargo-openvm
+          cargo openvm toolchain install
+
+      - name: Build for the guest target
+        run: |
+          cd crates/accelerators
+          cargo openvm build --no-transpile

From 66bf4983211914d6ac7387da1083f6e61741e45e Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:34:02 -0400
Subject: [PATCH 58/94] feat(ops): blake2

---
 crates/accelerators/src/ops/blake2/mod.rs     | 77 +++++++++++++++++
 .../accelerators/src/ops/blake2/portable.rs   | 76 +++++++++++++++++
 crates/accelerators/src/ops/mod.rs            |  4 +
 .../accelerators/tests/conformance/blake2.rs  | 83 +++++++++++++++++++
 crates/accelerators/tests/conformance/main.rs |  1 +
 5 files changed, 241 insertions(+)
 create mode 100644 crates/accelerators/src/ops/blake2/mod.rs
 create mode 100644 crates/accelerators/src/ops/blake2/portable.rs
 create mode 100644 crates/accelerators/tests/conformance/blake2.rs

diff --git a/crates/accelerators/src/ops/blake2/mod.rs b/crates/accelerators/src/ops/blake2/mod.rs
new file mode 100644
index 000000000..06d0c1866
--- /dev/null
+++ b/crates/accelerators/src/ops/blake2/mod.rs
@@ -0,0 +1,77 @@
+//! BLAKE2b compression function F (EIP-152).
+//!
+//! Vendored from revm-precompile, which adapted the compression function from
+//! [`blake2b_simd`](https://github.com/oconnor663/blake2_simd) (MIT license)
+//! for EIP-152 variable round counts.
+
+mod portable;
+
+use crate::{
+    ops::Error,
+    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
+};
+
+type Word = u64;
+
+const IV: [Word; 8] = [
+    0x6A09E667F3BCC908,
+    0xBB67AE8584CAA73B,
+    0x3C6EF372FE94F82B,
+    0xA54FF53A5F1D36F1,
+    0x510E527FADE682D1,
+    0x9B05688C2B3E6C1F,
+    0x1F83D9ABFB41BD6B,
+    0x5BE0CD19137E2179,
+];
+
+// SIGMA has spec period 10 (RFC 7693 §2.7). BLAKE2b runs 12 rounds by reusing
+// SIGMA[0]/SIGMA[1] for rounds 10/11; for EIP-152's variable round count we
+// must index with `r % 10`, not `r % 12`.
+const SIGMA: [[u8; 16]; 10] = [
+    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
+    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
+    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
+    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
+    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
+    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
+    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
+    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
+    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
+];
+
+/// Apply the BLAKE2 compression function F to the state vector `h` in place.
+///
+/// `h`, `m` and `t` hold little-endian words; `f` is the final-block
+/// indicator and must be `0` or `1`.
+pub fn blake2f(
+    rounds: u32,
+    h: &mut ZkvmBlake2fState,
+    m: &ZkvmBlake2fMessage,
+    t: &ZkvmBlake2fOffset,
+    f: u8,
+) -> Result<(), Error> {
+    if f > 1 {
+        return Err(Error::InvalidFinalFlag);
+    }
+
+    let mut state = [0u64; 8];
+    for (word, chunk) in state.iter_mut().zip(h.data.chunks_exact(8)) {
+        *word = u64::from_le_bytes(chunk.try_into().unwrap());
+    }
+    let mut message = [0u64; 16];
+    for (word, chunk) in message.iter_mut().zip(m.data.chunks_exact(8)) {
+        *word = u64::from_le_bytes(chunk.try_into().unwrap());
+    }
+    let offset = [
+        u64::from_le_bytes(t.data[..8].try_into().unwrap()),
+        u64::from_le_bytes(t.data[8..].try_into().unwrap()),
+    ];
+
+    portable::compress(rounds, &mut state, &message, &offset, f == 1);
+
+    for (chunk, word) in h.data.chunks_exact_mut(8).zip(state.iter()) {
+        chunk.copy_from_slice(&word.to_le_bytes());
+    }
+    Ok(())
+}
diff --git a/crates/accelerators/src/ops/blake2/portable.rs b/crates/accelerators/src/ops/blake2/portable.rs
new file mode 100644
index 000000000..2e3a52b7f
--- /dev/null
+++ b/crates/accelerators/src/ops/blake2/portable.rs
@@ -0,0 +1,76 @@
+// Adapted from https://github.com/oconnor663/blake2_simd
+// Copyright (c) 2018 Jack O'Connor
+// Licensed under the MIT license
+
+use super::{Word, IV, SIGMA};
+
+// G is the mixing function, called eight times per round in the compression
+// function. V is the 16-word state vector of the compression function, usually
+// described as a 4x4 matrix. A, B, C, and D are the mixing indices, set by the
+// caller first to the four columns of V, and then to its four diagonals. X and
+// Y are words of input, chosen by the caller according to the message
+// schedule, SIGMA.
+#[inline(always)]
+const fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
+    v[d] = (v[d] ^ v[a]).rotate_right(32);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(24);
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
+    v[d] = (v[d] ^ v[a]).rotate_right(16);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(63);
+}
+
+#[inline(always)]
+const fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
+    // Select the message schedule based on the round.
+    let s = SIGMA[r % 10];
+
+    // Mix the columns.
+    g(v, 0, 4, 8, 12, m[s[0] as usize], m[s[1] as usize]);
+    g(v, 1, 5, 9, 13, m[s[2] as usize], m[s[3] as usize]);
+    g(v, 2, 6, 10, 14, m[s[4] as usize], m[s[5] as usize]);
+    g(v, 3, 7, 11, 15, m[s[6] as usize], m[s[7] as usize]);
+
+    // Mix the rows.
+    g(v, 0, 5, 10, 15, m[s[8] as usize], m[s[9] as usize]);
+    g(v, 1, 6, 11, 12, m[s[10] as usize], m[s[11] as usize]);
+    g(v, 2, 7, 8, 13, m[s[12] as usize], m[s[13] as usize]);
+    g(v, 3, 4, 9, 14, m[s[14] as usize], m[s[15] as usize]);
+}
+
+pub(super) fn compress(rounds: u32, words: &mut [Word; 8], m: &[Word; 16], t: &[Word; 2], f: bool) {
+    // Initialize the compression state.
+    let mut v = [
+        words[0],
+        words[1],
+        words[2],
+        words[3],
+        words[4],
+        words[5],
+        words[6],
+        words[7],
+        IV[0],
+        IV[1],
+        IV[2],
+        IV[3],
+        IV[4] ^ t[0],
+        IV[5] ^ t[1],
+        IV[6] ^ if f { !0 } else { 0 },
+        IV[7],
+    ];
+
+    for i in 0..rounds as usize {
+        round(i, m, &mut v);
+    }
+
+    words[0] ^= v[0] ^ v[8];
+    words[1] ^= v[1] ^ v[9];
+    words[2] ^= v[2] ^ v[10];
+    words[3] ^= v[3] ^ v[11];
+    words[4] ^= v[4] ^ v[12];
+    words[5] ^= v[5] ^ v[13];
+    words[6] ^= v[6] ^ v[14];
+    words[7] ^= v[7] ^ v[15];
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 72a5da521..c9c9fedae 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -4,8 +4,10 @@
 //! G2 is `x_c0 || x_c1 || y_c0 || y_c1`, BN254 G2 uses the EIP-197
 //! `x_c1 || x_c0 || y_c1 || y_c0` order.
 
+mod blake2;
 mod hash;
 
+pub use blake2::blake2f;
 pub use hash::{keccak256, ripemd160, sha256};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -16,6 +18,8 @@ pub enum Error {
     PointNotOnCurve,
     /// A point is on the curve but not in the prime-order subgroup.
     PointNotInSubgroup,
+    /// The BLAKE2f final-block flag is neither 0 nor 1.
+    InvalidFinalFlag,
     /// A signature could not be parsed or key recovery failed.
     InvalidSignature,
     /// KZG commitment/proof/field-element inputs are malformed.
diff --git a/crates/accelerators/tests/conformance/blake2.rs b/crates/accelerators/tests/conformance/blake2.rs
new file mode 100644
index 000000000..55054f2ab
--- /dev/null
+++ b/crates/accelerators/tests/conformance/blake2.rs
@@ -0,0 +1,83 @@
+//! BLAKE2f conformance: the official EIP-152 test vectors 4-7.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    ops::{blake2f, Error},
+    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
+};
+
+/// EIP-152 vectors 4-7 share the same h, m and t inputs.
+const H: [u8; 64] = hex!(
+    "48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5"
+    "d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b"
+);
+const T: [u8; 16] = hex!("03000000000000000000000000000000");
+
+fn m() -> ZkvmBlake2fMessage {
+    let mut m = ZkvmBlake2fMessage { data: [0; 128] };
+    m.data[..3].copy_from_slice(b"abc");
+    m
+}
+
+fn check(rounds: u32, f: u8, expected: [u8; 64]) {
+    let mut h = ZkvmBlake2fState { data: H };
+    blake2f(rounds, &mut h, &m(), &ZkvmBlake2fOffset { data: T }, f).unwrap();
+    assert_eq!(h.data, expected, "rounds={rounds}, f={f}");
+}
+
+#[test]
+fn blake2f_eip152_vector_4_zero_rounds() {
+    check(
+        0,
+        1,
+        hex!(
+            "08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5"
+            "d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b"
+        ),
+    );
+}
+
+#[test]
+fn blake2f_eip152_vector_5_twelve_rounds() {
+    check(
+        12,
+        1,
+        hex!(
+            "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1"
+            "7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923"
+        ),
+    );
+}
+
+#[test]
+fn blake2f_eip152_vector_6_no_final_flag() {
+    check(
+        12,
+        0,
+        hex!(
+            "75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d28752"
+            "98743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735"
+        ),
+    );
+}
+
+#[test]
+fn blake2f_eip152_vector_7_one_round() {
+    check(
+        1,
+        1,
+        hex!(
+            "b63a380cb2897d521994a85234ee2c181b5f844d2c624c002677e9703449d2fb"
+            "a551b3a8333bcdf5f2f7e08993d53923de3d64fcc68c034e717b9293fed7a421"
+        ),
+    );
+}
+
+#[test]
+fn blake2f_invalid_final_flag() {
+    let mut h = ZkvmBlake2fState { data: H };
+    let result = blake2f(12, &mut h, &m(), &ZkvmBlake2fOffset { data: T }, 2);
+    assert_eq!(result, Err(Error::InvalidFinalFlag));
+    // The state must be untouched on failure.
+    assert_eq!(h.data, H);
+}
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
index 12e61b30d..acfab0996 100644
--- a/crates/accelerators/tests/conformance/main.rs
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -3,4 +3,5 @@
 //!
 //! Modules mirror the `src/ops` layout: one file per domain.
 
+mod blake2;
 mod hash;

From a8820c576b5ce19bad180f82475605225cd4d928 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Tue, 28 Jul 2026 18:37:25 -0400
Subject: [PATCH 59/94] feat(ffi): blake2 interface

---
 crates/accelerators/src/ffi/blake2.rs         | 35 ++++++++++++++++
 crates/accelerators/src/ffi/mod.rs            |  2 +
 .../accelerators/tests/conformance/blake2.rs  | 42 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 crates/accelerators/src/ffi/blake2.rs

diff --git a/crates/accelerators/src/ffi/blake2.rs b/crates/accelerators/src/ffi/blake2.rs
new file mode 100644
index 000000000..fb43c0ff4
--- /dev/null
+++ b/crates/accelerators/src/ffi/blake2.rs
@@ -0,0 +1,35 @@
+//! C ABI for the BLAKE2 compression function.
+
+use crate::{
+    ops,
+    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus},
+};
+
+/// Apply the BLAKE2 compression function F (EIP-152) to `h` in place.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL, or if `f` is neither
+/// 0 nor 1.
+///
+/// # Safety
+///
+/// - `h`, if non-NULL, must be valid for reads and writes of 64 bytes.
+/// - `m`, if non-NULL, must be valid for reads of 128 bytes.
+/// - `t`, if non-NULL, must be valid for reads of 16 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_blake2f(
+    rounds: u32,
+    h: *mut ZkvmBlake2fState,
+    m: *const ZkvmBlake2fMessage,
+    t: *const ZkvmBlake2fOffset,
+    f: u8,
+) -> ZkvmStatus {
+    if h.is_null() || m.is_null() || t.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (h, m, t) = unsafe { (&mut *h, &*m, &*t) };
+    match ops::blake2f(rounds, h, m, t, f) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index 34441d5b6..8e9ba6c90 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -4,6 +4,8 @@
 //! converts them to references, calls the operation, and maps the result to
 //! [`crate::types::ZkvmStatus`]. No other logic lives here.
 
+mod blake2;
 mod hash;
 
+pub use blake2::*;
 pub use hash::*;
diff --git a/crates/accelerators/tests/conformance/blake2.rs b/crates/accelerators/tests/conformance/blake2.rs
index 55054f2ab..05f147c22 100644
--- a/crates/accelerators/tests/conformance/blake2.rs
+++ b/crates/accelerators/tests/conformance/blake2.rs
@@ -2,8 +2,9 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
+    ffi::zkvm_blake2f,
     ops::{blake2f, Error},
-    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
+    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus},
 };
 
 /// EIP-152 vectors 4-7 share the same h, m and t inputs.
@@ -81,3 +82,42 @@ fn blake2f_invalid_final_flag() {
     // The state must be untouched on failure.
     assert_eq!(h.data, H);
 }
+
+#[test]
+fn zkvm_blake2f_smoke() {
+    let mut h = ZkvmBlake2fState { data: H };
+    let m = m();
+    let t = ZkvmBlake2fOffset { data: T };
+
+    let status = unsafe { zkvm_blake2f(12, &mut h, &m, &t, 1) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(
+        h.data,
+        hex!(
+            "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1"
+            "7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923"
+        )
+    );
+
+    // An invalid final flag maps to the failure status.
+    let status = unsafe { zkvm_blake2f(12, &mut h, &m, &t, 2) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}
+
+#[test]
+fn zkvm_blake2f_null_pointers() {
+    let mut h = ZkvmBlake2fState { data: H };
+    let m = m();
+    let t = ZkvmBlake2fOffset { data: T };
+
+    let status = unsafe { zkvm_blake2f(12, core::ptr::null_mut(), &m, &t, 1) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_blake2f(12, &mut h, core::ptr::null(), &t, 1) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_blake2f(12, &mut h, &m, core::ptr::null(), 1) };
+    assert_eq!(status, ZkvmStatus::Fail);
+    // The state must be untouched when a pointer is NULL.
+    assert_eq!(h.data, H);
+}

From 4129e4cbd0cd5cec943faf44b67080870be2ec39 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:24:44 -0400
Subject: [PATCH 60/94] feat(ops): secp256k1 ecrecover and verify

---
 Cargo.lock                           |  1 +
 crates/accelerators/Cargo.toml       |  1 +
 crates/accelerators/src/ops/ecdsa.rs | 61 ++++++++++++++++++++++++++++
 crates/accelerators/src/ops/mod.rs   |  2 +
 4 files changed, 65 insertions(+)
 create mode 100644 crates/accelerators/src/ops/ecdsa.rs

diff --git a/Cargo.lock b/Cargo.lock
index 1833a04ce..7cd4a9eb4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6790,6 +6790,7 @@ name = "openvm-accelerators"
 version = "0.4.0"
 dependencies = [
  "hex-literal",
+ "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-keccak256",
  "openvm-sha2",
  "ripemd",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index c353aa641..fc6987841 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -11,6 +11,7 @@ workspace = true
 
 [dependencies]
 # openvm
+openvm-k256.workspace = true
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
diff --git a/crates/accelerators/src/ops/ecdsa.rs b/crates/accelerators/src/ops/ecdsa.rs
new file mode 100644
index 000000000..f7c5c7ad0
--- /dev/null
+++ b/crates/accelerators/src/ops/ecdsa.rs
@@ -0,0 +1,61 @@
+//! ECDSA operations.
+
+use openvm_k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
+
+use crate::{
+    ops::Error,
+    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature},
+};
+
+/// Recover the uncompressed secp256k1 public key from an ECDSA signature
+/// over `msg` into `output`.
+///
+/// Both low-s and high-s signatures are accepted.
+pub fn secp256k1_ecrecover(
+    msg: &ZkvmSecp256k1Hash,
+    sig: &ZkvmSecp256k1Signature,
+    mut recid: u8,
+    output: &mut ZkvmSecp256k1Pubkey,
+) -> Result<(), Error> {
+    let mut signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+    // k256 requires a low-s signature for recovery; normalizing flips the
+    // recovery id parity but recovers the same key.
+    if let Some(normalized) = signature.normalize_s() {
+        signature = normalized;
+        recid ^= 1;
+    }
+    let recovery_id = RecoveryId::from_byte(recid).ok_or(Error::InvalidSignature)?;
+
+    let key =
+        VerifyingKey::recover_from_prehash_noverify(&msg.data, &signature.to_bytes(), recovery_id)
+            .map_err(|_| Error::InvalidSignature)?;
+
+    let point = key.to_encoded_point(false);
+    output.data.copy_from_slice(&point.as_bytes()[1..65]);
+    Ok(())
+}
+
+/// Verify an ECDSA signature over secp256k1 against an uncompressed public
+/// key, writing the result to `verified`.
+///
+/// Both low-s and high-s signatures are accepted.
+pub fn secp256k1_verify(
+    msg: &ZkvmSecp256k1Hash,
+    sig: &ZkvmSecp256k1Signature,
+    pubkey: &ZkvmSecp256k1Pubkey,
+    verified: &mut bool,
+) -> Result<(), Error> {
+    *verified = false;
+
+    let mut sec1 = [0u8; 65];
+    sec1[0] = 0x04;
+    sec1[1..].copy_from_slice(&pubkey.data);
+    let key = VerifyingKey::from_sec1_bytes(&sec1).map_err(|_| Error::PointNotOnCurve)?;
+    let mut signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+    // k256 rejects high-s signatures in verification. Normalize to accept both forms.
+    if let Some(normalized) = signature.normalize_s() {
+        signature = normalized;
+    }
+    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
+    Ok(())
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index c9c9fedae..bbed3cd18 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -5,9 +5,11 @@
 //! `x_c1 || x_c0 || y_c1 || y_c0` order.
 
 mod blake2;
+mod ecdsa;
 mod hash;
 
 pub use blake2::blake2f;
+pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

From acbca999158a2273b545f04cf0731fbdf6f25970 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:28:50 -0400
Subject: [PATCH 61/94] feat(ffi): secp256k1 ecrecover and verify interfaces

---
 crates/accelerators/src/ffi/ecdsa.rs | 66 ++++++++++++++++++++++++++++
 crates/accelerators/src/ffi/mod.rs   |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 crates/accelerators/src/ffi/ecdsa.rs

diff --git a/crates/accelerators/src/ffi/ecdsa.rs b/crates/accelerators/src/ffi/ecdsa.rs
new file mode 100644
index 000000000..bf9563c4f
--- /dev/null
+++ b/crates/accelerators/src/ffi/ecdsa.rs
@@ -0,0 +1,66 @@
+//! C ABI for the ECDSA accelerators.
+
+use crate::{
+    ops,
+    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmStatus},
+};
+
+/// Recover the uncompressed secp256k1 public key from an ECDSA signature
+/// over `msg` into `output`.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL, the signature cannot
+/// be parsed, or the recovery id is invalid.
+///
+/// # Safety
+///
+/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
+/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `output`, if non-NULL, must be valid for writes of 64 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
+    msg: *const ZkvmSecp256k1Hash,
+    sig: *const ZkvmSecp256k1Signature,
+    recid: u8,
+    output: *mut ZkvmSecp256k1Pubkey,
+) -> ZkvmStatus {
+    if msg.is_null() || sig.is_null() || output.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (msg, sig, output) = unsafe { (&*msg, &*sig, &mut *output) };
+    match ops::secp256k1_ecrecover(msg, sig, recid, output) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// Verify an ECDSA signature over secp256k1 against an uncompressed public
+/// key, writing the result to `verified`.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
+/// malformed; `verified` is `false` when a well-formed signature does not
+/// verify.
+///
+/// # Safety
+///
+/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
+/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `pubkey`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `verified`, if non-NULL, must be valid for writes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256k1_verify(
+    msg: *const ZkvmSecp256k1Hash,
+    sig: *const ZkvmSecp256k1Signature,
+    pubkey: *const ZkvmSecp256k1Pubkey,
+    verified: *mut bool,
+) -> ZkvmStatus {
+    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (msg, sig, pubkey, verified) = unsafe { (&*msg, &*sig, &*pubkey, &mut *verified) };
+    match ops::secp256k1_verify(msg, sig, pubkey, verified) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index 8e9ba6c90..3f82ef4ea 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -5,7 +5,9 @@
 //! [`crate::types::ZkvmStatus`]. No other logic lives here.
 
 mod blake2;
+mod ecdsa;
 mod hash;
 
 pub use blake2::*;
+pub use ecdsa::*;
 pub use hash::*;

From e6577826b88992c89212df74d3fbb662f0675a47 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:36:56 -0400
Subject: [PATCH 62/94] feat(ops): secp256r1 verify

---
 Cargo.lock                           |  1 +
 crates/accelerators/Cargo.toml       |  1 +
 crates/accelerators/src/ops/ecdsa.rs | 28 +++++++++++++++++++++++++++-
 crates/accelerators/src/ops/mod.rs   |  2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7cd4a9eb4..b7b7ecc15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6793,6 +6793,7 @@ dependencies = [
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-keccak256",
  "openvm-sha2",
+ "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "ripemd",
 ]
 
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index fc6987841..5b7c7afe2 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -12,6 +12,7 @@ workspace = true
 [dependencies]
 # openvm
 openvm-k256.workspace = true
+openvm-p256.workspace = true
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
diff --git a/crates/accelerators/src/ops/ecdsa.rs b/crates/accelerators/src/ops/ecdsa.rs
index f7c5c7ad0..40e454bf8 100644
--- a/crates/accelerators/src/ops/ecdsa.rs
+++ b/crates/accelerators/src/ops/ecdsa.rs
@@ -4,7 +4,10 @@ use openvm_k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signatu
 
 use crate::{
     ops::Error,
-    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature},
+    types::{
+        ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash,
+        ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature,
+    },
 };
 
 /// Recover the uncompressed secp256k1 public key from an ECDSA signature
@@ -59,3 +62,26 @@ pub fn secp256k1_verify(
     *verified = key.verify_prehash(&msg.data, &signature).is_ok();
     Ok(())
 }
+
+/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
+/// public key, writing the result to `verified`.
+pub fn secp256r1_verify(
+    msg: &ZkvmSecp256r1Hash,
+    sig: &ZkvmSecp256r1Signature,
+    pubkey: &ZkvmSecp256r1Pubkey,
+    verified: &mut bool,
+) -> Result<(), Error> {
+    use openvm_p256::{
+        ecdsa::{Signature, VerifyingKey},
+        EncodedPoint,
+    };
+
+    *verified = false;
+
+    let encoded_point = EncodedPoint::from_untagged_bytes(&pubkey.data.into());
+    let key =
+        VerifyingKey::from_encoded_point(&encoded_point).map_err(|_| Error::PointNotOnCurve)?;
+    let signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
+    Ok(())
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index bbed3cd18..f269b7319 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -9,7 +9,7 @@ mod ecdsa;
 mod hash;
 
 pub use blake2::blake2f;
-pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify};
+pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]

From a87c146c0fe5156e6f000f27d667f475ebc84c27 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:37:18 -0400
Subject: [PATCH 63/94] feat(tests): tests for secp256r1 verify

---
 .../accelerators/tests/conformance/ecdsa.rs   | 60 +++++++++++++++++++
 crates/accelerators/tests/conformance/main.rs |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 crates/accelerators/tests/conformance/ecdsa.rs

diff --git a/crates/accelerators/tests/conformance/ecdsa.rs b/crates/accelerators/tests/conformance/ecdsa.rs
new file mode 100644
index 000000000..705921151
--- /dev/null
+++ b/crates/accelerators/tests/conformance/ecdsa.rs
@@ -0,0 +1,60 @@
+//! ECDSA conformance vectors.
+//!
+//! Tested with vectors from https://github.com/daimo-eth/p256-verifier/tree/master/test-vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    ops::{secp256r1_verify, Error},
+    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature},
+};
+
+/// Splits a 160-byte P256VERIFY input (msg || sig || pk) into its parts.
+fn parts(input: &[u8; 160]) -> (ZkvmSecp256r1Hash, ZkvmSecp256r1Signature, ZkvmSecp256r1Pubkey) {
+    (
+        ZkvmSecp256r1Hash { data: input[..32].try_into().unwrap() },
+        ZkvmSecp256r1Signature { data: input[32..96].try_into().unwrap() },
+        ZkvmSecp256r1Pubkey { data: input[96..].try_into().unwrap() },
+    )
+}
+
+const VALID: [u8; 160] = hex!(
+    "4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4d"
+    "a73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac"
+    "36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d60"
+    "4aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff3"
+    "7618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"
+);
+
+#[test]
+fn secp256r1_verify_vectors() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = false;
+
+    secp256r1_verify(&msg, &sig, &pubkey, &mut verified).unwrap();
+    assert!(verified);
+
+    // Wrong message must not verify; `verified` must be overwritten.
+    let mut wrong_msg = msg;
+    wrong_msg.data[0] = 0x3c;
+    secp256r1_verify(&wrong_msg, &sig, &pubkey, &mut verified).unwrap();
+    assert!(!verified);
+}
+
+#[test]
+fn secp256r1_verify_malformed_inputs() {
+    let (msg, sig, _) = parts(&VALID);
+    let mut verified = true;
+
+    // A signature with out-of-range values cannot be parsed.
+    let bad_sig = ZkvmSecp256r1Signature { data: [0xff; 64] };
+    let result = secp256r1_verify(&msg, &bad_sig, &parts(&VALID).2, &mut verified);
+    assert_eq!(result, Err(Error::InvalidSignature));
+    assert!(!verified);
+
+    // A public key that is not on the curve cannot be parsed.
+    verified = true;
+    let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
+    let result = secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified);
+    assert_eq!(result, Err(Error::PointNotOnCurve));
+    assert!(!verified);
+}
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
index acfab0996..d8bb24d1e 100644
--- a/crates/accelerators/tests/conformance/main.rs
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -4,4 +4,5 @@
 //! Modules mirror the `src/ops` layout: one file per domain.
 
 mod blake2;
+mod ecdsa;
 mod hash;

From 7e3bea7c82afbd0a21cf823c815b36d71b4c1d61 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:39:54 -0400
Subject: [PATCH 64/94] feat(ffi): secp256r1 verify interface

---
 crates/accelerators/src/ffi/ecdsa.rs          | 36 +++++++++++++++++-
 .../accelerators/tests/conformance/ecdsa.rs   | 37 ++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/crates/accelerators/src/ffi/ecdsa.rs b/crates/accelerators/src/ffi/ecdsa.rs
index bf9563c4f..266771893 100644
--- a/crates/accelerators/src/ffi/ecdsa.rs
+++ b/crates/accelerators/src/ffi/ecdsa.rs
@@ -2,7 +2,10 @@
 
 use crate::{
     ops,
-    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmStatus},
+    types::{
+        ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash,
+        ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus,
+    },
 };
 
 /// Recover the uncompressed secp256k1 public key from an ECDSA signature
@@ -64,3 +67,34 @@ pub unsafe extern "C" fn zkvm_secp256k1_verify(
         Err(_) => ZkvmStatus::Fail,
     }
 }
+
+/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
+/// public key, writing the result to `verified`.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
+/// malformed; `verified` is `false` when a well-formed signature does not
+/// verify.
+///
+/// # Safety
+///
+/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
+/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `pubkey`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `verified`, if non-NULL, must be valid for writes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256r1_verify(
+    msg: *const ZkvmSecp256r1Hash,
+    sig: *const ZkvmSecp256r1Signature,
+    pubkey: *const ZkvmSecp256r1Pubkey,
+    verified: *mut bool,
+) -> ZkvmStatus {
+    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (msg, sig, pubkey, verified) = unsafe { (&*msg, &*sig, &*pubkey, &mut *verified) };
+    match ops::secp256r1_verify(msg, sig, pubkey, verified) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
diff --git a/crates/accelerators/tests/conformance/ecdsa.rs b/crates/accelerators/tests/conformance/ecdsa.rs
index 705921151..972fdd5be 100644
--- a/crates/accelerators/tests/conformance/ecdsa.rs
+++ b/crates/accelerators/tests/conformance/ecdsa.rs
@@ -4,8 +4,9 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
+    ffi::zkvm_secp256r1_verify,
     ops::{secp256r1_verify, Error},
-    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature},
+    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus},
 };
 
 /// Splits a 160-byte P256VERIFY input (msg || sig || pk) into its parts.
@@ -58,3 +59,37 @@ fn secp256r1_verify_malformed_inputs() {
     assert_eq!(result, Err(Error::PointNotOnCurve));
     assert!(!verified);
 }
+
+#[test]
+fn zkvm_secp256r1_verify_smoke() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = false;
+
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    // Malformed inputs map to the failure status.
+    let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+    assert!(!verified);
+}
+
+#[test]
+fn zkvm_secp256r1_verify_null_pointers() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = false;
+
+    let status = unsafe { zkvm_secp256r1_verify(core::ptr::null(), &sig, &pubkey, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_secp256r1_verify(&msg, core::ptr::null(), &pubkey, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, core::ptr::null(), &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 608b307712b7a261cb776c6b00e4d96b6c2601d5 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:51:06 -0400
Subject: [PATCH 65/94] feat(ops): host fallback for secp256k1

---
 Cargo.lock                           | 1 +
 crates/accelerators/Cargo.toml       | 7 ++++++-
 crates/accelerators/src/ops/ecdsa.rs | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7b7ecc15..f6fd77a28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6790,6 +6790,7 @@ name = "openvm-accelerators"
 version = "0.4.0"
 dependencies = [
  "hex-literal",
+ "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-keccak256",
  "openvm-sha2",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 5b7c7afe2..19648018d 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -11,7 +11,6 @@ workspace = true
 
 [dependencies]
 # openvm
-openvm-k256.workspace = true
 openvm-p256.workspace = true
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
@@ -19,8 +18,14 @@ openvm-sha2.workspace = true
 # crypto
 ripemd = { version = "0.1.3", default-features = false }
 
+# The OpenVM-accelerated k256 fork; its ECDSA recovery relies on zkVM hints
+# and is unimplemented outside the guest.
+[target.'cfg(any(target_os = "none", target_os = "openvm"))'.dependencies]
+openvm-k256.workspace = true
+
 # Host implementations when not building for the zkVM guest.
 [target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
+k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }
 openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
 openvm-sha2 = { workspace = true, features = ["import_sha2"] }
 
diff --git a/crates/accelerators/src/ops/ecdsa.rs b/crates/accelerators/src/ops/ecdsa.rs
index 40e454bf8..ae5735bc1 100644
--- a/crates/accelerators/src/ops/ecdsa.rs
+++ b/crates/accelerators/src/ops/ecdsa.rs
@@ -1,6 +1,9 @@
 //! ECDSA operations.
 
-use openvm_k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
+#[cfg(any(target_os = "none", target_os = "openvm"))]
+use openvm_k256 as k256;
+
+use k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
 
 use crate::{
     ops::Error,
@@ -29,9 +32,13 @@ pub fn secp256k1_ecrecover(
     }
     let recovery_id = RecoveryId::from_byte(recid).ok_or(Error::InvalidSignature)?;
 
+    #[cfg(any(target_os = "none", target_os = "openvm"))]
     let key =
         VerifyingKey::recover_from_prehash_noverify(&msg.data, &signature.to_bytes(), recovery_id)
             .map_err(|_| Error::InvalidSignature)?;
+    #[cfg(not(any(target_os = "none", target_os = "openvm")))]
+    let key = VerifyingKey::recover_from_prehash(&msg.data, &signature, recovery_id)
+        .map_err(|_| Error::InvalidSignature)?;
 
     let point = key.to_encoded_point(false);
     output.data.copy_from_slice(&point.as_bytes()[1..65]);

From fec6ae8b563fe7385f0d934859d44a4cd048e646 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 10:51:49 -0400
Subject: [PATCH 66/94] feat(tests): tests for secp256k1

---
 .../accelerators/tests/conformance/ecdsa.rs   | 67 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/crates/accelerators/tests/conformance/ecdsa.rs b/crates/accelerators/tests/conformance/ecdsa.rs
index 972fdd5be..3230f324e 100644
--- a/crates/accelerators/tests/conformance/ecdsa.rs
+++ b/crates/accelerators/tests/conformance/ecdsa.rs
@@ -5,8 +5,11 @@
 use hex_literal::hex;
 use openvm_accelerators::{
     ffi::zkvm_secp256r1_verify,
-    ops::{secp256r1_verify, Error},
-    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus},
+    ops::{keccak256, secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, Error},
+    types::{
+        ZkvmKeccak256Hash, ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature,
+        ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus,
+    },
 };
 
 /// Splits a 160-byte P256VERIFY input (msg || sig || pk) into its parts.
@@ -93,3 +96,63 @@ fn zkvm_secp256r1_verify_null_pointers() {
     let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, core::ptr::null_mut()) };
     assert_eq!(status, ZkvmStatus::Fail);
 }
+
+const K1_MSG: ZkvmSecp256k1Hash = ZkvmSecp256k1Hash {
+    data: hex!("456e9aea5e197a1f1af7a3e85a3212fa4049a3ba34c2289b4c860fc0b0c64ef3"),
+};
+const K1_SIG: ZkvmSecp256k1Signature = ZkvmSecp256k1Signature {
+    data: hex!(
+        "9242685bf161793cc25603c231bc2f568eb630ea16aa137d2664ac8038825608"
+        "4f8ae3bd7535248d0bd448298cc2e2071e56992d0774dc340c368ae950852ada"
+    ),
+};
+const K1_ADDRESS: [u8; 20] = hex!("7156526fbd7a3c72969b54f64e42c10fbb768c8a");
+
+#[test]
+fn secp256k1_ecrecover_vector() {
+    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
+    secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, &mut pubkey).unwrap();
+
+    // The Ethereum address is keccak(pubkey)[12..], derived here exactly as
+    // a caller of the interface would.
+    let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
+    keccak256(&pubkey.data, &mut hash);
+    assert_eq!(hash.data[12..], K1_ADDRESS);
+}
+
+#[test]
+fn secp256k1_ecrecover_invalid_inputs() {
+    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
+
+    // Recovery ids above 3 are invalid.
+    let result = secp256k1_ecrecover(&K1_MSG, &K1_SIG, 4, &mut pubkey);
+    assert_eq!(result, Err(Error::InvalidSignature));
+
+    // The zero signature cannot be parsed.
+    let zero_sig = ZkvmSecp256k1Signature { data: [0; 64] };
+    let result = secp256k1_ecrecover(&K1_MSG, &zero_sig, 0, &mut pubkey);
+    assert_eq!(result, Err(Error::InvalidSignature));
+}
+
+#[test]
+fn secp256k1_verify_roundtrip() {
+    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
+    secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, &mut pubkey).unwrap();
+
+    let mut verified = false;
+    secp256k1_verify(&K1_MSG, &K1_SIG, &pubkey, &mut verified).unwrap();
+    assert!(verified);
+
+    // Wrong message must not verify; `verified` must be overwritten.
+    let mut wrong_msg = K1_MSG;
+    wrong_msg.data[0] ^= 1;
+    secp256k1_verify(&wrong_msg, &K1_SIG, &pubkey, &mut verified).unwrap();
+    assert!(!verified);
+
+    // A public key that is not on the curve cannot be parsed.
+    verified = true;
+    let bad_pubkey = ZkvmSecp256k1Pubkey { data: [0xff; 64] };
+    let result = secp256k1_verify(&K1_MSG, &K1_SIG, &bad_pubkey, &mut verified);
+    assert_eq!(result, Err(Error::PointNotOnCurve));
+    assert!(!verified);
+}

From 890e08193ced3a73cc8304dbc22cd34402e10f35 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Thu, 30 Jul 2026 10:34:13 -0400
Subject: [PATCH 67/94] feat(ops): split ecdsa by curve

---
 crates/accelerators/src/ops/ecdsa/mod.rs      | 10 ++++++
 .../src/ops/{ecdsa.rs => ecdsa/secp256k1.rs}  | 33 +++----------------
 .../accelerators/src/ops/ecdsa/secp256r1.rs   | 29 ++++++++++++++++
 3 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 crates/accelerators/src/ops/ecdsa/mod.rs
 rename crates/accelerators/src/ops/{ecdsa.rs => ecdsa/secp256k1.rs} (71%)
 create mode 100644 crates/accelerators/src/ops/ecdsa/secp256r1.rs

diff --git a/crates/accelerators/src/ops/ecdsa/mod.rs b/crates/accelerators/src/ops/ecdsa/mod.rs
new file mode 100644
index 000000000..e25e45ee3
--- /dev/null
+++ b/crates/accelerators/src/ops/ecdsa/mod.rs
@@ -0,0 +1,10 @@
+//! ECDSA operations.
+//!
+//! Split by curve: the two crates providing them use the same type names, and
+//! secp256k1 additionally needs a guest/host split that secp256r1 does not.
+
+mod secp256k1;
+mod secp256r1;
+
+pub use secp256k1::{secp256k1_ecrecover, secp256k1_verify};
+pub use secp256r1::secp256r1_verify;
diff --git a/crates/accelerators/src/ops/ecdsa.rs b/crates/accelerators/src/ops/ecdsa/secp256k1.rs
similarity index 71%
rename from crates/accelerators/src/ops/ecdsa.rs
rename to crates/accelerators/src/ops/ecdsa/secp256k1.rs
index ae5735bc1..a69dfdbea 100644
--- a/crates/accelerators/src/ops/ecdsa.rs
+++ b/crates/accelerators/src/ops/ecdsa/secp256k1.rs
@@ -1,5 +1,8 @@
-//! ECDSA operations.
+//! ECDSA over the secp256k1 curve.
 
+// In the guest, secp256k1 operations use the OpenVM-accelerated k256; on
+// the host they use upstream RustCrypto k256 (the ECDSA recovery
+// relies on zkVM hints and is unimplemented outside the guest).
 #[cfg(any(target_os = "none", target_os = "openvm"))]
 use openvm_k256 as k256;
 
@@ -7,10 +10,7 @@ use k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, Ver
 
 use crate::{
     ops::Error,
-    types::{
-        ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash,
-        ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature,
-    },
+    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature},
 };
 
 /// Recover the uncompressed secp256k1 public key from an ECDSA signature
@@ -69,26 +69,3 @@ pub fn secp256k1_verify(
     *verified = key.verify_prehash(&msg.data, &signature).is_ok();
     Ok(())
 }
-
-/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
-/// public key, writing the result to `verified`.
-pub fn secp256r1_verify(
-    msg: &ZkvmSecp256r1Hash,
-    sig: &ZkvmSecp256r1Signature,
-    pubkey: &ZkvmSecp256r1Pubkey,
-    verified: &mut bool,
-) -> Result<(), Error> {
-    use openvm_p256::{
-        ecdsa::{Signature, VerifyingKey},
-        EncodedPoint,
-    };
-
-    *verified = false;
-
-    let encoded_point = EncodedPoint::from_untagged_bytes(&pubkey.data.into());
-    let key =
-        VerifyingKey::from_encoded_point(&encoded_point).map_err(|_| Error::PointNotOnCurve)?;
-    let signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
-    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
-    Ok(())
-}
diff --git a/crates/accelerators/src/ops/ecdsa/secp256r1.rs b/crates/accelerators/src/ops/ecdsa/secp256r1.rs
new file mode 100644
index 000000000..fd21c0a16
--- /dev/null
+++ b/crates/accelerators/src/ops/ecdsa/secp256r1.rs
@@ -0,0 +1,29 @@
+//! ECDSA over the secp256r1 (P-256) curve.
+
+use openvm_p256::{
+    ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey},
+    EncodedPoint,
+};
+
+use crate::{
+    ops::Error,
+    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature},
+};
+
+/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
+/// public key, writing the result to `verified`.
+pub fn secp256r1_verify(
+    msg: &ZkvmSecp256r1Hash,
+    sig: &ZkvmSecp256r1Signature,
+    pubkey: &ZkvmSecp256r1Pubkey,
+    verified: &mut bool,
+) -> Result<(), Error> {
+    *verified = false;
+
+    let encoded_point = EncodedPoint::from_untagged_bytes(&pubkey.data.into());
+    let key =
+        VerifyingKey::from_encoded_point(&encoded_point).map_err(|_| Error::PointNotOnCurve)?;
+    let signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
+    Ok(())
+}

From fde9c312ac9d7a8786246dfc8148c164d528531d Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 11:12:21 -0400
Subject: [PATCH 68/94] feat(ops): modexp

---
 Cargo.lock                                    |   3 +
 crates/accelerators/Cargo.toml                |   3 +
 crates/accelerators/src/lib.rs                |   2 +
 crates/accelerators/src/ops/mod.rs            |   2 +
 crates/accelerators/src/ops/modexp.rs         | 143 ++++++++++++++++++
 crates/accelerators/tests/conformance/main.rs |   1 +
 .../accelerators/tests/conformance/modexp.rs  |  41 +++++
 7 files changed, 195 insertions(+)
 create mode 100644 crates/accelerators/src/ops/modexp.rs
 create mode 100644 crates/accelerators/tests/conformance/modexp.rs

diff --git a/Cargo.lock b/Cargo.lock
index f6fd77a28..8d9ca6a3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6789,10 +6789,13 @@ dependencies = [
 name = "openvm-accelerators"
 version = "0.4.0"
 dependencies = [
+ "aurora-engine-modexp",
  "hex-literal",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "openvm-ecc-guest",
  "openvm-keccak256",
+ "openvm-pairing",
  "openvm-sha2",
  "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "ripemd",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 19648018d..e89886d92 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -11,11 +11,14 @@ workspace = true
 
 [dependencies]
 # openvm
+openvm-ecc-guest.workspace = true
 openvm-p256.workspace = true
+openvm-pairing = { workspace = true, features = ["bn254"] }
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
 # crypto
+aurora-engine-modexp = { version = "1.2.0", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
 
 # The OpenVM-accelerated k256 fork; its ECDSA recovery relies on zkVM hints
diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
index 10a85ec01..e851bff8e 100644
--- a/crates/accelerators/src/lib.rs
+++ b/crates/accelerators/src/lib.rs
@@ -2,6 +2,8 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+extern crate alloc;
+
 #[cfg(feature = "ffi")]
 pub mod ffi;
 pub mod ops;
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index f269b7319..4813df2b2 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -7,10 +7,12 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod modexp;
 
 pub use blake2::blake2f;
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
+pub use modexp::modexp;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
diff --git a/crates/accelerators/src/ops/modexp.rs b/crates/accelerators/src/ops/modexp.rs
new file mode 100644
index 000000000..9b15018c5
--- /dev/null
+++ b/crates/accelerators/src/ops/modexp.rs
@@ -0,0 +1,143 @@
+//! Modular exponentiation with a BN254-Fr fast path.
+
+use alloc::{vec, vec::Vec};
+
+use openvm_pairing::bn254 as bn;
+
+/// The number of bytes needed to represent an element of BN254's scalar
+/// field Fr.
+const BN_SCALAR_LEN: usize = 32;
+
+/// Compute `base^exp % modulus` into `output`, left-padded with zeros.
+///
+/// # Panics
+///
+/// Panics if `output.len() != modulus.len()`.
+pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8], output: &mut [u8]) {
+    assert_eq!(output.len(), modulus.len(), "output must be exactly modulus-sized");
+
+    let result = if is_bn254_fr(modulus) {
+        accelerated_modexp_bn254_fr(base, exp)
+    } else {
+        aurora_engine_modexp::modexp(base, exp, modulus)
+    };
+
+    // The result is numerically reduced, but its byte representation may be
+    // shorter or longer (leading zeros); right-align it.
+    if result.len() >= output.len() {
+        output.copy_from_slice(&result[result.len() - output.len()..]);
+    } else {
+        let pad = output.len() - result.len();
+        output[..pad].fill(0);
+        output[pad..].copy_from_slice(&result);
+    }
+}
+
+/// Returns true if the modulus (big-endian, possibly with leading zeros) equals BN254 Fr.
+fn is_bn254_fr(modulus: &[u8]) -> bool {
+    use openvm_ecc_guest::algebra::IntMod;
+
+    // Strip leading zeros
+    let stripped = match modulus.iter().position(|&b| b != 0) {
+        Some(i) => &modulus[i..],
+        None => return false, // all zeros
+    };
+    // bn::Scalar::MODULUS is little-endian; compare against reversed input
+    stripped.len() == BN_SCALAR_LEN && stripped.iter().rev().eq(bn::Scalar::MODULUS.as_ref().iter())
+}
+
+/// Accelerated modexp for BN254 Fr using field arithmetic intrinsics.
+fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
+    use openvm_ecc_guest::algebra::{ExpBytes, IntMod, Reduce};
+
+    // OpenVM's field reduction requires inputs to be aligned to the field byte size.
+    let padded_len = base.len().next_multiple_of(BN_SCALAR_LEN).max(BN_SCALAR_LEN);
+    let mut padded = vec![0u8; padded_len];
+    padded[padded_len - base.len()..].copy_from_slice(base);
+    let base_fr = bn::Scalar::reduce_be_bytes(&padded);
+
+    base_fr.exp_bytes(true, exp).to_be_bytes().as_ref().to_vec()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// BN254 Fr modulus in big-endian bytes
+    fn bn254_fr_modulus_be() -> Vec<u8> {
+        use openvm_ecc_guest::algebra::IntMod;
+        bn::Scalar::MODULUS.as_ref().iter().rev().copied().collect()
+    }
+
+    /// Helper: run the accelerated path and compare against the aurora
+    /// reference. The accelerated path always returns BN_SCALAR_LEN bytes,
+    /// so the reference output is left-padded to match.
+    fn check(base: &[u8], exp: &[u8]) {
+        let modulus = bn254_fr_modulus_be();
+        let expected = aurora_engine_modexp::modexp(base, exp, &modulus);
+        let actual = accelerated_modexp_bn254_fr(base, exp);
+        let mut expected_padded = vec![0u8; BN_SCALAR_LEN];
+        let offset = BN_SCALAR_LEN - expected.len();
+        expected_padded[offset..].copy_from_slice(&expected);
+        assert_eq!(actual, expected_padded, "base={base:?}, exp={exp:?}");
+    }
+
+    #[test]
+    fn test_is_bn254_fr() {
+        // Exact modulus
+        assert!(is_bn254_fr(&bn254_fr_modulus_be()));
+
+        // With leading zeros
+        let mut padded = vec![0u8; 10];
+        padded.extend_from_slice(&bn254_fr_modulus_be());
+        assert!(is_bn254_fr(&padded));
+
+        // All zeros → false
+        assert!(!is_bn254_fr(&[0u8; 32]));
+
+        // Wrong modulus (flip last bit)
+        let mut m = bn254_fr_modulus_be();
+        *m.last_mut().unwrap() ^= 1;
+        assert!(!is_bn254_fr(&m));
+    }
+
+    #[test]
+    fn test_accelerated_modexp_bn254_fr() {
+        // --- short base (<=32 bytes), value < modulus ---
+        check(&[3], &[5]); // 3^5 mod Fr
+        check(&[0], &[5]); // 0^5 = 0
+        check(&[3], &[0]); // 3^0 = 1
+        check(&[0], &[0]); // 0^0 = 1 by convention
+        check(&[], &[]); // empty inputs
+        check(&[0, 0, 0, 3], &[5]); // leading zeros in base
+
+        // --- short base, value >= modulus (triggers the reduce fallback) ---
+        let m = bn254_fr_modulus_be();
+        check(&m, &[1]); // Fr mod Fr = 0, so 0^1 = 0
+        let mut m_plus_1 = m.clone();
+        *m_plus_1.last_mut().unwrap() += 1;
+        check(&m_plus_1, &[2]); // (Fr+1)^2 mod Fr = 1
+        check(&[0xff; 32], &[1]); // max 256-bit value, >= modulus
+
+        // --- large base (> 32 bytes, reduce_be_bytes path) ---
+        check(&[0xab; 64], &[3]); // aligned (multiple of 32)
+        check(&[0x42; 100], &[2]); // unaligned (tests the padding)
+        check(&[0xab; 64], &[0xff; 32]); // large base + large exponent
+
+        // --- larger exponents ---
+        check(&[2], &[0xff; 32]); // 2^(2^256-1) mod Fr
+        check(&[2], &[0, 0, 0, 5]); // leading zeros in exponent
+        check(&[3], &[0xab; 64]); // exponent > 32 bytes
+
+        // --- same value through both base-parsing code paths ---
+        let base_32 = [0xab; 32];
+        let mut base_33 = vec![0u8];
+        base_33.extend_from_slice(&base_32);
+        let exp = &[7];
+        assert_eq!(
+            accelerated_modexp_bn254_fr(&base_32, exp),
+            accelerated_modexp_bn254_fr(&base_33, exp),
+            "33-byte base with leading zero must match 32-byte base"
+        );
+    }
+}
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
index d8bb24d1e..af50b7471 100644
--- a/crates/accelerators/tests/conformance/main.rs
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -6,3 +6,4 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod modexp;
diff --git a/crates/accelerators/tests/conformance/modexp.rs b/crates/accelerators/tests/conformance/modexp.rs
new file mode 100644
index 000000000..f66e1c2fb
--- /dev/null
+++ b/crates/accelerators/tests/conformance/modexp.rs
@@ -0,0 +1,41 @@
+//! Modexp conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::ops::modexp;
+
+/// BN254 Fr (the scalar field) modulus, big-endian. Not to be confused with
+/// the base field prime, which shares the leading bytes.
+const BN254_FR: [u8; 32] = hex!("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
+
+#[test]
+fn modexp_small() {
+    // 3^5 mod 7 = 5
+    let mut output = [0xffu8; 1];
+    modexp(&[3], &[5], &[7], &mut output);
+    assert_eq!(output, [5]);
+
+    // Output is left-padded to the modulus length.
+    let mut output = [0xffu8; 2];
+    modexp(&[3], &[5], &[0, 7], &mut output);
+    assert_eq!(output, [0, 5]);
+
+    // A zero-length modulus writes nothing.
+    modexp(&[3], &[5], &[], &mut []);
+}
+
+#[test]
+fn modexp_matches_reference() {
+    // The BN254-Fr accelerated path, compared right-aligned against the
+    // aurora reference.
+    let mut output = [0u8; 32];
+    modexp(&[0xab; 32], &[0x07], &BN254_FR, &mut output);
+    let reference = aurora_engine_modexp::modexp(&[0xab; 32], &[0x07], &BN254_FR);
+    assert_eq!(output[32 - reference.len()..], reference[..]);
+
+    // The generic path with a non-special modulus.
+    let modulus = [0xef; 24];
+    let mut output = [0u8; 24];
+    modexp(&[0x12; 40], &[0x34; 3], &modulus, &mut output);
+    let reference = aurora_engine_modexp::modexp(&[0x12; 40], &[0x34; 3], &modulus);
+    assert_eq!(output[24 - reference.len()..], reference[..]);
+}

From 9d9fcf7bb0ef23d8479b60c64e0b243a2e26db13 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 11:17:01 -0400
Subject: [PATCH 69/94] feat(ffi): modexp interface

---
 crates/accelerators/src/ffi/mod.rs            |  2 +
 crates/accelerators/src/ffi/modexp.rs         | 48 +++++++++++++
 .../accelerators/tests/conformance/modexp.rs  | 68 ++++++++++++++++++-
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 crates/accelerators/src/ffi/modexp.rs

diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index 3f82ef4ea..e351d6812 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -7,7 +7,9 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod modexp;
 
 pub use blake2::*;
 pub use ecdsa::*;
 pub use hash::*;
+pub use modexp::*;
diff --git a/crates/accelerators/src/ffi/modexp.rs b/crates/accelerators/src/ffi/modexp.rs
new file mode 100644
index 000000000..3733d987f
--- /dev/null
+++ b/crates/accelerators/src/ffi/modexp.rs
@@ -0,0 +1,48 @@
+//! C ABI for modular exponentiation.
+
+use crate::{ops, types::ZkvmStatus};
+
+/// Compute `base[..base_len] ^ exp[..exp_len] % modulus[..mod_len]` into
+/// `output`, which receives exactly `mod_len` bytes, left-padded with zeros.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL while its length is
+/// non-zero; a NULL pointer with a zero length is the empty input.
+///
+/// # Safety
+///
+/// - `base`, `exp` and `modulus`, if non-NULL, must be valid for reads of their respective lengths.
+/// - `output`, if non-NULL, must be valid for writes of `mod_len` bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_modexp(
+    base: *const u8,
+    base_len: usize,
+    exp: *const u8,
+    exp_len: usize,
+    modulus: *const u8,
+    mod_len: usize,
+    output: *mut u8,
+) -> ZkvmStatus {
+    if (base.is_null() && base_len != 0) ||
+        (exp.is_null() && exp_len != 0) ||
+        (modulus.is_null() && mod_len != 0) ||
+        (output.is_null() && mod_len != 0)
+    {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let base =
+        if base_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(base, base_len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let exp = if exp_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(exp, exp_len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let modulus =
+        if mod_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(modulus, mod_len) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let output = if mod_len == 0 {
+        &mut [][..]
+    } else {
+        unsafe { core::slice::from_raw_parts_mut(output, mod_len) }
+    };
+    ops::modexp(base, exp, modulus, output);
+    ZkvmStatus::Ok
+}
diff --git a/crates/accelerators/tests/conformance/modexp.rs b/crates/accelerators/tests/conformance/modexp.rs
index f66e1c2fb..760015463 100644
--- a/crates/accelerators/tests/conformance/modexp.rs
+++ b/crates/accelerators/tests/conformance/modexp.rs
@@ -1,7 +1,7 @@
 //! Modexp conformance vectors.
 
 use hex_literal::hex;
-use openvm_accelerators::ops::modexp;
+use openvm_accelerators::{ffi::zkvm_modexp, ops::modexp, types::ZkvmStatus};
 
 /// BN254 Fr (the scalar field) modulus, big-endian. Not to be confused with
 /// the base field prime, which shares the leading bytes.
@@ -39,3 +39,69 @@ fn modexp_matches_reference() {
     let reference = aurora_engine_modexp::modexp(&[0x12; 40], &[0x34; 3], &modulus);
     assert_eq!(output[24 - reference.len()..], reference[..]);
 }
+
+#[test]
+fn zkvm_modexp_smoke() {
+    // 3^5 mod 7 = 5
+    let base = [3u8];
+    let exp = [5u8];
+    let modulus = [7u8];
+    let mut output = [0xffu8; 1];
+    let status = unsafe {
+        zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, output.as_mut_ptr())
+    };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(output, [5]);
+}
+
+#[test]
+fn zkvm_modexp_null_pointers() {
+    let base = [3u8];
+    let exp = [5u8];
+    let modulus = [7u8];
+    let mut output = [0xffu8; 1];
+
+    // NULL base and exp with zero lengths are empty inputs: 0^0 mod 7 = 1.
+    let status = unsafe {
+        zkvm_modexp(
+            core::ptr::null(),
+            0,
+            core::ptr::null(),
+            0,
+            modulus.as_ptr(),
+            1,
+            output.as_mut_ptr(),
+        )
+    };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(output, [1]);
+
+    // A NULL pointer with a non-zero length fails.
+    let status = unsafe {
+        zkvm_modexp(core::ptr::null(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, output.as_mut_ptr())
+    };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe {
+        zkvm_modexp(
+            base.as_ptr(),
+            1,
+            core::ptr::null(),
+            1,
+            modulus.as_ptr(),
+            1,
+            output.as_mut_ptr(),
+        )
+    };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe {
+        zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, core::ptr::null(), 1, output.as_mut_ptr())
+    };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe {
+        zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, core::ptr::null_mut())
+    };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From d3b1d0268ffa631e67d8bd62d952f1b6445a0eed Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Thu, 30 Jul 2026 10:37:23 -0400
Subject: [PATCH 70/94] refactor(ops): imports out of functions

---
 crates/accelerators/src/ops/modexp.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/crates/accelerators/src/ops/modexp.rs b/crates/accelerators/src/ops/modexp.rs
index 9b15018c5..5652d7362 100644
--- a/crates/accelerators/src/ops/modexp.rs
+++ b/crates/accelerators/src/ops/modexp.rs
@@ -2,6 +2,7 @@
 
 use alloc::{vec, vec::Vec};
 
+use openvm_ecc_guest::algebra::{ExpBytes, IntMod, Reduce};
 use openvm_pairing::bn254 as bn;
 
 /// The number of bytes needed to represent an element of BN254's scalar
@@ -35,8 +36,6 @@ pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8], output: &mut [u8]) {
 
 /// Returns true if the modulus (big-endian, possibly with leading zeros) equals BN254 Fr.
 fn is_bn254_fr(modulus: &[u8]) -> bool {
-    use openvm_ecc_guest::algebra::IntMod;
-
     // Strip leading zeros
     let stripped = match modulus.iter().position(|&b| b != 0) {
         Some(i) => &modulus[i..],
@@ -48,8 +47,6 @@ fn is_bn254_fr(modulus: &[u8]) -> bool {
 
 /// Accelerated modexp for BN254 Fr using field arithmetic intrinsics.
 fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
-    use openvm_ecc_guest::algebra::{ExpBytes, IntMod, Reduce};
-
     // OpenVM's field reduction requires inputs to be aligned to the field byte size.
     let padded_len = base.len().next_multiple_of(BN_SCALAR_LEN).max(BN_SCALAR_LEN);
     let mut padded = vec![0u8; padded_len];
@@ -65,7 +62,6 @@ mod tests {
 
     /// BN254 Fr modulus in big-endian bytes
     fn bn254_fr_modulus_be() -> Vec<u8> {
-        use openvm_ecc_guest::algebra::IntMod;
         bn::Scalar::MODULUS.as_ref().iter().rev().copied().collect()
     }
 

From 49ddafa9b82a8db6601ee02605e1e37d36566e72 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 12:12:12 -0400
Subject: [PATCH 71/94] feat(ops): kzg point evaluation

---
 Cargo.lock                                    |  2 +
 Cargo.toml                                    |  1 +
 crates/accelerators/Cargo.toml                | 12 ++++
 crates/accelerators/src/ops/kzg.rs            | 36 ++++++++++++
 crates/accelerators/src/ops/mod.rs            |  2 +
 crates/accelerators/tests/conformance/kzg.rs  | 58 +++++++++++++++++++
 crates/accelerators/tests/conformance/main.rs |  1 +
 7 files changed, 112 insertions(+)
 create mode 100644 crates/accelerators/src/ops/kzg.rs
 create mode 100644 crates/accelerators/tests/conformance/kzg.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8d9ca6a3f..f307b53bb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6795,7 +6795,9 @@ dependencies = [
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "openvm-ecc-guest",
  "openvm-keccak256",
+ "openvm-kzg",
  "openvm-pairing",
+ "openvm-pairing-guest",
  "openvm-sha2",
  "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
  "ripemd",
diff --git a/Cargo.toml b/Cargo.toml
index 761b39e61..b9aa23503 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,6 +112,7 @@ openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", branch = "d
 openvm-verify-stark-host = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-keccak256 = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
+openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false }
 openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", branch = "develop-v2.1.0", default-features = false, features = [
     "bn254",
     "bls12_381",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index e89886d92..ca0c0719a 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -12,6 +12,7 @@ workspace = true
 [dependencies]
 # openvm
 openvm-ecc-guest.workspace = true
+openvm-kzg = { workspace = true, features = ["use-intrinsics"] }
 openvm-p256.workspace = true
 openvm-pairing = { workspace = true, features = ["bn254"] }
 openvm-keccak256.workspace = true
@@ -30,11 +31,22 @@ openvm-k256.workspace = true
 [target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
 k256 = { version = "0.13", default-features = false, features = ["ecdsa"] }
 openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
+# Not imported directly: enables the host pairing backend used by the KZG
+# verification. openvm-pairing's `halo2curves` feature does not forward to
+# openvm-pairing-guest, so the inner feature is enabled explicitly.
+openvm-pairing = { workspace = true, features = ["halo2curves"] }
+openvm-pairing-guest = { workspace = true, features = ["halo2curves"] }
 openvm-sha2 = { workspace = true, features = ["import_sha2"] }
 
 [dev-dependencies]
 hex-literal.workspace = true
 
+[package.metadata.cargo-shear]
+ignored = ["openvm-pairing-guest"]
+
+[package.metadata.cargo-machete]
+ignored = ["openvm-pairing-guest"]
+
 [features]
 default = ["ffi"]
 # The extern "C" `zkvm_*` symbols. Rust consumers that only need `ops` can
diff --git a/crates/accelerators/src/ops/kzg.rs b/crates/accelerators/src/ops/kzg.rs
new file mode 100644
index 000000000..3cca34cc4
--- /dev/null
+++ b/crates/accelerators/src/ops/kzg.rs
@@ -0,0 +1,36 @@
+//! KZG point-evaluation proof verification (EIP-4844).
+
+use openvm_kzg::{Bytes32, Bytes48, KzgProof};
+
+use crate::{
+    ops::Error,
+    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof},
+};
+
+/// Verify a KZG proof that the blob committed to by `commitment` evaluates
+/// to `y` at point `z`, writing the result to `verified`.
+///
+/// Errors mean the check could not run — a commitment or proof that is not
+/// a valid compressed G1 point, or an out-of-range field element; `verified`
+/// is `false` only when a well-formed proof does not verify.
+pub fn kzg_point_eval(
+    commitment: &ZkvmKzgCommitment,
+    z: &ZkvmKzgFieldElement,
+    y: &ZkvmKzgFieldElement,
+    proof: &ZkvmKzgProof,
+    verified: &mut bool,
+) -> Result<(), Error> {
+    *verified = false;
+
+    let env = openvm_kzg::EnvKzgSettings::default();
+    let kzg_settings = env.get();
+
+    let commitment = Bytes48::from_slice(&commitment.data).map_err(|_| Error::KzgInvalidInput)?;
+    let z = Bytes32::from_slice(&z.data).map_err(|_| Error::KzgInvalidInput)?;
+    let y = Bytes32::from_slice(&y.data).map_err(|_| Error::KzgInvalidInput)?;
+    let proof = Bytes48::from_slice(&proof.data).map_err(|_| Error::KzgInvalidInput)?;
+
+    *verified = KzgProof::verify_kzg_proof(&commitment, &z, &y, &proof, kzg_settings)
+        .map_err(|_| Error::KzgInvalidInput)?;
+    Ok(())
+}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 4813df2b2..673c373fd 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -7,11 +7,13 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod kzg;
 mod modexp;
 
 pub use blake2::blake2f;
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
+pub use kzg::kzg_point_eval;
 pub use modexp::modexp;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/crates/accelerators/tests/conformance/kzg.rs b/crates/accelerators/tests/conformance/kzg.rs
new file mode 100644
index 000000000..06b17118a
--- /dev/null
+++ b/crates/accelerators/tests/conformance/kzg.rs
@@ -0,0 +1,58 @@
+//! KZG point-evaluation conformance using the point-at-infinity commitment,
+//! which commits to the zero polynomial (p(z) = 0 for every z).
+
+use openvm_accelerators::{
+    ops::{kzg_point_eval, Error},
+    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof},
+};
+
+/// The compressed point at infinity: 0xc0 followed by zeros.
+fn infinity() -> ZkvmKzgCommitment {
+    let mut point = ZkvmKzgCommitment { data: [0; 48] };
+    point.data[0] = 0xc0;
+    point
+}
+
+fn scalar(value: u8) -> ZkvmKzgFieldElement {
+    let mut s = ZkvmKzgFieldElement { data: [0; 32] };
+    s.data[31] = value;
+    s
+}
+
+#[test]
+fn kzg_point_eval_infinity_commitment() {
+    let commitment = infinity();
+    let proof: ZkvmKzgProof = infinity();
+    let z = scalar(2);
+    let mut verified = false;
+
+    // The zero polynomial evaluates to 0 at every z; the infinity proof
+    // attests it.
+    kzg_point_eval(&commitment, &z, &scalar(0), &proof, &mut verified).unwrap();
+    assert!(verified);
+
+    // Claiming y = 1 for the zero polynomial must not verify.
+    kzg_point_eval(&commitment, &z, &scalar(1), &proof, &mut verified).unwrap();
+    assert!(!verified);
+}
+
+#[test]
+fn kzg_point_eval_malformed_inputs() {
+    let z = scalar(2);
+    let y = scalar(0);
+    let mut verified = true;
+
+    // Not a valid compressed-point prefix.
+    let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
+    garbage.data[0] = 0x01;
+    let result = kzg_point_eval(&garbage, &z, &y, &infinity(), &mut verified);
+    assert_eq!(result, Err(Error::KzgInvalidInput));
+    assert!(!verified);
+
+    // An out-of-range evaluation point (>= the BLS scalar field order).
+    let big_z = ZkvmKzgFieldElement { data: [0xff; 32] };
+    verified = true;
+    let result = kzg_point_eval(&infinity(), &big_z, &y, &infinity(), &mut verified);
+    assert_eq!(result, Err(Error::KzgInvalidInput));
+    assert!(!verified);
+}
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
index af50b7471..9115352c0 100644
--- a/crates/accelerators/tests/conformance/main.rs
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -6,4 +6,5 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod kzg;
 mod modexp;

From 271341b06d05dc668ceb2d2e6f991093c7c7fe8f Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 12:14:55 -0400
Subject: [PATCH 72/94] feat(ffi): kzg interface

---
 crates/accelerators/src/ffi/kzg.rs           | 38 +++++++++++++++
 crates/accelerators/src/ffi/mod.rs           |  2 +
 crates/accelerators/tests/conformance/kzg.rs | 50 +++++++++++++++++++-
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 crates/accelerators/src/ffi/kzg.rs

diff --git a/crates/accelerators/src/ffi/kzg.rs b/crates/accelerators/src/ffi/kzg.rs
new file mode 100644
index 000000000..8fb2b60ec
--- /dev/null
+++ b/crates/accelerators/src/ffi/kzg.rs
@@ -0,0 +1,38 @@
+//! C ABI for KZG point evaluation.
+
+use crate::{
+    ops,
+    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmStatus},
+};
+
+/// Verify a KZG proof that the blob committed to by `commitment` evaluates
+/// to `y` at point `z`, writing the result to `verified`.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
+/// malformed; `verified` is `false` when a well-formed proof does not
+/// verify.
+///
+/// # Safety
+///
+/// - `commitment` and `proof`, if non-NULL, must be valid for reads of 48 bytes.
+/// - `z` and `y`, if non-NULL, must be valid for reads of 32 bytes.
+/// - `verified`, if non-NULL, must be valid for writes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_kzg_point_eval(
+    commitment: *const ZkvmKzgCommitment,
+    z: *const ZkvmKzgFieldElement,
+    y: *const ZkvmKzgFieldElement,
+    proof: *const ZkvmKzgProof,
+    verified: *mut bool,
+) -> ZkvmStatus {
+    if commitment.is_null() || z.is_null() || y.is_null() || proof.is_null() || verified.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (commitment, z, y, proof, verified) =
+        unsafe { (&*commitment, &*z, &*y, &*proof, &mut *verified) };
+    match ops::kzg_point_eval(commitment, z, y, proof, verified) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index e351d6812..fe78701e8 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -7,9 +7,11 @@
 mod blake2;
 mod ecdsa;
 mod hash;
+mod kzg;
 mod modexp;
 
 pub use blake2::*;
 pub use ecdsa::*;
 pub use hash::*;
+pub use kzg::*;
 pub use modexp::*;
diff --git a/crates/accelerators/tests/conformance/kzg.rs b/crates/accelerators/tests/conformance/kzg.rs
index 06b17118a..74dba8e1f 100644
--- a/crates/accelerators/tests/conformance/kzg.rs
+++ b/crates/accelerators/tests/conformance/kzg.rs
@@ -2,8 +2,9 @@
 //! which commits to the zero polynomial (p(z) = 0 for every z).
 
 use openvm_accelerators::{
+    ffi::zkvm_kzg_point_eval,
     ops::{kzg_point_eval, Error},
-    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof},
+    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmStatus},
 };
 
 /// The compressed point at infinity: 0xc0 followed by zeros.
@@ -56,3 +57,50 @@ fn kzg_point_eval_malformed_inputs() {
     assert_eq!(result, Err(Error::KzgInvalidInput));
     assert!(!verified);
 }
+
+#[test]
+fn zkvm_kzg_point_eval_smoke() {
+    let commitment = infinity();
+    let proof: ZkvmKzgProof = infinity();
+    let z = scalar(2);
+    let y = scalar(0);
+    let mut verified = false;
+
+    let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    // Malformed inputs map to the failure status.
+    let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
+    garbage.data[0] = 0x01;
+    let status = unsafe { zkvm_kzg_point_eval(&garbage, &z, &y, &proof, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+    assert!(!verified);
+}
+
+#[test]
+fn zkvm_kzg_point_eval_null_pointers() {
+    let commitment = infinity();
+    let proof: ZkvmKzgProof = infinity();
+    let z = scalar(2);
+    let y = scalar(0);
+    let mut verified = false;
+
+    let status = unsafe { zkvm_kzg_point_eval(core::ptr::null(), &z, &y, &proof, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status =
+        unsafe { zkvm_kzg_point_eval(&commitment, core::ptr::null(), &y, &proof, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status =
+        unsafe { zkvm_kzg_point_eval(&commitment, &z, core::ptr::null(), &proof, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status =
+        unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, core::ptr::null(), &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 64f981b277ed498a8e54f547e48778551baa00f1 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 14:44:27 -0400
Subject: [PATCH 73/94] feat(ops): BN254 add and mul

---
 Cargo.lock                                 |  1 +
 crates/accelerators/Cargo.toml             |  3 +-
 crates/accelerators/src/ops/bn254/codec.rs | 47 ++++++++++++++++++++++
 crates/accelerators/src/ops/bn254/mod.rs   | 36 +++++++++++++++++
 4 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 crates/accelerators/src/ops/bn254/codec.rs
 create mode 100644 crates/accelerators/src/ops/bn254/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index f307b53bb..2f475c492 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6793,6 +6793,7 @@ dependencies = [
  "hex-literal",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "openvm-curve-utils",
  "openvm-ecc-guest",
  "openvm-keccak256",
  "openvm-kzg",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index ca0c0719a..14a75e5af 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -11,10 +11,11 @@ workspace = true
 
 [dependencies]
 # openvm
+openvm-curve-utils = { workspace = true, features = ["bn254", "bls12_381"] }
 openvm-ecc-guest.workspace = true
 openvm-kzg = { workspace = true, features = ["use-intrinsics"] }
 openvm-p256.workspace = true
-openvm-pairing = { workspace = true, features = ["bn254"] }
+openvm-pairing = { workspace = true, features = ["bn254", "bls12_381"] }
 openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
diff --git a/crates/accelerators/src/ops/bn254/codec.rs b/crates/accelerators/src/ops/bn254/codec.rs
new file mode 100644
index 000000000..2a248f792
--- /dev/null
+++ b/crates/accelerators/src/ops/bn254/codec.rs
@@ -0,0 +1,47 @@
+//! Byte codecs for BN254: EIP-196/197 point encodings, including the
+//! on-curve and subgroup validation performed while decoding.
+
+use openvm_curve_utils::SubgroupCheck;
+use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint};
+use openvm_pairing::bn254 as bn;
+
+use crate::{
+    ops::Error,
+    types::{ZkvmBn254G1Point, ZkvmBn254Scalar},
+};
+
+const BN_FQ_LEN: usize = 32;
+
+#[inline]
+fn read_bn_fq(input: &[u8]) -> Result<bn::Fp, Error> {
+    bn::Fp::from_be_bytes(&input[..BN_FQ_LEN]).ok_or(Error::FieldElementInvalid)
+}
+
+#[inline]
+pub(super) fn read_bn_g1_point(input: &ZkvmBn254G1Point) -> Result<bn::G1Affine, Error> {
+    let px = read_bn_fq(&input.data[0..BN_FQ_LEN])?;
+    let py = read_bn_fq(&input.data[BN_FQ_LEN..])?;
+    // SAFETY: `read_bn_fq` produces canonical Fp elements; `from_xy` itself checks the curve
+    // equation and returns `None` if `(px, py)` is not on the curve.
+    let point = unsafe { bn::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)?;
+    if point.is_in_correct_subgroup() {
+        Ok(point)
+    } else {
+        Err(Error::PointNotInSubgroup)
+    }
+}
+
+#[inline]
+pub(super) fn read_bn_scalar(input: &ZkvmBn254Scalar) -> bn::Scalar {
+    bn::Scalar::from_be_bytes_unchecked(&input.data)
+}
+
+#[inline]
+pub(super) fn encode_bn_g1_point(point: bn::G1Affine, output: &mut ZkvmBn254G1Point) {
+    let x_bytes: &[u8] = point.x().as_le_bytes();
+    let y_bytes: &[u8] = point.y().as_le_bytes();
+    for i in 0..BN_FQ_LEN {
+        output.data[i] = x_bytes[BN_FQ_LEN - 1 - i];
+        output.data[i + BN_FQ_LEN] = y_bytes[BN_FQ_LEN - 1 - i];
+    }
+}
diff --git a/crates/accelerators/src/ops/bn254/mod.rs b/crates/accelerators/src/ops/bn254/mod.rs
new file mode 100644
index 000000000..72c595f5d
--- /dev/null
+++ b/crates/accelerators/src/ops/bn254/mod.rs
@@ -0,0 +1,36 @@
+//! BN254 (alt_bn128) group operations (EIP-196 / EIP-197).
+
+mod codec;
+
+use codec::{encode_bn_g1_point, read_bn_g1_point, read_bn_scalar};
+use openvm_ecc_guest::weierstrass::IntrinsicCurve;
+use openvm_pairing::bn254::Bn254;
+
+use crate::{
+    ops::Error,
+    types::{ZkvmBn254G1Point, ZkvmBn254Scalar},
+};
+
+/// BN254 G1 point addition (precompile 0x06).
+pub fn bn254_g1_add(
+    p1: &ZkvmBn254G1Point,
+    p2: &ZkvmBn254G1Point,
+    output: &mut ZkvmBn254G1Point,
+) -> Result<(), Error> {
+    let p1 = read_bn_g1_point(p1)?;
+    let p2 = read_bn_g1_point(p2)?;
+    encode_bn_g1_point(p1 + p2, output);
+    Ok(())
+}
+
+/// BN254 G1 scalar multiplication (precompile 0x07).
+pub fn bn254_g1_mul(
+    point: &ZkvmBn254G1Point,
+    scalar: &ZkvmBn254Scalar,
+    output: &mut ZkvmBn254G1Point,
+) -> Result<(), Error> {
+    let p = read_bn_g1_point(point)?;
+    let s = read_bn_scalar(scalar);
+    encode_bn_g1_point(Bn254::msm(&[s], &[p]), output);
+    Ok(())
+}

From 3a3464a89d09b1d159aa1c7f58f5e5ec3d215e41 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 14:54:23 -0400
Subject: [PATCH 74/94] feat(ops): BN254 pairing check

---
 crates/accelerators/src/ops/bn254/codec.rs | 24 +++++++++++-
 crates/accelerators/src/ops/bn254/mod.rs   | 43 ++++++++++++++++++++--
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/crates/accelerators/src/ops/bn254/codec.rs b/crates/accelerators/src/ops/bn254/codec.rs
index 2a248f792..b940549ff 100644
--- a/crates/accelerators/src/ops/bn254/codec.rs
+++ b/crates/accelerators/src/ops/bn254/codec.rs
@@ -7,7 +7,7 @@ use openvm_pairing::bn254 as bn;
 
 use crate::{
     ops::Error,
-    types::{ZkvmBn254G1Point, ZkvmBn254Scalar},
+    types::{ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254Scalar},
 };
 
 const BN_FQ_LEN: usize = 32;
@@ -17,6 +17,14 @@ fn read_bn_fq(input: &[u8]) -> Result<bn::Fp, Error> {
     bn::Fp::from_be_bytes(&input[..BN_FQ_LEN]).ok_or(Error::FieldElementInvalid)
 }
 
+#[inline]
+fn read_bn_fq2(input: &[u8]) -> Result<bn::Fp2, Error> {
+    // EIP-197 encodes the imaginary part first.
+    let imag = read_bn_fq(&input[..BN_FQ_LEN])?;
+    let real = read_bn_fq(&input[BN_FQ_LEN..BN_FQ_LEN * 2])?;
+    Ok(bn::Fp2::new(real, imag))
+}
+
 #[inline]
 pub(super) fn read_bn_g1_point(input: &ZkvmBn254G1Point) -> Result<bn::G1Affine, Error> {
     let px = read_bn_fq(&input.data[0..BN_FQ_LEN])?;
@@ -31,6 +39,20 @@ pub(super) fn read_bn_g1_point(input: &ZkvmBn254G1Point) -> Result<bn::G1Affine,
     }
 }
 
+#[inline]
+pub(super) fn read_bn_g2_point(input: &ZkvmBn254G2Point) -> Result<bn::G2Affine, Error> {
+    let x = read_bn_fq2(&input.data[..BN_FQ_LEN * 2])?;
+    let y = read_bn_fq2(&input.data[BN_FQ_LEN * 2..])?;
+    // SAFETY: `read_bn_fq2` produces canonical Fp2 elements; `from_xy` itself checks the curve
+    // equation and returns `None` if `(x, y)` is not on the twist.
+    let point = unsafe { bn::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)?;
+    if point.is_in_correct_subgroup() {
+        Ok(point)
+    } else {
+        Err(Error::PointNotInSubgroup)
+    }
+}
+
 #[inline]
 pub(super) fn read_bn_scalar(input: &ZkvmBn254Scalar) -> bn::Scalar {
     bn::Scalar::from_be_bytes_unchecked(&input.data)
diff --git a/crates/accelerators/src/ops/bn254/mod.rs b/crates/accelerators/src/ops/bn254/mod.rs
index 72c595f5d..10041166a 100644
--- a/crates/accelerators/src/ops/bn254/mod.rs
+++ b/crates/accelerators/src/ops/bn254/mod.rs
@@ -2,13 +2,18 @@
 
 mod codec;
 
-use codec::{encode_bn_g1_point, read_bn_g1_point, read_bn_scalar};
-use openvm_ecc_guest::weierstrass::IntrinsicCurve;
-use openvm_pairing::bn254::Bn254;
+use alloc::vec::Vec;
+
+use codec::{encode_bn_g1_point, read_bn_g1_point, read_bn_g2_point, read_bn_scalar};
+use openvm_ecc_guest::{
+    weierstrass::{IntrinsicCurve, WeierstrassPoint},
+    AffinePoint,
+};
+use openvm_pairing::{bn254::Bn254, PairingCheck};
 
 use crate::{
     ops::Error,
-    types::{ZkvmBn254G1Point, ZkvmBn254Scalar},
+    types::{ZkvmBn254G1Point, ZkvmBn254PairingPair, ZkvmBn254Scalar},
 };
 
 /// BN254 G1 point addition (precompile 0x06).
@@ -34,3 +39,33 @@ pub fn bn254_g1_mul(
     encode_bn_g1_point(Bn254::msm(&[s], &[p]), output);
     Ok(())
 }
+
+/// BN254 pairing check (precompile 0x08).
+pub fn bn254_pairing_check(
+    pairs: &[ZkvmBn254PairingPair],
+    verified: &mut bool,
+) -> Result<(), Error> {
+    *verified = false;
+
+    if pairs.is_empty() {
+        *verified = true;
+        return Ok(());
+    }
+
+    let mut g1_points = Vec::with_capacity(pairs.len());
+    let mut g2_points = Vec::with_capacity(pairs.len());
+
+    for pair in pairs {
+        let g1 = read_bn_g1_point(&pair.g1)?;
+        let g2 = read_bn_g2_point(&pair.g2)?;
+
+        let (g1_x, g1_y) = g1.into_coords();
+        let (g2_x, g2_y) = g2.into_coords();
+
+        g1_points.push(AffinePoint::new(g1_x, g1_y));
+        g2_points.push(AffinePoint::new(g2_x, g2_y));
+    }
+
+    *verified = Bn254::pairing_check(&g1_points, &g2_points).is_ok();
+    Ok(())
+}

From d6e399ea79d6eb7247e9d18527bd72e510c4089c Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 14:56:55 -0400
Subject: [PATCH 75/94] feat(ffi): BN254 add/mul/pairing check interfaces

---
 crates/accelerators/src/ffi/bn254.rs | 90 ++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 crates/accelerators/src/ffi/bn254.rs

diff --git a/crates/accelerators/src/ffi/bn254.rs b/crates/accelerators/src/ffi/bn254.rs
new file mode 100644
index 000000000..a866c845c
--- /dev/null
+++ b/crates/accelerators/src/ffi/bn254.rs
@@ -0,0 +1,90 @@
+//! C ABI for the BN254 (alt_bn128) accelerators.
+
+use crate::{
+    ops,
+    types::{ZkvmBn254G1Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmStatus},
+};
+
+/// BN254 G1 point addition (precompile 0x06, EIP-196).
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or an input point is
+/// malformed.
+///
+/// # Safety
+///
+/// - `p1` and `p2`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 64 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_g1_add(
+    p1: *const ZkvmBn254G1Point,
+    p2: *const ZkvmBn254G1Point,
+    result: *mut ZkvmBn254G1Point,
+) -> ZkvmStatus {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
+    match ops::bn254_g1_add(p1, p2, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BN254 G1 scalar multiplication (precompile 0x07, EIP-196).
+///
+/// The scalar need not be canonical.
+///
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the input point is
+/// malformed.
+///
+/// # Safety
+///
+/// - `point`, if non-NULL, must be valid for reads of 64 bytes.
+/// - `scalar`, if non-NULL, must be valid for reads of 32 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 64 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_g1_mul(
+    point: *const ZkvmBn254G1Point,
+    scalar: *const ZkvmBn254Scalar,
+    result: *mut ZkvmBn254G1Point,
+) -> ZkvmStatus {
+    if point.is_null() || scalar.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (point, scalar, result) = unsafe { (&*point, &*scalar, &mut *result) };
+    match ops::bn254_g1_mul(point, scalar, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BN254 pairing check (precompile 0x08, EIP-197).
+///
+/// Sets `verified` to whether the product of pairings equals one. Malformed
+/// points return [`ZkvmStatus::Fail`]. `num_pairs == 0` verifies trivially.
+///
+/// # Safety
+///
+/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
+/// - `verified`, if non-NULL, must be valid for writes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_pairing(
+    pairs: *const ZkvmBn254PairingPair,
+    num_pairs: usize,
+    verified: *mut bool,
+) -> ZkvmStatus {
+    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let verified = unsafe { &mut *verified };
+    match ops::bn254_pairing_check(pairs, verified) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}

From 55e7e653a743869527155bbdc23df48eb11c3526 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 14:58:26 -0400
Subject: [PATCH 76/94] feat(tests): BN254 tests

---
 .../accelerators/tests/conformance/bn254.rs   | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 crates/accelerators/tests/conformance/bn254.rs

diff --git a/crates/accelerators/tests/conformance/bn254.rs b/crates/accelerators/tests/conformance/bn254.rs
new file mode 100644
index 000000000..dcbce7b16
--- /dev/null
+++ b/crates/accelerators/tests/conformance/bn254.rs
@@ -0,0 +1,168 @@
+//! BN254 add/mul/pairing conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    ffi::{zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_pairing},
+    ops::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check, Error},
+    types::{
+        ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmStatus,
+    },
+};
+
+fn scalar(value: u8) -> ZkvmBn254Scalar {
+    let mut scalar = ZkvmBn254Scalar { data: [0; 32] };
+    scalar.data[31] = value;
+    scalar
+}
+
+/// BN254 generator (1, 2).
+fn generator() -> ZkvmBn254G1Point {
+    let mut point = ZkvmBn254G1Point { data: [0; 64] };
+    point.data[31] = 1;
+    point.data[63] = 2;
+    point
+}
+
+/// Doubled BN254 generator, from the EIP-196 reference vectors.
+const BN254_2GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
+    data: hex!(
+        "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd3"
+        "15ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"
+    ),
+};
+
+/// BN254 negated generator (1, p - 2).
+const BN254_NEG_GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
+    data: hex!(
+        "0000000000000000000000000000000000000000000000000000000000000001"
+        "30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
+    ),
+};
+
+/// BN254 G2 generator in EIP-197 order (`x_c1 || x_c0 || y_c1 || y_c0`).
+const BN254_G2_GEN: ZkvmBn254G2Point = ZkvmBn254G2Point {
+    data: hex!(
+        "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+        "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+        "090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+        "12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+    ),
+};
+
+#[test]
+fn bn254_add_mul_vectors() {
+    let point = generator();
+    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+
+    bn254_g1_add(&point, &point, &mut output).unwrap();
+    assert_eq!(output, BN254_2GEN);
+
+    output.data = [0; 64];
+    bn254_g1_mul(&point, &scalar(2), &mut output).unwrap();
+    assert_eq!(output, BN254_2GEN);
+}
+
+#[test]
+fn bn254_pairing_vectors() {
+    let pairs = [
+        ZkvmBn254PairingPair { g1: generator(), g2: BN254_G2_GEN },
+        ZkvmBn254PairingPair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
+    ];
+    let mut verified = false;
+
+    bn254_pairing_check(&pairs, &mut verified).unwrap();
+    assert!(verified);
+
+    bn254_pairing_check(&pairs[..1], &mut verified).unwrap();
+    assert!(!verified);
+
+    bn254_pairing_check(&[], &mut verified).unwrap();
+    assert!(verified);
+}
+
+#[test]
+fn zkvm_bn254_add_mul_smoke() {
+    let point = generator();
+    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+
+    let status = unsafe { zkvm_bn254_g1_add(&point, &point, &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(output, BN254_2GEN);
+
+    output.data = [0; 64];
+    let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar(2), &mut output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(output, BN254_2GEN);
+}
+
+#[test]
+fn zkvm_bn254_pairing_smoke() {
+    let pairs = [
+        ZkvmBn254PairingPair { g1: generator(), g2: BN254_G2_GEN },
+        ZkvmBn254PairingPair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
+    ];
+    let mut verified = false;
+
+    let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), 1, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(!verified);
+}
+
+#[test]
+fn bn254_rejects_invalid_point() {
+    let mut not_on_curve = generator();
+    not_on_curve.data[63] = 3;
+    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+
+    assert_eq!(bn254_g1_add(&not_on_curve, &generator(), &mut output), Err(Error::PointNotOnCurve));
+
+    let status = unsafe { zkvm_bn254_g1_mul(&not_on_curve, &scalar(2), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let pairs = [ZkvmBn254PairingPair { g1: not_on_curve, g2: BN254_G2_GEN }];
+    let mut verified = true;
+    assert_eq!(bn254_pairing_check(&pairs, &mut verified), Err(Error::PointNotOnCurve));
+    assert!(!verified);
+}
+
+#[test]
+fn zkvm_bn254_null_pointers() {
+    let point = generator();
+    let scalar = scalar(2);
+    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+
+    let status = unsafe { zkvm_bn254_g1_add(core::ptr::null(), &point, &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_g1_add(&point, core::ptr::null(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_g1_add(&point, &point, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_g1_mul(core::ptr::null(), &scalar, &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_g1_mul(&point, core::ptr::null(), &mut output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let pairs = [ZkvmBn254PairingPair { g1: point, g2: BN254_G2_GEN }];
+    let mut verified = false;
+
+    let status = unsafe { zkvm_bn254_pairing(core::ptr::null(), 0, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    let status = unsafe { zkvm_bn254_pairing(core::ptr::null(), 1, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 5f2e8d4521198571ded3679ef30dc6894c0ea4fe Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 15:03:42 -0400
Subject: [PATCH 77/94] feat(ops): BLS12-381 add/msm

---
 .../accelerators/src/ops/bls12_381/codec.rs   | 109 ++++++++++++++++++
 crates/accelerators/src/ops/bls12_381/mod.rs  |  98 ++++++++++++++++
 2 files changed, 207 insertions(+)
 create mode 100644 crates/accelerators/src/ops/bls12_381/codec.rs
 create mode 100644 crates/accelerators/src/ops/bls12_381/mod.rs

diff --git a/crates/accelerators/src/ops/bls12_381/codec.rs b/crates/accelerators/src/ops/bls12_381/codec.rs
new file mode 100644
index 000000000..0d9fda155
--- /dev/null
+++ b/crates/accelerators/src/ops/bls12_381/codec.rs
@@ -0,0 +1,109 @@
+//! Byte codecs for BLS12-381: EIP-2537 point encodings, including the
+//! on-curve and subgroup validation performed while decoding.
+
+use openvm_curve_utils::SubgroupCheck;
+use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint, Group};
+use openvm_pairing::bls12_381 as bls;
+
+use crate::{
+    ops::Error,
+    types::{ZkvmBls12381G1Point, ZkvmBls12381G2Point, ZkvmBls12381Scalar},
+};
+
+use super::BLS_FP_LEN;
+
+#[inline]
+fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, Error> {
+    bls::Fp::from_be_bytes(input).ok_or(Error::FieldElementInvalid)
+}
+
+#[inline]
+fn read_bls_fp2(c0: &[u8], c1: &[u8]) -> Result<bls::Fp2, Error> {
+    let real = read_bls_fp(c0)?;
+    let imag = read_bls_fp(c1)?;
+    Ok(bls::Fp2::new(real, imag))
+}
+
+#[inline]
+pub(super) fn read_bls_g1_point_no_subgroup_check(
+    point: &ZkvmBls12381G1Point,
+) -> Result<bls::G1Affine, Error> {
+    let px = read_bls_fp(&point.data[..BLS_FP_LEN])?;
+    let py = read_bls_fp(&point.data[BLS_FP_LEN..])?;
+    // SAFETY: `read_bls_fp` produces canonical Fp elements; `from_xy` itself checks the curve
+    // equation and returns `None` if `(px, py)` is not on the curve.
+    unsafe { bls::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)
+}
+
+#[inline]
+pub(super) fn read_bls_g1_point(point: &ZkvmBls12381G1Point) -> Result<bls::G1Affine, Error> {
+    let point = read_bls_g1_point_no_subgroup_check(point)?;
+    if point.is_in_correct_subgroup() {
+        Ok(point)
+    } else {
+        Err(Error::PointNotInSubgroup)
+    }
+}
+
+#[inline]
+pub(super) fn read_bls_g2_point_no_subgroup_check(
+    point: &ZkvmBls12381G2Point,
+) -> Result<bls::G2Affine, Error> {
+    let x = read_bls_fp2(&point.data[..BLS_FP_LEN], &point.data[BLS_FP_LEN..2 * BLS_FP_LEN])?;
+    let y =
+        read_bls_fp2(&point.data[2 * BLS_FP_LEN..3 * BLS_FP_LEN], &point.data[3 * BLS_FP_LEN..])?;
+    // SAFETY: `read_bls_fp2` produces canonical Fp2 elements; `from_xy` itself checks the curve
+    // equation and returns `None` if `(x, y)` is not on the twist.
+    unsafe { bls::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)
+}
+
+#[inline]
+pub(super) fn read_bls_g2_point(point: &ZkvmBls12381G2Point) -> Result<bls::G2Affine, Error> {
+    let point = read_bls_g2_point_no_subgroup_check(point)?;
+    if point.is_in_correct_subgroup() {
+        Ok(point)
+    } else {
+        Err(Error::PointNotInSubgroup)
+    }
+}
+
+#[inline]
+pub(super) fn read_bls_scalar(input: &ZkvmBls12381Scalar) -> bls::Scalar {
+    bls::Scalar::from_be_bytes_unchecked(&input.data)
+}
+
+#[inline]
+pub(super) fn encode_bls_g1_point(point: &bls::G1Affine, output: &mut ZkvmBls12381G1Point) {
+    if point.is_identity() {
+        output.data.fill(0);
+        return;
+    }
+
+    let x_bytes: &[u8] = point.x().as_le_bytes();
+    let y_bytes: &[u8] = point.y().as_le_bytes();
+    for i in 0..BLS_FP_LEN {
+        output.data[i] = x_bytes[BLS_FP_LEN - 1 - i];
+        output.data[i + BLS_FP_LEN] = y_bytes[BLS_FP_LEN - 1 - i];
+    }
+}
+
+#[inline]
+pub(super) fn encode_bls_g2_point(point: &bls::G2Affine, output: &mut ZkvmBls12381G2Point) {
+    if point.is_identity() {
+        output.data.fill(0);
+        return;
+    }
+
+    let x = point.x();
+    let y = point.y();
+    let x_c0 = x.c0.as_le_bytes();
+    let x_c1 = x.c1.as_le_bytes();
+    let y_c0 = y.c0.as_le_bytes();
+    let y_c1 = y.c1.as_le_bytes();
+    for i in 0..BLS_FP_LEN {
+        output.data[i] = x_c0[BLS_FP_LEN - 1 - i];
+        output.data[i + BLS_FP_LEN] = x_c1[BLS_FP_LEN - 1 - i];
+        output.data[i + (2 * BLS_FP_LEN)] = y_c0[BLS_FP_LEN - 1 - i];
+        output.data[i + (3 * BLS_FP_LEN)] = y_c1[BLS_FP_LEN - 1 - i];
+    }
+}
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
new file mode 100644
index 000000000..620b1b938
--- /dev/null
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -0,0 +1,98 @@
+//! BLS12-381 group operations (EIP-2537).
+
+mod codec;
+
+use alloc::vec::Vec;
+
+use codec::{
+    encode_bls_g1_point, encode_bls_g2_point, read_bls_g1_point,
+    read_bls_g1_point_no_subgroup_check, read_bls_g2_point, read_bls_g2_point_no_subgroup_check,
+    read_bls_scalar,
+};
+use openvm_ecc_guest::weierstrass::IntrinsicCurve;
+use openvm_pairing::bls12_381::Bls12_381;
+
+use crate::{
+    ops::Error,
+    types::{
+        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
+    },
+};
+
+pub(super) const BLS_FP_LEN: usize = 48;
+
+/// BLS12-381 G1 point addition (precompile 0x0b). Inputs are `x || y`.
+///
+/// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup
+/// membership.
+pub fn bls12_381_g1_add(
+    p1: &ZkvmBls12381G1Point,
+    p2: &ZkvmBls12381G1Point,
+    output: &mut ZkvmBls12381G1Point,
+) -> Result<(), Error> {
+    let p1 = read_bls_g1_point_no_subgroup_check(p1)?;
+    let p2 = read_bls_g1_point_no_subgroup_check(p2)?;
+    encode_bls_g1_point(&(p1 + p2), output);
+    Ok(())
+}
+
+/// BLS12-381 G1 multi-scalar multiplication (precompile 0x0c).
+///
+/// Points must be in the prime-order subgroup; scalars need not be canonical.
+/// An empty input yields the identity (all-zero) encoding.
+pub fn bls12_381_g1_msm(
+    pairs: &[ZkvmBls12381G1MsmPair],
+    output: &mut ZkvmBls12381G1Point,
+) -> Result<(), Error> {
+    if pairs.is_empty() {
+        output.data = [0u8; 96];
+        return Ok(());
+    }
+
+    let mut points = Vec::with_capacity(pairs.len());
+    let mut scalars = Vec::with_capacity(pairs.len());
+    for pair in pairs {
+        points.push(read_bls_g1_point(&pair.point)?);
+        scalars.push(read_bls_scalar(&pair.scalar));
+    }
+    encode_bls_g1_point(&Bls12_381::msm(&scalars, &points), output);
+    Ok(())
+}
+
+/// BLS12-381 G2 point addition (precompile 0x0d).
+///
+/// Per EIP-2537 G2ADD, inputs are validated on-curve only, not for subgroup
+/// membership.
+pub fn bls12_381_g2_add(
+    p1: &ZkvmBls12381G2Point,
+    p2: &ZkvmBls12381G2Point,
+    output: &mut ZkvmBls12381G2Point,
+) -> Result<(), Error> {
+    let p1 = read_bls_g2_point_no_subgroup_check(p1)?;
+    let p2 = read_bls_g2_point_no_subgroup_check(p2)?;
+    encode_bls_g2_point(&(p1 + p2), output);
+    Ok(())
+}
+
+/// BLS12-381 G2 multi-scalar multiplication (precompile 0x0e).
+///
+/// Points must be in the prime-order subgroup; scalars need not be canonical.
+/// An empty input yields the identity (all-zero) encoding.
+pub fn bls12_381_g2_msm(
+    pairs: &[ZkvmBls12381G2MsmPair],
+    output: &mut ZkvmBls12381G2Point,
+) -> Result<(), Error> {
+    if pairs.is_empty() {
+        output.data = [0u8; 192];
+        return Ok(());
+    }
+
+    let mut points = Vec::with_capacity(pairs.len());
+    let mut scalars = Vec::with_capacity(pairs.len());
+    for pair in pairs {
+        points.push(read_bls_g2_point(&pair.point)?);
+        scalars.push(read_bls_scalar(&pair.scalar));
+    }
+    encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points), output);
+    Ok(())
+}

From 24adf2862246ca52b0cb2c962ebb894a8449206c Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 15:10:37 -0400
Subject: [PATCH 78/94] feat(ops): BLS12-381 pairing check

---
 crates/accelerators/src/ops/bls12_381/mod.rs | 40 +++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 620b1b938..2c62ff7d4 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -9,13 +9,17 @@ use codec::{
     read_bls_g1_point_no_subgroup_check, read_bls_g2_point, read_bls_g2_point_no_subgroup_check,
     read_bls_scalar,
 };
-use openvm_ecc_guest::weierstrass::IntrinsicCurve;
-use openvm_pairing::bls12_381::Bls12_381;
+use openvm_ecc_guest::{
+    weierstrass::{IntrinsicCurve, WeierstrassPoint},
+    AffinePoint,
+};
+use openvm_pairing::{bls12_381::Bls12_381, PairingCheck};
 
 use crate::{
     ops::Error,
     types::{
         ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
+        ZkvmBls12381PairingPair,
     },
 };
 
@@ -96,3 +100,35 @@ pub fn bls12_381_g2_msm(
     encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points), output);
     Ok(())
 }
+
+/// BLS12-381 pairing check (precompile 0x0f).
+///
+/// Points must be in the prime-order subgroup.
+pub fn bls12_381_pairing_check(
+    pairs: &[ZkvmBls12381PairingPair],
+    verified: &mut bool,
+) -> Result<(), Error> {
+    *verified = false;
+
+    if pairs.is_empty() {
+        *verified = true;
+        return Ok(());
+    }
+
+    let mut g1_points = Vec::with_capacity(pairs.len());
+    let mut g2_points = Vec::with_capacity(pairs.len());
+
+    for pair in pairs {
+        let g1 = read_bls_g1_point(&pair.g1)?;
+        let g2 = read_bls_g2_point(&pair.g2)?;
+
+        let (g1_x, g1_y) = g1.into_coords();
+        let (g2_x, g2_y) = g2.into_coords();
+
+        g1_points.push(AffinePoint::new(g1_x, g1_y));
+        g2_points.push(AffinePoint::new(g2_x, g2_y));
+    }
+
+    *verified = Bls12_381::pairing_check(&g1_points, &g2_points).is_ok();
+    Ok(())
+}

From 9ca136b59c70bfc332eb580a35a9b318be097c07 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 15:11:28 -0400
Subject: [PATCH 79/94] feat(ffi): BLS12-381 add/msm/pairing check interfaces

---
 crates/accelerators/src/ffi/bls12_381.rs | 149 +++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 crates/accelerators/src/ffi/bls12_381.rs

diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
new file mode 100644
index 000000000..a12a7e360
--- /dev/null
+++ b/crates/accelerators/src/ffi/bls12_381.rs
@@ -0,0 +1,149 @@
+//! C ABI for the BLS12-381 add/MSM accelerators (EIP-2537).
+
+use crate::{
+    ops,
+    types::{
+        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
+        ZkvmBls12381PairingPair, ZkvmStatus,
+    },
+};
+
+/// BLS12-381 G1 point addition (precompile 0x0b, EIP-2537).
+///
+/// Inputs must be on the curve but, per EIP-2537 G1ADD, need not be in the
+/// prime-order subgroup.
+///
+/// # Safety
+///
+/// - `p1` and `p2`, if non-NULL, must be valid for reads of 96 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g1_add(
+    p1: *const ZkvmBls12381G1Point,
+    p2: *const ZkvmBls12381G1Point,
+    result: *mut ZkvmBls12381G1Point,
+) -> ZkvmStatus {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
+    match ops::bls12_381_g1_add(p1, p2, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BLS12-381 G1 multi-scalar multiplication (precompile 0x0c, EIP-2537).
+///
+/// Inputs must be in the prime-order subgroup. Scalars need not be canonical.
+/// `num_pairs == 0` yields the identity (all-zero) point.
+///
+/// # Safety
+///
+/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
+/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g1_msm(
+    pairs: *const ZkvmBls12381G1MsmPair,
+    num_pairs: usize,
+    result: *mut ZkvmBls12381G1Point,
+) -> ZkvmStatus {
+    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let result = unsafe { &mut *result };
+    match ops::bls12_381_g1_msm(pairs, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BLS12-381 G2 point addition (precompile 0x0d, EIP-2537).
+///
+/// Inputs must be on the curve but, per EIP-2537 G2ADD, need not be in the
+/// prime-order subgroup.
+///
+/// # Safety
+///
+/// - `p1` and `p2`, if non-NULL, must be valid for reads of 192 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g2_add(
+    p1: *const ZkvmBls12381G2Point,
+    p2: *const ZkvmBls12381G2Point,
+    result: *mut ZkvmBls12381G2Point,
+) -> ZkvmStatus {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
+    match ops::bls12_381_g2_add(p1, p2, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BLS12-381 G2 multi-scalar multiplication (precompile 0x0e, EIP-2537).
+///
+/// Inputs must be in the prime-order subgroup. Scalars need not be canonical.
+/// `num_pairs == 0` yields the identity (all-zero) point.
+///
+/// # Safety
+///
+/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
+/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g2_msm(
+    pairs: *const ZkvmBls12381G2MsmPair,
+    num_pairs: usize,
+    result: *mut ZkvmBls12381G2Point,
+) -> ZkvmStatus {
+    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let result = unsafe { &mut *result };
+    match ops::bls12_381_g2_msm(pairs, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BLS12-381 pairing check (precompile 0x0f, EIP-2537).
+///
+/// Sets `verified` to whether the product of pairings equals one. Inputs must
+/// be in the prime-order subgroup; malformed points return
+/// [`ZkvmStatus::Fail`]. `num_pairs == 0` verifies trivially.
+///
+/// # Safety
+///
+/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
+/// - `verified`, if non-NULL, must be valid for writes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_pairing(
+    pairs: *const ZkvmBls12381PairingPair,
+    num_pairs: usize,
+    verified: *mut bool,
+) -> ZkvmStatus {
+    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let verified = unsafe { &mut *verified };
+    match ops::bls12_381_pairing_check(pairs, verified) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}

From 1070b0e9a31ea6996eb8474ecd758360c02cd1bf Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 15:12:25 -0400
Subject: [PATCH 80/94] feat(tests): BLS12-381 tests

---
 .../tests/conformance/bls12_381.rs            | 227 ++++++++++++++++++
 1 file changed, 227 insertions(+)
 create mode 100644 crates/accelerators/tests/conformance/bls12_381.rs

diff --git a/crates/accelerators/tests/conformance/bls12_381.rs b/crates/accelerators/tests/conformance/bls12_381.rs
new file mode 100644
index 000000000..94a550857
--- /dev/null
+++ b/crates/accelerators/tests/conformance/bls12_381.rs
@@ -0,0 +1,227 @@
+//! BLS12-381 add/MSM/pairing conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    ffi::{
+        zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add, zkvm_bls12_g2_msm,
+        zkvm_bls12_pairing,
+    },
+    ops::{
+        bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
+        bls12_381_pairing_check,
+    },
+    types::{
+        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
+        ZkvmBls12381PairingPair, ZkvmBls12381Scalar, ZkvmStatus,
+    },
+};
+
+fn scalar(value: u8) -> ZkvmBls12381Scalar {
+    let mut scalar = ZkvmBls12381Scalar { data: [0; 32] };
+    scalar.data[31] = value;
+    scalar
+}
+
+/// BLS12-381 G1 generator (`x || y`).
+const BLS_G1_GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
+    data: hex!(
+        "17f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb"
+        "08b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e1"
+    ),
+};
+
+/// Doubled BLS12-381 G1 generator, stripped from the EIP-2537 test-vector padding.
+const BLS_G1_2GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
+    data: hex!(
+        "0572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e"
+        "166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d28"
+    ),
+};
+
+/// BLS12-381 G2 generator in EIP-2537 order (`x_c0 || x_c1 || y_c0 || y_c1`).
+const BLS_G2_GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
+    data: hex!(
+        "024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
+        "13e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e"
+        "0ce5d527727d6e118cc9cdc6da2e351aadfd9baa8cbdd3a76d429a695160d12c923ac9cc3baca289e193548608b82801"
+        "0606c4a02ea734cc32acd2b02bc28b99cb3e287e85a763af267492ab572e99ab3f370d275cec1da1aaa9075ff05f79be"
+    ),
+};
+
+/// Doubled BLS12-381 G2 generator, stripped from the EIP-2537 test-vector padding.
+const BLS_G2_2GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
+    data: hex!(
+        "1638533957d540a9d2370f17cc7ed5863bc0b995b8825e0ee1ea1e1e4d00dbae81f14b0bf3611b78c952aacab827a053"
+        "0a4edef9c1ed7f729f520e47730a124fd70662a904ba1074728114d1031e1572c6c886f6b57ec72a6178288c47c33577"
+        "0468fb440d82b0630aeb8dca2b5256789a66da69bf91009cbfe6bd221e47aa8ae88dece9764bf3bd999d95d71e4c9899"
+        "0f6d4552fa65dd2638b361543f887136a43253d9c66c411697003f7a13c308f5422e1aa0a59c8967acdefd8b6e36ccf3"
+    ),
+};
+
+/// BLS12-381 scalar field order minus one; multiplying by it negates a point.
+const BLS_R_MINUS_1: ZkvmBls12381Scalar = ZkvmBls12381Scalar {
+    data: hex!("73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000"),
+};
+
+fn neg_g1_generator() -> ZkvmBls12381G1Point {
+    let pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: BLS_R_MINUS_1 }];
+    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
+    bls12_381_g1_msm(&pairs, &mut output).unwrap();
+    output
+}
+
+#[test]
+fn bls12_g1_add_msm_vectors() {
+    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
+    bls12_381_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, &mut output).unwrap();
+    assert_eq!(output, BLS_G1_2GEN);
+
+    let pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: scalar(2) }];
+    output.data = [0; 96];
+    bls12_381_g1_msm(&pairs, &mut output).unwrap();
+    assert_eq!(output, BLS_G1_2GEN);
+
+    output.data = [0xff; 96];
+    bls12_381_g1_msm(&[], &mut output).unwrap();
+    assert_eq!(output.data, [0u8; 96]);
+}
+
+#[test]
+fn bls12_g2_add_msm_vectors() {
+    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
+    bls12_381_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, &mut output).unwrap();
+    assert_eq!(output, BLS_G2_2GEN);
+
+    let pairs = [ZkvmBls12381G2MsmPair { point: BLS_G2_GEN, scalar: scalar(2) }];
+    output.data = [0; 192];
+    bls12_381_g2_msm(&pairs, &mut output).unwrap();
+    assert_eq!(output, BLS_G2_2GEN);
+
+    output.data = [0xff; 192];
+    bls12_381_g2_msm(&[], &mut output).unwrap();
+    assert_eq!(output.data, [0u8; 192]);
+}
+
+#[test]
+fn bls12_pairing_vectors() {
+    let neg_g1 = neg_g1_generator();
+    let pairs = [
+        ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN },
+        ZkvmBls12381PairingPair { g1: neg_g1, g2: BLS_G2_GEN },
+    ];
+    let mut verified = false;
+
+    bls12_381_pairing_check(&pairs, &mut verified).unwrap();
+    assert!(verified);
+
+    bls12_381_pairing_check(&pairs[..1], &mut verified).unwrap();
+    assert!(!verified);
+
+    bls12_381_pairing_check(&[], &mut verified).unwrap();
+    assert!(verified);
+}
+
+#[test]
+fn zkvm_bls12_add_msm_smoke() {
+    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, &mut g1_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g1_output, BLS_G1_2GEN);
+
+    let g1_pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: scalar(2) }];
+    g1_output.data = [0; 96];
+    let status = unsafe { zkvm_bls12_g1_msm(g1_pairs.as_ptr(), g1_pairs.len(), &mut g1_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g1_output, BLS_G1_2GEN);
+
+    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, &mut g2_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g2_output, BLS_G2_2GEN);
+
+    let g2_pairs = [ZkvmBls12381G2MsmPair { point: BLS_G2_GEN, scalar: scalar(2) }];
+    g2_output.data = [0; 192];
+    let status = unsafe { zkvm_bls12_g2_msm(g2_pairs.as_ptr(), g2_pairs.len(), &mut g2_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g2_output, BLS_G2_2GEN);
+}
+
+#[test]
+fn zkvm_bls12_pairing_smoke() {
+    let neg_g1 = neg_g1_generator();
+    let pairs = [
+        ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN },
+        ZkvmBls12381PairingPair { g1: neg_g1, g2: BLS_G2_GEN },
+    ];
+    let mut verified = false;
+
+    let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), 1, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(!verified);
+}
+
+#[test]
+fn bls12_rejects_invalid_points() {
+    let mut off_curve_g1 = BLS_G1_GEN;
+    off_curve_g1.data[95] ^= 1;
+    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
+    assert!(bls12_381_g1_add(&off_curve_g1, &BLS_G1_GEN, &mut g1_output).is_err());
+
+    let mut off_curve_g2 = BLS_G2_GEN;
+    off_curve_g2.data[191] ^= 1;
+    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
+    assert!(bls12_381_g2_add(&off_curve_g2, &BLS_G2_GEN, &mut g2_output).is_err());
+
+    let pairs = [ZkvmBls12381PairingPair { g1: off_curve_g1, g2: BLS_G2_GEN }];
+    let mut verified = true;
+    assert!(bls12_381_pairing_check(&pairs, &mut verified).is_err());
+    assert!(!verified);
+}
+
+#[test]
+fn zkvm_bls12_null_pointers() {
+    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_add(core::ptr::null(), &BLS_G1_GEN, &mut g1_output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bls12_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bls12_g1_msm(core::ptr::null(), 0, &mut g1_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g1_output.data, [0u8; 96]);
+
+    let status = unsafe { zkvm_bls12_g1_msm(core::ptr::null(), 1, &mut g1_output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_g2_add(core::ptr::null(), &BLS_G2_GEN, &mut g2_output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bls12_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bls12_g2_msm(core::ptr::null(), 0, &mut g2_output) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g2_output.data, [0u8; 192]);
+
+    let status = unsafe { zkvm_bls12_g2_msm(core::ptr::null(), 1, &mut g2_output) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let pairs = [ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN }];
+    let mut verified = false;
+
+    let status = unsafe { zkvm_bls12_pairing(core::ptr::null(), 0, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(verified);
+
+    let status = unsafe { zkvm_bls12_pairing(core::ptr::null(), 1, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 8b1a6e1a72446c0e7c3ccd040a6619991bce38ac Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 15:13:13 -0400
Subject: [PATCH 81/94] fix: expose functions

---
 crates/accelerators/src/ffi/mod.rs            | 4 ++++
 crates/accelerators/src/ops/mod.rs            | 6 ++++++
 crates/accelerators/tests/conformance/main.rs | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index fe78701e8..87dc17f4d 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -5,12 +5,16 @@
 //! [`crate::types::ZkvmStatus`]. No other logic lives here.
 
 mod blake2;
+mod bls12_381;
+mod bn254;
 mod ecdsa;
 mod hash;
 mod kzg;
 mod modexp;
 
 pub use blake2::*;
+pub use bls12_381::*;
+pub use bn254::*;
 pub use ecdsa::*;
 pub use hash::*;
 pub use kzg::*;
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 673c373fd..e65ab9083 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -5,12 +5,18 @@
 //! `x_c1 || x_c0 || y_c1 || y_c0` order.
 
 mod blake2;
+mod bls12_381;
+mod bn254;
 mod ecdsa;
 mod hash;
 mod kzg;
 mod modexp;
 
 pub use blake2::blake2f;
+pub use bls12_381::{
+    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm, bls12_381_pairing_check,
+};
+pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check};
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
 pub use kzg::kzg_point_eval;
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
index 9115352c0..0b6034a30 100644
--- a/crates/accelerators/tests/conformance/main.rs
+++ b/crates/accelerators/tests/conformance/main.rs
@@ -4,6 +4,8 @@
 //! Modules mirror the `src/ops` layout: one file per domain.
 
 mod blake2;
+mod bls12_381;
+mod bn254;
 mod ecdsa;
 mod hash;
 mod kzg;

From 096b615628b28052512f0f61f4d56b999a07d7cb Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 16:54:35 -0400
Subject: [PATCH 82/94] refactor: move bls fp length constant into codec

---
 crates/accelerators/src/ops/bls12_381/codec.rs | 2 +-
 crates/accelerators/src/ops/bls12_381/mod.rs   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/crates/accelerators/src/ops/bls12_381/codec.rs b/crates/accelerators/src/ops/bls12_381/codec.rs
index 0d9fda155..8d8771875 100644
--- a/crates/accelerators/src/ops/bls12_381/codec.rs
+++ b/crates/accelerators/src/ops/bls12_381/codec.rs
@@ -10,7 +10,7 @@ use crate::{
     types::{ZkvmBls12381G1Point, ZkvmBls12381G2Point, ZkvmBls12381Scalar},
 };
 
-use super::BLS_FP_LEN;
+const BLS_FP_LEN: usize = 48;
 
 #[inline]
 fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, Error> {
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 2c62ff7d4..569d304e2 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -23,8 +23,6 @@ use crate::{
     },
 };
 
-pub(super) const BLS_FP_LEN: usize = 48;
-
 /// BLS12-381 G1 point addition (precompile 0x0b). Inputs are `x || y`.
 ///
 /// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup

From 12d983eafc14f48cdcd8f794992d0f5ac78ebdb0 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 18:35:00 -0400
Subject: [PATCH 83/94] feat(ops): map-to-curve implementation

---
 Cargo.lock                                    |  3 +
 crates/accelerators/Cargo.toml                |  3 +
 .../accelerators/src/ops/bls12_381/codec.rs   |  3 +-
 crates/accelerators/src/ops/bls12_381/map.rs  | 83 +++++++++++++++++++
 crates/accelerators/src/ops/bls12_381/mod.rs  |  6 ++
 crates/accelerators/src/ops/mod.rs            |  3 +-
 6 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 crates/accelerators/src/ops/bls12_381/map.rs

diff --git a/Cargo.lock b/Cargo.lock
index 2f475c492..5e5419547 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6789,6 +6789,9 @@ dependencies = [
 name = "openvm-accelerators"
 version = "0.4.0"
 dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-serialize 0.5.0",
  "aurora-engine-modexp",
  "hex-literal",
  "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 14a75e5af..e919e9fd2 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -20,6 +20,9 @@ openvm-keccak256.workspace = true
 openvm-sha2.workspace = true
 
 # crypto
+ark-bls12-381 = { version = "0.5", default-features = false, features = ["curve"] }
+ark-ec = { version = "0.5", default-features = false }
+ark-serialize = { version = "0.5", default-features = false }
 aurora-engine-modexp = { version = "1.2.0", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
 
diff --git a/crates/accelerators/src/ops/bls12_381/codec.rs b/crates/accelerators/src/ops/bls12_381/codec.rs
index 8d8771875..f6c5d7ebc 100644
--- a/crates/accelerators/src/ops/bls12_381/codec.rs
+++ b/crates/accelerators/src/ops/bls12_381/codec.rs
@@ -5,13 +5,12 @@ use openvm_curve_utils::SubgroupCheck;
 use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint, Group};
 use openvm_pairing::bls12_381 as bls;
 
+use super::BLS_FP_LEN;
 use crate::{
     ops::Error,
     types::{ZkvmBls12381G1Point, ZkvmBls12381G2Point, ZkvmBls12381Scalar},
 };
 
-const BLS_FP_LEN: usize = 48;
-
 #[inline]
 fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, Error> {
     bls::Fp::from_be_bytes(input).ok_or(Error::FieldElementInvalid)
diff --git a/crates/accelerators/src/ops/bls12_381/map.rs b/crates/accelerators/src/ops/bls12_381/map.rs
new file mode 100644
index 000000000..c08625647
--- /dev/null
+++ b/crates/accelerators/src/ops/bls12_381/map.rs
@@ -0,0 +1,83 @@
+//! BLS12-381 map-to-curve (EIP-2537).
+//!
+//! Implemented using arkworks.
+
+use ark_bls12_381::{Fq, Fq2, G1Affine, G2Affine};
+use ark_ec::{
+    hashing::{curve_maps::wb::WBMap, map_to_curve_hasher::MapToCurve},
+    AffineRepr,
+};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+
+use super::BLS_FP_LEN;
+use crate::{
+    ops::Error,
+    types::{ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1Point, ZkvmBls12381G2Point},
+};
+
+/// BLS12-381 map field element to G1 (precompile 0x10).
+pub fn bls12_381_map_fp_to_g1(
+    fp: &ZkvmBls12381Fp,
+    output: &mut ZkvmBls12381G1Point,
+) -> Result<(), Error> {
+    let fp = read_fq(&fp.data)?;
+    let point = WBMap::map_to_curve(fp).map_err(|_| Error::FieldElementInvalid)?.clear_cofactor();
+
+    encode_g1_point(&point, output);
+    Ok(())
+}
+
+/// BLS12-381 map field element to G2 (precompile 0x11). Input is `c0 || c1`.
+pub fn bls12_381_map_fp2_to_g2(
+    fp2: &ZkvmBls12381Fp2,
+    output: &mut ZkvmBls12381G2Point,
+) -> Result<(), Error> {
+    let c0 = read_fq(&fp2.data[..BLS_FP_LEN])?;
+    let c1 = read_fq(&fp2.data[BLS_FP_LEN..])?;
+    let point = WBMap::map_to_curve(Fq2::new(c0, c1))
+        .map_err(|_| Error::FieldElementInvalid)?
+        .clear_cofactor();
+
+    encode_g2_point(&point, output);
+    Ok(())
+}
+
+/// Reads a big-endian field element, rejecting non-canonical encodings.
+fn read_fq(input_be: &[u8]) -> Result<Fq, Error> {
+    let mut input_le = [0u8; BLS_FP_LEN];
+    input_le.copy_from_slice(input_be);
+    input_le.reverse();
+
+    Fq::deserialize_uncompressed(&input_le[..]).map_err(|_| Error::FieldElementInvalid)
+}
+
+/// Writes a field element as big-endian bytes.
+fn encode_fq(fq: &Fq, output: &mut [u8]) {
+    fq.serialize_uncompressed(&mut output[..]).expect("Failed to serialize field element");
+    output.reverse();
+}
+
+/// Writes a G1 point as `x || y`; the point at infinity encodes as zeros.
+fn encode_g1_point(point: &G1Affine, output: &mut ZkvmBls12381G1Point) {
+    let Some((x, y)) = point.xy() else {
+        output.data.fill(0);
+        return;
+    };
+
+    encode_fq(&x, &mut output.data[..BLS_FP_LEN]);
+    encode_fq(&y, &mut output.data[BLS_FP_LEN..]);
+}
+
+/// Writes a G2 point as `x_c0 || x_c1 || y_c0 || y_c1`; the point at infinity
+/// encodes as zeros.
+fn encode_g2_point(point: &G2Affine, output: &mut ZkvmBls12381G2Point) {
+    let Some((x, y)) = point.xy() else {
+        output.data.fill(0);
+        return;
+    };
+
+    encode_fq(&x.c0, &mut output.data[..BLS_FP_LEN]);
+    encode_fq(&x.c1, &mut output.data[BLS_FP_LEN..2 * BLS_FP_LEN]);
+    encode_fq(&y.c0, &mut output.data[2 * BLS_FP_LEN..3 * BLS_FP_LEN]);
+    encode_fq(&y.c1, &mut output.data[3 * BLS_FP_LEN..]);
+}
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 569d304e2..17e19695b 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -1,6 +1,9 @@
 //! BLS12-381 group operations (EIP-2537).
 
 mod codec;
+mod map;
+
+pub use map::{bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1};
 
 use alloc::vec::Vec;
 
@@ -23,6 +26,9 @@ use crate::{
     },
 };
 
+/// The number of bytes needed to represent an element of the base field Fp.
+const BLS_FP_LEN: usize = 48;
+
 /// BLS12-381 G1 point addition (precompile 0x0b). Inputs are `x || y`.
 ///
 /// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index e65ab9083..258a55ac0 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -14,7 +14,8 @@ mod modexp;
 
 pub use blake2::blake2f;
 pub use bls12_381::{
-    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm, bls12_381_pairing_check,
+    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
+    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check,
 };
 pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check};
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};

From 7d297c95bf2eaa4aaf8a4b15f772d96b7fd9b8bf Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 18:52:18 -0400
Subject: [PATCH 84/94] feat(ffi): map-to-curve C Interface

---
 crates/accelerators/src/ffi/bls12_381.rs | 56 ++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
index a12a7e360..9dcc6c73b 100644
--- a/crates/accelerators/src/ffi/bls12_381.rs
+++ b/crates/accelerators/src/ffi/bls12_381.rs
@@ -1,10 +1,10 @@
-//! C ABI for the BLS12-381 add/MSM accelerators (EIP-2537).
+//! C ABI for the BLS12-381 add/MSM/map accelerators (EIP-2537).
 
 use crate::{
     ops,
     types::{
-        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
-        ZkvmBls12381PairingPair, ZkvmStatus,
+        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
+        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmStatus,
     },
 };
 
@@ -147,3 +147,53 @@ pub unsafe extern "C" fn zkvm_bls12_pairing(
         Err(_) => ZkvmStatus::Fail,
     }
 }
+
+/// BLS12-381 map field element to G1 (precompile 0x10, EIP-2537).
+///
+/// Returns [`ZkvmStatus::Fail`] if either pointer is NULL or the field element
+/// is not canonical.
+///
+/// # Safety
+///
+/// - `field_element`, if non-NULL, must be valid for reads of 48 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_map_fp_to_g1(
+    field_element: *const ZkvmBls12381Fp,
+    result: *mut ZkvmBls12381G1Point,
+) -> ZkvmStatus {
+    if field_element.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (field_element, result) = unsafe { (&*field_element, &mut *result) };
+    match ops::bls12_381_map_fp_to_g1(field_element, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}
+
+/// BLS12-381 map field element to G2 (precompile 0x11, EIP-2537).
+///
+/// Returns [`ZkvmStatus::Fail`] if either pointer is NULL or either half of
+/// the field element is not canonical.
+///
+/// # Safety
+///
+/// - `field_element`, if non-NULL, must be valid for reads of 96 bytes.
+/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
+    field_element: *const ZkvmBls12381Fp2,
+    result: *mut ZkvmBls12381G2Point,
+) -> ZkvmStatus {
+    if field_element.is_null() || result.is_null() {
+        return ZkvmStatus::Fail;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let (field_element, result) = unsafe { (&*field_element, &mut *result) };
+    match ops::bls12_381_map_fp2_to_g2(field_element, result) {
+        Ok(()) => ZkvmStatus::Ok,
+        Err(_) => ZkvmStatus::Fail,
+    }
+}

From f30fe50dcd1b77e5fc758e0a1af8edbca79cbc90 Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 29 Jul 2026 18:53:02 -0400
Subject: [PATCH 85/94] feat(tests): map-to-curve tests

---
 .../tests/conformance/bls12_381.rs            | 176 +++++++++++++++++-
 1 file changed, 171 insertions(+), 5 deletions(-)

diff --git a/crates/accelerators/tests/conformance/bls12_381.rs b/crates/accelerators/tests/conformance/bls12_381.rs
index 94a550857..d1d827d73 100644
--- a/crates/accelerators/tests/conformance/bls12_381.rs
+++ b/crates/accelerators/tests/conformance/bls12_381.rs
@@ -1,18 +1,19 @@
-//! BLS12-381 add/MSM/pairing conformance vectors.
+//! BLS12-381 add/MSM/pairing/map conformance vectors.
 
 use hex_literal::hex;
 use openvm_accelerators::{
     ffi::{
         zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add, zkvm_bls12_g2_msm,
-        zkvm_bls12_pairing,
+        zkvm_bls12_map_fp2_to_g2, zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing,
     },
     ops::{
         bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-        bls12_381_pairing_check,
+        bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, Error,
     },
     types::{
-        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
-        ZkvmBls12381PairingPair, ZkvmBls12381Scalar, ZkvmStatus,
+        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
+        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBls12381Scalar,
+        ZkvmStatus,
     },
 };
 
@@ -225,3 +226,168 @@ fn zkvm_bls12_null_pointers() {
     let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), core::ptr::null_mut()) };
     assert_eq!(status, ZkvmStatus::Fail);
 }
+
+/* ============================================================================
+ * Map to curve
+ * ============================================================================ */
+
+/// Official EIP-2537 vectors for MAP_FP_TO_G1, from https://github.com/ethereum/EIPs/blob/master/assets/eip-2537/map_fp_to_G1_bls.json
+const MAP_FP_TO_G1_VECTORS: [([u8; 48], [u8; 96]); 2] = [
+    // "bls_g1map_"
+    (
+        hex!("156c8a6a2c184569d69a76be144b5cdc5141d2d2ca4fe341f011e25e3969c55ad9e9b9ce2eb833c81a908e5fa4ac5f03"),
+        hex!(
+            "184bb665c37ff561a89ec2122dd343f20e0f4cbcaec84e3c3052ea81d1834e192c426074b02ed3dca4e7676ce4ce48ba"
+            "04407b8d35af4dacc809927071fc0405218f1401a6d15af775810e4e460064bcc9468beeba82fdc751be70476c888bf3"
+        ),
+    ),
+    // "bls_g1map_616263"
+    (
+        hex!("147e1ed29f06e4c5079b9d14fc89d2820d32419b990c1c7bb7dbea2a36a045124b31ffbde7c99329c05c559af1c6cc82"),
+        hex!(
+            "009769f3ab59bfd551d53a5f846b9984c59b97d6842b20a2c565baa167945e3d026a3755b6345df8ec7e6acb6868ae6d"
+            "1532c00cf61aa3d0ce3e5aa20c3b531a2abd2c770a790a2613818303c6b830ffc0ecf6c357af3317b9575c567f11cd2c"
+        ),
+    ),
+];
+
+/// Official EIP-2537 vectors for MAP_FP2_TO_G2, from https://github.com/ethereum/EIPs/blob/master/assets/eip-2537/map_fp2_to_G2_bls.json
+const MAP_FP2_TO_G2_VECTORS: [([u8; 96], [u8; 192]); 2] = [
+    // "bls_g2map_"
+    (
+        hex!(
+            "07355d25caf6e7f2f0cb2812ca0e513bd026ed09dda65b177500fa31714e09ea0ded3a078b526bed3307f804d4b93b04"
+            "02829ce3c021339ccb5caf3e187f6370e1e2a311dec9b75363117063ab2015603ff52c3d3b98f19c2f65575e99e8b78c"
+        ),
+        hex!(
+            "00e7f4568a82b4b7dc1f14c6aaa055edf51502319c723c4dc2688c7fe5944c213f510328082396515734b6612c4e7bb7"
+            "126b855e9e69b1f691f816e48ac6977664d24d99f8724868a184186469ddfd4617367e94527d4b74fc86413483afb35b"
+            "0caead0fd7b6176c01436833c79d305c78be307da5f6af6c133c47311def6ff1e0babf57a0fb5539fce7ee12407b0a42"
+            "1498aadcf7ae2b345243e281ae076df6de84455d766ab6fcdaad71fab60abb2e8b980a440043cd305db09d283c895e3d"
+        ),
+    ),
+    // "bls_g2map_616263"
+    (
+        hex!(
+            "138879a9559e24cecee8697b8b4ad32cced053138ab913b99872772dc753a2967ed50aabc907937aefb2439ba06cc50c"
+            "0a1ae7999ea9bab1dcc9ef8887a6cb6e8f1e22566015428d220b7eec90ffa70ad1f624018a9ad11e78d588bd3617f9f2"
+        ),
+        hex!(
+            "108ed59fd9fae381abfd1d6bce2fd2fa220990f0f837fa30e0f27914ed6e1454db0d1ee957b219f61da6ff8be0d6441f"
+            "0296238ea82c6d4adb3c838ee3cb2346049c90b96d602d7bb1b469b905c9228be25c627bffee872def773d5b2a2eb57d"
+            "033f90f6057aadacae7963b0a0b379dd46750c1c94a6357c99b65f63b79e321ff50fe3053330911c56b6ceea08fee656"
+            "153606c417e59fb331b7ae6bce4fbf7c5190c33ce9402b5ebe2b70e44fca614f3f1382a3625ed5493843d0b0a652fc3f"
+        ),
+    ),
+];
+
+/// The largest canonical field element.
+const BLS_FP_MAX: [u8; 48] =
+    hex!("1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaaa");
+
+/// The base field modulus itself, which is not a canonical field element.
+const BLS_FP_MODULUS: [u8; 48] =
+    hex!("1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab");
+
+#[test]
+fn bls12_map_fp_to_g1_vectors() {
+    for (input, expected) in MAP_FP_TO_G1_VECTORS {
+        let mut output = ZkvmBls12381G1Point { data: [0xff; 96] };
+        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: input }, &mut output).unwrap();
+        assert_eq!(output.data, expected, "input={input:?}");
+    }
+}
+
+#[test]
+fn bls12_map_fp2_to_g2_vectors() {
+    for (input, expected) in MAP_FP2_TO_G2_VECTORS {
+        let mut output = ZkvmBls12381G2Point { data: [0xff; 192] };
+        bls12_381_map_fp2_to_g2(&ZkvmBls12381Fp2 { data: input }, &mut output).unwrap();
+        assert_eq!(output.data, expected, "input={input:?}");
+    }
+}
+
+/// Mapped points must be valid members of the prime-order subgroup.
+///
+/// MSM re-parses the point and validates subgroup membership, so this is an
+/// independent check that the cofactor was cleared; multiplying by one must
+/// return the point itself.
+#[test]
+fn bls12_map_lands_in_prime_order_subgroup() {
+    let mapped = ZkvmBls12381G1Point { data: MAP_FP_TO_G1_VECTORS[0].1 };
+    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
+    bls12_381_g1_msm(&[ZkvmBls12381G1MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
+        .expect("mapped G1 point must be in the prime-order subgroup");
+    assert_eq!(output.data, mapped.data);
+
+    let mapped = ZkvmBls12381G2Point { data: MAP_FP2_TO_G2_VECTORS[0].1 };
+    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
+    bls12_381_g2_msm(&[ZkvmBls12381G2MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
+        .expect("mapped G2 point must be in the prime-order subgroup");
+    assert_eq!(output.data, mapped.data);
+}
+
+#[test]
+fn bls12_map_field_element_range() {
+    let mut g1 = ZkvmBls12381G1Point { data: [0; 96] };
+    let mut g2 = ZkvmBls12381G2Point { data: [0; 192] };
+
+    // The largest canonical element is accepted, the modulus itself is not.
+    assert_eq!(bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: BLS_FP_MAX }, &mut g1), Ok(()));
+    assert_eq!(
+        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: BLS_FP_MODULUS }, &mut g1),
+        Err(Error::FieldElementInvalid)
+    );
+    assert_eq!(
+        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: [0xff; 48] }, &mut g1),
+        Err(Error::FieldElementInvalid)
+    );
+
+    // Either half of an Fp2 input is checked.
+    let mut c0_bad = ZkvmBls12381Fp2 { data: [0; 96] };
+    c0_bad.data[..48].copy_from_slice(&BLS_FP_MODULUS);
+    assert_eq!(bls12_381_map_fp2_to_g2(&c0_bad, &mut g2), Err(Error::FieldElementInvalid));
+
+    let mut c1_bad = ZkvmBls12381Fp2 { data: [0; 96] };
+    c1_bad.data[48..].copy_from_slice(&BLS_FP_MODULUS);
+    assert_eq!(bls12_381_map_fp2_to_g2(&c1_bad, &mut g2), Err(Error::FieldElementInvalid));
+}
+
+#[test]
+fn zkvm_bls12_map_smoke() {
+    let (fp, expected) = MAP_FP_TO_G1_VECTORS[0];
+    let field_element = ZkvmBls12381Fp { data: fp };
+    let mut g1 = ZkvmBls12381G1Point { data: [0xff; 96] };
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, &mut g1) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g1.data, expected);
+
+    let (fp2, expected) = MAP_FP2_TO_G2_VECTORS[0];
+    let field_element = ZkvmBls12381Fp2 { data: fp2 };
+    let mut g2 = ZkvmBls12381G2Point { data: [0xff; 192] };
+    let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, &mut g2) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(g2.data, expected);
+
+    // A non-canonical field element maps to the failure status.
+    let not_canonical = ZkvmBls12381Fp { data: BLS_FP_MODULUS };
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(&not_canonical, &mut g1) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}
+
+#[test]
+fn zkvm_bls12_map_null_pointers() {
+    let field_element = ZkvmBls12381Fp { data: MAP_FP_TO_G1_VECTORS[0].0 };
+    let mut g1 = ZkvmBls12381G1Point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(core::ptr::null(), &mut g1) };
+    assert_eq!(status, ZkvmStatus::Fail);
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+
+    let field_element = ZkvmBls12381Fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 };
+    let mut g2 = ZkvmBls12381G2Point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_map_fp2_to_g2(core::ptr::null(), &mut g2) };
+    assert_eq!(status, ZkvmStatus::Fail);
+    let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, core::ptr::null_mut()) };
+    assert_eq!(status, ZkvmStatus::Fail);
+}

From 06b1b06a1a01fb831245776c92f8d3c588faf224 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 11 Aug 2026 22:40:31 +0200
Subject: [PATCH 86/94] refactor: dogfood zkVM accelerator interface

---
 Cargo.lock                                    |  11 +-
 Cargo.toml                                    |   2 +
 bin/stateless-guest/Cargo.lock                |  34 +-
 crates/accelerators/Cargo.toml                |   6 +
 crates/accelerators/src/ffi/blake2.rs         |  12 +-
 crates/accelerators/src/ffi/bls12_381.rs      |  91 +-
 crates/accelerators/src/ffi/bn254.rs          |  43 +-
 crates/accelerators/src/ffi/ecdsa.rs          |  49 +-
 crates/accelerators/src/ffi/hash.rs           |  22 +-
 crates/accelerators/src/ffi/kzg.rs            |  20 +-
 crates/accelerators/src/ffi/modexp.rs         |  13 +-
 crates/accelerators/src/ops/blake2/mod.rs     |  44 +-
 .../accelerators/src/ops/blake2/portable.rs   |  76 --
 crates/accelerators/src/ops/bls12_381/map.rs  |   8 +-
 crates/accelerators/src/ops/bls12_381/mod.rs  | 102 +-
 crates/accelerators/src/ops/bn254/mod.rs      |  36 +-
 crates/accelerators/src/ops/mod.rs            |  27 +-
 crates/accelerators/src/ops/modexp.rs         |  57 +-
 crates/accelerators/src/types.rs              |  28 +-
 .../tests/conformance/bls12_381.rs            |  10 +-
 .../accelerators/tests/conformance/ecdsa.rs   |  25 +-
 crates/accelerators/tests/conformance/kzg.rs  |   4 +-
 .../accelerators/tests/conformance/modexp.rs  |  12 +-
 crates/revm-crypto/Cargo.toml                 |  18 +-
 crates/revm-crypto/src/lib.rs                 | 879 +++++++-----------
 25 files changed, 719 insertions(+), 910 deletions(-)
 delete mode 100644 crates/accelerators/src/ops/blake2/portable.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5e5419547..a89c4bd7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6804,6 +6804,7 @@ dependencies = [
  "openvm-pairing-guest",
  "openvm-sha2",
  "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "revm-precompile 36.0.3",
  "ripemd",
 ]
 
@@ -7751,15 +7752,7 @@ version = "0.4.0"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
- "aurora-engine-modexp",
- "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
- "openvm-curve-utils",
- "openvm-ecc-guest",
- "openvm-keccak256",
- "openvm-kzg",
- "openvm-pairing",
- "openvm-sha2",
- "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "openvm-accelerators",
  "revm 40.0.3",
  "revm-primitives 24.0.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index b9aa23503..0e45bb4a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,6 +59,7 @@ zstd = { version = "0.13", default-features = false }
 
 # workspace
 openvm-curve-utils = { path = "./crates/curve-utils", default-features = false }
+openvm-accelerators = { path = "./crates/accelerators", default-features = false }
 openvm-kzg = { path = "./crates/kzg", default-features = false }
 openvm-mpt = { path = "./crates/mpt" }
 openvm-revm-crypto = { path = "./crates/revm-crypto" }
@@ -86,6 +87,7 @@ reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v2.3.0", d
 
 # revm
 revm = { version = "=40.0.3", features = ["serde"], default-features = false }
+revm-precompile = { version = "=36.0.3", default-features = false }
 revm-primitives = { version = "=24.0.1", default-features = false }
 
 # alloy
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 46c3bb510..8279dd5bf 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2463,6 +2463,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "openvm-accelerators"
+version = "0.4.0"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-serialize 0.5.0",
+ "aurora-engine-modexp",
+ "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "openvm-curve-utils",
+ "openvm-ecc-guest",
+ "openvm-keccak256",
+ "openvm-kzg",
+ "openvm-pairing",
+ "openvm-pairing-guest",
+ "openvm-sha2",
+ "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "revm-precompile",
+ "ripemd",
+]
+
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
@@ -2627,6 +2649,7 @@ version = "2.0.0"
 source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
  "group",
+ "halo2curves-axiom",
  "hex-literal",
  "itertools 0.14.0",
  "num-bigint",
@@ -2649,6 +2672,7 @@ name = "openvm-pairing-guest"
 version = "2.0.0"
 source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
 dependencies = [
+ "halo2curves-axiom",
  "hex-literal",
  "itertools 0.14.0",
  "lazy_static",
@@ -2681,15 +2705,7 @@ version = "0.4.0"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
- "aurora-engine-modexp",
- "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
- "openvm-curve-utils",
- "openvm-ecc-guest",
- "openvm-keccak256",
- "openvm-kzg",
- "openvm-pairing",
- "openvm-sha2",
- "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
+ "openvm-accelerators",
  "revm",
  "revm-primitives",
 ]
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index e919e9fd2..5b3baff20 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -25,6 +25,7 @@ ark-ec = { version = "0.5", default-features = false }
 ark-serialize = { version = "0.5", default-features = false }
 aurora-engine-modexp = { version = "1.2.0", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
+revm-precompile.workspace = true
 
 # The OpenVM-accelerated k256 fork; its ECDSA recovery relies on zkVM hints
 # and is unimplemented outside the guest.
@@ -51,6 +52,11 @@ ignored = ["openvm-pairing-guest"]
 [package.metadata.cargo-machete]
 ignored = ["openvm-pairing-guest"]
 
+[[test]]
+name = "conformance"
+path = "tests/conformance/main.rs"
+required-features = ["ffi"]
+
 [features]
 default = ["ffi"]
 # The extern "C" `zkvm_*` symbols. Rust consumers that only need `ops` can
diff --git a/crates/accelerators/src/ffi/blake2.rs b/crates/accelerators/src/ffi/blake2.rs
index fb43c0ff4..a08840a7f 100644
--- a/crates/accelerators/src/ffi/blake2.rs
+++ b/crates/accelerators/src/ffi/blake2.rs
@@ -26,10 +26,12 @@ pub unsafe extern "C" fn zkvm_blake2f(
     if h.is_null() || m.is_null() || t.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (h, m, t) = unsafe { (&mut *h, &*m, &*t) };
-    match ops::blake2f(rounds, h, m, t, f) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
+    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
+    let (mut state, message, offset) = unsafe { (h.read(), m.read(), t.read()) };
+    if ops::blake2f(rounds, &mut state, &message, &offset, f).is_err() {
+        return ZkvmStatus::Fail;
     }
+    // SAFETY: `h` is non-NULL and valid for writes.
+    unsafe { h.write(state) };
+    ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
index 9dcc6c73b..3e802b12a 100644
--- a/crates/accelerators/src/ffi/bls12_381.rs
+++ b/crates/accelerators/src/ffi/bls12_381.rs
@@ -26,10 +26,15 @@ pub unsafe extern "C" fn zkvm_bls12_g1_add(
     if p1.is_null() || p2.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
-    match ops::bls12_381_g1_add(p1, p2, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
+    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
+    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
+    match ops::bls12_381_g1_add(&p1, &p2, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -55,10 +60,13 @@ pub unsafe extern "C" fn zkvm_bls12_g1_msm(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let result = unsafe { &mut *result };
-    match ops::bls12_381_g1_msm(pairs, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
+    match ops::bls12_381_g1_msm(pairs, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -81,10 +89,15 @@ pub unsafe extern "C" fn zkvm_bls12_g2_add(
     if p1.is_null() || p2.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
-    match ops::bls12_381_g2_add(p1, p2, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
+    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
+    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
+    match ops::bls12_381_g2_add(&p1, &p2, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -110,10 +123,13 @@ pub unsafe extern "C" fn zkvm_bls12_g2_msm(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let result = unsafe { &mut *result };
-    match ops::bls12_381_g2_msm(pairs, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
+    match ops::bls12_381_g2_msm(pairs, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -140,11 +156,18 @@ pub unsafe extern "C" fn zkvm_bls12_pairing(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let verified = unsafe { &mut *verified };
-    match ops::bls12_381_pairing_check(pairs, verified) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
+    let mut value = false;
+    match ops::bls12_381_pairing_check(pairs, &mut value) {
+        Ok(()) => {
+            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
+            unsafe { verified.write(value) };
+            ZkvmStatus::Ok
+        }
+        Err(_) => {
+            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
+            unsafe { verified.write(false) };
+            ZkvmStatus::Fail
+        }
     }
 }
 
@@ -165,10 +188,15 @@ pub unsafe extern "C" fn zkvm_bls12_map_fp_to_g1(
     if field_element.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (field_element, result) = unsafe { (&*field_element, &mut *result) };
-    match ops::bls12_381_map_fp_to_g1(field_element, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
+    let field_element = unsafe { field_element.read() };
+    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
+    match ops::bls12_381_map_fp_to_g1(&field_element, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -190,10 +218,15 @@ pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
     if field_element.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (field_element, result) = unsafe { (&*field_element, &mut *result) };
-    match ops::bls12_381_map_fp2_to_g2(field_element, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
+    let field_element = unsafe { field_element.read() };
+    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
+    match ops::bls12_381_map_fp2_to_g2(&field_element, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
diff --git a/crates/accelerators/src/ffi/bn254.rs b/crates/accelerators/src/ffi/bn254.rs
index a866c845c..7dae5301f 100644
--- a/crates/accelerators/src/ffi/bn254.rs
+++ b/crates/accelerators/src/ffi/bn254.rs
@@ -23,10 +23,15 @@ pub unsafe extern "C" fn zkvm_bn254_g1_add(
     if p1.is_null() || p2.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (p1, p2, result) = unsafe { (&*p1, &*p2, &mut *result) };
-    match ops::bn254_g1_add(p1, p2, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
+    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
+    let mut value = ZkvmBn254G1Point { data: [0; 64] };
+    match ops::bn254_g1_add(&p1, &p2, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -52,10 +57,15 @@ pub unsafe extern "C" fn zkvm_bn254_g1_mul(
     if point.is_null() || scalar.is_null() || result.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (point, scalar, result) = unsafe { (&*point, &*scalar, &mut *result) };
-    match ops::bn254_g1_mul(point, scalar, result) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
+    let (point, scalar) = unsafe { (point.read(), scalar.read()) };
+    let mut value = ZkvmBn254G1Point { data: [0; 64] };
+    match ops::bn254_g1_mul(&point, &scalar, &mut value) {
+        Ok(()) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -81,10 +91,17 @@ pub unsafe extern "C" fn zkvm_bn254_pairing(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let verified = unsafe { &mut *verified };
-    match ops::bn254_pairing_check(pairs, verified) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
+    let mut value = false;
+    match ops::bn254_pairing_check(pairs, &mut value) {
+        Ok(()) => {
+            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
+            unsafe { verified.write(value) };
+            ZkvmStatus::Ok
+        }
+        Err(_) => {
+            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
+            unsafe { verified.write(false) };
+            ZkvmStatus::Fail
+        }
     }
 }
diff --git a/crates/accelerators/src/ffi/ecdsa.rs b/crates/accelerators/src/ffi/ecdsa.rs
index 266771893..a3396c33b 100644
--- a/crates/accelerators/src/ffi/ecdsa.rs
+++ b/crates/accelerators/src/ffi/ecdsa.rs
@@ -29,10 +29,15 @@ pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
     if msg.is_null() || sig.is_null() || output.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (msg, sig, output) = unsafe { (&*msg, &*sig, &mut *output) };
-    match ops::secp256k1_ecrecover(msg, sig, recid, output) {
-        Ok(()) => ZkvmStatus::Ok,
+    // SAFETY: the non-NULL inputs are valid for reads. Copying before writing supports overlap.
+    let (msg, sig) = unsafe { (msg.read(), sig.read()) };
+    let mut value = ZkvmSecp256k1Pubkey { data: [0; 64] };
+    match ops::secp256k1_ecrecover(&msg, &sig, recid, &mut value) {
+        Ok(()) => {
+            // SAFETY: `output` is non-NULL and valid for writes.
+            unsafe { output.write(value) };
+            ZkvmStatus::Ok
+        }
         Err(_) => ZkvmStatus::Fail,
     }
 }
@@ -40,9 +45,8 @@ pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
 /// Verify an ECDSA signature over secp256k1 against an uncompressed public
 /// key, writing the result to `verified`.
 ///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
-/// malformed; `verified` is `false` when a well-formed signature does not
-/// verify.
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
+/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
 ///
 /// # Safety
 ///
@@ -60,20 +64,20 @@ pub unsafe extern "C" fn zkvm_secp256k1_verify(
     if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (msg, sig, pubkey, verified) = unsafe { (&*msg, &*sig, &*pubkey, &mut *verified) };
-    match ops::secp256k1_verify(msg, sig, pubkey, verified) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
-    }
+    // SAFETY: the non-NULL inputs are valid for reads.
+    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
+    let mut value = false;
+    let _ = ops::secp256k1_verify(&msg, &sig, &pubkey, &mut value);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZkvmStatus::Ok
 }
 
 /// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
 /// public key, writing the result to `verified`.
 ///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
-/// malformed; `verified` is `false` when a well-formed signature does not
-/// verify.
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
+/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
 ///
 /// # Safety
 ///
@@ -91,10 +95,11 @@ pub unsafe extern "C" fn zkvm_secp256r1_verify(
     if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (msg, sig, pubkey, verified) = unsafe { (&*msg, &*sig, &*pubkey, &mut *verified) };
-    match ops::secp256r1_verify(msg, sig, pubkey, verified) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
-    }
+    // SAFETY: the non-NULL inputs are valid for reads.
+    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
+    let mut value = false;
+    let _ = ops::secp256r1_verify(&msg, &sig, &pubkey, &mut value);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
index 0deb16129..16f950bb7 100644
--- a/crates/accelerators/src/ffi/hash.rs
+++ b/crates/accelerators/src/ffi/hash.rs
@@ -26,9 +26,11 @@ pub unsafe extern "C" fn zkvm_keccak256(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let output = unsafe { &mut *output };
-    ops::keccak256(data, output);
+    let mut value = ZkvmKeccak256Hash { data: [0; 32] };
+    ops::keccak256(data, &mut value);
+    // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
+    // overlapping input/output storage is supported.
+    unsafe { output.write(value) };
     ZkvmStatus::Ok
 }
 
@@ -53,9 +55,10 @@ pub unsafe extern "C" fn zkvm_sha256(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let output = unsafe { &mut *output };
-    ops::sha256(data, output);
+    let mut value = ZkvmSha256Hash { data: [0; 32] };
+    ops::sha256(data, &mut value);
+    // SAFETY: see `zkvm_keccak256`.
+    unsafe { output.write(value) };
     ZkvmStatus::Ok
 }
 
@@ -83,8 +86,9 @@ pub unsafe extern "C" fn zkvm_ripemd160(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let output = unsafe { &mut *output };
-    ops::ripemd160(data, output);
+    let mut value = ZkvmRipemd160Hash { data: [0; 32] };
+    ops::ripemd160(data, &mut value);
+    // SAFETY: see `zkvm_keccak256`.
+    unsafe { output.write(value) };
     ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ffi/kzg.rs b/crates/accelerators/src/ffi/kzg.rs
index 8fb2b60ec..4b23d1bed 100644
--- a/crates/accelerators/src/ffi/kzg.rs
+++ b/crates/accelerators/src/ffi/kzg.rs
@@ -8,9 +8,8 @@ use crate::{
 /// Verify a KZG proof that the blob committed to by `commitment` evaluates
 /// to `y` at point `z`, writing the result to `verified`.
 ///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the inputs are
-/// malformed; `verified` is `false` when a well-formed proof does not
-/// verify.
+/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
+/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
 ///
 /// # Safety
 ///
@@ -28,11 +27,12 @@ pub unsafe extern "C" fn zkvm_kzg_point_eval(
     if commitment.is_null() || z.is_null() || y.is_null() || proof.is_null() || verified.is_null() {
         return ZkvmStatus::Fail;
     }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let (commitment, z, y, proof, verified) =
-        unsafe { (&*commitment, &*z, &*y, &*proof, &mut *verified) };
-    match ops::kzg_point_eval(commitment, z, y, proof, verified) {
-        Ok(()) => ZkvmStatus::Ok,
-        Err(_) => ZkvmStatus::Fail,
-    }
+    // SAFETY: the non-NULL inputs are valid for reads.
+    let (commitment, z, y, proof) =
+        unsafe { (commitment.read(), z.read(), y.read(), proof.read()) };
+    let mut value = false;
+    let _ = ops::kzg_point_eval(&commitment, &z, &y, &proof, &mut value);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ffi/modexp.rs b/crates/accelerators/src/ffi/modexp.rs
index 3733d987f..db86c7a13 100644
--- a/crates/accelerators/src/ffi/modexp.rs
+++ b/crates/accelerators/src/ffi/modexp.rs
@@ -37,12 +37,11 @@ pub unsafe extern "C" fn zkvm_modexp(
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let modulus =
         if mod_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(modulus, mod_len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let output = if mod_len == 0 {
-        &mut [][..]
-    } else {
-        unsafe { core::slice::from_raw_parts_mut(output, mod_len) }
-    };
-    ops::modexp(base, exp, modulus, output);
+    let value = ops::modexp_result(base, exp, modulus);
+    if mod_len != 0 {
+        // SAFETY: `output` is non-NULL and valid for `mod_len` writes. `value` cannot overlap it,
+        // and all caller-provided input reads are complete.
+        unsafe { core::ptr::copy_nonoverlapping(value.as_ptr(), output, mod_len) };
+    }
     ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ops/blake2/mod.rs b/crates/accelerators/src/ops/blake2/mod.rs
index 06d0c1866..4714055a7 100644
--- a/crates/accelerators/src/ops/blake2/mod.rs
+++ b/crates/accelerators/src/ops/blake2/mod.rs
@@ -1,45 +1,13 @@
 //! BLAKE2b compression function F (EIP-152).
 //!
-//! Vendored from revm-precompile, which adapted the compression function from
-//! [`blake2b_simd`](https://github.com/oconnor663/blake2_simd) (MIT license)
-//! for EIP-152 variable round counts.
-
-mod portable;
+//! Uses REVM's EIP-152 implementation so the standard interface and REVM's
+//! precompile provider share one compression function.
 
 use crate::{
     ops::Error,
     types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
 };
 
-type Word = u64;
-
-const IV: [Word; 8] = [
-    0x6A09E667F3BCC908,
-    0xBB67AE8584CAA73B,
-    0x3C6EF372FE94F82B,
-    0xA54FF53A5F1D36F1,
-    0x510E527FADE682D1,
-    0x9B05688C2B3E6C1F,
-    0x1F83D9ABFB41BD6B,
-    0x5BE0CD19137E2179,
-];
-
-// SIGMA has spec period 10 (RFC 7693 §2.7). BLAKE2b runs 12 rounds by reusing
-// SIGMA[0]/SIGMA[1] for rounds 10/11; for EIP-152's variable round count we
-// must index with `r % 10`, not `r % 12`.
-const SIGMA: [[u8; 16]; 10] = [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
-    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
-    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
-    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
-    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
-    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
-    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
-    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
-    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
-];
-
 /// Apply the BLAKE2 compression function F to the state vector `h` in place.
 ///
 /// `h`, `m` and `t` hold little-endian words; `f` is the final-block
@@ -68,10 +36,16 @@ pub fn blake2f(
         u64::from_le_bytes(t.data[8..].try_into().unwrap()),
     ];
 
-    portable::compress(rounds, &mut state, &message, &offset, f == 1);
+    blake2f_words(rounds, &mut state, &message, &offset, f == 1);
 
     for (chunk, word) in h.data.chunks_exact_mut(8).zip(state.iter()) {
         chunk.copy_from_slice(&word.to_le_bytes());
     }
     Ok(())
 }
+
+/// Apply BLAKE2 compression to word-oriented state without byte conversion.
+#[inline]
+pub fn blake2f_words(rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
+    revm_precompile::blake2::compress(rounds, h, m, t, f);
+}
diff --git a/crates/accelerators/src/ops/blake2/portable.rs b/crates/accelerators/src/ops/blake2/portable.rs
deleted file mode 100644
index 2e3a52b7f..000000000
--- a/crates/accelerators/src/ops/blake2/portable.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-// Adapted from https://github.com/oconnor663/blake2_simd
-// Copyright (c) 2018 Jack O'Connor
-// Licensed under the MIT license
-
-use super::{Word, IV, SIGMA};
-
-// G is the mixing function, called eight times per round in the compression
-// function. V is the 16-word state vector of the compression function, usually
-// described as a 4x4 matrix. A, B, C, and D are the mixing indices, set by the
-// caller first to the four columns of V, and then to its four diagonals. X and
-// Y are words of input, chosen by the caller according to the message
-// schedule, SIGMA.
-#[inline(always)]
-const fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
-    v[d] = (v[d] ^ v[a]).rotate_right(32);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(24);
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
-    v[d] = (v[d] ^ v[a]).rotate_right(16);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(63);
-}
-
-#[inline(always)]
-const fn round(r: usize, m: &[Word; 16], v: &mut [Word; 16]) {
-    // Select the message schedule based on the round.
-    let s = SIGMA[r % 10];
-
-    // Mix the columns.
-    g(v, 0, 4, 8, 12, m[s[0] as usize], m[s[1] as usize]);
-    g(v, 1, 5, 9, 13, m[s[2] as usize], m[s[3] as usize]);
-    g(v, 2, 6, 10, 14, m[s[4] as usize], m[s[5] as usize]);
-    g(v, 3, 7, 11, 15, m[s[6] as usize], m[s[7] as usize]);
-
-    // Mix the rows.
-    g(v, 0, 5, 10, 15, m[s[8] as usize], m[s[9] as usize]);
-    g(v, 1, 6, 11, 12, m[s[10] as usize], m[s[11] as usize]);
-    g(v, 2, 7, 8, 13, m[s[12] as usize], m[s[13] as usize]);
-    g(v, 3, 4, 9, 14, m[s[14] as usize], m[s[15] as usize]);
-}
-
-pub(super) fn compress(rounds: u32, words: &mut [Word; 8], m: &[Word; 16], t: &[Word; 2], f: bool) {
-    // Initialize the compression state.
-    let mut v = [
-        words[0],
-        words[1],
-        words[2],
-        words[3],
-        words[4],
-        words[5],
-        words[6],
-        words[7],
-        IV[0],
-        IV[1],
-        IV[2],
-        IV[3],
-        IV[4] ^ t[0],
-        IV[5] ^ t[1],
-        IV[6] ^ if f { !0 } else { 0 },
-        IV[7],
-    ];
-
-    for i in 0..rounds as usize {
-        round(i, m, &mut v);
-    }
-
-    words[0] ^= v[0] ^ v[8];
-    words[1] ^= v[1] ^ v[9];
-    words[2] ^= v[2] ^ v[10];
-    words[3] ^= v[3] ^ v[11];
-    words[4] ^= v[4] ^ v[12];
-    words[5] ^= v[5] ^ v[13];
-    words[6] ^= v[6] ^ v[14];
-    words[7] ^= v[7] ^ v[15];
-}
diff --git a/crates/accelerators/src/ops/bls12_381/map.rs b/crates/accelerators/src/ops/bls12_381/map.rs
index c08625647..93ab05d7a 100644
--- a/crates/accelerators/src/ops/bls12_381/map.rs
+++ b/crates/accelerators/src/ops/bls12_381/map.rs
@@ -21,7 +21,9 @@ pub fn bls12_381_map_fp_to_g1(
     output: &mut ZkvmBls12381G1Point,
 ) -> Result<(), Error> {
     let fp = read_fq(&fp.data)?;
-    let point = WBMap::map_to_curve(fp).map_err(|_| Error::FieldElementInvalid)?.clear_cofactor();
+    let point = WBMap::map_to_curve(fp)
+        .expect("the arkworks WB map is defined for every field element")
+        .clear_cofactor();
 
     encode_g1_point(&point, output);
     Ok(())
@@ -35,7 +37,7 @@ pub fn bls12_381_map_fp2_to_g2(
     let c0 = read_fq(&fp2.data[..BLS_FP_LEN])?;
     let c1 = read_fq(&fp2.data[BLS_FP_LEN..])?;
     let point = WBMap::map_to_curve(Fq2::new(c0, c1))
-        .map_err(|_| Error::FieldElementInvalid)?
+        .expect("the arkworks WB map is defined for every field element")
         .clear_cofactor();
 
     encode_g2_point(&point, output);
@@ -53,7 +55,7 @@ fn read_fq(input_be: &[u8]) -> Result<Fq, Error> {
 
 /// Writes a field element as big-endian bytes.
 fn encode_fq(fq: &Fq, output: &mut [u8]) {
-    fq.serialize_uncompressed(&mut output[..]).expect("Failed to serialize field element");
+    fq.serialize_uncompressed(&mut output[..]).expect("field element serialization is infallible");
     output.reverse();
 }
 
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 17e19695b..2b14a8564 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -19,7 +19,7 @@ use openvm_ecc_guest::{
 use openvm_pairing::{bls12_381::Bls12_381, PairingCheck};
 
 use crate::{
-    ops::Error,
+    ops::{Error, StreamError},
     types::{
         ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
         ZkvmBls12381PairingPair,
@@ -52,19 +52,33 @@ pub fn bls12_381_g1_msm(
     pairs: &[ZkvmBls12381G1MsmPair],
     output: &mut ZkvmBls12381G1Point,
 ) -> Result<(), Error> {
-    if pairs.is_empty() {
-        output.data = [0u8; 96];
-        return Ok(());
-    }
+    *output = bls12_381_g1_msm_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
+        .map_err(|error| match error {
+            StreamError::Operation(error) => error,
+            StreamError::Source(never) => match never {},
+        })?;
+    Ok(())
+}
 
-    let mut points = Vec::with_capacity(pairs.len());
-    let mut scalars = Vec::with_capacity(pairs.len());
+/// BLS12-381 G1 MSM over a fallible stream, preserving input-error order.
+pub fn bls12_381_g1_msm_iter<E>(
+    pairs: impl IntoIterator<Item = Result<ZkvmBls12381G1MsmPair, E>>,
+) -> Result<ZkvmBls12381G1Point, StreamError<E>> {
+    let pairs = pairs.into_iter();
+    let capacity = pairs.size_hint().0;
+
+    let mut points = Vec::with_capacity(capacity);
+    let mut scalars = Vec::with_capacity(capacity);
     for pair in pairs {
-        points.push(read_bls_g1_point(&pair.point)?);
+        let pair = pair.map_err(StreamError::Source)?;
+        points.push(read_bls_g1_point(&pair.point).map_err(StreamError::Operation)?);
         scalars.push(read_bls_scalar(&pair.scalar));
     }
-    encode_bls_g1_point(&Bls12_381::msm(&scalars, &points), output);
-    Ok(())
+    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
+    if !points.is_empty() {
+        encode_bls_g1_point(&Bls12_381::msm(&scalars, &points), &mut output);
+    }
+    Ok(output)
 }
 
 /// BLS12-381 G2 point addition (precompile 0x0d).
@@ -90,19 +104,33 @@ pub fn bls12_381_g2_msm(
     pairs: &[ZkvmBls12381G2MsmPair],
     output: &mut ZkvmBls12381G2Point,
 ) -> Result<(), Error> {
-    if pairs.is_empty() {
-        output.data = [0u8; 192];
-        return Ok(());
-    }
+    *output = bls12_381_g2_msm_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
+        .map_err(|error| match error {
+            StreamError::Operation(error) => error,
+            StreamError::Source(never) => match never {},
+        })?;
+    Ok(())
+}
 
-    let mut points = Vec::with_capacity(pairs.len());
-    let mut scalars = Vec::with_capacity(pairs.len());
+/// BLS12-381 G2 MSM over a fallible stream, preserving input-error order.
+pub fn bls12_381_g2_msm_iter<E>(
+    pairs: impl IntoIterator<Item = Result<ZkvmBls12381G2MsmPair, E>>,
+) -> Result<ZkvmBls12381G2Point, StreamError<E>> {
+    let pairs = pairs.into_iter();
+    let capacity = pairs.size_hint().0;
+
+    let mut points = Vec::with_capacity(capacity);
+    let mut scalars = Vec::with_capacity(capacity);
     for pair in pairs {
-        points.push(read_bls_g2_point(&pair.point)?);
+        let pair = pair.map_err(StreamError::Source)?;
+        points.push(read_bls_g2_point(&pair.point).map_err(StreamError::Operation)?);
         scalars.push(read_bls_scalar(&pair.scalar));
     }
-    encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points), output);
-    Ok(())
+    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
+    if !points.is_empty() {
+        encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points), &mut output);
+    }
+    Ok(output)
 }
 
 /// BLS12-381 pairing check (precompile 0x0f).
@@ -113,18 +141,32 @@ pub fn bls12_381_pairing_check(
     verified: &mut bool,
 ) -> Result<(), Error> {
     *verified = false;
+    let value = bls12_381_pairing_check_iter(pairs.iter().copied())?;
+    *verified = value;
+    Ok(())
+}
 
-    if pairs.is_empty() {
-        *verified = true;
-        return Ok(());
-    }
+/// BLS12-381 pairing check over a stream of encoded pairs.
+pub fn bls12_381_pairing_check_iter(
+    pairs: impl IntoIterator<Item = ZkvmBls12381PairingPair>,
+) -> Result<bool, Error> {
+    let pairs = pairs.into_iter();
+    let capacity = pairs.size_hint().0;
 
-    let mut g1_points = Vec::with_capacity(pairs.len());
-    let mut g2_points = Vec::with_capacity(pairs.len());
+    let mut g1_points = Vec::with_capacity(capacity);
+    let mut g2_points = Vec::with_capacity(capacity);
 
     for pair in pairs {
-        let g1 = read_bls_g1_point(&pair.g1)?;
-        let g2 = read_bls_g2_point(&pair.g2)?;
+        let g1 = read_bls_g1_point(&pair.g1).map_err(|error| match error {
+            Error::PointNotOnCurve => Error::BlsG1PointNotOnCurve,
+            Error::PointNotInSubgroup => Error::BlsG1PointNotInSubgroup,
+            error => error,
+        })?;
+        let g2 = read_bls_g2_point(&pair.g2).map_err(|error| match error {
+            Error::PointNotOnCurve => Error::BlsG2PointNotOnCurve,
+            Error::PointNotInSubgroup => Error::BlsG2PointNotInSubgroup,
+            error => error,
+        })?;
 
         let (g1_x, g1_y) = g1.into_coords();
         let (g2_x, g2_y) = g2.into_coords();
@@ -133,6 +175,8 @@ pub fn bls12_381_pairing_check(
         g2_points.push(AffinePoint::new(g2_x, g2_y));
     }
 
-    *verified = Bls12_381::pairing_check(&g1_points, &g2_points).is_ok();
-    Ok(())
+    if g1_points.is_empty() {
+        return Ok(true);
+    }
+    Ok(Bls12_381::pairing_check(&g1_points, &g2_points).is_ok())
 }
diff --git a/crates/accelerators/src/ops/bn254/mod.rs b/crates/accelerators/src/ops/bn254/mod.rs
index 10041166a..a2fcad052 100644
--- a/crates/accelerators/src/ops/bn254/mod.rs
+++ b/crates/accelerators/src/ops/bn254/mod.rs
@@ -12,7 +12,7 @@ use openvm_ecc_guest::{
 use openvm_pairing::{bn254::Bn254, PairingCheck};
 
 use crate::{
-    ops::Error,
+    ops::{Error, StreamError},
     types::{ZkvmBn254G1Point, ZkvmBn254PairingPair, ZkvmBn254Scalar},
 };
 
@@ -46,18 +46,30 @@ pub fn bn254_pairing_check(
     verified: &mut bool,
 ) -> Result<(), Error> {
     *verified = false;
+    let value =
+        bn254_pairing_check_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
+            .map_err(|error| match error {
+                StreamError::Operation(error) => error,
+                StreamError::Source(never) => match never {},
+            })?;
+    *verified = value;
+    Ok(())
+}
 
-    if pairs.is_empty() {
-        *verified = true;
-        return Ok(());
-    }
+/// BN254 pairing check over a stream of encoded pairs.
+pub fn bn254_pairing_check_iter<E>(
+    pairs: impl IntoIterator<Item = Result<ZkvmBn254PairingPair, E>>,
+) -> Result<bool, StreamError<E>> {
+    let pairs = pairs.into_iter();
+    let capacity = pairs.size_hint().0;
 
-    let mut g1_points = Vec::with_capacity(pairs.len());
-    let mut g2_points = Vec::with_capacity(pairs.len());
+    let mut g1_points = Vec::with_capacity(capacity);
+    let mut g2_points = Vec::with_capacity(capacity);
 
     for pair in pairs {
-        let g1 = read_bn_g1_point(&pair.g1)?;
-        let g2 = read_bn_g2_point(&pair.g2)?;
+        let pair = pair.map_err(StreamError::Source)?;
+        let g1 = read_bn_g1_point(&pair.g1).map_err(StreamError::Operation)?;
+        let g2 = read_bn_g2_point(&pair.g2).map_err(StreamError::Operation)?;
 
         let (g1_x, g1_y) = g1.into_coords();
         let (g2_x, g2_y) = g2.into_coords();
@@ -66,6 +78,8 @@ pub fn bn254_pairing_check(
         g2_points.push(AffinePoint::new(g2_x, g2_y));
     }
 
-    *verified = Bn254::pairing_check(&g1_points, &g2_points).is_ok();
-    Ok(())
+    if g1_points.is_empty() {
+        return Ok(true);
+    }
+    Ok(Bn254::pairing_check(&g1_points, &g2_points).is_ok())
 }
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 258a55ac0..2072ba6aa 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -12,16 +12,25 @@ mod hash;
 mod kzg;
 mod modexp;
 
-pub use blake2::blake2f;
+pub use blake2::{blake2f, blake2f_words};
 pub use bls12_381::{
-    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check,
+    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g1_msm_iter, bls12_381_g2_add, bls12_381_g2_msm,
+    bls12_381_g2_msm_iter, bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1,
+    bls12_381_pairing_check, bls12_381_pairing_check_iter,
 };
-pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check};
+pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check, bn254_pairing_check_iter};
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
 pub use kzg::kzg_point_eval;
-pub use modexp::modexp;
+pub use modexp::{modexp, modexp_result};
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum StreamError<E> {
+    /// The input iterator produced an error.
+    Source(E),
+    /// An accelerator operation rejected an input.
+    Operation(Error),
+}
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
@@ -31,6 +40,14 @@ pub enum Error {
     PointNotOnCurve,
     /// A point is on the curve but not in the prime-order subgroup.
     PointNotInSubgroup,
+    /// A BLS12-381 pairing G1 point does not satisfy the curve equation.
+    BlsG1PointNotOnCurve,
+    /// A BLS12-381 pairing G1 point is not in the prime-order subgroup.
+    BlsG1PointNotInSubgroup,
+    /// A BLS12-381 pairing G2 point does not satisfy the curve equation.
+    BlsG2PointNotOnCurve,
+    /// A BLS12-381 pairing G2 point is not in the prime-order subgroup.
+    BlsG2PointNotInSubgroup,
     /// The BLAKE2f final-block flag is neither 0 nor 1.
     InvalidFinalFlag,
     /// A signature could not be parsed or key recovery failed.
diff --git a/crates/accelerators/src/ops/modexp.rs b/crates/accelerators/src/ops/modexp.rs
index 5652d7362..88afd49fa 100644
--- a/crates/accelerators/src/ops/modexp.rs
+++ b/crates/accelerators/src/ops/modexp.rs
@@ -17,21 +17,36 @@ const BN_SCALAR_LEN: usize = 32;
 pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8], output: &mut [u8]) {
     assert_eq!(output.len(), modulus.len(), "output must be exactly modulus-sized");
 
-    let result = if is_bn254_fr(modulus) {
+    output.copy_from_slice(&modexp_result(base, exp, modulus));
+}
+
+/// Compute `base^exp % modulus`, returning exactly `modulus.len()` bytes.
+pub fn modexp_result(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
+    let mut result = if is_bn254_fr(modulus) {
         accelerated_modexp_bn254_fr(base, exp)
     } else {
         aurora_engine_modexp::modexp(base, exp, modulus)
     };
 
-    // The result is numerically reduced, but its byte representation may be
-    // shorter or longer (leading zeros); right-align it.
-    if result.len() >= output.len() {
-        output.copy_from_slice(&result[result.len() - output.len()..]);
-    } else {
-        let pad = output.len() - result.len();
-        output[..pad].fill(0);
-        output[pad..].copy_from_slice(&result);
+    // The result is numerically reduced, but its byte representation may not
+    // be modulus-sized. Reuse its allocation while right-aligning it.
+    let output_len = modulus.len();
+    match result.len().cmp(&output_len) {
+        core::cmp::Ordering::Greater => {
+            let start = result.len() - output_len;
+            result.copy_within(start.., 0);
+            result.truncate(output_len);
+        }
+        core::cmp::Ordering::Less => {
+            let value_len = result.len();
+            let padding = output_len - value_len;
+            result.resize(output_len, 0);
+            result.copy_within(0..value_len, padding);
+            result[..padding].fill(0);
+        }
+        core::cmp::Ordering::Equal => {}
     }
+    result
 }
 
 /// Returns true if the modulus (big-endian, possibly with leading zeros) equals BN254 Fr.
@@ -60,17 +75,18 @@ fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
 mod tests {
     use super::*;
 
-    /// BN254 Fr modulus in big-endian bytes
-    fn bn254_fr_modulus_be() -> Vec<u8> {
-        bn::Scalar::MODULUS.as_ref().iter().rev().copied().collect()
-    }
+    /// EIP-197 BN254 scalar-field modulus, independently specified in big-endian order.
+    const BN254_FR: [u8; 32] = [
+        0x30, 0x64, 0x4e, 0x72, 0xe1, 0x31, 0xa0, 0x29, 0xb8, 0x50, 0x45, 0xb6, 0x81, 0x81, 0x58,
+        0x5d, 0x28, 0x33, 0xe8, 0x48, 0x79, 0xb9, 0x70, 0x91, 0x43, 0xe1, 0xf5, 0x93, 0xf0, 0x00,
+        0x00, 0x01,
+    ];
 
     /// Helper: run the accelerated path and compare against the aurora
     /// reference. The accelerated path always returns BN_SCALAR_LEN bytes,
     /// so the reference output is left-padded to match.
     fn check(base: &[u8], exp: &[u8]) {
-        let modulus = bn254_fr_modulus_be();
-        let expected = aurora_engine_modexp::modexp(base, exp, &modulus);
+        let expected = aurora_engine_modexp::modexp(base, exp, &BN254_FR);
         let actual = accelerated_modexp_bn254_fr(base, exp);
         let mut expected_padded = vec![0u8; BN_SCALAR_LEN];
         let offset = BN_SCALAR_LEN - expected.len();
@@ -81,18 +97,18 @@ mod tests {
     #[test]
     fn test_is_bn254_fr() {
         // Exact modulus
-        assert!(is_bn254_fr(&bn254_fr_modulus_be()));
+        assert!(is_bn254_fr(&BN254_FR));
 
         // With leading zeros
         let mut padded = vec![0u8; 10];
-        padded.extend_from_slice(&bn254_fr_modulus_be());
+        padded.extend_from_slice(&BN254_FR);
         assert!(is_bn254_fr(&padded));
 
         // All zeros → false
         assert!(!is_bn254_fr(&[0u8; 32]));
 
         // Wrong modulus (flip last bit)
-        let mut m = bn254_fr_modulus_be();
+        let mut m = BN254_FR;
         *m.last_mut().unwrap() ^= 1;
         assert!(!is_bn254_fr(&m));
     }
@@ -108,9 +124,8 @@ mod tests {
         check(&[0, 0, 0, 3], &[5]); // leading zeros in base
 
         // --- short base, value >= modulus (triggers the reduce fallback) ---
-        let m = bn254_fr_modulus_be();
-        check(&m, &[1]); // Fr mod Fr = 0, so 0^1 = 0
-        let mut m_plus_1 = m.clone();
+        check(&BN254_FR, &[1]); // Fr mod Fr = 0, so 0^1 = 0
+        let mut m_plus_1 = BN254_FR;
         *m_plus_1.last_mut().unwrap() += 1;
         check(&m_plus_1, &[2]); // (Fr+1)^2 mod Fr = 1
         check(&[0xff; 32], &[1]); // max 256-bit value, >= modulus
diff --git a/crates/accelerators/src/types.rs b/crates/accelerators/src/types.rs
index 56c2694ef..b76b7da11 100644
--- a/crates/accelerators/src/types.rs
+++ b/crates/accelerators/src/types.rs
@@ -139,34 +139,12 @@ pub type ZkvmKzgCommitment = ZkvmBytes48;
 pub type ZkvmKzgProof = ZkvmBytes48;
 pub type ZkvmKzgFieldElement = ZkvmBytes32;
 
-// Assert 8-byte alignment and sizes.
+// Pin the non-trivial aggregate layouts exposed by the canonical C header.
 const _: () = {
-    use core::mem::{align_of, size_of};
-
-    assert!(size_of::<ZkvmStatus>() == 4);
-    assert!(align_of::<ZkvmStatus>() == 4);
-
-    assert!(size_of::<ZkvmBytes16>() == 16);
-    assert!(size_of::<ZkvmBytes32>() == 32);
-    assert!(size_of::<ZkvmBytes48>() == 48);
-    assert!(size_of::<ZkvmBytes64>() == 64);
-    assert!(size_of::<ZkvmBytes96>() == 96);
-    assert!(size_of::<ZkvmBytes128>() == 128);
-    assert!(size_of::<ZkvmBytes192>() == 192);
+    use core::mem::size_of;
+
     assert!(size_of::<ZkvmBn254PairingPair>() == 192);
     assert!(size_of::<ZkvmBls12381G1MsmPair>() == 128);
     assert!(size_of::<ZkvmBls12381G2MsmPair>() == 224);
     assert!(size_of::<ZkvmBls12381PairingPair>() == 288);
-
-    assert!(align_of::<ZkvmBytes16>() == 8);
-    assert!(align_of::<ZkvmBytes32>() == 8);
-    assert!(align_of::<ZkvmBytes48>() == 8);
-    assert!(align_of::<ZkvmBytes64>() == 8);
-    assert!(align_of::<ZkvmBytes96>() == 8);
-    assert!(align_of::<ZkvmBytes128>() == 8);
-    assert!(align_of::<ZkvmBytes192>() == 8);
-    assert!(align_of::<ZkvmBn254PairingPair>() == 8);
-    assert!(align_of::<ZkvmBls12381G1MsmPair>() == 8);
-    assert!(align_of::<ZkvmBls12381G2MsmPair>() == 8);
-    assert!(align_of::<ZkvmBls12381PairingPair>() == 8);
 };
diff --git a/crates/accelerators/tests/conformance/bls12_381.rs b/crates/accelerators/tests/conformance/bls12_381.rs
index d1d827d73..87e3aabd3 100644
--- a/crates/accelerators/tests/conformance/bls12_381.rs
+++ b/crates/accelerators/tests/conformance/bls12_381.rs
@@ -179,7 +179,7 @@ fn bls12_rejects_invalid_points() {
 
     let pairs = [ZkvmBls12381PairingPair { g1: off_curve_g1, g2: BLS_G2_GEN }];
     let mut verified = true;
-    assert!(bls12_381_pairing_check(&pairs, &mut verified).is_err());
+    assert_eq!(bls12_381_pairing_check(&pairs, &mut verified), Err(Error::BlsG1PointNotOnCurve));
     assert!(!verified);
 }
 
@@ -314,13 +314,17 @@ fn bls12_map_fp2_to_g2_vectors() {
 /// return the point itself.
 #[test]
 fn bls12_map_lands_in_prime_order_subgroup() {
-    let mapped = ZkvmBls12381G1Point { data: MAP_FP_TO_G1_VECTORS[0].1 };
+    let mut mapped = ZkvmBls12381G1Point { data: [0; 96] };
+    bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: MAP_FP_TO_G1_VECTORS[0].0 }, &mut mapped)
+        .unwrap();
     let mut output = ZkvmBls12381G1Point { data: [0; 96] };
     bls12_381_g1_msm(&[ZkvmBls12381G1MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
         .expect("mapped G1 point must be in the prime-order subgroup");
     assert_eq!(output.data, mapped.data);
 
-    let mapped = ZkvmBls12381G2Point { data: MAP_FP2_TO_G2_VECTORS[0].1 };
+    let mut mapped = ZkvmBls12381G2Point { data: [0; 192] };
+    bls12_381_map_fp2_to_g2(&ZkvmBls12381Fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 }, &mut mapped)
+        .unwrap();
     let mut output = ZkvmBls12381G2Point { data: [0; 192] };
     bls12_381_g2_msm(&[ZkvmBls12381G2MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
         .expect("mapped G2 point must be in the prime-order subgroup");
diff --git a/crates/accelerators/tests/conformance/ecdsa.rs b/crates/accelerators/tests/conformance/ecdsa.rs
index 3230f324e..e4710250d 100644
--- a/crates/accelerators/tests/conformance/ecdsa.rs
+++ b/crates/accelerators/tests/conformance/ecdsa.rs
@@ -4,7 +4,7 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::zkvm_secp256r1_verify,
+    ffi::{zkvm_secp256k1_ecrecover, zkvm_secp256k1_verify, zkvm_secp256r1_verify},
     ops::{keccak256, secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, Error},
     types::{
         ZkvmKeccak256Hash, ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature,
@@ -72,10 +72,10 @@ fn zkvm_secp256r1_verify_smoke() {
     assert_eq!(status, ZkvmStatus::Ok);
     assert!(verified);
 
-    // Malformed inputs map to the failure status.
+    // Malformed cryptographic inputs are a completed verification with a false result.
     let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
     let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZkvmStatus::Ok);
     assert!(!verified);
 }
 
@@ -156,3 +156,22 @@ fn secp256k1_verify_roundtrip() {
     assert_eq!(result, Err(Error::PointNotOnCurve));
     assert!(!verified);
 }
+
+#[test]
+fn zkvm_secp256k1_recover_and_verify() {
+    let mut pubkey = core::mem::MaybeUninit::<ZkvmSecp256k1Pubkey>::uninit();
+    let status = unsafe { zkvm_secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, pubkey.as_mut_ptr()) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    let pubkey = unsafe { pubkey.assume_init() };
+
+    let mut verified = core::mem::MaybeUninit::<bool>::uninit();
+    let status = unsafe { zkvm_secp256k1_verify(&K1_MSG, &K1_SIG, &pubkey, verified.as_mut_ptr()) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    let mut verified = unsafe { verified.assume_init() };
+    assert!(verified);
+
+    let bad_pubkey = ZkvmSecp256k1Pubkey { data: [0xff; 64] };
+    let status = unsafe { zkvm_secp256k1_verify(&K1_MSG, &K1_SIG, &bad_pubkey, &mut verified) };
+    assert_eq!(status, ZkvmStatus::Ok);
+    assert!(!verified);
+}
diff --git a/crates/accelerators/tests/conformance/kzg.rs b/crates/accelerators/tests/conformance/kzg.rs
index 74dba8e1f..0c425139a 100644
--- a/crates/accelerators/tests/conformance/kzg.rs
+++ b/crates/accelerators/tests/conformance/kzg.rs
@@ -70,11 +70,11 @@ fn zkvm_kzg_point_eval_smoke() {
     assert_eq!(status, ZkvmStatus::Ok);
     assert!(verified);
 
-    // Malformed inputs map to the failure status.
+    // Malformed cryptographic inputs are a completed verification with a false result.
     let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
     garbage.data[0] = 0x01;
     let status = unsafe { zkvm_kzg_point_eval(&garbage, &z, &y, &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZkvmStatus::Ok);
     assert!(!verified);
 }
 
diff --git a/crates/accelerators/tests/conformance/modexp.rs b/crates/accelerators/tests/conformance/modexp.rs
index 760015463..d72f12ce0 100644
--- a/crates/accelerators/tests/conformance/modexp.rs
+++ b/crates/accelerators/tests/conformance/modexp.rs
@@ -27,17 +27,21 @@ fn modexp_small() {
 fn modexp_matches_reference() {
     // The BN254-Fr accelerated path, compared right-aligned against the
     // aurora reference.
-    let mut output = [0u8; 32];
+    let mut output = [0xa5; 32];
     modexp(&[0xab; 32], &[0x07], &BN254_FR, &mut output);
     let reference = aurora_engine_modexp::modexp(&[0xab; 32], &[0x07], &BN254_FR);
-    assert_eq!(output[32 - reference.len()..], reference[..]);
+    let mut expected = [0; 32];
+    expected[32 - reference.len()..].copy_from_slice(&reference);
+    assert_eq!(output, expected);
 
     // The generic path with a non-special modulus.
     let modulus = [0xef; 24];
-    let mut output = [0u8; 24];
+    let mut output = [0xa5; 24];
     modexp(&[0x12; 40], &[0x34; 3], &modulus, &mut output);
     let reference = aurora_engine_modexp::modexp(&[0x12; 40], &[0x34; 3], &modulus);
-    assert_eq!(output[24 - reference.len()..], reference[..]);
+    let mut expected = [0; 24];
+    expected[24 - reference.len()..].copy_from_slice(&reference);
+    assert_eq!(output, expected);
 }
 
 #[test]
diff --git a/crates/revm-crypto/Cargo.toml b/crates/revm-crypto/Cargo.toml
index 226cc5ef1..fea11ff40 100644
--- a/crates/revm-crypto/Cargo.toml
+++ b/crates/revm-crypto/Cargo.toml
@@ -12,33 +12,19 @@ workspace = true
 [dependencies]
 # revm
 revm.workspace = true
+openvm-accelerators.workspace = true
 
 # alloy
 alloy-primitives = { workspace = true, features = ["map-foldhash"] }
 alloy-consensus = { workspace = true, features = ["crypto-backend"] }
 
-# OpenVM dependencies for optimized crypto (only needed when running in zkvm)
-openvm-curve-utils = { workspace = true, features = ["bn254", "bls12_381"] }
-openvm-ecc-guest = { workspace = true }
-openvm-sha2 = { workspace = true }
-openvm-pairing = { workspace = true, features = ["bn254", "bls12_381"] }
-openvm-k256 = { workspace = true }
-openvm-p256 = { workspace = true }
-openvm-kzg = { workspace = true, features = ["use-intrinsics"] }
-openvm-keccak256 = { workspace = true }
-aurora-engine-modexp = { version = "1.2.0", default-features = false }
-
 [target.'cfg(all(target_arch = "riscv64", any(target_os = "none", target_os = "openvm")))'.dependencies]
 revm-primitives = { workspace = true, features = ["hashbrown"] }
 alloy-primitives = { workspace = true, features = ["native-keccak"] }
 
-[target.'cfg(not(any(target_os = "none", target_os = "openvm")))'.dependencies]
-openvm-sha2 = { workspace = true, features = ["import_sha2"] }
-openvm-keccak256 = { workspace = true, features = ["tiny_keccak"] }
-
 [features]
 default = []
-std = []
+std = ["openvm-accelerators/std"]
 
 [package.metadata.cargo-shear]
 ignored = ["revm-primitives"]
diff --git a/crates/revm-crypto/src/lib.rs b/crates/revm-crypto/src/lib.rs
index 090e3e623..28abb25b9 100644
--- a/crates/revm-crypto/src/lib.rs
+++ b/crates/revm-crypto/src/lib.rs
@@ -1,30 +1,29 @@
-//! OpenVM Crypto Implementation for REVM
+//! OpenVM crypto providers for REVM and Alloy.
 //!
-//! This module provides OpenVM-optimized implementations of cryptographic operations
-//! for both transaction validation (via Alloy crypto provider) and precompile execution.
+//! Cryptographic operations live in `openvm-accelerators`; this crate only
+//! adapts their byte-oriented API to REVM and Alloy's provider traits.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate alloc;
 
-use alloc::{boxed::Box, sync::Arc, vec, vec::Vec};
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
+
 use alloy_consensus::crypto::{
     backend::{install_default_provider, CryptoProvider},
     RecoveryError,
 };
 use alloy_primitives::Address;
-use openvm_ecc_guest::{
-    algebra::IntMod,
-    weierstrass::{IntrinsicCurve, WeierstrassPoint},
-    AffinePoint, Group,
-};
-use openvm_k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
-use openvm_keccak256::keccak256;
-use openvm_kzg::{Bytes32, Bytes48, KzgProof};
-use openvm_pairing::{
-    bls12_381::{self as bls, Bls12_381},
-    bn254::{self as bn, Bn254},
-    PairingCheck,
+use openvm_accelerators::{
+    ops::{self, Error, StreamError},
+    types::{
+        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
+        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBn254G1Point,
+        ZkvmBn254G2Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmBytes32, ZkvmKeccak256Hash,
+        ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmRipemd160Hash, ZkvmSecp256k1Hash,
+        ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey,
+        ZkvmSecp256r1Signature, ZkvmSha256Hash,
+    },
 };
 use revm::{
     install_crypto,
@@ -35,23 +34,11 @@ use revm::{
         },
         bls12_381_const::{
             FP_LENGTH as BLS_FP_LEN, G1_LENGTH as BLS_G1_LEN, G2_LENGTH as BLS_G2_LEN,
-            SCALAR_LENGTH as BLS_SCALAR_LEN,
         },
         Crypto, PrecompileHalt,
     },
 };
 
-use openvm_curve_utils::SubgroupCheck;
-
-// BN254 constants
-const BN_FQ_LEN: usize = 32;
-const BN_G1_LEN: usize = 64;
-const BN_G2_LEN: usize = 128;
-/// BN_SCALAR_LEN specifies the number of bytes needed to represent an Fr element.
-/// This is an element in the scalar field of BN254.
-const BN_SCALAR_LEN: usize = 32;
-
-/// OpenVM k256 backend for Alloy crypto operations (transaction validation)
 #[derive(Debug, Default)]
 struct OpenVmK256Provider;
 
@@ -61,34 +48,14 @@ impl CryptoProvider for OpenVmK256Provider {
         sig: &[u8; 65],
         msg: &[u8; 32],
     ) -> Result<Address, RecoveryError> {
-        // Extract components: sig[0..32]=r, sig[32..64]=s, sig[64]=recovery_id
-        // Parse signature using OpenVM k256
-        let mut signature = Signature::from_slice(&sig[..64]).map_err(|_| RecoveryError::new())?;
-
-        // Normalize signature if needed
-        let mut recid = sig[64];
-        if let Some(sig_normalized) = signature.normalize_s() {
-            signature = sig_normalized;
-            recid ^= 1;
-        }
-
-        // Create recovery ID
-        let recovery_id = RecoveryId::from_byte(recid).ok_or(RecoveryError::new())?;
-
-        // Recover public key using OpenVM
-        let recovered_key =
-            VerifyingKey::recover_from_prehash_noverify(msg, &signature.to_bytes(), recovery_id)
-                .map_err(|_| RecoveryError::new())?;
-
-        // Hash the uncompressed SEC1 key without the 0x04 prefix.
-        let public_key = recovered_key.to_encoded_point(false);
-        let encoded_pubkey = &public_key.as_bytes()[1..65];
-
-        // Hash to get Ethereum address
-        let pubkey_hash = keccak256(encoded_pubkey);
-        let address_bytes = &pubkey_hash[12..32]; // Last 20 bytes
+        let recovery_id = sig[64];
+        let msg = ZkvmSecp256k1Hash { data: *msg };
+        let sig = ZkvmSecp256k1Signature { data: sig[..64].try_into().unwrap() };
+        let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
+        ops::secp256k1_ecrecover(&msg, &sig, recovery_id, &mut pubkey)
+            .map_err(|_| RecoveryError::new())?;
 
-        Ok(Address::from_slice(address_bytes))
+        Ok(address_from_pubkey(&pubkey.data))
     }
 
     fn verify_and_compute_signer_unchecked(
@@ -97,508 +64,305 @@ impl CryptoProvider for OpenVmK256Provider {
         sig: &[u8; 64],
         msg: &[u8; 32],
     ) -> Result<Address, RecoveryError> {
-        let vk = VerifyingKey::from_sec1_bytes(pubkey).map_err(|_| RecoveryError::new())?;
-
-        let mut signature = Signature::from_slice(sig).map_err(|_| RecoveryError::new())?;
-        if let Some(sig_normalized) = signature.normalize_s() {
-            signature = sig_normalized;
+        if pubkey[0] != 0x04 {
+            return Err(RecoveryError::new());
         }
 
-        vk.verify_prehash(msg.as_ref(), &signature).map_err(|_| RecoveryError::new())?;
+        let msg = ZkvmSecp256k1Hash { data: *msg };
+        let sig = ZkvmSecp256k1Signature { data: *sig };
+        let pubkey = ZkvmSecp256k1Pubkey { data: pubkey[1..].try_into().unwrap() };
+        let mut verified = false;
+        ops::secp256k1_verify(&msg, &sig, &pubkey, &mut verified)
+            .map_err(|_| RecoveryError::new())?;
+        if !verified {
+            return Err(RecoveryError::new());
+        }
 
-        // Compute address directly from the provided pubkey bytes (skip 0x04 prefix)
-        let pubkey_hash = keccak256(&pubkey[1..65]);
-        Ok(Address::from_slice(&pubkey_hash[12..32]))
+        Ok(address_from_pubkey(&pubkey.data))
     }
 }
 
-/// OpenVM custom crypto implementation for faster precompiles
+// Kept separate so both Alloy provider methods use exactly the standard-interface hash path.
+fn address_from_pubkey(pubkey: &[u8; 64]) -> Address {
+    let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
+    ops::keccak256(pubkey, &mut hash);
+    Address::from_slice(&hash.data[12..])
+}
+
 #[derive(Debug, Default)]
 struct OpenVmCrypto;
 
 impl Crypto for OpenVmCrypto {
-    /// Custom SHA-256 implementation with openvm optimization
     fn sha256(&self, input: &[u8]) -> [u8; 32] {
-        #[cfg(not(openvm_intrinsics))]
-        use openvm_sha2::Digest;
-        openvm_sha2::Sha256::digest(input).into()
+        let mut output = ZkvmSha256Hash { data: [0; 32] };
+        ops::sha256(input, &mut output);
+        output.data
     }
 
-    /// Custom BN254 G1 addition with openvm optimization
-    fn bn254_g1_add(&self, p1_bytes: &[u8], p2_bytes: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
-        let p1 = read_bn_g1_point(p1_bytes)?;
-        let p2 = read_bn_g1_point(p2_bytes)?;
-        let result = p1 + p2;
-        Ok(encode_bn_g1_point(result))
+    fn ripemd160(&self, input: &[u8]) -> [u8; 32] {
+        let mut output = ZkvmRipemd160Hash { data: [0; 32] };
+        ops::ripemd160(input, &mut output);
+        output.data
     }
 
-    /// Custom BN254 G1 scalar multiplication with openvm optimization
-    fn bn254_g1_mul(
-        &self,
-        point_bytes: &[u8],
-        scalar_bytes: &[u8],
-    ) -> Result<[u8; 64], PrecompileHalt> {
-        let p = read_bn_g1_point(point_bytes)?;
-        let s = read_bn_scalar(scalar_bytes);
-        let result = Bn254::msm(&[s], &[p]);
-        Ok(encode_bn_g1_point(result))
+    fn bn254_g1_add(&self, p1: &[u8], p2: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
+        let p1 =
+            ZkvmBn254G1Point { data: p1.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)? };
+        let p2 =
+            ZkvmBn254G1Point { data: p2.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)? };
+        let mut output = ZkvmBn254G1Point { data: [0; 64] };
+        ops::bn254_g1_add(&p1, &p2, &mut output).map_err(map_bn_error)?;
+        Ok(output.data)
+    }
+
+    fn bn254_g1_mul(&self, point: &[u8], scalar: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
+        let point = ZkvmBn254G1Point {
+            data: point.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let scalar = ZkvmBn254Scalar {
+            data: scalar.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let mut output = ZkvmBn254G1Point { data: [0; 64] };
+        ops::bn254_g1_mul(&point, &scalar, &mut output).map_err(map_bn_error)?;
+        Ok(output.data)
     }
 
-    /// Custom BN254 pairing check with openvm optimization
     fn bn254_pairing_check(&self, pairs: &[(&[u8], &[u8])]) -> Result<bool, PrecompileHalt> {
-        if pairs.is_empty() {
-            return Ok(true);
-        }
-        let mut g1_points = Vec::with_capacity(pairs.len());
-        let mut g2_points = Vec::with_capacity(pairs.len());
+        let pairs = pairs.iter().map(|(g1, g2)| {
+            Ok(ZkvmBn254PairingPair {
+                g1: ZkvmBn254G1Point {
+                    data: (*g1).try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+                },
+                g2: ZkvmBn254G2Point {
+                    data: (*g2).try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+                },
+            })
+        });
+        ops::bn254_pairing_check_iter(pairs).map_err(|error| map_stream_error(error, map_bn_error))
+    }
 
-        for (g1_bytes, g2_bytes) in pairs {
-            let g1 = read_bn_g1_point(g1_bytes)?;
-            let g2 = read_bn_g2_point(g2_bytes)?;
+    fn secp256k1_ecrecover(
+        &self,
+        sig: &[u8; 64],
+        recid: u8,
+        msg: &[u8; 32],
+    ) -> Result<[u8; 32], PrecompileHalt> {
+        let msg = ZkvmSecp256k1Hash { data: *msg };
+        let sig = ZkvmSecp256k1Signature { data: *sig };
+        let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
+        ops::secp256k1_ecrecover(&msg, &sig, recid, &mut pubkey)
+            .map_err(|_| PrecompileHalt::Secp256k1RecoverFailed)?;
 
-            let (g1_x, g1_y) = g1.into_coords();
-            let g1 = AffinePoint::new(g1_x, g1_y);
+        let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
+        ops::keccak256(&pubkey.data, &mut hash);
+        hash.data[..12].fill(0);
+        Ok(hash.data)
+    }
 
-            let (g2_x, g2_y) = g2.into_coords();
-            let g2 = AffinePoint::new(g2_x, g2_y);
+    fn modexp(&self, base: &[u8], exp: &[u8], modulus: &[u8]) -> Result<Vec<u8>, PrecompileHalt> {
+        Ok(ops::modexp_result(base, exp, modulus))
+    }
 
-            g1_points.push(g1);
-            g2_points.push(g2);
-        }
+    fn blake2_compress(&self, rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
+        ops::blake2f_words(rounds, h, m, t, f);
+    }
 
-        let pairing_result = Bn254::pairing_check(&g1_points, &g2_points).is_ok();
-        Ok(pairing_result)
+    fn secp256r1_verify_signature(&self, msg: &[u8; 32], sig: &[u8; 64], pk: &[u8; 64]) -> bool {
+        let msg = ZkvmSecp256r1Hash { data: *msg };
+        let sig = ZkvmSecp256r1Signature { data: *sig };
+        let pubkey = ZkvmSecp256r1Pubkey { data: *pk };
+        let mut verified = false;
+        ops::secp256r1_verify(&msg, &sig, &pubkey, &mut verified).is_ok() && verified
+    }
+
+    fn verify_kzg_proof(
+        &self,
+        z: &[u8; 32],
+        y: &[u8; 32],
+        commitment: &[u8; 48],
+        proof: &[u8; 48],
+    ) -> Result<(), PrecompileHalt> {
+        let commitment = ZkvmKzgCommitment { data: *commitment };
+        let z = ZkvmKzgFieldElement { data: *z };
+        let y = ZkvmKzgFieldElement { data: *y };
+        let proof = ZkvmKzgProof { data: *proof };
+        let mut verified = false;
+        ops::kzg_point_eval(&commitment, &z, &y, &proof, &mut verified)
+            .map_err(|_| PrecompileHalt::BlobVerifyKzgProofFailed)?;
+        if verified {
+            Ok(())
+        } else {
+            Err(PrecompileHalt::BlobVerifyKzgProofFailed)
+        }
     }
 
-    /// Custom BLS12-381 G1 addition with openvm optimization
     fn bls12_381_g1_add(
         &self,
         a: BlsG1Point,
         b: BlsG1Point,
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        // EIP-2537 G1ADD validates on-curve only, not subgroup membership.
-        let p1 = read_bls_g1_point_no_subgroup_check(&a)?;
-        let p2 = read_bls_g1_point_no_subgroup_check(&b)?;
-        let sum = p1 + p2;
-        Ok(encode_bls_g1_point(&sum))
+        let a = bls_g1(a);
+        let b = bls_g1(b);
+        let mut output = ZkvmBls12381G1Point { data: [0; BLS_G1_LEN] };
+        ops::bls12_381_g1_add(&a, &b, &mut output).map_err(map_bls_g1_error)?;
+        Ok(output.data)
     }
 
-    /// Custom BLS12-381 G1 MSM with openvm optimization
     fn bls12_381_g1_msm(
         &self,
         pairs: &mut dyn Iterator<Item = Result<BlsG1PointScalar, PrecompileHalt>>,
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        let mut scalars = Vec::new();
-        let mut points = Vec::new();
-
-        for pair in pairs {
-            let (point_bytes, scalar_bytes) = pair?;
-            points.push(read_bls_g1_point(&point_bytes)?);
-            scalars.push(read_bls_scalar(&scalar_bytes));
-        }
-
-        if points.is_empty() {
-            return Ok([0u8; BLS_G1_LEN]);
-        }
-
-        let result = Bls12_381::msm(&scalars, &points);
-        Ok(encode_bls_g1_point(&result))
+        let pairs = pairs.map(|pair| {
+            let (point, scalar) = pair?;
+            Ok(ZkvmBls12381G1MsmPair { point: bls_g1(point), scalar: ZkvmBytes32 { data: scalar } })
+        });
+        ops::bls12_381_g1_msm_iter(pairs)
+            .map(|output| output.data)
+            .map_err(|error| map_stream_error(error, map_bls_g1_error))
     }
 
-    /// Custom BLS12-381 G2 addition with openvm optimization
     fn bls12_381_g2_add(
         &self,
         a: BlsG2Point,
         b: BlsG2Point,
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        // EIP-2537 G2ADD validates on-curve only, not subgroup membership.
-        let p1 = read_bls_g2_point_no_subgroup_check(&a)?;
-        let p2 = read_bls_g2_point_no_subgroup_check(&b)?;
-        let sum = p1 + p2;
-        Ok(encode_bls_g2_point(&sum))
+        let a = bls_g2(a);
+        let b = bls_g2(b);
+        let mut output = ZkvmBls12381G2Point { data: [0; BLS_G2_LEN] };
+        ops::bls12_381_g2_add(&a, &b, &mut output).map_err(map_bls_g2_error)?;
+        Ok(output.data)
     }
 
-    /// Custom BLS12-381 G2 MSM with openvm optimization
     fn bls12_381_g2_msm(
         &self,
         pairs: &mut dyn Iterator<Item = Result<BlsG2PointScalar, PrecompileHalt>>,
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        let mut scalars = Vec::new();
-        let mut points = Vec::new();
-
-        for pair in pairs {
-            let (point_bytes, scalar_bytes) = pair?;
-            points.push(read_bls_g2_point(&point_bytes)?);
-            scalars.push(read_bls_scalar(&scalar_bytes));
-        }
-
-        if points.is_empty() {
-            return Ok([0u8; BLS_G2_LEN]);
-        }
-
-        // directly using openvm_ecc_guest::msm here
-        let result = openvm_ecc_guest::msm(&scalars, &points);
-        Ok(encode_bls_g2_point(&result))
+        let pairs = pairs.map(|pair| {
+            let (point, scalar) = pair?;
+            Ok(ZkvmBls12381G2MsmPair { point: bls_g2(point), scalar: ZkvmBytes32 { data: scalar } })
+        });
+        ops::bls12_381_g2_msm_iter(pairs)
+            .map(|output| output.data)
+            .map_err(|error| map_stream_error(error, map_bls_g2_error))
     }
 
-    /// Custom BLS12-381 pairing check with openvm optimization
     fn bls12_381_pairing_check(
         &self,
         pairs: &[(BlsG1Point, BlsG2Point)],
     ) -> Result<bool, PrecompileHalt> {
-        if pairs.is_empty() {
-            return Ok(true);
-        }
-
-        let mut g1_points = Vec::with_capacity(pairs.len());
-        let mut g2_points = Vec::with_capacity(pairs.len());
-
-        for (g1_bytes, g2_bytes) in pairs {
-            let g1 = read_bls_g1_point(g1_bytes)?;
-            let g2 = read_bls_g2_point(g2_bytes)?;
-
-            let (g1_x, g1_y) = g1.into_coords();
-            let (g2_x, g2_y) = g2.into_coords();
-
-            g1_points.push(AffinePoint::new(g1_x, g1_y));
-            g2_points.push(AffinePoint::new(g2_x, g2_y));
-        }
-
-        let pairing_result = Bls12_381::pairing_check(&g1_points, &g2_points).is_ok();
-        Ok(pairing_result)
+        let pairs = pairs
+            .iter()
+            .copied()
+            .map(|(g1, g2)| ZkvmBls12381PairingPair { g1: bls_g1(g1), g2: bls_g2(g2) });
+        ops::bls12_381_pairing_check_iter(pairs).map_err(map_bls_pairing_error)
     }
 
-    /// Custom secp256k1 ECDSA signature recovery with openvm optimization
-    fn secp256k1_ecrecover(
+    fn bls12_381_fp_to_g1(
         &self,
-        sig_bytes: &[u8; 64],
-        mut recid: u8,
-        msg_hash: &[u8; 32],
-    ) -> Result<[u8; 32], PrecompileHalt> {
-        let mut sig = Signature::from_slice(sig_bytes)
-            .map_err(|_| PrecompileHalt::other("Invalid signature format"))?;
-
-        if let Some(sig_normalized) = sig.normalize_s() {
-            sig = sig_normalized;
-            recid ^= 1;
-        }
-
-        let recovery_id = RecoveryId::from_byte(recid)
-            .ok_or_else(|| PrecompileHalt::other("Invalid recovery ID"))?;
-
-        let recovered_key =
-            VerifyingKey::recover_from_prehash_noverify(msg_hash, &sig.to_bytes(), recovery_id)
-                .map_err(|_| PrecompileHalt::other("Key recovery failed"))?;
-
-        let public_key = recovered_key.to_encoded_point(false);
-        let encoded_pubkey = &public_key.as_bytes()[1..65];
-
-        let pubkey_hash = keccak256(encoded_pubkey);
-        let mut address = [0u8; 32];
-        address[12..].copy_from_slice(&pubkey_hash[12..]);
-
-        Ok(address)
-    }
-
-    /// Custom secp256r1 signature verification with openvm optimization
-    fn secp256r1_verify_signature(&self, msg: &[u8; 32], sig: &[u8; 64], pk: &[u8; 64]) -> bool {
-        use openvm_p256::{
-            ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey},
-            EncodedPoint,
-        };
-
-        // Can fail only if the input is not exact length.
-        let Ok(signature) = Signature::from_slice(sig) else {
-            return false;
-        };
-        // Decode the public key bytes (x,y coordinates) using EncodedPoint
-        let encoded_point = EncodedPoint::from_untagged_bytes(&(*pk).into());
-        // Create VerifyingKey from the encoded point
-        let Ok(public_key) = VerifyingKey::from_encoded_point(&encoded_point) else {
-            return false;
-        };
-
-        public_key.verify_prehash(msg, &signature).is_ok()
+        fp: &[u8; BLS_FP_LEN],
+    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
+        let fp = ZkvmBls12381Fp { data: *fp };
+        let mut output = ZkvmBls12381G1Point { data: [0; BLS_G1_LEN] };
+        ops::bls12_381_map_fp_to_g1(&fp, &mut output).map_err(map_bls_field_error)?;
+        Ok(output.data)
     }
 
-    /// Custom KZG point evaluation with configurable backends
-    fn verify_kzg_proof(
+    fn bls12_381_fp2_to_g2(
         &self,
-        z: &[u8; 32],
-        y: &[u8; 32],
-        commitment: &[u8; 48],
-        proof: &[u8; 48],
-    ) -> Result<(), PrecompileHalt> {
-        let env = openvm_kzg::EnvKzgSettings::default();
-        let kzg_settings = env.get();
-
-        let commitment_bytes = Bytes48::from_slice(commitment)
-            .map_err(|_| PrecompileHalt::other("invalid commitment bytes"))?;
-        let z_bytes =
-            Bytes32::from_slice(z).map_err(|_| PrecompileHalt::other("invalid z bytes"))?;
-        let y_bytes =
-            Bytes32::from_slice(y).map_err(|_| PrecompileHalt::other("invalid y bytes"))?;
-        let proof_bytes =
-            Bytes48::from_slice(proof).map_err(|_| PrecompileHalt::other("invalid proof bytes"))?;
-
-        let valid = KzgProof::verify_kzg_proof(
-            &commitment_bytes,
-            &z_bytes,
-            &y_bytes,
-            &proof_bytes,
-            kzg_settings,
-        )
-        .map_err(|_| PrecompileHalt::other("openvm kzg proof verification failed"))?;
-        if valid {
-            Ok(())
-        } else {
-            Err(PrecompileHalt::BlobVerifyKzgProofFailed)
-        }
-    }
-
-    /// Custom modular exponentiation with BN254 Fr acceleration
-    fn modexp(&self, base: &[u8], exp: &[u8], modulus: &[u8]) -> Result<Vec<u8>, PrecompileHalt> {
-        if is_bn254_fr(modulus) {
-            return Ok(accelerated_modexp_bn254_fr(base, exp));
-        }
-        Ok(aurora_engine_modexp::modexp(base, exp, modulus))
+        fp2: ([u8; BLS_FP_LEN], [u8; BLS_FP_LEN]),
+    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
+        let mut data = [0; BLS_FP_LEN * 2];
+        data[..BLS_FP_LEN].copy_from_slice(&fp2.0);
+        data[BLS_FP_LEN..].copy_from_slice(&fp2.1);
+        let fp2 = ZkvmBls12381Fp2 { data };
+        let mut output = ZkvmBls12381G2Point { data: [0; BLS_G2_LEN] };
+        ops::bls12_381_map_fp2_to_g2(&fp2, &mut output).map_err(map_bls_field_error)?;
+        Ok(output.data)
     }
 }
 
-/// Returns true if the modulus (big-endian, possibly with leading zeros) equals BN254 Fr.
-fn is_bn254_fr(modulus: &[u8]) -> bool {
-    // Strip leading zeros
-    let stripped = match modulus.iter().position(|&b| b != 0) {
-        Some(i) => &modulus[i..],
-        None => return false, // all zeros
-    };
-    // bn::Scalar::MODULUS is little-endian; compare against reversed input
-    stripped.len() == BN_SCALAR_LEN && stripped.iter().rev().eq(bn::Scalar::MODULUS.as_ref().iter())
+fn bls_g1((x, y): BlsG1Point) -> ZkvmBls12381G1Point {
+    let mut data = [0; BLS_G1_LEN];
+    data[..BLS_FP_LEN].copy_from_slice(&x);
+    data[BLS_FP_LEN..].copy_from_slice(&y);
+    ZkvmBls12381G1Point { data }
 }
 
-/// Accelerated modexp for BN254 Fr using field arithmetic intrinsics.
-fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
-    use openvm_ecc_guest::algebra::{ExpBytes, Reduce};
-
-    // OpenVM's field reduction requires inputs to be aligned to the field byte size.
-    let padded_len = base.len().next_multiple_of(BN_SCALAR_LEN).max(BN_SCALAR_LEN);
-    let mut padded = vec![0u8; padded_len];
-    padded[padded_len - base.len()..].copy_from_slice(base);
-    let base_fr = bn::Scalar::reduce_be_bytes(&padded);
-
-    base_fr.exp_bytes(true, exp).to_be_bytes().as_ref().to_vec()
-}
-
-/// Install OpenVM crypto implementations globally
-pub fn install_openvm_crypto() -> Result<bool, Box<dyn core::error::Error>> {
-    // Install OpenVM k256 provider for Alloy (transaction validation)
-    install_default_provider(Arc::new(OpenVmK256Provider))?;
-
-    // Install OpenVM crypto for REVM precompiles
-    let installed = install_crypto(OpenVmCrypto);
-
-    Ok(installed)
-}
-
-// Helper functions for BN254 operations
-
-#[inline]
-fn read_bn_fq(input: &[u8]) -> Result<bn::Fp, PrecompileHalt> {
-    if input.len() < BN_FQ_LEN {
-        Err(PrecompileHalt::Bn254FieldPointNotAMember)
-    } else {
-        bn::Fp::from_be_bytes(&input[..BN_FQ_LEN]).ok_or(PrecompileHalt::Bn254FieldPointNotAMember)
+fn bls_g2((x0, x1, y0, y1): BlsG2Point) -> ZkvmBls12381G2Point {
+    let mut data = [0; BLS_G2_LEN];
+    for (output, coordinate) in data.chunks_exact_mut(BLS_FP_LEN).zip([x0, x1, y0, y1]) {
+        output.copy_from_slice(&coordinate);
     }
+    ZkvmBls12381G2Point { data }
 }
 
-#[inline]
-fn read_bn_fq2(input: &[u8]) -> Result<bn::Fp2, PrecompileHalt> {
-    let y = read_bn_fq(&input[..BN_FQ_LEN])?;
-    let x = read_bn_fq(&input[BN_FQ_LEN..BN_FQ_LEN * 2])?;
-    Ok(bn::Fp2::new(x, y))
-}
-
-#[inline]
-fn read_bn_g1_point(input: &[u8]) -> Result<bn::G1Affine, PrecompileHalt> {
-    if input.len() != BN_G1_LEN {
-        return Err(PrecompileHalt::Bn254PairLength);
-    }
-    let px = read_bn_fq(&input[0..BN_FQ_LEN])?;
-    let py = read_bn_fq(&input[BN_FQ_LEN..BN_G1_LEN])?;
-    // SAFETY: `read_bn_fq` produces canonical Fp elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(px, py)` is not on the curve.
-    let point = unsafe { bn::G1Affine::from_xy(px, py) }
-        .ok_or(PrecompileHalt::Bn254AffineGFailedToCreate)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(PrecompileHalt::Bn254AffineGFailedToCreate)
+fn map_stream_error(
+    error: StreamError<PrecompileHalt>,
+    map_operation: fn(Error) -> PrecompileHalt,
+) -> PrecompileHalt {
+    match error {
+        StreamError::Source(error) => error,
+        StreamError::Operation(error) => map_operation(error),
     }
 }
 
-#[inline]
-fn read_bn_g2_point(input: &[u8]) -> Result<bn::G2Affine, PrecompileHalt> {
-    if input.len() != BN_G2_LEN {
-        return Err(PrecompileHalt::Bn254PairLength);
-    }
-    let c0 = read_bn_fq2(&input[0..BN_G1_LEN])?;
-    let c1 = read_bn_fq2(&input[BN_G1_LEN..BN_G2_LEN])?;
-    // SAFETY: `read_bn_fq2` produces canonical Fp2 elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(c0, c1)` is not on the twist.
-    let point = unsafe { bn::G2Affine::from_xy(c0, c1) }
-        .ok_or(PrecompileHalt::Bn254AffineGFailedToCreate)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(PrecompileHalt::Bn254AffineGFailedToCreate)
+fn map_bn_error(error: Error) -> PrecompileHalt {
+    match error {
+        Error::FieldElementInvalid => PrecompileHalt::Bn254FieldPointNotAMember,
+        Error::PointNotOnCurve | Error::PointNotInSubgroup => {
+            PrecompileHalt::Bn254AffineGFailedToCreate
+        }
+        _ => PrecompileHalt::other("unexpected BN254 accelerator error"),
     }
 }
 
-#[inline]
-fn encode_bn_g1_point(point: bn::G1Affine) -> [u8; BN_G1_LEN] {
-    let mut output = [0u8; BN_G1_LEN];
-
-    let x_bytes: &[u8] = point.x().as_le_bytes();
-    let y_bytes: &[u8] = point.y().as_le_bytes();
-    for i in 0..BN_FQ_LEN {
-        output[i] = x_bytes[BN_FQ_LEN - 1 - i];
-        output[i + BN_FQ_LEN] = y_bytes[BN_FQ_LEN - 1 - i];
+fn map_bls_g1_error(error: Error) -> PrecompileHalt {
+    match error {
+        Error::PointNotInSubgroup => PrecompileHalt::Bls12381G1NotInSubgroup,
+        Error::PointNotOnCurve => PrecompileHalt::Bls12381G1NotOnCurve,
+        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
+        _ => PrecompileHalt::other("unexpected BLS12-381 G1 accelerator error"),
     }
-    output
 }
 
-/// Reads a scalar from the input slice
-///
-/// Note: The scalar does not need to be canonical.
-///
-/// # Panics
-///
-/// If `input.len()` is not equal to [`BN_SCALAR_LEN`].
-#[inline]
-fn read_bn_scalar(input: &[u8]) -> bn::Scalar {
-    assert_eq!(
-        input.len(),
-        BN_SCALAR_LEN,
-        "unexpected scalar length. got {}, expected {BN_SCALAR_LEN}",
-        input.len()
-    );
-    bn::Scalar::from_be_bytes_unchecked(input)
-}
-
-// Helper functions for BLS12-381 operations
-
-#[inline]
-fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, PrecompileHalt> {
-    if input.len() != BLS_FP_LEN {
-        return Err(PrecompileHalt::other("invalid BLS12-381 fp length"));
+fn map_bls_g2_error(error: Error) -> PrecompileHalt {
+    match error {
+        Error::PointNotInSubgroup => PrecompileHalt::Bls12381G2NotInSubgroup,
+        Error::PointNotOnCurve => PrecompileHalt::Bls12381G2NotOnCurve,
+        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
+        _ => PrecompileHalt::other("unexpected BLS12-381 G2 accelerator error"),
     }
-    bls::Fp::from_be_bytes(input)
-        .ok_or_else(|| PrecompileHalt::other("element not in BLS12-381 base field"))
-}
-
-#[inline]
-fn read_bls_fp2(c0: &[u8], c1: &[u8]) -> Result<bls::Fp2, PrecompileHalt> {
-    let real = read_bls_fp(c0)?;
-    let imag = read_bls_fp(c1)?;
-    Ok(bls::Fp2::new(real, imag))
 }
 
-#[inline]
-fn read_bls_g1_point_no_subgroup_check(
-    point: &BlsG1Point,
-) -> Result<bls::G1Affine, PrecompileHalt> {
-    let px = read_bls_fp(&point.0)?;
-    let py = read_bls_fp(&point.1)?;
-    // SAFETY: `read_bls_fp` produces canonical Fp elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(px, py)` is not on the curve.
-    unsafe { bls::G1Affine::from_xy(px, py) }.ok_or(PrecompileHalt::Bls12381G1NotOnCurve)
-}
-
-#[inline]
-fn read_bls_g1_point(point: &BlsG1Point) -> Result<bls::G1Affine, PrecompileHalt> {
-    let point = read_bls_g1_point_no_subgroup_check(point)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(PrecompileHalt::Bls12381G1NotInSubgroup)
+fn map_bls_pairing_error(error: Error) -> PrecompileHalt {
+    match error {
+        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
+        Error::BlsG1PointNotOnCurve => PrecompileHalt::Bls12381G1NotOnCurve,
+        Error::BlsG1PointNotInSubgroup => PrecompileHalt::Bls12381G1NotInSubgroup,
+        Error::BlsG2PointNotOnCurve => PrecompileHalt::Bls12381G2NotOnCurve,
+        Error::BlsG2PointNotInSubgroup => PrecompileHalt::Bls12381G2NotInSubgroup,
+        _ => PrecompileHalt::other("unexpected BLS12-381 pairing accelerator error"),
     }
 }
 
-#[inline]
-fn read_bls_g2_point_no_subgroup_check(
-    point: &BlsG2Point,
-) -> Result<bls::G2Affine, PrecompileHalt> {
-    let x = read_bls_fp2(&point.0, &point.1)?;
-    let y = read_bls_fp2(&point.2, &point.3)?;
-    // SAFETY: `read_bls_fp2` produces canonical Fp2 elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(x, y)` is not on the twist.
-    unsafe { bls::G2Affine::from_xy(x, y) }.ok_or(PrecompileHalt::Bls12381G2NotOnCurve)
-}
-
-#[inline]
-fn read_bls_g2_point(point: &BlsG2Point) -> Result<bls::G2Affine, PrecompileHalt> {
-    let point = read_bls_g2_point_no_subgroup_check(point)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(PrecompileHalt::Bls12381G2NotInSubgroup)
+fn map_bls_field_error(error: Error) -> PrecompileHalt {
+    match error {
+        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
+        _ => PrecompileHalt::other("unexpected BLS12-381 map accelerator error"),
     }
 }
 
-#[inline]
-fn read_bls_scalar(input: &[u8]) -> bls::Scalar {
-    assert_eq!(
-        input.len(),
-        BLS_SCALAR_LEN,
-        "unexpected scalar length. got {}, expected {BLS_SCALAR_LEN}",
-        input.len()
-    );
-    bls::Scalar::from_be_bytes_unchecked(input)
-}
-
-#[inline]
-fn encode_bls_g1_point(point: &bls::G1Affine) -> [u8; BLS_G1_LEN] {
-    if point.is_identity() {
-        return [0u8; BLS_G1_LEN];
-    }
-
-    let mut output = [0u8; BLS_G1_LEN];
-    let x_bytes: &[u8] = point.x().as_le_bytes();
-    let y_bytes: &[u8] = point.y().as_le_bytes();
-    for i in 0..BLS_FP_LEN {
-        output[i] = x_bytes[BLS_FP_LEN - 1 - i];
-        output[i + BLS_FP_LEN] = y_bytes[BLS_FP_LEN - 1 - i];
-    }
-    output
-}
-
-#[inline]
-fn encode_bls_g2_point(point: &bls::G2Affine) -> [u8; BLS_G2_LEN] {
-    if point.is_identity() {
-        return [0u8; BLS_G2_LEN];
-    }
-
-    let mut output = [0u8; BLS_G2_LEN];
-    let x = point.x();
-    let y = point.y();
-    let x_c0 = x.c0.as_le_bytes();
-    let x_c1 = x.c1.as_le_bytes();
-    let y_c0 = y.c0.as_le_bytes();
-    let y_c1 = y.c1.as_le_bytes();
-    for i in 0..BLS_FP_LEN {
-        output[i] = x_c0[BLS_FP_LEN - 1 - i];
-        output[i + BLS_FP_LEN] = x_c1[BLS_FP_LEN - 1 - i];
-        output[i + (2 * BLS_FP_LEN)] = y_c0[BLS_FP_LEN - 1 - i];
-        output[i + (3 * BLS_FP_LEN)] = y_c1[BLS_FP_LEN - 1 - i];
-    }
-    output
+/// Install the OpenVM implementations globally.
+pub fn install_openvm_crypto() -> Result<bool, Box<dyn core::error::Error>> {
+    install_default_provider(Arc::new(OpenVmK256Provider))?;
+    Ok(install_crypto(OpenVmCrypto))
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use revm::precompile::DefaultCrypto;
 
-    /// Runs `secp256r1_verify_signature` on a 160-byte P256VERIFY input (msg || sig || pk).
     fn p256_verify_input(input_hex: &str) -> bool {
         let input = alloy_primitives::hex::decode(input_hex).unwrap();
         assert_eq!(input.len(), 160);
@@ -609,125 +373,112 @@ mod tests {
         )
     }
 
-    // Test vectors from https://github.com/daimo-eth/p256-verifier/tree/master/test-vectors,
-    // as used by revm-precompile's secp256r1 tests.
+    // Vectors from daimo-eth/p256-verifier, also used by revm-precompile.
     #[test]
-    fn test_secp256r1_verify_signature() {
-        // valid signature
+    fn secp256r1_verify_signature() {
         assert!(p256_verify_input("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"));
-        assert!(p256_verify_input("3fec5769b5cf4e310a7d150508e82fb8e3eda1c2c94c61492d3bd8aea99e06c9e22466e928fdccef0de49e3503d2657d00494a00e764fd437bdafa05f5922b1fbbb77c6817ccf50748419477e843d5bac67e6a70e97dde5a57e0c983b777e1ad31a80482dadf89de6302b1988c82c29544c9c07bb910596158f6062517eb089a2f54c9a0f348752950094d3228d3b940258c75fe2a413cb70baa21dc2e352fc5"));
-        // wrong message
         assert!(!p256_verify_input("3cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"));
-        // signature values out of range
-        assert!(!p256_verify_input("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"));
-        // public key not on the curve
-        assert!(!p256_verify_input("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"));
     }
 
-    /// BN254 Fr modulus in big-endian bytes
-    fn bn254_fr_modulus_be() -> Vec<u8> {
-        let m = bn::Scalar::MODULUS;
-        m.as_ref().iter().rev().copied().collect()
-    }
+    #[test]
+    fn modexp_dispatch_and_padding() {
+        let modulus = alloy_primitives::hex::decode(
+            "30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
+        )
+        .unwrap();
+        let accelerated = OpenVmCrypto.modexp(&[3], &[5], &modulus).unwrap();
+        assert_eq!(accelerated.len(), 32);
+        assert!(accelerated[..31].iter().all(|byte| *byte == 0));
+        assert_eq!(accelerated[31], 243);
 
-    /// Reference implementation: aurora_engine_modexp
-    fn reference_modexp(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
-        aurora_engine_modexp::modexp(base, exp, modulus)
+        assert_eq!(OpenVmCrypto.modexp(&[3], &[4], &[7]).unwrap(), [4]);
     }
 
-    /// Helper: run accelerated and compare against reference.
-    /// The accelerated path always returns BN_SCALAR_LEN bytes, so we left-pad the
-    /// reference output to match.
-    fn check(base: &[u8], exp: &[u8]) {
-        let modulus = bn254_fr_modulus_be();
-        let expected = reference_modexp(base, exp, &modulus);
-        let actual = accelerated_modexp_bn254_fr(base, exp);
-        let mut expected_padded = vec![0u8; BN_SCALAR_LEN];
-        let offset = BN_SCALAR_LEN - expected.len();
-        expected_padded[offset..].copy_from_slice(&expected);
-        assert_eq!(actual, expected_padded, "base={base:?}, exp={exp:?}");
+    #[test]
+    fn ripemd160_adapter_uses_evm_padding() {
+        assert_eq!(
+            OpenVmCrypto.ripemd160(b"abc"),
+            alloy_primitives::hex!(
+                "0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc"
+            )
+        );
     }
 
     #[test]
-    fn test_is_bn254_fr() {
-        // Exact modulus
-        assert!(is_bn254_fr(&bn254_fr_modulus_be()));
-
-        // With leading zeros
-        let mut padded = vec![0u8; 10];
-        padded.extend_from_slice(&bn254_fr_modulus_be());
-        assert!(is_bn254_fr(&padded));
-
-        // All zeros → false
-        assert!(!is_bn254_fr(&[0u8; 32]));
+    fn adapters_match_revm_for_portable_primitives() {
+        let input = b"OpenVM accelerator provider";
+        assert_eq!(OpenVmCrypto.sha256(input), DefaultCrypto.sha256(input));
+        assert_eq!(OpenVmCrypto.ripemd160(input), DefaultCrypto.ripemd160(input));
+        assert_eq!(
+            OpenVmCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24]),
+            DefaultCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24])
+        );
 
-        // Wrong modulus (flip last bit)
-        let mut m = bn254_fr_modulus_be();
-        *m.last_mut().unwrap() ^= 1;
-        assert!(!is_bn254_fr(&m));
+        let mut actual = [
+            0x6a09e667f3bcc908,
+            0xbb67ae8584caa73b,
+            0x3c6ef372fe94f82b,
+            0xa54ff53a5f1d36f1,
+            0x510e527fade682d1,
+            0x9b05688c2b3e6c1f,
+            0x1f83d9abfb41bd6b,
+            0x5be0cd19137e2179,
+        ];
+        let mut expected = actual;
+        let message = [0x0123_4567_89ab_cdef; 16];
+        let offset = [0x1020_3040_5060_7080, 0x90a0_b0c0_d0e0_f000];
+        OpenVmCrypto.blake2_compress(12, &mut actual, &message, &offset, true);
+        DefaultCrypto.blake2_compress(12, &mut expected, &message, &offset, true);
+        assert_eq!(actual, expected);
     }
 
     #[test]
-    fn test_accelerated_modexp_bn254_fr() {
-        // --- short base (<=32 bytes), value < modulus ---
-        check(&[3], &[5]); // 3^5 mod Fr
-        check(&[0], &[5]); // 0^5 = 0
-        check(&[3], &[0]); // 3^0 = 1
-        check(&[0], &[0]); // 0^0 = 1 by convention
-        check(&[], &[]); // empty inputs
-        check(&[0, 0, 0, 3], &[5]); // leading zeros in base
-
-        // --- short base, value >= modulus (triggers reduce fallback) ---
-        let m = bn254_fr_modulus_be();
-        check(&m, &[1]); // Fr mod Fr = 0, so 0^1 = 0
-        let mut m_plus_1 = m.clone();
-        *m_plus_1.last_mut().unwrap() = m_plus_1.last().unwrap().wrapping_add(1);
-        check(&m_plus_1, &[2]); // (Fr+1)^2 mod Fr = 1
-        check(&[0xff; 32], &[1]); // max 256-bit value, >= modulus
-
-        // --- large base (> 32 bytes, reduce_be_bytes path) ---
-        check(&[0xab; 64], &[3]); // aligned (multiple of 32)
-        check(&[0x42; 100], &[2]); // unaligned (tests padding fix)
-        check(&[0xab; 64], &[0xff; 32]); // large base + large exponent
-
-        // --- larger exponents ---
-        check(&[2], &[0xff; 32]); // 2^(2^256-1) mod Fr
-        check(&[2], &[0, 0, 0, 5]); // leading zeros in exponent
-        check(&[3], &[0xab; 64]); // exponent > 32 bytes
-
-        // --- cross-path consistency: same value through different code paths ---
-        // 33-byte base with leading zero (reduce_be_bytes path) vs 32-byte base (from_be_bytes
-        // path)
-        let base_32 = [0xab; 32];
-        let mut base_33 = vec![0u8];
-        base_33.extend_from_slice(&base_32);
-        let exp = &[7];
+    fn adapters_preserve_revm_error_variants() {
+        let invalid_bn_point = [0xff; 64];
+        assert_eq!(
+            OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]),
+            Err(PrecompileHalt::Bn254FieldPointNotAMember)
+        );
         assert_eq!(
-            accelerated_modexp_bn254_fr(&base_32, exp),
-            accelerated_modexp_bn254_fr(&base_33, exp),
-            "33-byte base with leading zero must match 32-byte base"
+            OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]),
+            DefaultCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64])
+        );
+
+        let noncanonical_fp = [0xff; BLS_FP_LEN];
+        assert_eq!(
+            OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp),
+            Err(PrecompileHalt::NonCanonicalFp)
+        );
+        assert_eq!(
+            OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp),
+            DefaultCrypto.bls12_381_fp_to_g1(&noncanonical_fp)
+        );
+
+        assert_eq!(
+            OpenVmCrypto.secp256k1_ecrecover(&[0; 64], 0, &[0; 32]),
+            Err(PrecompileHalt::Secp256k1RecoverFailed)
         );
     }
 
-    /// Test the `Crypto::modexp` dispatch: accelerated path for BN254 Fr,
-    /// aurora fallback for other moduli.
     #[test]
-    fn test_modexp_dispatch() {
-        let crypto = OpenVmCrypto;
-        let fr_mod = bn254_fr_modulus_be();
-
-        // Accelerated path: BN254 Fr modulus
-        let accel = crypto.modexp(&[3], &[5], &fr_mod).unwrap();
-        let reference = reference_modexp(&[3], &[5], &fr_mod);
-        let mut ref_padded = vec![0u8; BN_SCALAR_LEN];
-        let offset = BN_SCALAR_LEN - reference.len();
-        ref_padded[offset..].copy_from_slice(&reference);
-        assert_eq!(accel, ref_padded, "accelerated path should match reference");
-
-        // Fallback path: non-BN254 modulus (e.g. small prime 7)
-        let other_mod = &[7];
-        let fallback = crypto.modexp(&[3], &[4], other_mod).unwrap();
-        let expected = reference_modexp(&[3], &[4], other_mod);
-        assert_eq!(fallback, expected, "fallback path should match reference");
+    fn streaming_adapters_report_the_first_invalid_pair() {
+        let invalid_bn_g1 = [0xff; 64];
+        let identity_bn_g2 = [0; 128];
+        let identity_bn_g1 = [0; 64];
+        let short_bn_g2 = [0; 127];
+        let bn_pairs =
+            [(&invalid_bn_g1[..], &identity_bn_g2[..]), (&identity_bn_g1[..], &short_bn_g2[..])];
+        assert_eq!(
+            OpenVmCrypto.bn254_pairing_check(&bn_pairs),
+            Err(PrecompileHalt::Bn254FieldPointNotAMember)
+        );
+
+        let invalid_g1 = ([0xff; BLS_FP_LEN], [0xff; BLS_FP_LEN]);
+        let mut g1_pairs =
+            [Ok((invalid_g1, [0; 32])), Err(PrecompileHalt::Bls12381ScalarInputLength)].into_iter();
+        assert_eq!(
+            OpenVmCrypto.bls12_381_g1_msm(&mut g1_pairs),
+            Err(PrecompileHalt::NonCanonicalFp)
+        );
     }
 }

From 95bd9cfe1436e5fdb1743e7d4892c457e95d95bb Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Tue, 11 Aug 2026 23:17:13 +0200
Subject: [PATCH 87/94] fix: keep accelerator interface client independent

---
 Cargo.lock                                    |  1 -
 Cargo.toml                                    |  1 -
 bin/stateless-guest/Cargo.lock                |  1 -
 crates/accelerators/Cargo.toml                |  1 -
 crates/accelerators/src/ops/blake2/mod.rs     | 35 +++++++-
 .../accelerators/src/ops/blake2/portable.rs   | 83 +++++++++++++++++++
 .../accelerators/tests/conformance/blake2.rs  |  2 +
 7 files changed, 117 insertions(+), 7 deletions(-)
 create mode 100644 crates/accelerators/src/ops/blake2/portable.rs

diff --git a/Cargo.lock b/Cargo.lock
index a89c4bd7f..05abc19af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6804,7 +6804,6 @@ dependencies = [
  "openvm-pairing-guest",
  "openvm-sha2",
  "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
- "revm-precompile 36.0.3",
  "ripemd",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 0e45bb4a8..7606f8b2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,7 +87,6 @@ reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v2.3.0", d
 
 # revm
 revm = { version = "=40.0.3", features = ["serde"], default-features = false }
-revm-precompile = { version = "=36.0.3", default-features = false }
 revm-primitives = { version = "=24.0.1", default-features = false }
 
 # alloy
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 8279dd5bf..330271d54 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -2481,7 +2481,6 @@ dependencies = [
  "openvm-pairing-guest",
  "openvm-sha2",
  "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0)",
- "revm-precompile",
  "ripemd",
 ]
 
diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 5b3baff20..8362f2ff1 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -25,7 +25,6 @@ ark-ec = { version = "0.5", default-features = false }
 ark-serialize = { version = "0.5", default-features = false }
 aurora-engine-modexp = { version = "1.2.0", default-features = false }
 ripemd = { version = "0.1.3", default-features = false }
-revm-precompile.workspace = true
 
 # The OpenVM-accelerated k256 fork; its ECDSA recovery relies on zkVM hints
 # and is unimplemented outside the guest.
diff --git a/crates/accelerators/src/ops/blake2/mod.rs b/crates/accelerators/src/ops/blake2/mod.rs
index 4714055a7..5bae255b6 100644
--- a/crates/accelerators/src/ops/blake2/mod.rs
+++ b/crates/accelerators/src/ops/blake2/mod.rs
@@ -1,13 +1,42 @@
 //! BLAKE2b compression function F (EIP-152).
 //!
-//! Uses REVM's EIP-152 implementation so the standard interface and REVM's
-//! precompile provider share one compression function.
+//! Operates on raw BLAKE2b state with an arbitrary round count.
+
+mod portable;
 
 use crate::{
     ops::Error,
     types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
 };
 
+type Word = u64;
+
+const IV: [Word; 8] = [
+    0x6A09E667F3BCC908,
+    0xBB67AE8584CAA73B,
+    0x3C6EF372FE94F82B,
+    0xA54FF53A5F1D36F1,
+    0x510E527FADE682D1,
+    0x9B05688C2B3E6C1F,
+    0x1F83D9ABFB41BD6B,
+    0x5BE0CD19137E2179,
+];
+
+// The message schedule has period 10 (RFC 7693 section 2.7). EIP-152 permits
+// arbitrary round counts, so rounds beyond the standard 12 must use `r % 10`.
+const SIGMA: [[u8; 16]; 10] = [
+    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
+    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
+    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
+    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
+    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
+    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
+    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
+    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
+    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
+];
+
 /// Apply the BLAKE2 compression function F to the state vector `h` in place.
 ///
 /// `h`, `m` and `t` hold little-endian words; `f` is the final-block
@@ -47,5 +76,5 @@ pub fn blake2f(
 /// Apply BLAKE2 compression to word-oriented state without byte conversion.
 #[inline]
 pub fn blake2f_words(rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
-    revm_precompile::blake2::compress(rounds, h, m, t, f);
+    portable::compress(rounds, h, m, t, f);
 }
diff --git a/crates/accelerators/src/ops/blake2/portable.rs b/crates/accelerators/src/ops/blake2/portable.rs
new file mode 100644
index 000000000..9bc4cc1db
--- /dev/null
+++ b/crates/accelerators/src/ops/blake2/portable.rs
@@ -0,0 +1,83 @@
+// Ported from revm-precompile 36.0.3's EIP-152 adaptation:
+// https://docs.rs/crate/revm-precompile/36.0.3/source/src/blake2/portable.rs
+// That implementation is adapted from blake2b_simd:
+// https://github.com/oconnor663/blake2_simd
+//
+// Copyright (c) 2018 Jack O'Connor
+// Copyright (c) 2021-2026 draganrakita
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+use super::{Word, IV, SIGMA};
+
+#[inline(always)]
+const fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
+    v[d] = (v[d] ^ v[a]).rotate_right(32);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(24);
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
+    v[d] = (v[d] ^ v[a]).rotate_right(16);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(63);
+}
+
+#[inline(always)]
+const fn round(round: usize, m: &[Word; 16], v: &mut [Word; 16]) {
+    let schedule = SIGMA[round % SIGMA.len()];
+
+    g(v, 0, 4, 8, 12, m[schedule[0] as usize], m[schedule[1] as usize]);
+    g(v, 1, 5, 9, 13, m[schedule[2] as usize], m[schedule[3] as usize]);
+    g(v, 2, 6, 10, 14, m[schedule[4] as usize], m[schedule[5] as usize]);
+    g(v, 3, 7, 11, 15, m[schedule[6] as usize], m[schedule[7] as usize]);
+
+    g(v, 0, 5, 10, 15, m[schedule[8] as usize], m[schedule[9] as usize]);
+    g(v, 1, 6, 11, 12, m[schedule[10] as usize], m[schedule[11] as usize]);
+    g(v, 2, 7, 8, 13, m[schedule[12] as usize], m[schedule[13] as usize]);
+    g(v, 3, 4, 9, 14, m[schedule[14] as usize], m[schedule[15] as usize]);
+}
+
+pub(super) fn compress(rounds: u32, h: &mut [Word; 8], m: &[Word; 16], t: &[Word; 2], f: bool) {
+    let mut v = [
+        h[0],
+        h[1],
+        h[2],
+        h[3],
+        h[4],
+        h[5],
+        h[6],
+        h[7],
+        IV[0],
+        IV[1],
+        IV[2],
+        IV[3],
+        IV[4] ^ t[0],
+        IV[5] ^ t[1],
+        IV[6] ^ if f { Word::MAX } else { 0 },
+        IV[7],
+    ];
+
+    for round_index in 0..rounds as usize {
+        round(round_index, m, &mut v);
+    }
+
+    for (index, word) in h.iter_mut().enumerate() {
+        *word ^= v[index] ^ v[index + 8];
+    }
+}
diff --git a/crates/accelerators/tests/conformance/blake2.rs b/crates/accelerators/tests/conformance/blake2.rs
index 05f147c22..a0c5f967e 100644
--- a/crates/accelerators/tests/conformance/blake2.rs
+++ b/crates/accelerators/tests/conformance/blake2.rs
@@ -100,8 +100,10 @@ fn zkvm_blake2f_smoke() {
     );
 
     // An invalid final flag maps to the failure status.
+    let valid_output = h;
     let status = unsafe { zkvm_blake2f(12, &mut h, &m, &t, 2) };
     assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(h, valid_output);
 }
 
 #[test]

From 9ed74b66874dcd117332812fffd9eea9cc77a6b7 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 12 Aug 2026 00:20:12 +0200
Subject: [PATCH 88/94] refactor: simplify accelerator API

---
 crates/accelerators/Cargo.toml                |   9 +-
 crates/accelerators/src/ffi/blake2.rs         |  27 ++-
 crates/accelerators/src/ffi/bls12_381.rs      |  71 ++++---
 crates/accelerators/src/ffi/bn254.rs          |  20 +-
 crates/accelerators/src/ffi/ecdsa.rs          |  13 +-
 crates/accelerators/src/ffi/hash.rs           |   9 +-
 crates/accelerators/src/ffi/kzg.rs            |   4 +-
 crates/accelerators/src/ffi/mod.rs            |   5 +-
 crates/accelerators/src/ffi/modexp.rs         |   2 +-
 crates/accelerators/src/lib.rs                |  19 +-
 crates/accelerators/src/ops/blake2/mod.rs     |  43 +---
 .../accelerators/src/ops/bls12_381/codec.rs   |  56 +++---
 crates/accelerators/src/ops/bls12_381/map.rs  |  55 +++--
 crates/accelerators/src/ops/bls12_381/mod.rs  | 119 +++--------
 crates/accelerators/src/ops/bn254/codec.rs    |  40 ++--
 crates/accelerators/src/ops/bn254/mod.rs      |  54 ++---
 .../accelerators/src/ops/ecdsa/secp256k1.rs   |  51 ++---
 .../accelerators/src/ops/ecdsa/secp256r1.rs   |  31 +--
 crates/accelerators/src/ops/hash.rs           |  28 +--
 crates/accelerators/src/ops/kzg.rs            |  37 ++--
 crates/accelerators/src/ops/mod.rs            |  25 ++-
 crates/accelerators/src/ops/modexp.rs         |  13 +-
 .../tests/{conformance => }/blake2.rs         |  33 +--
 .../tests/{conformance => }/bls12_381.rs      | 181 ++++++++---------
 .../tests/{conformance => }/bn254.rs          |  46 ++---
 crates/accelerators/tests/conformance/main.rs |  12 --
 .../tests/{conformance => }/ecdsa.rs          |  65 ++----
 .../tests/{conformance => }/hash.rs           |  32 +--
 .../tests/{conformance => }/kzg.rs            |  24 +--
 .../tests/{conformance => }/modexp.rs         |  21 +-
 crates/revm-crypto/src/lib.rs                 | 190 ++++--------------
 31 files changed, 495 insertions(+), 840 deletions(-)
 rename crates/accelerators/tests/{conformance => }/blake2.rs (80%)
 rename crates/accelerators/tests/{conformance => }/bls12_381.rs (70%)
 rename crates/accelerators/tests/{conformance => }/bn254.rs (81%)
 delete mode 100644 crates/accelerators/tests/conformance/main.rs
 rename crates/accelerators/tests/{conformance => }/ecdsa.rs (66%)
 rename crates/accelerators/tests/{conformance => }/hash.rs (84%)
 rename crates/accelerators/tests/{conformance => }/kzg.rs (81%)
 rename crates/accelerators/tests/{conformance => }/modexp.rs (83%)

diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index 8362f2ff1..d70690b93 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openvm-accelerators"
-description = "OpenVM implementation of the zkVM Cryptographic Accelerators C Interface"
+description = "OpenVM cryptographic accelerator interface"
 version.workspace = true
 edition.workspace = true
 homepage.workspace = true
@@ -51,14 +51,7 @@ ignored = ["openvm-pairing-guest"]
 [package.metadata.cargo-machete]
 ignored = ["openvm-pairing-guest"]
 
-[[test]]
-name = "conformance"
-path = "tests/conformance/main.rs"
-required-features = ["ffi"]
-
 [features]
 default = ["ffi"]
-# The extern "C" `zkvm_*` symbols. Rust consumers that only need `ops` can
-# disable this.
 ffi = []
 std = []
diff --git a/crates/accelerators/src/ffi/blake2.rs b/crates/accelerators/src/ffi/blake2.rs
index a08840a7f..3fda48d18 100644
--- a/crates/accelerators/src/ffi/blake2.rs
+++ b/crates/accelerators/src/ffi/blake2.rs
@@ -23,15 +23,32 @@ pub unsafe extern "C" fn zkvm_blake2f(
     t: *const ZkvmBlake2fOffset,
     f: u8,
 ) -> ZkvmStatus {
-    if h.is_null() || m.is_null() || t.is_null() {
+    if h.is_null() || m.is_null() || t.is_null() || f > 1 {
         return ZkvmStatus::Fail;
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (mut state, message, offset) = unsafe { (h.read(), m.read(), t.read()) };
-    if ops::blake2f(rounds, &mut state, &message, &offset, f).is_err() {
-        return ZkvmStatus::Fail;
+    let (state, message, offset) = unsafe { (h.read(), m.read(), t.read()) };
+
+    let mut state_words = [0; 8];
+    for (word, bytes) in state_words.iter_mut().zip(state.data.as_chunks::<8>().0) {
+        *word = u64::from_le_bytes(*bytes);
+    }
+    let mut message_words = [0; 16];
+    for (word, bytes) in message_words.iter_mut().zip(message.data.as_chunks::<8>().0) {
+        *word = u64::from_le_bytes(*bytes);
+    }
+    let offset_words = [
+        u64::from_le_bytes(offset.data[..8].try_into().unwrap()),
+        u64::from_le_bytes(offset.data[8..].try_into().unwrap()),
+    ];
+
+    ops::blake2f(rounds, &mut state_words, &message_words, &offset_words, f == 1);
+
+    let mut value = ZkvmBlake2fState { data: [0; 64] };
+    for (bytes, word) in value.data.as_chunks_mut::<8>().0.iter_mut().zip(state_words) {
+        *bytes = word.to_le_bytes();
     }
     // SAFETY: `h` is non-NULL and valid for writes.
-    unsafe { h.write(state) };
+    unsafe { h.write(value) };
     ZkvmStatus::Ok
 }
diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
index 3e802b12a..489ecfd59 100644
--- a/crates/accelerators/src/ffi/bls12_381.rs
+++ b/crates/accelerators/src/ffi/bls12_381.rs
@@ -28,11 +28,10 @@ pub unsafe extern "C" fn zkvm_bls12_g1_add(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
-    match ops::bls12_381_g1_add(&p1, &p2, &mut value) {
-        Ok(()) => {
+    match ops::bls12_381_g1_add(bls_g1(p1.data), bls_g1(p2.data)) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G1Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -60,11 +59,13 @@ pub unsafe extern "C" fn zkvm_bls12_g1_msm(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
-    match ops::bls12_381_g1_msm(pairs, &mut value) {
-        Ok(()) => {
+    let pairs = pairs.iter().map(|pair| {
+        Ok::<_, core::convert::Infallible>((bls_g1(pair.point.data), pair.scalar.data))
+    });
+    match ops::bls12_381_g1_msm(pairs) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G1Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -91,11 +92,10 @@ pub unsafe extern "C" fn zkvm_bls12_g2_add(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
-    match ops::bls12_381_g2_add(&p1, &p2, &mut value) {
-        Ok(()) => {
+    match ops::bls12_381_g2_add(bls_g2(p1.data), bls_g2(p2.data)) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G2Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -123,11 +123,13 @@ pub unsafe extern "C" fn zkvm_bls12_g2_msm(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
-    match ops::bls12_381_g2_msm(pairs, &mut value) {
-        Ok(()) => {
+    let pairs = pairs.iter().map(|pair| {
+        Ok::<_, core::convert::Infallible>((bls_g2(pair.point.data), pair.scalar.data))
+    });
+    match ops::bls12_381_g2_msm(pairs) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G2Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -156,9 +158,9 @@ pub unsafe extern "C" fn zkvm_bls12_pairing(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let mut value = false;
-    match ops::bls12_381_pairing_check(pairs, &mut value) {
-        Ok(()) => {
+    let pairs = pairs.iter().map(|pair| (bls_g1(pair.g1.data), bls_g2(pair.g2.data)));
+    match ops::bls12_381_pairing_check(pairs) {
+        Ok(value) => {
             // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
             unsafe { verified.write(value) };
             ZkvmStatus::Ok
@@ -171,6 +173,19 @@ pub unsafe extern "C" fn zkvm_bls12_pairing(
     }
 }
 
+fn bls_g1(data: [u8; 96]) -> ([u8; 48], [u8; 48]) {
+    (data[..48].try_into().unwrap(), data[48..].try_into().unwrap())
+}
+
+fn bls_g2(data: [u8; 192]) -> ([u8; 48], [u8; 48], [u8; 48], [u8; 48]) {
+    (
+        data[..48].try_into().unwrap(),
+        data[48..96].try_into().unwrap(),
+        data[96..144].try_into().unwrap(),
+        data[144..].try_into().unwrap(),
+    )
+}
+
 /// BLS12-381 map field element to G1 (precompile 0x10, EIP-2537).
 ///
 /// Returns [`ZkvmStatus::Fail`] if either pointer is NULL or the field element
@@ -190,11 +205,10 @@ pub unsafe extern "C" fn zkvm_bls12_map_fp_to_g1(
     }
     // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
     let field_element = unsafe { field_element.read() };
-    let mut value = ZkvmBls12381G1Point { data: [0; 96] };
-    match ops::bls12_381_map_fp_to_g1(&field_element, &mut value) {
-        Ok(()) => {
+    match ops::bls12_381_map_fp_to_g1(&field_element.data) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G1Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -220,11 +234,14 @@ pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
     }
     // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
     let field_element = unsafe { field_element.read() };
-    let mut value = ZkvmBls12381G2Point { data: [0; 192] };
-    match ops::bls12_381_map_fp2_to_g2(&field_element, &mut value) {
-        Ok(()) => {
+    let fp2 = (
+        field_element.data[..48].try_into().unwrap(),
+        field_element.data[48..].try_into().unwrap(),
+    );
+    match ops::bls12_381_map_fp2_to_g2(fp2) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBls12381G2Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
diff --git a/crates/accelerators/src/ffi/bn254.rs b/crates/accelerators/src/ffi/bn254.rs
index 7dae5301f..d0d34b884 100644
--- a/crates/accelerators/src/ffi/bn254.rs
+++ b/crates/accelerators/src/ffi/bn254.rs
@@ -25,11 +25,10 @@ pub unsafe extern "C" fn zkvm_bn254_g1_add(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    let mut value = ZkvmBn254G1Point { data: [0; 64] };
-    match ops::bn254_g1_add(&p1, &p2, &mut value) {
-        Ok(()) => {
+    match ops::bn254_g1_add(&p1.data, &p2.data) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBn254G1Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -59,11 +58,10 @@ pub unsafe extern "C" fn zkvm_bn254_g1_mul(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (point, scalar) = unsafe { (point.read(), scalar.read()) };
-    let mut value = ZkvmBn254G1Point { data: [0; 64] };
-    match ops::bn254_g1_mul(&point, &scalar, &mut value) {
-        Ok(()) => {
+    match ops::bn254_g1_mul(&point.data, &scalar.data) {
+        Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(value) };
+            unsafe { result.write(ZkvmBn254G1Point { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -91,9 +89,9 @@ pub unsafe extern "C" fn zkvm_bn254_pairing(
     // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
     let pairs =
         if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let mut value = false;
-    match ops::bn254_pairing_check(pairs, &mut value) {
-        Ok(()) => {
+    let pairs = pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()));
+    match ops::bn254_pairing_check(pairs) {
+        Ok(value) => {
             // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
             unsafe { verified.write(value) };
             ZkvmStatus::Ok
diff --git a/crates/accelerators/src/ffi/ecdsa.rs b/crates/accelerators/src/ffi/ecdsa.rs
index a3396c33b..a262a360c 100644
--- a/crates/accelerators/src/ffi/ecdsa.rs
+++ b/crates/accelerators/src/ffi/ecdsa.rs
@@ -31,11 +31,10 @@ pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copying before writing supports overlap.
     let (msg, sig) = unsafe { (msg.read(), sig.read()) };
-    let mut value = ZkvmSecp256k1Pubkey { data: [0; 64] };
-    match ops::secp256k1_ecrecover(&msg, &sig, recid, &mut value) {
-        Ok(()) => {
+    match ops::secp256k1_ecrecover(&msg.data, &sig.data, recid) {
+        Ok(data) => {
             // SAFETY: `output` is non-NULL and valid for writes.
-            unsafe { output.write(value) };
+            unsafe { output.write(ZkvmSecp256k1Pubkey { data }) };
             ZkvmStatus::Ok
         }
         Err(_) => ZkvmStatus::Fail,
@@ -66,8 +65,7 @@ pub unsafe extern "C" fn zkvm_secp256k1_verify(
     }
     // SAFETY: the non-NULL inputs are valid for reads.
     let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
-    let mut value = false;
-    let _ = ops::secp256k1_verify(&msg, &sig, &pubkey, &mut value);
+    let value = ops::secp256k1_verify(&msg.data, &sig.data, &pubkey.data);
     // SAFETY: `verified` is non-NULL and valid for writes.
     unsafe { verified.write(value) };
     ZkvmStatus::Ok
@@ -97,8 +95,7 @@ pub unsafe extern "C" fn zkvm_secp256r1_verify(
     }
     // SAFETY: the non-NULL inputs are valid for reads.
     let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
-    let mut value = false;
-    let _ = ops::secp256r1_verify(&msg, &sig, &pubkey, &mut value);
+    let value = ops::secp256r1_verify(&msg.data, &sig.data, &pubkey.data);
     // SAFETY: `verified` is non-NULL and valid for writes.
     unsafe { verified.write(value) };
     ZkvmStatus::Ok
diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
index 16f950bb7..50978a19b 100644
--- a/crates/accelerators/src/ffi/hash.rs
+++ b/crates/accelerators/src/ffi/hash.rs
@@ -26,8 +26,7 @@ pub unsafe extern "C" fn zkvm_keccak256(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let mut value = ZkvmKeccak256Hash { data: [0; 32] };
-    ops::keccak256(data, &mut value);
+    let value = ZkvmKeccak256Hash { data: ops::keccak256(data) };
     // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
     // overlapping input/output storage is supported.
     unsafe { output.write(value) };
@@ -55,8 +54,7 @@ pub unsafe extern "C" fn zkvm_sha256(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let mut value = ZkvmSha256Hash { data: [0; 32] };
-    ops::sha256(data, &mut value);
+    let value = ZkvmSha256Hash { data: ops::sha256(data) };
     // SAFETY: see `zkvm_keccak256`.
     unsafe { output.write(value) };
     ZkvmStatus::Ok
@@ -86,8 +84,7 @@ pub unsafe extern "C" fn zkvm_ripemd160(
     }
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let mut value = ZkvmRipemd160Hash { data: [0; 32] };
-    ops::ripemd160(data, &mut value);
+    let value = ZkvmRipemd160Hash { data: ops::ripemd160(data) };
     // SAFETY: see `zkvm_keccak256`.
     unsafe { output.write(value) };
     ZkvmStatus::Ok
diff --git a/crates/accelerators/src/ffi/kzg.rs b/crates/accelerators/src/ffi/kzg.rs
index 4b23d1bed..e2310f5df 100644
--- a/crates/accelerators/src/ffi/kzg.rs
+++ b/crates/accelerators/src/ffi/kzg.rs
@@ -30,8 +30,8 @@ pub unsafe extern "C" fn zkvm_kzg_point_eval(
     // SAFETY: the non-NULL inputs are valid for reads.
     let (commitment, z, y, proof) =
         unsafe { (commitment.read(), z.read(), y.read(), proof.read()) };
-    let mut value = false;
-    let _ = ops::kzg_point_eval(&commitment, &z, &y, &proof, &mut value);
+    let value =
+        ops::kzg_point_eval(&commitment.data, &z.data, &y.data, &proof.data).unwrap_or(false);
     // SAFETY: `verified` is non-NULL and valid for writes.
     unsafe { verified.write(value) };
     ZkvmStatus::Ok
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
index 87dc17f4d..3ecddb08c 100644
--- a/crates/accelerators/src/ffi/mod.rs
+++ b/crates/accelerators/src/ffi/mod.rs
@@ -1,8 +1,7 @@
 //! The `extern "C"` layer: `zkvm_*` symbols matching `zkvm_accelerators.h`.
 //!
-//! Every function is a thin wrapper over [`crate::ops`]: it checks pointers,
-//! converts them to references, calls the operation, and maps the result to
-//! [`crate::types::ZkvmStatus`]. No other logic lives here.
+//! Each function validates the ABI inputs, converts their representation,
+//! calls [`crate::ops`], and maps the result to [`crate::types::ZkvmStatus`].
 
 mod blake2;
 mod bls12_381;
diff --git a/crates/accelerators/src/ffi/modexp.rs b/crates/accelerators/src/ffi/modexp.rs
index db86c7a13..652eaabba 100644
--- a/crates/accelerators/src/ffi/modexp.rs
+++ b/crates/accelerators/src/ffi/modexp.rs
@@ -37,7 +37,7 @@ pub unsafe extern "C" fn zkvm_modexp(
     // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
     let modulus =
         if mod_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(modulus, mod_len) } };
-    let value = ops::modexp_result(base, exp, modulus);
+    let value = ops::modexp(base, exp, modulus);
     if mod_len != 0 {
         // SAFETY: `output` is non-NULL and valid for `mod_len` writes. `value` cannot overlap it,
         // and all caller-provided input reads are complete.
diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
index e851bff8e..affa9e773 100644
--- a/crates/accelerators/src/lib.rs
+++ b/crates/accelerators/src/lib.rs
@@ -1,10 +1,21 @@
-//! OpenVM implementation of the zkVM Cryptographic Accelerators C Interface.
+//! OpenVM implementation of the zkVM cryptographic accelerator interface.
+//!
+//! Points and scalars use fixed-size big-endian encodings. BLS12-381 G2 uses
+//! `x_c0 || x_c1 || y_c0 || y_c1`; BN254 G2 uses the EIP-197
+//! `x_c1 || x_c0 || y_c1 || y_c0` order.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate alloc;
 
 #[cfg(feature = "ffi")]
-pub mod ffi;
-pub mod ops;
-pub mod types;
+mod ffi;
+mod ops;
+#[cfg(feature = "ffi")]
+mod types;
+
+#[cfg(feature = "ffi")]
+pub use ffi::*;
+pub use ops::*;
+#[cfg(feature = "ffi")]
+pub use types::*;
diff --git a/crates/accelerators/src/ops/blake2/mod.rs b/crates/accelerators/src/ops/blake2/mod.rs
index 5bae255b6..800b08e69 100644
--- a/crates/accelerators/src/ops/blake2/mod.rs
+++ b/crates/accelerators/src/ops/blake2/mod.rs
@@ -4,11 +4,6 @@
 
 mod portable;
 
-use crate::{
-    ops::Error,
-    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState},
-};
-
 type Word = u64;
 
 const IV: [Word; 8] = [
@@ -37,44 +32,8 @@ const SIGMA: [[u8; 16]; 10] = [
     [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
 ];
 
-/// Apply the BLAKE2 compression function F to the state vector `h` in place.
-///
-/// `h`, `m` and `t` hold little-endian words; `f` is the final-block
-/// indicator and must be `0` or `1`.
-pub fn blake2f(
-    rounds: u32,
-    h: &mut ZkvmBlake2fState,
-    m: &ZkvmBlake2fMessage,
-    t: &ZkvmBlake2fOffset,
-    f: u8,
-) -> Result<(), Error> {
-    if f > 1 {
-        return Err(Error::InvalidFinalFlag);
-    }
-
-    let mut state = [0u64; 8];
-    for (word, chunk) in state.iter_mut().zip(h.data.chunks_exact(8)) {
-        *word = u64::from_le_bytes(chunk.try_into().unwrap());
-    }
-    let mut message = [0u64; 16];
-    for (word, chunk) in message.iter_mut().zip(m.data.chunks_exact(8)) {
-        *word = u64::from_le_bytes(chunk.try_into().unwrap());
-    }
-    let offset = [
-        u64::from_le_bytes(t.data[..8].try_into().unwrap()),
-        u64::from_le_bytes(t.data[8..].try_into().unwrap()),
-    ];
-
-    blake2f_words(rounds, &mut state, &message, &offset, f == 1);
-
-    for (chunk, word) in h.data.chunks_exact_mut(8).zip(state.iter()) {
-        chunk.copy_from_slice(&word.to_le_bytes());
-    }
-    Ok(())
-}
-
 /// Apply BLAKE2 compression to word-oriented state without byte conversion.
 #[inline]
-pub fn blake2f_words(rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
+pub fn blake2f(rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
     portable::compress(rounds, h, m, t, f);
 }
diff --git a/crates/accelerators/src/ops/bls12_381/codec.rs b/crates/accelerators/src/ops/bls12_381/codec.rs
index f6c5d7ebc..7f72feeaf 100644
--- a/crates/accelerators/src/ops/bls12_381/codec.rs
+++ b/crates/accelerators/src/ops/bls12_381/codec.rs
@@ -6,10 +6,7 @@ use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint, Group};
 use openvm_pairing::bls12_381 as bls;
 
 use super::BLS_FP_LEN;
-use crate::{
-    ops::Error,
-    types::{ZkvmBls12381G1Point, ZkvmBls12381G2Point, ZkvmBls12381Scalar},
-};
+use crate::ops::{BlsG1, BlsG2, Error};
 
 #[inline]
 fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, Error> {
@@ -24,18 +21,16 @@ fn read_bls_fp2(c0: &[u8], c1: &[u8]) -> Result<bls::Fp2, Error> {
 }
 
 #[inline]
-pub(super) fn read_bls_g1_point_no_subgroup_check(
-    point: &ZkvmBls12381G1Point,
-) -> Result<bls::G1Affine, Error> {
-    let px = read_bls_fp(&point.data[..BLS_FP_LEN])?;
-    let py = read_bls_fp(&point.data[BLS_FP_LEN..])?;
+pub(super) fn read_bls_g1_point_no_subgroup_check(point: &BlsG1) -> Result<bls::G1Affine, Error> {
+    let px = read_bls_fp(&point.0)?;
+    let py = read_bls_fp(&point.1)?;
     // SAFETY: `read_bls_fp` produces canonical Fp elements; `from_xy` itself checks the curve
     // equation and returns `None` if `(px, py)` is not on the curve.
     unsafe { bls::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)
 }
 
 #[inline]
-pub(super) fn read_bls_g1_point(point: &ZkvmBls12381G1Point) -> Result<bls::G1Affine, Error> {
+pub(super) fn read_bls_g1_point(point: &BlsG1) -> Result<bls::G1Affine, Error> {
     let point = read_bls_g1_point_no_subgroup_check(point)?;
     if point.is_in_correct_subgroup() {
         Ok(point)
@@ -45,19 +40,16 @@ pub(super) fn read_bls_g1_point(point: &ZkvmBls12381G1Point) -> Result<bls::G1Af
 }
 
 #[inline]
-pub(super) fn read_bls_g2_point_no_subgroup_check(
-    point: &ZkvmBls12381G2Point,
-) -> Result<bls::G2Affine, Error> {
-    let x = read_bls_fp2(&point.data[..BLS_FP_LEN], &point.data[BLS_FP_LEN..2 * BLS_FP_LEN])?;
-    let y =
-        read_bls_fp2(&point.data[2 * BLS_FP_LEN..3 * BLS_FP_LEN], &point.data[3 * BLS_FP_LEN..])?;
+pub(super) fn read_bls_g2_point_no_subgroup_check(point: &BlsG2) -> Result<bls::G2Affine, Error> {
+    let x = read_bls_fp2(&point.0, &point.1)?;
+    let y = read_bls_fp2(&point.2, &point.3)?;
     // SAFETY: `read_bls_fp2` produces canonical Fp2 elements; `from_xy` itself checks the curve
     // equation and returns `None` if `(x, y)` is not on the twist.
     unsafe { bls::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)
 }
 
 #[inline]
-pub(super) fn read_bls_g2_point(point: &ZkvmBls12381G2Point) -> Result<bls::G2Affine, Error> {
+pub(super) fn read_bls_g2_point(point: &BlsG2) -> Result<bls::G2Affine, Error> {
     let point = read_bls_g2_point_no_subgroup_check(point)?;
     if point.is_in_correct_subgroup() {
         Ok(point)
@@ -67,30 +59,31 @@ pub(super) fn read_bls_g2_point(point: &ZkvmBls12381G2Point) -> Result<bls::G2Af
 }
 
 #[inline]
-pub(super) fn read_bls_scalar(input: &ZkvmBls12381Scalar) -> bls::Scalar {
-    bls::Scalar::from_be_bytes_unchecked(&input.data)
+pub(super) fn read_bls_scalar(input: &[u8; 32]) -> bls::Scalar {
+    bls::Scalar::from_be_bytes_unchecked(input)
 }
 
 #[inline]
-pub(super) fn encode_bls_g1_point(point: &bls::G1Affine, output: &mut ZkvmBls12381G1Point) {
+pub(super) fn encode_bls_g1_point(point: &bls::G1Affine) -> [u8; 96] {
+    let mut output = [0; 96];
     if point.is_identity() {
-        output.data.fill(0);
-        return;
+        return output;
     }
 
     let x_bytes: &[u8] = point.x().as_le_bytes();
     let y_bytes: &[u8] = point.y().as_le_bytes();
     for i in 0..BLS_FP_LEN {
-        output.data[i] = x_bytes[BLS_FP_LEN - 1 - i];
-        output.data[i + BLS_FP_LEN] = y_bytes[BLS_FP_LEN - 1 - i];
+        output[i] = x_bytes[BLS_FP_LEN - 1 - i];
+        output[i + BLS_FP_LEN] = y_bytes[BLS_FP_LEN - 1 - i];
     }
+    output
 }
 
 #[inline]
-pub(super) fn encode_bls_g2_point(point: &bls::G2Affine, output: &mut ZkvmBls12381G2Point) {
+pub(super) fn encode_bls_g2_point(point: &bls::G2Affine) -> [u8; 192] {
+    let mut output = [0; 192];
     if point.is_identity() {
-        output.data.fill(0);
-        return;
+        return output;
     }
 
     let x = point.x();
@@ -100,9 +93,10 @@ pub(super) fn encode_bls_g2_point(point: &bls::G2Affine, output: &mut ZkvmBls123
     let y_c0 = y.c0.as_le_bytes();
     let y_c1 = y.c1.as_le_bytes();
     for i in 0..BLS_FP_LEN {
-        output.data[i] = x_c0[BLS_FP_LEN - 1 - i];
-        output.data[i + BLS_FP_LEN] = x_c1[BLS_FP_LEN - 1 - i];
-        output.data[i + (2 * BLS_FP_LEN)] = y_c0[BLS_FP_LEN - 1 - i];
-        output.data[i + (3 * BLS_FP_LEN)] = y_c1[BLS_FP_LEN - 1 - i];
+        output[i] = x_c0[BLS_FP_LEN - 1 - i];
+        output[i + BLS_FP_LEN] = x_c1[BLS_FP_LEN - 1 - i];
+        output[i + (2 * BLS_FP_LEN)] = y_c0[BLS_FP_LEN - 1 - i];
+        output[i + (3 * BLS_FP_LEN)] = y_c1[BLS_FP_LEN - 1 - i];
     }
+    output
 }
diff --git a/crates/accelerators/src/ops/bls12_381/map.rs b/crates/accelerators/src/ops/bls12_381/map.rs
index 93ab05d7a..c16f3bb73 100644
--- a/crates/accelerators/src/ops/bls12_381/map.rs
+++ b/crates/accelerators/src/ops/bls12_381/map.rs
@@ -10,38 +10,27 @@ use ark_ec::{
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 
 use super::BLS_FP_LEN;
-use crate::{
-    ops::Error,
-    types::{ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1Point, ZkvmBls12381G2Point},
-};
+use crate::ops::Error;
 
 /// BLS12-381 map field element to G1 (precompile 0x10).
-pub fn bls12_381_map_fp_to_g1(
-    fp: &ZkvmBls12381Fp,
-    output: &mut ZkvmBls12381G1Point,
-) -> Result<(), Error> {
-    let fp = read_fq(&fp.data)?;
+pub fn bls12_381_map_fp_to_g1(fp: &[u8; 48]) -> Result<[u8; 96], Error> {
+    let fp = read_fq(fp)?;
     let point = WBMap::map_to_curve(fp)
         .expect("the arkworks WB map is defined for every field element")
         .clear_cofactor();
 
-    encode_g1_point(&point, output);
-    Ok(())
+    Ok(encode_g1_point(&point))
 }
 
-/// BLS12-381 map field element to G2 (precompile 0x11). Input is `c0 || c1`.
-pub fn bls12_381_map_fp2_to_g2(
-    fp2: &ZkvmBls12381Fp2,
-    output: &mut ZkvmBls12381G2Point,
-) -> Result<(), Error> {
-    let c0 = read_fq(&fp2.data[..BLS_FP_LEN])?;
-    let c1 = read_fq(&fp2.data[BLS_FP_LEN..])?;
+/// BLS12-381 map field element to G2 (precompile 0x11).
+pub fn bls12_381_map_fp2_to_g2(fp2: ([u8; 48], [u8; 48])) -> Result<[u8; 192], Error> {
+    let c0 = read_fq(&fp2.0)?;
+    let c1 = read_fq(&fp2.1)?;
     let point = WBMap::map_to_curve(Fq2::new(c0, c1))
         .expect("the arkworks WB map is defined for every field element")
         .clear_cofactor();
 
-    encode_g2_point(&point, output);
-    Ok(())
+    Ok(encode_g2_point(&point))
 }
 
 /// Reads a big-endian field element, rejecting non-canonical encodings.
@@ -60,26 +49,28 @@ fn encode_fq(fq: &Fq, output: &mut [u8]) {
 }
 
 /// Writes a G1 point as `x || y`; the point at infinity encodes as zeros.
-fn encode_g1_point(point: &G1Affine, output: &mut ZkvmBls12381G1Point) {
+fn encode_g1_point(point: &G1Affine) -> [u8; 96] {
+    let mut output = [0; 96];
     let Some((x, y)) = point.xy() else {
-        output.data.fill(0);
-        return;
+        return output;
     };
 
-    encode_fq(&x, &mut output.data[..BLS_FP_LEN]);
-    encode_fq(&y, &mut output.data[BLS_FP_LEN..]);
+    encode_fq(&x, &mut output[..BLS_FP_LEN]);
+    encode_fq(&y, &mut output[BLS_FP_LEN..]);
+    output
 }
 
 /// Writes a G2 point as `x_c0 || x_c1 || y_c0 || y_c1`; the point at infinity
 /// encodes as zeros.
-fn encode_g2_point(point: &G2Affine, output: &mut ZkvmBls12381G2Point) {
+fn encode_g2_point(point: &G2Affine) -> [u8; 192] {
+    let mut output = [0; 192];
     let Some((x, y)) = point.xy() else {
-        output.data.fill(0);
-        return;
+        return output;
     };
 
-    encode_fq(&x.c0, &mut output.data[..BLS_FP_LEN]);
-    encode_fq(&x.c1, &mut output.data[BLS_FP_LEN..2 * BLS_FP_LEN]);
-    encode_fq(&y.c0, &mut output.data[2 * BLS_FP_LEN..3 * BLS_FP_LEN]);
-    encode_fq(&y.c1, &mut output.data[3 * BLS_FP_LEN..]);
+    encode_fq(&x.c0, &mut output[..BLS_FP_LEN]);
+    encode_fq(&x.c1, &mut output[BLS_FP_LEN..2 * BLS_FP_LEN]);
+    encode_fq(&y.c0, &mut output[2 * BLS_FP_LEN..3 * BLS_FP_LEN]);
+    encode_fq(&y.c1, &mut output[3 * BLS_FP_LEN..]);
+    output
 }
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 2b14a8564..68d21064f 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -18,13 +18,7 @@ use openvm_ecc_guest::{
 };
 use openvm_pairing::{bls12_381::Bls12_381, PairingCheck};
 
-use crate::{
-    ops::{Error, StreamError},
-    types::{
-        ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point,
-        ZkvmBls12381PairingPair,
-    },
-};
+use crate::ops::{BlsG1, BlsG2, Error, StreamError};
 
 /// The number of bytes needed to represent an element of the base field Fp.
 const BLS_FP_LEN: usize = 48;
@@ -33,122 +27,75 @@ const BLS_FP_LEN: usize = 48;
 ///
 /// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup
 /// membership.
-pub fn bls12_381_g1_add(
-    p1: &ZkvmBls12381G1Point,
-    p2: &ZkvmBls12381G1Point,
-    output: &mut ZkvmBls12381G1Point,
-) -> Result<(), Error> {
-    let p1 = read_bls_g1_point_no_subgroup_check(p1)?;
-    let p2 = read_bls_g1_point_no_subgroup_check(p2)?;
-    encode_bls_g1_point(&(p1 + p2), output);
-    Ok(())
+pub fn bls12_381_g1_add(p1: BlsG1, p2: BlsG1) -> Result<[u8; 96], Error> {
+    let p1 = read_bls_g1_point_no_subgroup_check(&p1)?;
+    let p2 = read_bls_g1_point_no_subgroup_check(&p2)?;
+    Ok(encode_bls_g1_point(&(p1 + p2)))
 }
 
 /// BLS12-381 G1 multi-scalar multiplication (precompile 0x0c).
 ///
 /// Points must be in the prime-order subgroup; scalars need not be canonical.
 /// An empty input yields the identity (all-zero) encoding.
-pub fn bls12_381_g1_msm(
-    pairs: &[ZkvmBls12381G1MsmPair],
-    output: &mut ZkvmBls12381G1Point,
-) -> Result<(), Error> {
-    *output = bls12_381_g1_msm_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
-        .map_err(|error| match error {
-            StreamError::Operation(error) => error,
-            StreamError::Source(never) => match never {},
-        })?;
-    Ok(())
-}
-
-/// BLS12-381 G1 MSM over a fallible stream, preserving input-error order.
-pub fn bls12_381_g1_msm_iter<E>(
-    pairs: impl IntoIterator<Item = Result<ZkvmBls12381G1MsmPair, E>>,
-) -> Result<ZkvmBls12381G1Point, StreamError<E>> {
+pub fn bls12_381_g1_msm<E>(
+    pairs: impl IntoIterator<Item = Result<(BlsG1, [u8; 32]), E>>,
+) -> Result<[u8; 96], StreamError<E>> {
     let pairs = pairs.into_iter();
     let capacity = pairs.size_hint().0;
 
     let mut points = Vec::with_capacity(capacity);
     let mut scalars = Vec::with_capacity(capacity);
     for pair in pairs {
-        let pair = pair.map_err(StreamError::Source)?;
-        points.push(read_bls_g1_point(&pair.point).map_err(StreamError::Operation)?);
-        scalars.push(read_bls_scalar(&pair.scalar));
+        let (point, scalar) = pair.map_err(StreamError::Source)?;
+        points.push(read_bls_g1_point(&point).map_err(StreamError::Operation)?);
+        scalars.push(read_bls_scalar(&scalar));
     }
-    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
-    if !points.is_empty() {
-        encode_bls_g1_point(&Bls12_381::msm(&scalars, &points), &mut output);
+    if points.is_empty() {
+        Ok([0; 96])
+    } else {
+        Ok(encode_bls_g1_point(&Bls12_381::msm(&scalars, &points)))
     }
-    Ok(output)
 }
 
 /// BLS12-381 G2 point addition (precompile 0x0d).
 ///
 /// Per EIP-2537 G2ADD, inputs are validated on-curve only, not for subgroup
 /// membership.
-pub fn bls12_381_g2_add(
-    p1: &ZkvmBls12381G2Point,
-    p2: &ZkvmBls12381G2Point,
-    output: &mut ZkvmBls12381G2Point,
-) -> Result<(), Error> {
-    let p1 = read_bls_g2_point_no_subgroup_check(p1)?;
-    let p2 = read_bls_g2_point_no_subgroup_check(p2)?;
-    encode_bls_g2_point(&(p1 + p2), output);
-    Ok(())
+pub fn bls12_381_g2_add(p1: BlsG2, p2: BlsG2) -> Result<[u8; 192], Error> {
+    let p1 = read_bls_g2_point_no_subgroup_check(&p1)?;
+    let p2 = read_bls_g2_point_no_subgroup_check(&p2)?;
+    Ok(encode_bls_g2_point(&(p1 + p2)))
 }
 
 /// BLS12-381 G2 multi-scalar multiplication (precompile 0x0e).
 ///
 /// Points must be in the prime-order subgroup; scalars need not be canonical.
 /// An empty input yields the identity (all-zero) encoding.
-pub fn bls12_381_g2_msm(
-    pairs: &[ZkvmBls12381G2MsmPair],
-    output: &mut ZkvmBls12381G2Point,
-) -> Result<(), Error> {
-    *output = bls12_381_g2_msm_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
-        .map_err(|error| match error {
-            StreamError::Operation(error) => error,
-            StreamError::Source(never) => match never {},
-        })?;
-    Ok(())
-}
-
-/// BLS12-381 G2 MSM over a fallible stream, preserving input-error order.
-pub fn bls12_381_g2_msm_iter<E>(
-    pairs: impl IntoIterator<Item = Result<ZkvmBls12381G2MsmPair, E>>,
-) -> Result<ZkvmBls12381G2Point, StreamError<E>> {
+pub fn bls12_381_g2_msm<E>(
+    pairs: impl IntoIterator<Item = Result<(BlsG2, [u8; 32]), E>>,
+) -> Result<[u8; 192], StreamError<E>> {
     let pairs = pairs.into_iter();
     let capacity = pairs.size_hint().0;
 
     let mut points = Vec::with_capacity(capacity);
     let mut scalars = Vec::with_capacity(capacity);
     for pair in pairs {
-        let pair = pair.map_err(StreamError::Source)?;
-        points.push(read_bls_g2_point(&pair.point).map_err(StreamError::Operation)?);
-        scalars.push(read_bls_scalar(&pair.scalar));
+        let (point, scalar) = pair.map_err(StreamError::Source)?;
+        points.push(read_bls_g2_point(&point).map_err(StreamError::Operation)?);
+        scalars.push(read_bls_scalar(&scalar));
     }
-    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
-    if !points.is_empty() {
-        encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points), &mut output);
+    if points.is_empty() {
+        Ok([0; 192])
+    } else {
+        Ok(encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points)))
     }
-    Ok(output)
 }
 
 /// BLS12-381 pairing check (precompile 0x0f).
 ///
 /// Points must be in the prime-order subgroup.
 pub fn bls12_381_pairing_check(
-    pairs: &[ZkvmBls12381PairingPair],
-    verified: &mut bool,
-) -> Result<(), Error> {
-    *verified = false;
-    let value = bls12_381_pairing_check_iter(pairs.iter().copied())?;
-    *verified = value;
-    Ok(())
-}
-
-/// BLS12-381 pairing check over a stream of encoded pairs.
-pub fn bls12_381_pairing_check_iter(
-    pairs: impl IntoIterator<Item = ZkvmBls12381PairingPair>,
+    pairs: impl IntoIterator<Item = (BlsG1, BlsG2)>,
 ) -> Result<bool, Error> {
     let pairs = pairs.into_iter();
     let capacity = pairs.size_hint().0;
@@ -156,13 +103,13 @@ pub fn bls12_381_pairing_check_iter(
     let mut g1_points = Vec::with_capacity(capacity);
     let mut g2_points = Vec::with_capacity(capacity);
 
-    for pair in pairs {
-        let g1 = read_bls_g1_point(&pair.g1).map_err(|error| match error {
+    for (g1, g2) in pairs {
+        let g1 = read_bls_g1_point(&g1).map_err(|error| match error {
             Error::PointNotOnCurve => Error::BlsG1PointNotOnCurve,
             Error::PointNotInSubgroup => Error::BlsG1PointNotInSubgroup,
             error => error,
         })?;
-        let g2 = read_bls_g2_point(&pair.g2).map_err(|error| match error {
+        let g2 = read_bls_g2_point(&g2).map_err(|error| match error {
             Error::PointNotOnCurve => Error::BlsG2PointNotOnCurve,
             Error::PointNotInSubgroup => Error::BlsG2PointNotInSubgroup,
             error => error,
diff --git a/crates/accelerators/src/ops/bn254/codec.rs b/crates/accelerators/src/ops/bn254/codec.rs
index b940549ff..4ac9b7439 100644
--- a/crates/accelerators/src/ops/bn254/codec.rs
+++ b/crates/accelerators/src/ops/bn254/codec.rs
@@ -5,12 +5,11 @@ use openvm_curve_utils::SubgroupCheck;
 use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint};
 use openvm_pairing::bn254 as bn;
 
-use crate::{
-    ops::Error,
-    types::{ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254Scalar},
-};
+use crate::ops::Error;
 
 const BN_FQ_LEN: usize = 32;
+const BN_G1_LEN: usize = BN_FQ_LEN * 2;
+const BN_G2_LEN: usize = BN_G1_LEN * 2;
 
 #[inline]
 fn read_bn_fq(input: &[u8]) -> Result<bn::Fp, Error> {
@@ -26,9 +25,12 @@ fn read_bn_fq2(input: &[u8]) -> Result<bn::Fp2, Error> {
 }
 
 #[inline]
-pub(super) fn read_bn_g1_point(input: &ZkvmBn254G1Point) -> Result<bn::G1Affine, Error> {
-    let px = read_bn_fq(&input.data[0..BN_FQ_LEN])?;
-    let py = read_bn_fq(&input.data[BN_FQ_LEN..])?;
+pub(super) fn read_bn_g1_point(input: &[u8]) -> Result<bn::G1Affine, Error> {
+    if input.len() != BN_G1_LEN {
+        return Err(Error::InvalidLength);
+    }
+    let px = read_bn_fq(&input[..BN_FQ_LEN])?;
+    let py = read_bn_fq(&input[BN_FQ_LEN..])?;
     // SAFETY: `read_bn_fq` produces canonical Fp elements; `from_xy` itself checks the curve
     // equation and returns `None` if `(px, py)` is not on the curve.
     let point = unsafe { bn::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)?;
@@ -40,9 +42,12 @@ pub(super) fn read_bn_g1_point(input: &ZkvmBn254G1Point) -> Result<bn::G1Affine,
 }
 
 #[inline]
-pub(super) fn read_bn_g2_point(input: &ZkvmBn254G2Point) -> Result<bn::G2Affine, Error> {
-    let x = read_bn_fq2(&input.data[..BN_FQ_LEN * 2])?;
-    let y = read_bn_fq2(&input.data[BN_FQ_LEN * 2..])?;
+pub(super) fn read_bn_g2_point(input: &[u8]) -> Result<bn::G2Affine, Error> {
+    if input.len() != BN_G2_LEN {
+        return Err(Error::InvalidLength);
+    }
+    let x = read_bn_fq2(&input[..BN_G1_LEN])?;
+    let y = read_bn_fq2(&input[BN_G1_LEN..])?;
     // SAFETY: `read_bn_fq2` produces canonical Fp2 elements; `from_xy` itself checks the curve
     // equation and returns `None` if `(x, y)` is not on the twist.
     let point = unsafe { bn::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)?;
@@ -54,16 +59,21 @@ pub(super) fn read_bn_g2_point(input: &ZkvmBn254G2Point) -> Result<bn::G2Affine,
 }
 
 #[inline]
-pub(super) fn read_bn_scalar(input: &ZkvmBn254Scalar) -> bn::Scalar {
-    bn::Scalar::from_be_bytes_unchecked(&input.data)
+pub(super) fn read_bn_scalar(input: &[u8]) -> Result<bn::Scalar, Error> {
+    if input.len() != BN_FQ_LEN {
+        return Err(Error::InvalidLength);
+    }
+    Ok(bn::Scalar::from_be_bytes_unchecked(input))
 }
 
 #[inline]
-pub(super) fn encode_bn_g1_point(point: bn::G1Affine, output: &mut ZkvmBn254G1Point) {
+pub(super) fn encode_bn_g1_point(point: bn::G1Affine) -> [u8; BN_G1_LEN] {
+    let mut output = [0; BN_G1_LEN];
     let x_bytes: &[u8] = point.x().as_le_bytes();
     let y_bytes: &[u8] = point.y().as_le_bytes();
     for i in 0..BN_FQ_LEN {
-        output.data[i] = x_bytes[BN_FQ_LEN - 1 - i];
-        output.data[i + BN_FQ_LEN] = y_bytes[BN_FQ_LEN - 1 - i];
+        output[i] = x_bytes[BN_FQ_LEN - 1 - i];
+        output[i + BN_FQ_LEN] = y_bytes[BN_FQ_LEN - 1 - i];
     }
+    output
 }
diff --git a/crates/accelerators/src/ops/bn254/mod.rs b/crates/accelerators/src/ops/bn254/mod.rs
index a2fcad052..394752f6d 100644
--- a/crates/accelerators/src/ops/bn254/mod.rs
+++ b/crates/accelerators/src/ops/bn254/mod.rs
@@ -11,65 +11,35 @@ use openvm_ecc_guest::{
 };
 use openvm_pairing::{bn254::Bn254, PairingCheck};
 
-use crate::{
-    ops::{Error, StreamError},
-    types::{ZkvmBn254G1Point, ZkvmBn254PairingPair, ZkvmBn254Scalar},
-};
+use crate::ops::Error;
 
 /// BN254 G1 point addition (precompile 0x06).
-pub fn bn254_g1_add(
-    p1: &ZkvmBn254G1Point,
-    p2: &ZkvmBn254G1Point,
-    output: &mut ZkvmBn254G1Point,
-) -> Result<(), Error> {
+pub fn bn254_g1_add(p1: &[u8], p2: &[u8]) -> Result<[u8; 64], Error> {
     let p1 = read_bn_g1_point(p1)?;
     let p2 = read_bn_g1_point(p2)?;
-    encode_bn_g1_point(p1 + p2, output);
-    Ok(())
+    Ok(encode_bn_g1_point(p1 + p2))
 }
 
 /// BN254 G1 scalar multiplication (precompile 0x07).
-pub fn bn254_g1_mul(
-    point: &ZkvmBn254G1Point,
-    scalar: &ZkvmBn254Scalar,
-    output: &mut ZkvmBn254G1Point,
-) -> Result<(), Error> {
+pub fn bn254_g1_mul(point: &[u8], scalar: &[u8]) -> Result<[u8; 64], Error> {
     let p = read_bn_g1_point(point)?;
-    let s = read_bn_scalar(scalar);
-    encode_bn_g1_point(Bn254::msm(&[s], &[p]), output);
-    Ok(())
+    let s = read_bn_scalar(scalar)?;
+    Ok(encode_bn_g1_point(Bn254::msm(&[s], &[p])))
 }
 
 /// BN254 pairing check (precompile 0x08).
-pub fn bn254_pairing_check(
-    pairs: &[ZkvmBn254PairingPair],
-    verified: &mut bool,
-) -> Result<(), Error> {
-    *verified = false;
-    let value =
-        bn254_pairing_check_iter(pairs.iter().copied().map(Ok::<_, core::convert::Infallible>))
-            .map_err(|error| match error {
-                StreamError::Operation(error) => error,
-                StreamError::Source(never) => match never {},
-            })?;
-    *verified = value;
-    Ok(())
-}
-
-/// BN254 pairing check over a stream of encoded pairs.
-pub fn bn254_pairing_check_iter<E>(
-    pairs: impl IntoIterator<Item = Result<ZkvmBn254PairingPair, E>>,
-) -> Result<bool, StreamError<E>> {
+pub fn bn254_pairing_check<'a>(
+    pairs: impl IntoIterator<Item = (&'a [u8], &'a [u8])>,
+) -> Result<bool, Error> {
     let pairs = pairs.into_iter();
     let capacity = pairs.size_hint().0;
 
     let mut g1_points = Vec::with_capacity(capacity);
     let mut g2_points = Vec::with_capacity(capacity);
 
-    for pair in pairs {
-        let pair = pair.map_err(StreamError::Source)?;
-        let g1 = read_bn_g1_point(&pair.g1).map_err(StreamError::Operation)?;
-        let g2 = read_bn_g2_point(&pair.g2).map_err(StreamError::Operation)?;
+    for (g1, g2) in pairs {
+        let g1 = read_bn_g1_point(g1)?;
+        let g2 = read_bn_g2_point(g2)?;
 
         let (g1_x, g1_y) = g1.into_coords();
         let (g2_x, g2_y) = g2.into_coords();
diff --git a/crates/accelerators/src/ops/ecdsa/secp256k1.rs b/crates/accelerators/src/ops/ecdsa/secp256k1.rs
index a69dfdbea..8ee8ca338 100644
--- a/crates/accelerators/src/ops/ecdsa/secp256k1.rs
+++ b/crates/accelerators/src/ops/ecdsa/secp256k1.rs
@@ -8,22 +8,18 @@ use openvm_k256 as k256;
 
 use k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
 
-use crate::{
-    ops::Error,
-    types::{ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature},
-};
+use crate::ops::Error;
 
 /// Recover the uncompressed secp256k1 public key from an ECDSA signature
-/// over `msg` into `output`.
+/// over `msg`.
 ///
 /// Both low-s and high-s signatures are accepted.
 pub fn secp256k1_ecrecover(
-    msg: &ZkvmSecp256k1Hash,
-    sig: &ZkvmSecp256k1Signature,
+    msg: &[u8; 32],
+    sig: &[u8; 64],
     mut recid: u8,
-    output: &mut ZkvmSecp256k1Pubkey,
-) -> Result<(), Error> {
-    let mut signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+) -> Result<[u8; 64], Error> {
+    let mut signature = Signature::from_slice(sig).map_err(|_| Error::InvalidSignature)?;
     // k256 requires a low-s signature for recovery; normalizing flips the
     // recovery id parity but recovers the same key.
     if let Some(normalized) = signature.normalize_s() {
@@ -33,39 +29,32 @@ pub fn secp256k1_ecrecover(
     let recovery_id = RecoveryId::from_byte(recid).ok_or(Error::InvalidSignature)?;
 
     #[cfg(any(target_os = "none", target_os = "openvm"))]
-    let key =
-        VerifyingKey::recover_from_prehash_noverify(&msg.data, &signature.to_bytes(), recovery_id)
-            .map_err(|_| Error::InvalidSignature)?;
+    let key = VerifyingKey::recover_from_prehash_noverify(msg, &signature.to_bytes(), recovery_id)
+        .map_err(|_| Error::InvalidSignature)?;
     #[cfg(not(any(target_os = "none", target_os = "openvm")))]
-    let key = VerifyingKey::recover_from_prehash(&msg.data, &signature, recovery_id)
+    let key = VerifyingKey::recover_from_prehash(msg, &signature, recovery_id)
         .map_err(|_| Error::InvalidSignature)?;
 
     let point = key.to_encoded_point(false);
-    output.data.copy_from_slice(&point.as_bytes()[1..65]);
-    Ok(())
+    Ok(point.as_bytes()[1..65].try_into().unwrap())
 }
 
-/// Verify an ECDSA signature over secp256k1 against an uncompressed public
-/// key, writing the result to `verified`.
+/// Verify an ECDSA signature over secp256k1 against an uncompressed public key.
 ///
 /// Both low-s and high-s signatures are accepted.
-pub fn secp256k1_verify(
-    msg: &ZkvmSecp256k1Hash,
-    sig: &ZkvmSecp256k1Signature,
-    pubkey: &ZkvmSecp256k1Pubkey,
-    verified: &mut bool,
-) -> Result<(), Error> {
-    *verified = false;
-
+pub fn secp256k1_verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
     let mut sec1 = [0u8; 65];
     sec1[0] = 0x04;
-    sec1[1..].copy_from_slice(&pubkey.data);
-    let key = VerifyingKey::from_sec1_bytes(&sec1).map_err(|_| Error::PointNotOnCurve)?;
-    let mut signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
+    sec1[1..].copy_from_slice(pubkey);
+    let Ok(key) = VerifyingKey::from_sec1_bytes(&sec1) else {
+        return false;
+    };
+    let Ok(mut signature) = Signature::from_slice(sig) else {
+        return false;
+    };
     // k256 rejects high-s signatures in verification. Normalize to accept both forms.
     if let Some(normalized) = signature.normalize_s() {
         signature = normalized;
     }
-    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
-    Ok(())
+    key.verify_prehash(msg, &signature).is_ok()
 }
diff --git a/crates/accelerators/src/ops/ecdsa/secp256r1.rs b/crates/accelerators/src/ops/ecdsa/secp256r1.rs
index fd21c0a16..3a355a36a 100644
--- a/crates/accelerators/src/ops/ecdsa/secp256r1.rs
+++ b/crates/accelerators/src/ops/ecdsa/secp256r1.rs
@@ -5,25 +5,14 @@ use openvm_p256::{
     EncodedPoint,
 };
 
-use crate::{
-    ops::Error,
-    types::{ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature},
-};
-
-/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
-/// public key, writing the result to `verified`.
-pub fn secp256r1_verify(
-    msg: &ZkvmSecp256r1Hash,
-    sig: &ZkvmSecp256r1Signature,
-    pubkey: &ZkvmSecp256r1Pubkey,
-    verified: &mut bool,
-) -> Result<(), Error> {
-    *verified = false;
-
-    let encoded_point = EncodedPoint::from_untagged_bytes(&pubkey.data.into());
-    let key =
-        VerifyingKey::from_encoded_point(&encoded_point).map_err(|_| Error::PointNotOnCurve)?;
-    let signature = Signature::from_slice(&sig.data).map_err(|_| Error::InvalidSignature)?;
-    *verified = key.verify_prehash(&msg.data, &signature).is_ok();
-    Ok(())
+/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed public key.
+pub fn secp256r1_verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
+    let encoded_point = EncodedPoint::from_untagged_bytes(&(*pubkey).into());
+    let Ok(key) = VerifyingKey::from_encoded_point(&encoded_point) else {
+        return false;
+    };
+    let Ok(signature) = Signature::from_slice(sig) else {
+        return false;
+    };
+    key.verify_prehash(msg, &signature).is_ok()
 }
diff --git a/crates/accelerators/src/ops/hash.rs b/crates/accelerators/src/ops/hash.rs
index 3bae39f29..847186648 100644
--- a/crates/accelerators/src/ops/hash.rs
+++ b/crates/accelerators/src/ops/hash.rs
@@ -1,30 +1,30 @@
 //! Hash operations.
 
-use crate::types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash};
-
-/// Compute the Keccak-256 hash of `data` into `output`.
+/// Compute the Keccak-256 hash of `data`.
 #[inline]
-pub fn keccak256(data: &[u8], output: &mut ZkvmKeccak256Hash) {
-    openvm_keccak256::set_keccak256(data, &mut output.data);
+pub fn keccak256(data: &[u8]) -> [u8; 32] {
+    openvm_keccak256::keccak256(data)
 }
 
-/// Compute the SHA-256 hash of `data` into `output`.
+/// Compute the SHA-256 hash of `data`.
 #[inline]
-pub fn sha256(data: &[u8], output: &mut ZkvmSha256Hash) {
+pub fn sha256(data: &[u8]) -> [u8; 32] {
     #[cfg(not(openvm_intrinsics))]
     use openvm_sha2::Digest;
-    output.data = openvm_sha2::Sha256::digest(data).into();
+    openvm_sha2::Sha256::digest(data).into()
 }
 
-/// Compute the RIPEMD-160 hash of `data` into `output`.
+/// Compute the RIPEMD-160 hash of `data`.
 ///
-/// The 20-byte digest is written to `output.data[12..]`; the first 12 bytes
-/// are zeroed, matching the EVM word layout.
+/// The 20-byte digest is written to the final 20 bytes; the first 12 bytes are
+/// zeroed, matching the EVM word layout.
 #[inline]
-pub fn ripemd160(data: &[u8], output: &mut ZkvmRipemd160Hash) {
+pub fn ripemd160(data: &[u8]) -> [u8; 32] {
     use ripemd::Digest;
     let mut hasher = ripemd::Ripemd160::new();
     hasher.update(data);
-    output.data[..12].fill(0);
-    hasher.finalize_into((&mut output.data[12..]).into());
+
+    let mut output = [0; 32];
+    hasher.finalize_into((&mut output[12..]).into());
+    output
 }
diff --git a/crates/accelerators/src/ops/kzg.rs b/crates/accelerators/src/ops/kzg.rs
index 3cca34cc4..d7df493fb 100644
--- a/crates/accelerators/src/ops/kzg.rs
+++ b/crates/accelerators/src/ops/kzg.rs
@@ -2,35 +2,28 @@
 
 use openvm_kzg::{Bytes32, Bytes48, KzgProof};
 
-use crate::{
-    ops::Error,
-    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof},
-};
+use crate::ops::Error;
 
 /// Verify a KZG proof that the blob committed to by `commitment` evaluates
-/// to `y` at point `z`, writing the result to `verified`.
+/// to `y` at point `z`.
 ///
 /// Errors mean the check could not run — a commitment or proof that is not
-/// a valid compressed G1 point, or an out-of-range field element; `verified`
-/// is `false` only when a well-formed proof does not verify.
+/// a valid compressed G1 point, or an out-of-range field element. `Ok(false)`
+/// means a well-formed proof did not verify.
 pub fn kzg_point_eval(
-    commitment: &ZkvmKzgCommitment,
-    z: &ZkvmKzgFieldElement,
-    y: &ZkvmKzgFieldElement,
-    proof: &ZkvmKzgProof,
-    verified: &mut bool,
-) -> Result<(), Error> {
-    *verified = false;
-
+    commitment: &[u8; 48],
+    z: &[u8; 32],
+    y: &[u8; 32],
+    proof: &[u8; 48],
+) -> Result<bool, Error> {
     let env = openvm_kzg::EnvKzgSettings::default();
     let kzg_settings = env.get();
 
-    let commitment = Bytes48::from_slice(&commitment.data).map_err(|_| Error::KzgInvalidInput)?;
-    let z = Bytes32::from_slice(&z.data).map_err(|_| Error::KzgInvalidInput)?;
-    let y = Bytes32::from_slice(&y.data).map_err(|_| Error::KzgInvalidInput)?;
-    let proof = Bytes48::from_slice(&proof.data).map_err(|_| Error::KzgInvalidInput)?;
+    let commitment = Bytes48::from_slice(commitment).map_err(|_| Error::KzgInvalidInput)?;
+    let z = Bytes32::from_slice(z).map_err(|_| Error::KzgInvalidInput)?;
+    let y = Bytes32::from_slice(y).map_err(|_| Error::KzgInvalidInput)?;
+    let proof = Bytes48::from_slice(proof).map_err(|_| Error::KzgInvalidInput)?;
 
-    *verified = KzgProof::verify_kzg_proof(&commitment, &z, &y, &proof, kzg_settings)
-        .map_err(|_| Error::KzgInvalidInput)?;
-    Ok(())
+    KzgProof::verify_kzg_proof(&commitment, &z, &y, &proof, kzg_settings)
+        .map_err(|_| Error::KzgInvalidInput)
 }
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
index 2072ba6aa..b43fff455 100644
--- a/crates/accelerators/src/ops/mod.rs
+++ b/crates/accelerators/src/ops/mod.rs
@@ -1,7 +1,7 @@
 //! OpenVM-accelerated implementations of the zkVM accelerator operations.
 //!
-//! All functions operate on fixed-size big-endian byte encodings; BLS12-381
-//! G2 is `x_c0 || x_c1 || y_c0 || y_c1`, BN254 G2 uses the EIP-197
+//! Functions use ordinary Rust arrays, slices and tuples. BLS12-381 G2 is
+//! `(x_c0, x_c1, y_c0, y_c1)`; BN254 G2 byte slices use the EIP-197
 //! `x_c1 || x_c0 || y_c1 || y_c0` order.
 
 mod blake2;
@@ -12,17 +12,22 @@ mod hash;
 mod kzg;
 mod modexp;
 
-pub use blake2::{blake2f, blake2f_words};
+pub use blake2::blake2f;
 pub use bls12_381::{
-    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g1_msm_iter, bls12_381_g2_add, bls12_381_g2_msm,
-    bls12_381_g2_msm_iter, bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1,
-    bls12_381_pairing_check, bls12_381_pairing_check_iter,
+    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
+    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check,
 };
-pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check, bn254_pairing_check_iter};
+pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check};
 pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
 pub use hash::{keccak256, ripemd160, sha256};
 pub use kzg::kzg_point_eval;
-pub use modexp::{modexp, modexp_result};
+pub use modexp::modexp;
+
+/// Uncompressed BLS12-381 G1 coordinates `(x, y)`, big-endian.
+pub type BlsG1 = ([u8; 48], [u8; 48]);
+
+/// Uncompressed BLS12-381 G2 coordinates `(x_c0, x_c1, y_c0, y_c1)`, big-endian.
+pub type BlsG2 = ([u8; 48], [u8; 48], [u8; 48], [u8; 48]);
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum StreamError<E> {
@@ -34,6 +39,8 @@ pub enum StreamError<E> {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Error {
+    /// An input does not have the length required by the operation.
+    InvalidLength,
     /// A field element is out of range or otherwise not a field member.
     FieldElementInvalid,
     /// A point encoding does not satisfy the curve equation.
@@ -48,8 +55,6 @@ pub enum Error {
     BlsG2PointNotOnCurve,
     /// A BLS12-381 pairing G2 point is not in the prime-order subgroup.
     BlsG2PointNotInSubgroup,
-    /// The BLAKE2f final-block flag is neither 0 nor 1.
-    InvalidFinalFlag,
     /// A signature could not be parsed or key recovery failed.
     InvalidSignature,
     /// KZG commitment/proof/field-element inputs are malformed.
diff --git a/crates/accelerators/src/ops/modexp.rs b/crates/accelerators/src/ops/modexp.rs
index 88afd49fa..223d87aff 100644
--- a/crates/accelerators/src/ops/modexp.rs
+++ b/crates/accelerators/src/ops/modexp.rs
@@ -9,19 +9,8 @@ use openvm_pairing::bn254 as bn;
 /// field Fr.
 const BN_SCALAR_LEN: usize = 32;
 
-/// Compute `base^exp % modulus` into `output`, left-padded with zeros.
-///
-/// # Panics
-///
-/// Panics if `output.len() != modulus.len()`.
-pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8], output: &mut [u8]) {
-    assert_eq!(output.len(), modulus.len(), "output must be exactly modulus-sized");
-
-    output.copy_from_slice(&modexp_result(base, exp, modulus));
-}
-
 /// Compute `base^exp % modulus`, returning exactly `modulus.len()` bytes.
-pub fn modexp_result(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
+pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
     let mut result = if is_bn254_fr(modulus) {
         accelerated_modexp_bn254_fr(base, exp)
     } else {
diff --git a/crates/accelerators/tests/conformance/blake2.rs b/crates/accelerators/tests/blake2.rs
similarity index 80%
rename from crates/accelerators/tests/conformance/blake2.rs
rename to crates/accelerators/tests/blake2.rs
index a0c5f967e..2c0c03a52 100644
--- a/crates/accelerators/tests/conformance/blake2.rs
+++ b/crates/accelerators/tests/blake2.rs
@@ -1,10 +1,10 @@
 //! BLAKE2f conformance: the official EIP-152 test vectors 4-7.
 
+#![cfg(feature = "ffi")]
+
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::zkvm_blake2f,
-    ops::{blake2f, Error},
-    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus},
+    blake2f, zkvm_blake2f, ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus,
 };
 
 /// EIP-152 vectors 4-7 share the same h, m and t inputs.
@@ -20,10 +20,22 @@ fn m() -> ZkvmBlake2fMessage {
     m
 }
 
+fn state_words(bytes: &[u8; 64]) -> [u64; 8] {
+    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
+}
+
+fn message_words(bytes: &[u8; 128]) -> [u64; 16] {
+    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
+}
+
+fn offset_words(bytes: &[u8; 16]) -> [u64; 2] {
+    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
+}
+
 fn check(rounds: u32, f: u8, expected: [u8; 64]) {
-    let mut h = ZkvmBlake2fState { data: H };
-    blake2f(rounds, &mut h, &m(), &ZkvmBlake2fOffset { data: T }, f).unwrap();
-    assert_eq!(h.data, expected, "rounds={rounds}, f={f}");
+    let mut h = state_words(&H);
+    blake2f(rounds, &mut h, &message_words(&m().data), &offset_words(&T), f == 1);
+    assert_eq!(h, state_words(&expected), "rounds={rounds}, f={f}");
 }
 
 #[test]
@@ -74,15 +86,6 @@ fn blake2f_eip152_vector_7_one_round() {
     );
 }
 
-#[test]
-fn blake2f_invalid_final_flag() {
-    let mut h = ZkvmBlake2fState { data: H };
-    let result = blake2f(12, &mut h, &m(), &ZkvmBlake2fOffset { data: T }, 2);
-    assert_eq!(result, Err(Error::InvalidFinalFlag));
-    // The state must be untouched on failure.
-    assert_eq!(h.data, H);
-}
-
 #[test]
 fn zkvm_blake2f_smoke() {
     let mut h = ZkvmBlake2fState { data: H };
diff --git a/crates/accelerators/tests/conformance/bls12_381.rs b/crates/accelerators/tests/bls12_381.rs
similarity index 70%
rename from crates/accelerators/tests/conformance/bls12_381.rs
rename to crates/accelerators/tests/bls12_381.rs
index 87e3aabd3..14cfab5dd 100644
--- a/crates/accelerators/tests/conformance/bls12_381.rs
+++ b/crates/accelerators/tests/bls12_381.rs
@@ -1,20 +1,17 @@
 //! BLS12-381 add/MSM/pairing/map conformance vectors.
 
+#![cfg(feature = "ffi")]
+
+use core::convert::Infallible;
+
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::{
-        zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add, zkvm_bls12_g2_msm,
-        zkvm_bls12_map_fp2_to_g2, zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing,
-    },
-    ops::{
-        bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-        bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, Error,
-    },
-    types::{
-        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
-        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBls12381Scalar,
-        ZkvmStatus,
-    },
+    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
+    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, zkvm_bls12_g1_add,
+    zkvm_bls12_g1_msm, zkvm_bls12_g2_add, zkvm_bls12_g2_msm, zkvm_bls12_map_fp2_to_g2,
+    zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing, BlsG1, BlsG2, Error, ZkvmBls12381Fp,
+    ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair,
+    ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBls12381Scalar, ZkvmStatus,
 };
 
 fn scalar(value: u8) -> ZkvmBls12381Scalar {
@@ -23,6 +20,23 @@ fn scalar(value: u8) -> ZkvmBls12381Scalar {
     scalar
 }
 
+fn bls_g1(point: ZkvmBls12381G1Point) -> BlsG1 {
+    (point.data[..48].try_into().unwrap(), point.data[48..].try_into().unwrap())
+}
+
+fn bls_g2(point: ZkvmBls12381G2Point) -> BlsG2 {
+    (
+        point.data[..48].try_into().unwrap(),
+        point.data[48..96].try_into().unwrap(),
+        point.data[96..144].try_into().unwrap(),
+        point.data[144..].try_into().unwrap(),
+    )
+}
+
+fn bls_fp2(input: [u8; 96]) -> ([u8; 48], [u8; 48]) {
+    (input[..48].try_into().unwrap(), input[48..].try_into().unwrap())
+}
+
 /// BLS12-381 G1 generator (`x || y`).
 const BLS_G1_GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
     data: hex!(
@@ -65,61 +79,46 @@ const BLS_R_MINUS_1: ZkvmBls12381Scalar = ZkvmBls12381Scalar {
 };
 
 fn neg_g1_generator() -> ZkvmBls12381G1Point {
-    let pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: BLS_R_MINUS_1 }];
-    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
-    bls12_381_g1_msm(&pairs, &mut output).unwrap();
-    output
+    let pairs = [Ok::<_, Infallible>((bls_g1(BLS_G1_GEN), BLS_R_MINUS_1.data))];
+    ZkvmBls12381G1Point { data: bls12_381_g1_msm(pairs).unwrap() }
 }
 
 #[test]
 fn bls12_g1_add_msm_vectors() {
-    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
-    bls12_381_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, &mut output).unwrap();
-    assert_eq!(output, BLS_G1_2GEN);
-
-    let pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: scalar(2) }];
-    output.data = [0; 96];
-    bls12_381_g1_msm(&pairs, &mut output).unwrap();
-    assert_eq!(output, BLS_G1_2GEN);
-
-    output.data = [0xff; 96];
-    bls12_381_g1_msm(&[], &mut output).unwrap();
-    assert_eq!(output.data, [0u8; 96]);
+    let output = bls12_381_g1_add(bls_g1(BLS_G1_GEN), bls_g1(BLS_G1_GEN)).unwrap();
+    assert_eq!(output, BLS_G1_2GEN.data);
+
+    let pairs = [Ok::<_, Infallible>((bls_g1(BLS_G1_GEN), scalar(2).data))];
+    let output = bls12_381_g1_msm(pairs).unwrap();
+    assert_eq!(output, BLS_G1_2GEN.data);
+
+    let output =
+        bls12_381_g1_msm(core::iter::empty::<Result<(BlsG1, [u8; 32]), Infallible>>()).unwrap();
+    assert_eq!(output, [0u8; 96]);
 }
 
 #[test]
 fn bls12_g2_add_msm_vectors() {
-    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
-    bls12_381_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, &mut output).unwrap();
-    assert_eq!(output, BLS_G2_2GEN);
-
-    let pairs = [ZkvmBls12381G2MsmPair { point: BLS_G2_GEN, scalar: scalar(2) }];
-    output.data = [0; 192];
-    bls12_381_g2_msm(&pairs, &mut output).unwrap();
-    assert_eq!(output, BLS_G2_2GEN);
-
-    output.data = [0xff; 192];
-    bls12_381_g2_msm(&[], &mut output).unwrap();
-    assert_eq!(output.data, [0u8; 192]);
+    let output = bls12_381_g2_add(bls_g2(BLS_G2_GEN), bls_g2(BLS_G2_GEN)).unwrap();
+    assert_eq!(output, BLS_G2_2GEN.data);
+
+    let pairs = [Ok::<_, Infallible>((bls_g2(BLS_G2_GEN), scalar(2).data))];
+    let output = bls12_381_g2_msm(pairs).unwrap();
+    assert_eq!(output, BLS_G2_2GEN.data);
+
+    let output =
+        bls12_381_g2_msm(core::iter::empty::<Result<(BlsG2, [u8; 32]), Infallible>>()).unwrap();
+    assert_eq!(output, [0u8; 192]);
 }
 
 #[test]
 fn bls12_pairing_vectors() {
     let neg_g1 = neg_g1_generator();
-    let pairs = [
-        ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN },
-        ZkvmBls12381PairingPair { g1: neg_g1, g2: BLS_G2_GEN },
-    ];
-    let mut verified = false;
-
-    bls12_381_pairing_check(&pairs, &mut verified).unwrap();
-    assert!(verified);
-
-    bls12_381_pairing_check(&pairs[..1], &mut verified).unwrap();
-    assert!(!verified);
+    let pairs = [(bls_g1(BLS_G1_GEN), bls_g2(BLS_G2_GEN)), (bls_g1(neg_g1), bls_g2(BLS_G2_GEN))];
 
-    bls12_381_pairing_check(&[], &mut verified).unwrap();
-    assert!(verified);
+    assert!(bls12_381_pairing_check(pairs).unwrap());
+    assert!(!bls12_381_pairing_check(pairs[..1].iter().copied()).unwrap());
+    assert!(bls12_381_pairing_check(core::iter::empty::<(BlsG1, BlsG2)>()).unwrap());
 }
 
 #[test]
@@ -169,18 +168,14 @@ fn zkvm_bls12_pairing_smoke() {
 fn bls12_rejects_invalid_points() {
     let mut off_curve_g1 = BLS_G1_GEN;
     off_curve_g1.data[95] ^= 1;
-    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
-    assert!(bls12_381_g1_add(&off_curve_g1, &BLS_G1_GEN, &mut g1_output).is_err());
+    assert!(bls12_381_g1_add(bls_g1(off_curve_g1), bls_g1(BLS_G1_GEN)).is_err());
 
     let mut off_curve_g2 = BLS_G2_GEN;
     off_curve_g2.data[191] ^= 1;
-    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
-    assert!(bls12_381_g2_add(&off_curve_g2, &BLS_G2_GEN, &mut g2_output).is_err());
+    assert!(bls12_381_g2_add(bls_g2(off_curve_g2), bls_g2(BLS_G2_GEN)).is_err());
 
-    let pairs = [ZkvmBls12381PairingPair { g1: off_curve_g1, g2: BLS_G2_GEN }];
-    let mut verified = true;
-    assert_eq!(bls12_381_pairing_check(&pairs, &mut verified), Err(Error::BlsG1PointNotOnCurve));
-    assert!(!verified);
+    let pairs = [(bls_g1(off_curve_g1), bls_g2(BLS_G2_GEN))];
+    assert_eq!(bls12_381_pairing_check(pairs), Err(Error::BlsG1PointNotOnCurve));
 }
 
 #[test]
@@ -292,18 +287,16 @@ const BLS_FP_MODULUS: [u8; 48] =
 #[test]
 fn bls12_map_fp_to_g1_vectors() {
     for (input, expected) in MAP_FP_TO_G1_VECTORS {
-        let mut output = ZkvmBls12381G1Point { data: [0xff; 96] };
-        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: input }, &mut output).unwrap();
-        assert_eq!(output.data, expected, "input={input:?}");
+        let output = bls12_381_map_fp_to_g1(&input).unwrap();
+        assert_eq!(output, expected, "input={input:?}");
     }
 }
 
 #[test]
 fn bls12_map_fp2_to_g2_vectors() {
     for (input, expected) in MAP_FP2_TO_G2_VECTORS {
-        let mut output = ZkvmBls12381G2Point { data: [0xff; 192] };
-        bls12_381_map_fp2_to_g2(&ZkvmBls12381Fp2 { data: input }, &mut output).unwrap();
-        assert_eq!(output.data, expected, "input={input:?}");
+        let output = bls12_381_map_fp2_to_g2(bls_fp2(input)).unwrap();
+        assert_eq!(output, expected, "input={input:?}");
     }
 }
 
@@ -314,47 +307,31 @@ fn bls12_map_fp2_to_g2_vectors() {
 /// return the point itself.
 #[test]
 fn bls12_map_lands_in_prime_order_subgroup() {
-    let mut mapped = ZkvmBls12381G1Point { data: [0; 96] };
-    bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: MAP_FP_TO_G1_VECTORS[0].0 }, &mut mapped)
-        .unwrap();
-    let mut output = ZkvmBls12381G1Point { data: [0; 96] };
-    bls12_381_g1_msm(&[ZkvmBls12381G1MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
-        .expect("mapped G1 point must be in the prime-order subgroup");
-    assert_eq!(output.data, mapped.data);
-
-    let mut mapped = ZkvmBls12381G2Point { data: [0; 192] };
-    bls12_381_map_fp2_to_g2(&ZkvmBls12381Fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 }, &mut mapped)
-        .unwrap();
-    let mut output = ZkvmBls12381G2Point { data: [0; 192] };
-    bls12_381_g2_msm(&[ZkvmBls12381G2MsmPair { point: mapped, scalar: scalar(1) }], &mut output)
-        .expect("mapped G2 point must be in the prime-order subgroup");
-    assert_eq!(output.data, mapped.data);
+    let mapped = bls12_381_map_fp_to_g1(&MAP_FP_TO_G1_VECTORS[0].0).unwrap();
+    let pairs =
+        [Ok::<_, Infallible>((bls_g1(ZkvmBls12381G1Point { data: mapped }), scalar(1).data))];
+    let output =
+        bls12_381_g1_msm(pairs).expect("mapped G1 point must be in the prime-order subgroup");
+    assert_eq!(output, mapped);
+
+    let mapped = bls12_381_map_fp2_to_g2(bls_fp2(MAP_FP2_TO_G2_VECTORS[0].0)).unwrap();
+    let pairs =
+        [Ok::<_, Infallible>((bls_g2(ZkvmBls12381G2Point { data: mapped }), scalar(1).data))];
+    let output =
+        bls12_381_g2_msm(pairs).expect("mapped G2 point must be in the prime-order subgroup");
+    assert_eq!(output, mapped);
 }
 
 #[test]
 fn bls12_map_field_element_range() {
-    let mut g1 = ZkvmBls12381G1Point { data: [0; 96] };
-    let mut g2 = ZkvmBls12381G2Point { data: [0; 192] };
-
     // The largest canonical element is accepted, the modulus itself is not.
-    assert_eq!(bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: BLS_FP_MAX }, &mut g1), Ok(()));
-    assert_eq!(
-        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: BLS_FP_MODULUS }, &mut g1),
-        Err(Error::FieldElementInvalid)
-    );
-    assert_eq!(
-        bls12_381_map_fp_to_g1(&ZkvmBls12381Fp { data: [0xff; 48] }, &mut g1),
-        Err(Error::FieldElementInvalid)
-    );
+    assert!(bls12_381_map_fp_to_g1(&BLS_FP_MAX).is_ok());
+    assert_eq!(bls12_381_map_fp_to_g1(&BLS_FP_MODULUS), Err(Error::FieldElementInvalid));
+    assert_eq!(bls12_381_map_fp_to_g1(&[0xff; 48]), Err(Error::FieldElementInvalid));
 
     // Either half of an Fp2 input is checked.
-    let mut c0_bad = ZkvmBls12381Fp2 { data: [0; 96] };
-    c0_bad.data[..48].copy_from_slice(&BLS_FP_MODULUS);
-    assert_eq!(bls12_381_map_fp2_to_g2(&c0_bad, &mut g2), Err(Error::FieldElementInvalid));
-
-    let mut c1_bad = ZkvmBls12381Fp2 { data: [0; 96] };
-    c1_bad.data[48..].copy_from_slice(&BLS_FP_MODULUS);
-    assert_eq!(bls12_381_map_fp2_to_g2(&c1_bad, &mut g2), Err(Error::FieldElementInvalid));
+    assert_eq!(bls12_381_map_fp2_to_g2((BLS_FP_MODULUS, [0; 48])), Err(Error::FieldElementInvalid));
+    assert_eq!(bls12_381_map_fp2_to_g2(([0; 48], BLS_FP_MODULUS)), Err(Error::FieldElementInvalid));
 }
 
 #[test]
diff --git a/crates/accelerators/tests/conformance/bn254.rs b/crates/accelerators/tests/bn254.rs
similarity index 81%
rename from crates/accelerators/tests/conformance/bn254.rs
rename to crates/accelerators/tests/bn254.rs
index dcbce7b16..c5a77666d 100644
--- a/crates/accelerators/tests/conformance/bn254.rs
+++ b/crates/accelerators/tests/bn254.rs
@@ -1,12 +1,12 @@
 //! BN254 add/mul/pairing conformance vectors.
 
+#![cfg(feature = "ffi")]
+
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::{zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_pairing},
-    ops::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check, Error},
-    types::{
-        ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmStatus,
-    },
+    bn254_g1_add, bn254_g1_mul, bn254_pairing_check, zkvm_bn254_g1_add, zkvm_bn254_g1_mul,
+    zkvm_bn254_pairing, Error, ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254PairingPair,
+    ZkvmBn254Scalar, ZkvmStatus,
 };
 
 fn scalar(value: u8) -> ZkvmBn254Scalar {
@@ -52,14 +52,8 @@ const BN254_G2_GEN: ZkvmBn254G2Point = ZkvmBn254G2Point {
 #[test]
 fn bn254_add_mul_vectors() {
     let point = generator();
-    let mut output = ZkvmBn254G1Point { data: [0; 64] };
-
-    bn254_g1_add(&point, &point, &mut output).unwrap();
-    assert_eq!(output, BN254_2GEN);
-
-    output.data = [0; 64];
-    bn254_g1_mul(&point, &scalar(2), &mut output).unwrap();
-    assert_eq!(output, BN254_2GEN);
+    assert_eq!(bn254_g1_add(&point.data, &point.data).unwrap(), BN254_2GEN.data);
+    assert_eq!(bn254_g1_mul(&point.data, &scalar(2).data).unwrap(), BN254_2GEN.data);
 }
 
 #[test]
@@ -68,16 +62,11 @@ fn bn254_pairing_vectors() {
         ZkvmBn254PairingPair { g1: generator(), g2: BN254_G2_GEN },
         ZkvmBn254PairingPair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
     ];
-    let mut verified = false;
-
-    bn254_pairing_check(&pairs, &mut verified).unwrap();
-    assert!(verified);
-
-    bn254_pairing_check(&pairs[..1], &mut verified).unwrap();
-    assert!(!verified);
-
-    bn254_pairing_check(&[], &mut verified).unwrap();
-    assert!(verified);
+    let raw = pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()));
+    assert!(bn254_pairing_check(raw).unwrap());
+    assert!(!bn254_pairing_check([(pairs[0].g1.data.as_slice(), pairs[0].g2.data.as_slice(),)])
+        .unwrap());
+    assert!(bn254_pairing_check(core::iter::empty()).unwrap());
 }
 
 #[test]
@@ -118,15 +107,18 @@ fn bn254_rejects_invalid_point() {
     not_on_curve.data[63] = 3;
     let mut output = ZkvmBn254G1Point { data: [0; 64] };
 
-    assert_eq!(bn254_g1_add(&not_on_curve, &generator(), &mut output), Err(Error::PointNotOnCurve));
+    assert_eq!(bn254_g1_add(&not_on_curve.data, &generator().data), Err(Error::PointNotOnCurve));
 
     let status = unsafe { zkvm_bn254_g1_mul(&not_on_curve, &scalar(2), &mut output) };
     assert_eq!(status, ZkvmStatus::Fail);
 
     let pairs = [ZkvmBn254PairingPair { g1: not_on_curve, g2: BN254_G2_GEN }];
-    let mut verified = true;
-    assert_eq!(bn254_pairing_check(&pairs, &mut verified), Err(Error::PointNotOnCurve));
-    assert!(!verified);
+    assert_eq!(
+        bn254_pairing_check(
+            pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()))
+        ),
+        Err(Error::PointNotOnCurve)
+    );
 }
 
 #[test]
diff --git a/crates/accelerators/tests/conformance/main.rs b/crates/accelerators/tests/conformance/main.rs
deleted file mode 100644
index 0b6034a30..000000000
--- a/crates/accelerators/tests/conformance/main.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! Conformance tests for the accelerator operations, using official test
-//! vectors and reference implementations.
-//!
-//! Modules mirror the `src/ops` layout: one file per domain.
-
-mod blake2;
-mod bls12_381;
-mod bn254;
-mod ecdsa;
-mod hash;
-mod kzg;
-mod modexp;
diff --git a/crates/accelerators/tests/conformance/ecdsa.rs b/crates/accelerators/tests/ecdsa.rs
similarity index 66%
rename from crates/accelerators/tests/conformance/ecdsa.rs
rename to crates/accelerators/tests/ecdsa.rs
index e4710250d..3ba682cd8 100644
--- a/crates/accelerators/tests/conformance/ecdsa.rs
+++ b/crates/accelerators/tests/ecdsa.rs
@@ -2,14 +2,14 @@
 //!
 //! Tested with vectors from https://github.com/daimo-eth/p256-verifier/tree/master/test-vectors.
 
+#![cfg(feature = "ffi")]
+
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::{zkvm_secp256k1_ecrecover, zkvm_secp256k1_verify, zkvm_secp256r1_verify},
-    ops::{keccak256, secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, Error},
-    types::{
-        ZkvmKeccak256Hash, ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature,
-        ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus,
-    },
+    keccak256, secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, zkvm_secp256k1_ecrecover,
+    zkvm_secp256k1_verify, zkvm_secp256r1_verify, Error, ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey,
+    ZkvmSecp256k1Signature, ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature,
+    ZkvmStatus,
 };
 
 /// Splits a 160-byte P256VERIFY input (msg || sig || pk) into its parts.
@@ -32,35 +32,21 @@ const VALID: [u8; 160] = hex!(
 #[test]
 fn secp256r1_verify_vectors() {
     let (msg, sig, pubkey) = parts(&VALID);
-    let mut verified = false;
-
-    secp256r1_verify(&msg, &sig, &pubkey, &mut verified).unwrap();
-    assert!(verified);
+    assert!(secp256r1_verify(&msg.data, &sig.data, &pubkey.data));
 
-    // Wrong message must not verify; `verified` must be overwritten.
     let mut wrong_msg = msg;
     wrong_msg.data[0] = 0x3c;
-    secp256r1_verify(&wrong_msg, &sig, &pubkey, &mut verified).unwrap();
-    assert!(!verified);
+    assert!(!secp256r1_verify(&wrong_msg.data, &sig.data, &pubkey.data));
 }
 
 #[test]
 fn secp256r1_verify_malformed_inputs() {
     let (msg, sig, _) = parts(&VALID);
-    let mut verified = true;
-
-    // A signature with out-of-range values cannot be parsed.
     let bad_sig = ZkvmSecp256r1Signature { data: [0xff; 64] };
-    let result = secp256r1_verify(&msg, &bad_sig, &parts(&VALID).2, &mut verified);
-    assert_eq!(result, Err(Error::InvalidSignature));
-    assert!(!verified);
+    assert!(!secp256r1_verify(&msg.data, &bad_sig.data, &parts(&VALID).2.data));
 
-    // A public key that is not on the curve cannot be parsed.
-    verified = true;
     let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
-    let result = secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified);
-    assert_eq!(result, Err(Error::PointNotOnCurve));
-    assert!(!verified);
+    assert!(!secp256r1_verify(&msg.data, &sig.data, &bad_pubkey.data));
 }
 
 #[test]
@@ -110,51 +96,36 @@ const K1_ADDRESS: [u8; 20] = hex!("7156526fbd7a3c72969b54f64e42c10fbb768c8a");
 
 #[test]
 fn secp256k1_ecrecover_vector() {
-    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
-    secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, &mut pubkey).unwrap();
+    let pubkey = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 1).unwrap();
 
     // The Ethereum address is keccak(pubkey)[12..], derived here exactly as
     // a caller of the interface would.
-    let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
-    keccak256(&pubkey.data, &mut hash);
-    assert_eq!(hash.data[12..], K1_ADDRESS);
+    assert_eq!(keccak256(&pubkey)[12..], K1_ADDRESS);
 }
 
 #[test]
 fn secp256k1_ecrecover_invalid_inputs() {
-    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
-
     // Recovery ids above 3 are invalid.
-    let result = secp256k1_ecrecover(&K1_MSG, &K1_SIG, 4, &mut pubkey);
+    let result = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 4);
     assert_eq!(result, Err(Error::InvalidSignature));
 
     // The zero signature cannot be parsed.
     let zero_sig = ZkvmSecp256k1Signature { data: [0; 64] };
-    let result = secp256k1_ecrecover(&K1_MSG, &zero_sig, 0, &mut pubkey);
+    let result = secp256k1_ecrecover(&K1_MSG.data, &zero_sig.data, 0);
     assert_eq!(result, Err(Error::InvalidSignature));
 }
 
 #[test]
 fn secp256k1_verify_roundtrip() {
-    let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
-    secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, &mut pubkey).unwrap();
+    let pubkey = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 1).unwrap();
+    assert!(secp256k1_verify(&K1_MSG.data, &K1_SIG.data, &pubkey));
 
-    let mut verified = false;
-    secp256k1_verify(&K1_MSG, &K1_SIG, &pubkey, &mut verified).unwrap();
-    assert!(verified);
-
-    // Wrong message must not verify; `verified` must be overwritten.
     let mut wrong_msg = K1_MSG;
     wrong_msg.data[0] ^= 1;
-    secp256k1_verify(&wrong_msg, &K1_SIG, &pubkey, &mut verified).unwrap();
-    assert!(!verified);
+    assert!(!secp256k1_verify(&wrong_msg.data, &K1_SIG.data, &pubkey));
 
-    // A public key that is not on the curve cannot be parsed.
-    verified = true;
     let bad_pubkey = ZkvmSecp256k1Pubkey { data: [0xff; 64] };
-    let result = secp256k1_verify(&K1_MSG, &K1_SIG, &bad_pubkey, &mut verified);
-    assert_eq!(result, Err(Error::PointNotOnCurve));
-    assert!(!verified);
+    assert!(!secp256k1_verify(&K1_MSG.data, &K1_SIG.data, &bad_pubkey.data));
 }
 
 #[test]
diff --git a/crates/accelerators/tests/conformance/hash.rs b/crates/accelerators/tests/hash.rs
similarity index 84%
rename from crates/accelerators/tests/conformance/hash.rs
rename to crates/accelerators/tests/hash.rs
index 339bc3f79..7c909bd4a 100644
--- a/crates/accelerators/tests/conformance/hash.rs
+++ b/crates/accelerators/tests/hash.rs
@@ -1,25 +1,22 @@
+#![cfg(feature = "ffi")]
+
 //! Hash conformance vectors.
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    ffi::{zkvm_keccak256, zkvm_ripemd160, zkvm_sha256},
-    ops::{keccak256, ripemd160, sha256},
-    types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus},
+    keccak256, ripemd160, sha256, zkvm_keccak256, zkvm_ripemd160, zkvm_sha256, ZkvmKeccak256Hash,
+    ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus,
 };
 
 #[test]
 fn keccak256_vectors() {
-    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
-
-    keccak256(b"", &mut output);
     assert_eq!(
-        output.data,
+        keccak256(b""),
         hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
     );
 
-    keccak256(b"abc", &mut output);
     assert_eq!(
-        output.data,
+        keccak256(b"abc"),
         hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
     );
 }
@@ -58,17 +55,13 @@ fn zkvm_keccak256_null_pointers() {
 
 #[test]
 fn sha256_vectors() {
-    let mut output = ZkvmSha256Hash { data: [0; 32] };
-
-    sha256(b"", &mut output);
     assert_eq!(
-        output.data,
+        sha256(b""),
         hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
     );
 
-    sha256(b"abc", &mut output);
     assert_eq!(
-        output.data,
+        sha256(b"abc"),
         hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
     );
 }
@@ -107,18 +100,13 @@ fn zkvm_sha256_null_pointers() {
 
 #[test]
 fn ripemd160_vectors() {
-    // Start from a dirty buffer to check the 12-byte zero padding is written.
-    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
-
-    ripemd160(b"", &mut output);
     assert_eq!(
-        output.data,
+        ripemd160(b""),
         hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
     );
 
-    ripemd160(b"abc", &mut output);
     assert_eq!(
-        output.data,
+        ripemd160(b"abc"),
         hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
     );
 }
diff --git a/crates/accelerators/tests/conformance/kzg.rs b/crates/accelerators/tests/kzg.rs
similarity index 81%
rename from crates/accelerators/tests/conformance/kzg.rs
rename to crates/accelerators/tests/kzg.rs
index 0c425139a..9505446c6 100644
--- a/crates/accelerators/tests/conformance/kzg.rs
+++ b/crates/accelerators/tests/kzg.rs
@@ -1,10 +1,11 @@
 //! KZG point-evaluation conformance using the point-at-infinity commitment,
 //! which commits to the zero polynomial (p(z) = 0 for every z).
 
+#![cfg(feature = "ffi")]
+
 use openvm_accelerators::{
-    ffi::zkvm_kzg_point_eval,
-    ops::{kzg_point_eval, Error},
-    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmStatus},
+    kzg_point_eval, zkvm_kzg_point_eval, Error, ZkvmKzgCommitment, ZkvmKzgFieldElement,
+    ZkvmKzgProof, ZkvmStatus,
 };
 
 /// The compressed point at infinity: 0xc0 followed by zeros.
@@ -25,37 +26,28 @@ fn kzg_point_eval_infinity_commitment() {
     let commitment = infinity();
     let proof: ZkvmKzgProof = infinity();
     let z = scalar(2);
-    let mut verified = false;
-
     // The zero polynomial evaluates to 0 at every z; the infinity proof
     // attests it.
-    kzg_point_eval(&commitment, &z, &scalar(0), &proof, &mut verified).unwrap();
-    assert!(verified);
+    assert!(kzg_point_eval(&commitment.data, &z.data, &scalar(0).data, &proof.data).unwrap());
 
     // Claiming y = 1 for the zero polynomial must not verify.
-    kzg_point_eval(&commitment, &z, &scalar(1), &proof, &mut verified).unwrap();
-    assert!(!verified);
+    assert!(!kzg_point_eval(&commitment.data, &z.data, &scalar(1).data, &proof.data).unwrap());
 }
 
 #[test]
 fn kzg_point_eval_malformed_inputs() {
     let z = scalar(2);
     let y = scalar(0);
-    let mut verified = true;
-
     // Not a valid compressed-point prefix.
     let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
     garbage.data[0] = 0x01;
-    let result = kzg_point_eval(&garbage, &z, &y, &infinity(), &mut verified);
+    let result = kzg_point_eval(&garbage.data, &z.data, &y.data, &infinity().data);
     assert_eq!(result, Err(Error::KzgInvalidInput));
-    assert!(!verified);
 
     // An out-of-range evaluation point (>= the BLS scalar field order).
     let big_z = ZkvmKzgFieldElement { data: [0xff; 32] };
-    verified = true;
-    let result = kzg_point_eval(&infinity(), &big_z, &y, &infinity(), &mut verified);
+    let result = kzg_point_eval(&infinity().data, &big_z.data, &y.data, &infinity().data);
     assert_eq!(result, Err(Error::KzgInvalidInput));
-    assert!(!verified);
 }
 
 #[test]
diff --git a/crates/accelerators/tests/conformance/modexp.rs b/crates/accelerators/tests/modexp.rs
similarity index 83%
rename from crates/accelerators/tests/conformance/modexp.rs
rename to crates/accelerators/tests/modexp.rs
index d72f12ce0..b97baa3f1 100644
--- a/crates/accelerators/tests/conformance/modexp.rs
+++ b/crates/accelerators/tests/modexp.rs
@@ -1,7 +1,9 @@
 //! Modexp conformance vectors.
 
+#![cfg(feature = "ffi")]
+
 use hex_literal::hex;
-use openvm_accelerators::{ffi::zkvm_modexp, ops::modexp, types::ZkvmStatus};
+use openvm_accelerators::{modexp, zkvm_modexp, ZkvmStatus};
 
 /// BN254 Fr (the scalar field) modulus, big-endian. Not to be confused with
 /// the base field prime, which shares the leading bytes.
@@ -10,25 +12,19 @@ const BN254_FR: [u8; 32] = hex!("30644e72e131a029b85045b68181585d2833e84879b9709
 #[test]
 fn modexp_small() {
     // 3^5 mod 7 = 5
-    let mut output = [0xffu8; 1];
-    modexp(&[3], &[5], &[7], &mut output);
-    assert_eq!(output, [5]);
+    assert_eq!(modexp(&[3], &[5], &[7]), [5]);
 
     // Output is left-padded to the modulus length.
-    let mut output = [0xffu8; 2];
-    modexp(&[3], &[5], &[0, 7], &mut output);
-    assert_eq!(output, [0, 5]);
+    assert_eq!(modexp(&[3], &[5], &[0, 7]), [0, 5]);
 
-    // A zero-length modulus writes nothing.
-    modexp(&[3], &[5], &[], &mut []);
+    assert!(modexp(&[3], &[5], &[]).is_empty());
 }
 
 #[test]
 fn modexp_matches_reference() {
     // The BN254-Fr accelerated path, compared right-aligned against the
     // aurora reference.
-    let mut output = [0xa5; 32];
-    modexp(&[0xab; 32], &[0x07], &BN254_FR, &mut output);
+    let output = modexp(&[0xab; 32], &[0x07], &BN254_FR);
     let reference = aurora_engine_modexp::modexp(&[0xab; 32], &[0x07], &BN254_FR);
     let mut expected = [0; 32];
     expected[32 - reference.len()..].copy_from_slice(&reference);
@@ -36,8 +32,7 @@ fn modexp_matches_reference() {
 
     // The generic path with a non-special modulus.
     let modulus = [0xef; 24];
-    let mut output = [0xa5; 24];
-    modexp(&[0x12; 40], &[0x34; 3], &modulus, &mut output);
+    let output = modexp(&[0x12; 40], &[0x34; 3], &modulus);
     let reference = aurora_engine_modexp::modexp(&[0x12; 40], &[0x34; 3], &modulus);
     let mut expected = [0; 24];
     expected[24 - reference.len()..].copy_from_slice(&reference);
diff --git a/crates/revm-crypto/src/lib.rs b/crates/revm-crypto/src/lib.rs
index 28abb25b9..51df00da9 100644
--- a/crates/revm-crypto/src/lib.rs
+++ b/crates/revm-crypto/src/lib.rs
@@ -15,15 +15,10 @@ use alloy_consensus::crypto::{
 };
 use alloy_primitives::Address;
 use openvm_accelerators::{
-    ops::{self, Error, StreamError},
-    types::{
-        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
-        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBn254G1Point,
-        ZkvmBn254G2Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmBytes32, ZkvmKeccak256Hash,
-        ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmRipemd160Hash, ZkvmSecp256k1Hash,
-        ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey,
-        ZkvmSecp256r1Signature, ZkvmSha256Hash,
-    },
+    blake2f, bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
+    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, bn254_g1_add,
+    bn254_g1_mul, bn254_pairing_check, keccak256, kzg_point_eval, modexp, ripemd160,
+    secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, sha256, Error, StreamError,
 };
 use revm::{
     install_crypto,
@@ -48,14 +43,9 @@ impl CryptoProvider for OpenVmK256Provider {
         sig: &[u8; 65],
         msg: &[u8; 32],
     ) -> Result<Address, RecoveryError> {
-        let recovery_id = sig[64];
-        let msg = ZkvmSecp256k1Hash { data: *msg };
-        let sig = ZkvmSecp256k1Signature { data: sig[..64].try_into().unwrap() };
-        let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
-        ops::secp256k1_ecrecover(&msg, &sig, recovery_id, &mut pubkey)
+        let pubkey = secp256k1_ecrecover(msg, sig[..64].try_into().unwrap(), sig[64])
             .map_err(|_| RecoveryError::new())?;
-
-        Ok(address_from_pubkey(&pubkey.data))
+        Ok(address_from_pubkey(&pubkey))
     }
 
     fn verify_and_compute_signer_unchecked(
@@ -68,25 +58,17 @@ impl CryptoProvider for OpenVmK256Provider {
             return Err(RecoveryError::new());
         }
 
-        let msg = ZkvmSecp256k1Hash { data: *msg };
-        let sig = ZkvmSecp256k1Signature { data: *sig };
-        let pubkey = ZkvmSecp256k1Pubkey { data: pubkey[1..].try_into().unwrap() };
-        let mut verified = false;
-        ops::secp256k1_verify(&msg, &sig, &pubkey, &mut verified)
-            .map_err(|_| RecoveryError::new())?;
-        if !verified {
+        let pubkey: &[u8; 64] = pubkey[1..].try_into().unwrap();
+        if !secp256k1_verify(msg, sig, pubkey) {
             return Err(RecoveryError::new());
         }
 
-        Ok(address_from_pubkey(&pubkey.data))
+        Ok(address_from_pubkey(pubkey))
     }
 }
 
-// Kept separate so both Alloy provider methods use exactly the standard-interface hash path.
 fn address_from_pubkey(pubkey: &[u8; 64]) -> Address {
-    let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
-    ops::keccak256(pubkey, &mut hash);
-    Address::from_slice(&hash.data[12..])
+    Address::from_slice(&keccak256(pubkey)[12..])
 }
 
 #[derive(Debug, Default)]
@@ -94,51 +76,23 @@ struct OpenVmCrypto;
 
 impl Crypto for OpenVmCrypto {
     fn sha256(&self, input: &[u8]) -> [u8; 32] {
-        let mut output = ZkvmSha256Hash { data: [0; 32] };
-        ops::sha256(input, &mut output);
-        output.data
+        sha256(input)
     }
 
     fn ripemd160(&self, input: &[u8]) -> [u8; 32] {
-        let mut output = ZkvmRipemd160Hash { data: [0; 32] };
-        ops::ripemd160(input, &mut output);
-        output.data
+        ripemd160(input)
     }
 
     fn bn254_g1_add(&self, p1: &[u8], p2: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
-        let p1 =
-            ZkvmBn254G1Point { data: p1.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)? };
-        let p2 =
-            ZkvmBn254G1Point { data: p2.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)? };
-        let mut output = ZkvmBn254G1Point { data: [0; 64] };
-        ops::bn254_g1_add(&p1, &p2, &mut output).map_err(map_bn_error)?;
-        Ok(output.data)
+        bn254_g1_add(p1, p2).map_err(map_bn_error)
     }
 
     fn bn254_g1_mul(&self, point: &[u8], scalar: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
-        let point = ZkvmBn254G1Point {
-            data: point.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
-        };
-        let scalar = ZkvmBn254Scalar {
-            data: scalar.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
-        };
-        let mut output = ZkvmBn254G1Point { data: [0; 64] };
-        ops::bn254_g1_mul(&point, &scalar, &mut output).map_err(map_bn_error)?;
-        Ok(output.data)
+        bn254_g1_mul(point, scalar).map_err(map_bn_error)
     }
 
     fn bn254_pairing_check(&self, pairs: &[(&[u8], &[u8])]) -> Result<bool, PrecompileHalt> {
-        let pairs = pairs.iter().map(|(g1, g2)| {
-            Ok(ZkvmBn254PairingPair {
-                g1: ZkvmBn254G1Point {
-                    data: (*g1).try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
-                },
-                g2: ZkvmBn254G2Point {
-                    data: (*g2).try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
-                },
-            })
-        });
-        ops::bn254_pairing_check_iter(pairs).map_err(|error| map_stream_error(error, map_bn_error))
+        bn254_pairing_check(pairs.iter().copied()).map_err(map_bn_error)
     }
 
     fn secp256k1_ecrecover(
@@ -147,32 +101,24 @@ impl Crypto for OpenVmCrypto {
         recid: u8,
         msg: &[u8; 32],
     ) -> Result<[u8; 32], PrecompileHalt> {
-        let msg = ZkvmSecp256k1Hash { data: *msg };
-        let sig = ZkvmSecp256k1Signature { data: *sig };
-        let mut pubkey = ZkvmSecp256k1Pubkey { data: [0; 64] };
-        ops::secp256k1_ecrecover(&msg, &sig, recid, &mut pubkey)
+        let pubkey = secp256k1_ecrecover(msg, sig, recid)
             .map_err(|_| PrecompileHalt::Secp256k1RecoverFailed)?;
 
-        let mut hash = ZkvmKeccak256Hash { data: [0; 32] };
-        ops::keccak256(&pubkey.data, &mut hash);
-        hash.data[..12].fill(0);
-        Ok(hash.data)
+        let mut hash = keccak256(&pubkey);
+        hash[..12].fill(0);
+        Ok(hash)
     }
 
     fn modexp(&self, base: &[u8], exp: &[u8], modulus: &[u8]) -> Result<Vec<u8>, PrecompileHalt> {
-        Ok(ops::modexp_result(base, exp, modulus))
+        Ok(modexp(base, exp, modulus))
     }
 
     fn blake2_compress(&self, rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
-        ops::blake2f_words(rounds, h, m, t, f);
+        blake2f(rounds, h, m, t, f);
     }
 
     fn secp256r1_verify_signature(&self, msg: &[u8; 32], sig: &[u8; 64], pk: &[u8; 64]) -> bool {
-        let msg = ZkvmSecp256r1Hash { data: *msg };
-        let sig = ZkvmSecp256r1Signature { data: *sig };
-        let pubkey = ZkvmSecp256r1Pubkey { data: *pk };
-        let mut verified = false;
-        ops::secp256r1_verify(&msg, &sig, &pubkey, &mut verified).is_ok() && verified
+        secp256r1_verify(msg, sig, pk)
     }
 
     fn verify_kzg_proof(
@@ -182,12 +128,7 @@ impl Crypto for OpenVmCrypto {
         commitment: &[u8; 48],
         proof: &[u8; 48],
     ) -> Result<(), PrecompileHalt> {
-        let commitment = ZkvmKzgCommitment { data: *commitment };
-        let z = ZkvmKzgFieldElement { data: *z };
-        let y = ZkvmKzgFieldElement { data: *y };
-        let proof = ZkvmKzgProof { data: *proof };
-        let mut verified = false;
-        ops::kzg_point_eval(&commitment, &z, &y, &proof, &mut verified)
+        let verified = kzg_point_eval(commitment, z, y, proof)
             .map_err(|_| PrecompileHalt::BlobVerifyKzgProofFailed)?;
         if verified {
             Ok(())
@@ -201,24 +142,14 @@ impl Crypto for OpenVmCrypto {
         a: BlsG1Point,
         b: BlsG1Point,
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        let a = bls_g1(a);
-        let b = bls_g1(b);
-        let mut output = ZkvmBls12381G1Point { data: [0; BLS_G1_LEN] };
-        ops::bls12_381_g1_add(&a, &b, &mut output).map_err(map_bls_g1_error)?;
-        Ok(output.data)
+        bls12_381_g1_add(a, b).map_err(map_bls_g1_error)
     }
 
     fn bls12_381_g1_msm(
         &self,
         pairs: &mut dyn Iterator<Item = Result<BlsG1PointScalar, PrecompileHalt>>,
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        let pairs = pairs.map(|pair| {
-            let (point, scalar) = pair?;
-            Ok(ZkvmBls12381G1MsmPair { point: bls_g1(point), scalar: ZkvmBytes32 { data: scalar } })
-        });
-        ops::bls12_381_g1_msm_iter(pairs)
-            .map(|output| output.data)
-            .map_err(|error| map_stream_error(error, map_bls_g1_error))
+        bls12_381_g1_msm(pairs).map_err(|error| map_stream_error(error, map_bls_g1_error))
     }
 
     fn bls12_381_g2_add(
@@ -226,76 +157,38 @@ impl Crypto for OpenVmCrypto {
         a: BlsG2Point,
         b: BlsG2Point,
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        let a = bls_g2(a);
-        let b = bls_g2(b);
-        let mut output = ZkvmBls12381G2Point { data: [0; BLS_G2_LEN] };
-        ops::bls12_381_g2_add(&a, &b, &mut output).map_err(map_bls_g2_error)?;
-        Ok(output.data)
+        bls12_381_g2_add(a, b).map_err(map_bls_g2_error)
     }
 
     fn bls12_381_g2_msm(
         &self,
         pairs: &mut dyn Iterator<Item = Result<BlsG2PointScalar, PrecompileHalt>>,
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        let pairs = pairs.map(|pair| {
-            let (point, scalar) = pair?;
-            Ok(ZkvmBls12381G2MsmPair { point: bls_g2(point), scalar: ZkvmBytes32 { data: scalar } })
-        });
-        ops::bls12_381_g2_msm_iter(pairs)
-            .map(|output| output.data)
-            .map_err(|error| map_stream_error(error, map_bls_g2_error))
+        bls12_381_g2_msm(pairs).map_err(|error| map_stream_error(error, map_bls_g2_error))
     }
 
     fn bls12_381_pairing_check(
         &self,
         pairs: &[(BlsG1Point, BlsG2Point)],
     ) -> Result<bool, PrecompileHalt> {
-        let pairs = pairs
-            .iter()
-            .copied()
-            .map(|(g1, g2)| ZkvmBls12381PairingPair { g1: bls_g1(g1), g2: bls_g2(g2) });
-        ops::bls12_381_pairing_check_iter(pairs).map_err(map_bls_pairing_error)
+        bls12_381_pairing_check(pairs.iter().copied()).map_err(map_bls_pairing_error)
     }
 
     fn bls12_381_fp_to_g1(
         &self,
         fp: &[u8; BLS_FP_LEN],
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        let fp = ZkvmBls12381Fp { data: *fp };
-        let mut output = ZkvmBls12381G1Point { data: [0; BLS_G1_LEN] };
-        ops::bls12_381_map_fp_to_g1(&fp, &mut output).map_err(map_bls_field_error)?;
-        Ok(output.data)
+        bls12_381_map_fp_to_g1(fp).map_err(map_bls_field_error)
     }
 
     fn bls12_381_fp2_to_g2(
         &self,
         fp2: ([u8; BLS_FP_LEN], [u8; BLS_FP_LEN]),
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        let mut data = [0; BLS_FP_LEN * 2];
-        data[..BLS_FP_LEN].copy_from_slice(&fp2.0);
-        data[BLS_FP_LEN..].copy_from_slice(&fp2.1);
-        let fp2 = ZkvmBls12381Fp2 { data };
-        let mut output = ZkvmBls12381G2Point { data: [0; BLS_G2_LEN] };
-        ops::bls12_381_map_fp2_to_g2(&fp2, &mut output).map_err(map_bls_field_error)?;
-        Ok(output.data)
+        bls12_381_map_fp2_to_g2(fp2).map_err(map_bls_field_error)
     }
 }
 
-fn bls_g1((x, y): BlsG1Point) -> ZkvmBls12381G1Point {
-    let mut data = [0; BLS_G1_LEN];
-    data[..BLS_FP_LEN].copy_from_slice(&x);
-    data[BLS_FP_LEN..].copy_from_slice(&y);
-    ZkvmBls12381G1Point { data }
-}
-
-fn bls_g2((x0, x1, y0, y1): BlsG2Point) -> ZkvmBls12381G2Point {
-    let mut data = [0; BLS_G2_LEN];
-    for (output, coordinate) in data.chunks_exact_mut(BLS_FP_LEN).zip([x0, x1, y0, y1]) {
-        output.copy_from_slice(&coordinate);
-    }
-    ZkvmBls12381G2Point { data }
-}
-
 fn map_stream_error(
     error: StreamError<PrecompileHalt>,
     map_operation: fn(Error) -> PrecompileHalt,
@@ -308,6 +201,7 @@ fn map_stream_error(
 
 fn map_bn_error(error: Error) -> PrecompileHalt {
     match error {
+        Error::InvalidLength => PrecompileHalt::Bn254PairLength,
         Error::FieldElementInvalid => PrecompileHalt::Bn254FieldPointNotAMember,
         Error::PointNotOnCurve | Error::PointNotInSubgroup => {
             PrecompileHalt::Bn254AffineGFailedToCreate
@@ -435,24 +329,14 @@ mod tests {
     #[test]
     fn adapters_preserve_revm_error_variants() {
         let invalid_bn_point = [0xff; 64];
-        assert_eq!(
-            OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]),
-            Err(PrecompileHalt::Bn254FieldPointNotAMember)
-        );
-        assert_eq!(
-            OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]),
-            DefaultCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64])
-        );
+        let actual = OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]);
+        assert_eq!(actual, Err(PrecompileHalt::Bn254FieldPointNotAMember));
+        assert_eq!(actual, DefaultCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]));
 
         let noncanonical_fp = [0xff; BLS_FP_LEN];
-        assert_eq!(
-            OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp),
-            Err(PrecompileHalt::NonCanonicalFp)
-        );
-        assert_eq!(
-            OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp),
-            DefaultCrypto.bls12_381_fp_to_g1(&noncanonical_fp)
-        );
+        let actual = OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp);
+        assert_eq!(actual, Err(PrecompileHalt::NonCanonicalFp));
+        assert_eq!(actual, DefaultCrypto.bls12_381_fp_to_g1(&noncanonical_fp));
 
         assert_eq!(
             OpenVmCrypto.secp256k1_ecrecover(&[0; 64], 0, &[0; 32]),

From 9feb074bb0ee09b96a006cb46e9019b3a85d9c16 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 12 Aug 2026 01:28:39 +0200
Subject: [PATCH 89/94] perf: inline BLS accelerator boundaries

---
 crates/accelerators/src/ffi/bls12_381.rs     |  6 +++---
 crates/accelerators/src/ops/bls12_381/map.rs |  4 +++-
 crates/accelerators/src/ops/bls12_381/mod.rs | 14 +++++++------
 crates/accelerators/tests/bls12_381.rs       | 22 +++++++++++++-------
 crates/revm-crypto/src/lib.rs                |  6 +++---
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
index 489ecfd59..b7e78d1ad 100644
--- a/crates/accelerators/src/ffi/bls12_381.rs
+++ b/crates/accelerators/src/ffi/bls12_381.rs
@@ -28,7 +28,7 @@ pub unsafe extern "C" fn zkvm_bls12_g1_add(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    match ops::bls12_381_g1_add(bls_g1(p1.data), bls_g1(p2.data)) {
+    match ops::bls12_381_g1_add(&bls_g1(p1.data), &bls_g1(p2.data)) {
         Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
             unsafe { result.write(ZkvmBls12381G1Point { data }) };
@@ -92,7 +92,7 @@ pub unsafe extern "C" fn zkvm_bls12_g2_add(
     }
     // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
     let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    match ops::bls12_381_g2_add(bls_g2(p1.data), bls_g2(p2.data)) {
+    match ops::bls12_381_g2_add(&bls_g2(p1.data), &bls_g2(p2.data)) {
         Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
             unsafe { result.write(ZkvmBls12381G2Point { data }) };
@@ -238,7 +238,7 @@ pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
         field_element.data[..48].try_into().unwrap(),
         field_element.data[48..].try_into().unwrap(),
     );
-    match ops::bls12_381_map_fp2_to_g2(fp2) {
+    match ops::bls12_381_map_fp2_to_g2(&fp2) {
         Ok(data) => {
             // SAFETY: `result` is non-NULL and valid for writes.
             unsafe { result.write(ZkvmBls12381G2Point { data }) };
diff --git a/crates/accelerators/src/ops/bls12_381/map.rs b/crates/accelerators/src/ops/bls12_381/map.rs
index c16f3bb73..5fba2b2dd 100644
--- a/crates/accelerators/src/ops/bls12_381/map.rs
+++ b/crates/accelerators/src/ops/bls12_381/map.rs
@@ -13,6 +13,7 @@ use super::BLS_FP_LEN;
 use crate::ops::Error;
 
 /// BLS12-381 map field element to G1 (precompile 0x10).
+#[inline]
 pub fn bls12_381_map_fp_to_g1(fp: &[u8; 48]) -> Result<[u8; 96], Error> {
     let fp = read_fq(fp)?;
     let point = WBMap::map_to_curve(fp)
@@ -23,7 +24,8 @@ pub fn bls12_381_map_fp_to_g1(fp: &[u8; 48]) -> Result<[u8; 96], Error> {
 }
 
 /// BLS12-381 map field element to G2 (precompile 0x11).
-pub fn bls12_381_map_fp2_to_g2(fp2: ([u8; 48], [u8; 48])) -> Result<[u8; 192], Error> {
+#[inline]
+pub fn bls12_381_map_fp2_to_g2(fp2: &([u8; 48], [u8; 48])) -> Result<[u8; 192], Error> {
     let c0 = read_fq(&fp2.0)?;
     let c1 = read_fq(&fp2.1)?;
     let point = WBMap::map_to_curve(Fq2::new(c0, c1))
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
index 68d21064f..dcd2cd905 100644
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ b/crates/accelerators/src/ops/bls12_381/mod.rs
@@ -27,9 +27,10 @@ const BLS_FP_LEN: usize = 48;
 ///
 /// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup
 /// membership.
-pub fn bls12_381_g1_add(p1: BlsG1, p2: BlsG1) -> Result<[u8; 96], Error> {
-    let p1 = read_bls_g1_point_no_subgroup_check(&p1)?;
-    let p2 = read_bls_g1_point_no_subgroup_check(&p2)?;
+#[inline]
+pub fn bls12_381_g1_add(p1: &BlsG1, p2: &BlsG1) -> Result<[u8; 96], Error> {
+    let p1 = read_bls_g1_point_no_subgroup_check(p1)?;
+    let p2 = read_bls_g1_point_no_subgroup_check(p2)?;
     Ok(encode_bls_g1_point(&(p1 + p2)))
 }
 
@@ -61,9 +62,10 @@ pub fn bls12_381_g1_msm<E>(
 ///
 /// Per EIP-2537 G2ADD, inputs are validated on-curve only, not for subgroup
 /// membership.
-pub fn bls12_381_g2_add(p1: BlsG2, p2: BlsG2) -> Result<[u8; 192], Error> {
-    let p1 = read_bls_g2_point_no_subgroup_check(&p1)?;
-    let p2 = read_bls_g2_point_no_subgroup_check(&p2)?;
+#[inline]
+pub fn bls12_381_g2_add(p1: &BlsG2, p2: &BlsG2) -> Result<[u8; 192], Error> {
+    let p1 = read_bls_g2_point_no_subgroup_check(p1)?;
+    let p2 = read_bls_g2_point_no_subgroup_check(p2)?;
     Ok(encode_bls_g2_point(&(p1 + p2)))
 }
 
diff --git a/crates/accelerators/tests/bls12_381.rs b/crates/accelerators/tests/bls12_381.rs
index 14cfab5dd..f78efe76c 100644
--- a/crates/accelerators/tests/bls12_381.rs
+++ b/crates/accelerators/tests/bls12_381.rs
@@ -85,7 +85,7 @@ fn neg_g1_generator() -> ZkvmBls12381G1Point {
 
 #[test]
 fn bls12_g1_add_msm_vectors() {
-    let output = bls12_381_g1_add(bls_g1(BLS_G1_GEN), bls_g1(BLS_G1_GEN)).unwrap();
+    let output = bls12_381_g1_add(&bls_g1(BLS_G1_GEN), &bls_g1(BLS_G1_GEN)).unwrap();
     assert_eq!(output, BLS_G1_2GEN.data);
 
     let pairs = [Ok::<_, Infallible>((bls_g1(BLS_G1_GEN), scalar(2).data))];
@@ -99,7 +99,7 @@ fn bls12_g1_add_msm_vectors() {
 
 #[test]
 fn bls12_g2_add_msm_vectors() {
-    let output = bls12_381_g2_add(bls_g2(BLS_G2_GEN), bls_g2(BLS_G2_GEN)).unwrap();
+    let output = bls12_381_g2_add(&bls_g2(BLS_G2_GEN), &bls_g2(BLS_G2_GEN)).unwrap();
     assert_eq!(output, BLS_G2_2GEN.data);
 
     let pairs = [Ok::<_, Infallible>((bls_g2(BLS_G2_GEN), scalar(2).data))];
@@ -168,11 +168,11 @@ fn zkvm_bls12_pairing_smoke() {
 fn bls12_rejects_invalid_points() {
     let mut off_curve_g1 = BLS_G1_GEN;
     off_curve_g1.data[95] ^= 1;
-    assert!(bls12_381_g1_add(bls_g1(off_curve_g1), bls_g1(BLS_G1_GEN)).is_err());
+    assert!(bls12_381_g1_add(&bls_g1(off_curve_g1), &bls_g1(BLS_G1_GEN)).is_err());
 
     let mut off_curve_g2 = BLS_G2_GEN;
     off_curve_g2.data[191] ^= 1;
-    assert!(bls12_381_g2_add(bls_g2(off_curve_g2), bls_g2(BLS_G2_GEN)).is_err());
+    assert!(bls12_381_g2_add(&bls_g2(off_curve_g2), &bls_g2(BLS_G2_GEN)).is_err());
 
     let pairs = [(bls_g1(off_curve_g1), bls_g2(BLS_G2_GEN))];
     assert_eq!(bls12_381_pairing_check(pairs), Err(Error::BlsG1PointNotOnCurve));
@@ -295,7 +295,7 @@ fn bls12_map_fp_to_g1_vectors() {
 #[test]
 fn bls12_map_fp2_to_g2_vectors() {
     for (input, expected) in MAP_FP2_TO_G2_VECTORS {
-        let output = bls12_381_map_fp2_to_g2(bls_fp2(input)).unwrap();
+        let output = bls12_381_map_fp2_to_g2(&bls_fp2(input)).unwrap();
         assert_eq!(output, expected, "input={input:?}");
     }
 }
@@ -314,7 +314,7 @@ fn bls12_map_lands_in_prime_order_subgroup() {
         bls12_381_g1_msm(pairs).expect("mapped G1 point must be in the prime-order subgroup");
     assert_eq!(output, mapped);
 
-    let mapped = bls12_381_map_fp2_to_g2(bls_fp2(MAP_FP2_TO_G2_VECTORS[0].0)).unwrap();
+    let mapped = bls12_381_map_fp2_to_g2(&bls_fp2(MAP_FP2_TO_G2_VECTORS[0].0)).unwrap();
     let pairs =
         [Ok::<_, Infallible>((bls_g2(ZkvmBls12381G2Point { data: mapped }), scalar(1).data))];
     let output =
@@ -330,8 +330,14 @@ fn bls12_map_field_element_range() {
     assert_eq!(bls12_381_map_fp_to_g1(&[0xff; 48]), Err(Error::FieldElementInvalid));
 
     // Either half of an Fp2 input is checked.
-    assert_eq!(bls12_381_map_fp2_to_g2((BLS_FP_MODULUS, [0; 48])), Err(Error::FieldElementInvalid));
-    assert_eq!(bls12_381_map_fp2_to_g2(([0; 48], BLS_FP_MODULUS)), Err(Error::FieldElementInvalid));
+    assert_eq!(
+        bls12_381_map_fp2_to_g2(&(BLS_FP_MODULUS, [0; 48])),
+        Err(Error::FieldElementInvalid)
+    );
+    assert_eq!(
+        bls12_381_map_fp2_to_g2(&([0; 48], BLS_FP_MODULUS)),
+        Err(Error::FieldElementInvalid)
+    );
 }
 
 #[test]
diff --git a/crates/revm-crypto/src/lib.rs b/crates/revm-crypto/src/lib.rs
index 51df00da9..fe33a80ab 100644
--- a/crates/revm-crypto/src/lib.rs
+++ b/crates/revm-crypto/src/lib.rs
@@ -142,7 +142,7 @@ impl Crypto for OpenVmCrypto {
         a: BlsG1Point,
         b: BlsG1Point,
     ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        bls12_381_g1_add(a, b).map_err(map_bls_g1_error)
+        bls12_381_g1_add(&a, &b).map_err(map_bls_g1_error)
     }
 
     fn bls12_381_g1_msm(
@@ -157,7 +157,7 @@ impl Crypto for OpenVmCrypto {
         a: BlsG2Point,
         b: BlsG2Point,
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        bls12_381_g2_add(a, b).map_err(map_bls_g2_error)
+        bls12_381_g2_add(&a, &b).map_err(map_bls_g2_error)
     }
 
     fn bls12_381_g2_msm(
@@ -185,7 +185,7 @@ impl Crypto for OpenVmCrypto {
         &self,
         fp2: ([u8; BLS_FP_LEN], [u8; BLS_FP_LEN]),
     ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        bls12_381_map_fp2_to_g2(fp2).map_err(map_bls_field_error)
+        bls12_381_map_fp2_to_g2(&fp2).map_err(map_bls_field_error)
     }
 }
 

From e811d53aa969244dd30bae1b424aab783a8b479c Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Wed, 12 Aug 2026 11:05:11 +0200
Subject: [PATCH 90/94] refactor: expose zkVM accelerator C interface

---
 crates/accelerators/Cargo.toml                |   3 +-
 crates/accelerators/src/blake2f.rs            | 166 ++++++++
 crates/accelerators/src/bls12_381/codec.rs    |  90 ++++
 crates/accelerators/src/bls12_381/map.rs      |  64 +++
 crates/accelerators/src/bls12_381/mod.rs      | 290 +++++++++++++
 crates/accelerators/src/bn254/codec.rs        |  54 +++
 crates/accelerators/src/bn254/mod.rs          | 136 ++++++
 crates/accelerators/src/error.rs              |   8 +
 crates/accelerators/src/ffi/blake2.rs         |  54 ---
 crates/accelerators/src/ffi/bls12_381.rs      | 249 -----------
 crates/accelerators/src/ffi/bn254.rs          | 105 -----
 crates/accelerators/src/ffi/ecdsa.rs          | 102 -----
 crates/accelerators/src/ffi/hash.rs           |  91 ----
 crates/accelerators/src/ffi/kzg.rs            |  38 --
 crates/accelerators/src/ffi/mod.rs            |  20 -
 crates/accelerators/src/ffi/modexp.rs         |  47 ---
 crates/accelerators/src/keccak256.rs          |  31 ++
 crates/accelerators/src/kzg.rs                |  48 +++
 crates/accelerators/src/lib.rs                |  51 ++-
 crates/accelerators/src/modexp.rs             | 139 +++++++
 crates/accelerators/src/ops/blake2/mod.rs     |  39 --
 .../accelerators/src/ops/blake2/portable.rs   |  83 ----
 .../accelerators/src/ops/bls12_381/codec.rs   | 102 -----
 crates/accelerators/src/ops/bls12_381/map.rs  |  78 ----
 crates/accelerators/src/ops/bls12_381/mod.rs  | 131 ------
 crates/accelerators/src/ops/bn254/codec.rs    |  79 ----
 crates/accelerators/src/ops/bn254/mod.rs      |  55 ---
 crates/accelerators/src/ops/ecdsa/mod.rs      |  10 -
 .../accelerators/src/ops/ecdsa/secp256k1.rs   |  60 ---
 .../accelerators/src/ops/ecdsa/secp256r1.rs   |  18 -
 crates/accelerators/src/ops/hash.rs           |  30 --
 crates/accelerators/src/ops/kzg.rs            |  29 --
 crates/accelerators/src/ops/mod.rs            |  62 ---
 crates/accelerators/src/ops/modexp.rs         | 143 -------
 crates/accelerators/src/ripemd160.rs          |  42 ++
 crates/accelerators/src/secp256k1.rs          |  95 +++++
 crates/accelerators/src/secp256r1.rs          |  46 +++
 crates/accelerators/src/sha256.rs             |  33 ++
 crates/accelerators/src/types.rs              | 152 +------
 .../tests/{blake2.rs => blake2f.rs}           |  65 +--
 crates/accelerators/tests/bls12_381.rs        | 298 ++++++-------
 crates/accelerators/tests/bn254.rs            |  73 ++--
 crates/accelerators/tests/ecdsa.rs            | 148 -------
 crates/accelerators/tests/hash.rs             | 144 -------
 crates/accelerators/tests/keccak256.rs        |  36 ++
 crates/accelerators/tests/kzg.rs              |  70 ++--
 crates/accelerators/tests/modexp.rs           |  55 ++-
 crates/accelerators/tests/ripemd160.rs        |  36 ++
 crates/accelerators/tests/secp256k1.rs        | 103 +++++
 crates/accelerators/tests/secp256r1.rs        |  81 ++++
 crates/accelerators/tests/sha256.rs           |  36 ++
 crates/revm-crypto/src/alloy.rs               |  67 +++
 crates/revm-crypto/src/lib.rs                 | 366 +---------------
 crates/revm-crypto/src/revm.rs                | 391 ++++++++++++++++++
 54 files changed, 2267 insertions(+), 2775 deletions(-)
 create mode 100644 crates/accelerators/src/blake2f.rs
 create mode 100644 crates/accelerators/src/bls12_381/codec.rs
 create mode 100644 crates/accelerators/src/bls12_381/map.rs
 create mode 100644 crates/accelerators/src/bls12_381/mod.rs
 create mode 100644 crates/accelerators/src/bn254/codec.rs
 create mode 100644 crates/accelerators/src/bn254/mod.rs
 create mode 100644 crates/accelerators/src/error.rs
 delete mode 100644 crates/accelerators/src/ffi/blake2.rs
 delete mode 100644 crates/accelerators/src/ffi/bls12_381.rs
 delete mode 100644 crates/accelerators/src/ffi/bn254.rs
 delete mode 100644 crates/accelerators/src/ffi/ecdsa.rs
 delete mode 100644 crates/accelerators/src/ffi/hash.rs
 delete mode 100644 crates/accelerators/src/ffi/kzg.rs
 delete mode 100644 crates/accelerators/src/ffi/mod.rs
 delete mode 100644 crates/accelerators/src/ffi/modexp.rs
 create mode 100644 crates/accelerators/src/keccak256.rs
 create mode 100644 crates/accelerators/src/kzg.rs
 create mode 100644 crates/accelerators/src/modexp.rs
 delete mode 100644 crates/accelerators/src/ops/blake2/mod.rs
 delete mode 100644 crates/accelerators/src/ops/blake2/portable.rs
 delete mode 100644 crates/accelerators/src/ops/bls12_381/codec.rs
 delete mode 100644 crates/accelerators/src/ops/bls12_381/map.rs
 delete mode 100644 crates/accelerators/src/ops/bls12_381/mod.rs
 delete mode 100644 crates/accelerators/src/ops/bn254/codec.rs
 delete mode 100644 crates/accelerators/src/ops/bn254/mod.rs
 delete mode 100644 crates/accelerators/src/ops/ecdsa/mod.rs
 delete mode 100644 crates/accelerators/src/ops/ecdsa/secp256k1.rs
 delete mode 100644 crates/accelerators/src/ops/ecdsa/secp256r1.rs
 delete mode 100644 crates/accelerators/src/ops/hash.rs
 delete mode 100644 crates/accelerators/src/ops/kzg.rs
 delete mode 100644 crates/accelerators/src/ops/mod.rs
 delete mode 100644 crates/accelerators/src/ops/modexp.rs
 create mode 100644 crates/accelerators/src/ripemd160.rs
 create mode 100644 crates/accelerators/src/secp256k1.rs
 create mode 100644 crates/accelerators/src/secp256r1.rs
 create mode 100644 crates/accelerators/src/sha256.rs
 rename crates/accelerators/tests/{blake2.rs => blake2f.rs} (54%)
 delete mode 100644 crates/accelerators/tests/ecdsa.rs
 delete mode 100644 crates/accelerators/tests/hash.rs
 create mode 100644 crates/accelerators/tests/keccak256.rs
 create mode 100644 crates/accelerators/tests/ripemd160.rs
 create mode 100644 crates/accelerators/tests/secp256k1.rs
 create mode 100644 crates/accelerators/tests/secp256r1.rs
 create mode 100644 crates/accelerators/tests/sha256.rs
 create mode 100644 crates/revm-crypto/src/alloy.rs
 create mode 100644 crates/revm-crypto/src/revm.rs

diff --git a/crates/accelerators/Cargo.toml b/crates/accelerators/Cargo.toml
index d70690b93..8479efdc2 100644
--- a/crates/accelerators/Cargo.toml
+++ b/crates/accelerators/Cargo.toml
@@ -52,6 +52,5 @@ ignored = ["openvm-pairing-guest"]
 ignored = ["openvm-pairing-guest"]
 
 [features]
-default = ["ffi"]
-ffi = []
+default = []
 std = []
diff --git a/crates/accelerators/src/blake2f.rs b/crates/accelerators/src/blake2f.rs
new file mode 100644
index 000000000..76689a19a
--- /dev/null
+++ b/crates/accelerators/src/blake2f.rs
@@ -0,0 +1,166 @@
+//! BLAKE2b compression function F (EIP-152).
+//!
+//! Operates on raw BLAKE2b state with an arbitrary round count.
+
+// Ported from revm-precompile 36.0.3's EIP-152 adaptation:
+// https://docs.rs/crate/revm-precompile/36.0.3/source/src/blake2/portable.rs
+// That implementation is adapted from blake2b_simd:
+// https://github.com/oconnor663/blake2_simd
+//
+// Copyright (c) 2018 Jack O'Connor
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+
+pub type zkvm_blake2f_state = ZkvmBytes<64>;
+pub type zkvm_blake2f_message = ZkvmBytes<128>;
+pub type zkvm_blake2f_offset = ZkvmBytes<16>;
+
+/// Apply BLAKE2 compression function F to `h` in place.
+///
+/// # Safety
+///
+/// - `h` must be valid for reads and writes of one [`zkvm_blake2f_state`].
+/// - `m` must be valid for reads of one [`zkvm_blake2f_message`].
+/// - `t` must be valid for reads of one [`zkvm_blake2f_offset`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_blake2f(
+    rounds: u32,
+    h: *mut zkvm_blake2f_state,
+    m: *const zkvm_blake2f_message,
+    t: *const zkvm_blake2f_offset,
+    f: u8,
+) -> zkvm_status {
+    if h.is_null() || m.is_null() || t.is_null() || f > 1 {
+        return ZKVM_EFAIL;
+    }
+
+    // SAFETY: the non-null inputs satisfy the function's pointer requirements.
+    // Read every input before writing `h` so overlapping arguments are supported.
+    let (state, message, offset) = unsafe { (h.read(), m.read(), t.read()) };
+
+    let mut state_words = [0; 8];
+    for (word, bytes) in state_words.iter_mut().zip(state.data.as_chunks::<8>().0) {
+        *word = Word::from_le_bytes(*bytes);
+    }
+    let mut message_words = [0; 16];
+    for (word, bytes) in message_words.iter_mut().zip(message.data.as_chunks::<8>().0) {
+        *word = Word::from_le_bytes(*bytes);
+    }
+    let offset_words = [
+        Word::from_le_bytes(offset.data[..8].try_into().unwrap()),
+        Word::from_le_bytes(offset.data[8..].try_into().unwrap()),
+    ];
+
+    compress(rounds, &mut state_words, &message_words, &offset_words, f == 1);
+
+    let mut value = zkvm_blake2f_state { data: [0; 64] };
+    for (bytes, word) in value.data.as_chunks_mut::<8>().0.iter_mut().zip(state_words) {
+        *bytes = word.to_le_bytes();
+    }
+
+    // SAFETY: `h` satisfies the function's write requirement; all reads are complete.
+    unsafe { h.write(value) };
+    ZKVM_EOK
+}
+
+type Word = u64;
+
+const IV: [Word; 8] = [
+    0x6A09E667F3BCC908,
+    0xBB67AE8584CAA73B,
+    0x3C6EF372FE94F82B,
+    0xA54FF53A5F1D36F1,
+    0x510E527FADE682D1,
+    0x9B05688C2B3E6C1F,
+    0x1F83D9ABFB41BD6B,
+    0x5BE0CD19137E2179,
+];
+
+// The message schedule has period 10 (RFC 7693 section 2.7). EIP-152 permits
+// arbitrary round counts, so rounds beyond the standard 12 must use `r % 10`.
+const SIGMA: [[u8; 16]; 10] = [
+    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
+    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
+    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
+    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
+    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
+    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
+    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
+    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
+    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
+    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
+];
+
+#[inline(always)]
+const fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
+    v[d] = (v[d] ^ v[a]).rotate_right(32);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(24);
+    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
+    v[d] = (v[d] ^ v[a]).rotate_right(16);
+    v[c] = v[c].wrapping_add(v[d]);
+    v[b] = (v[b] ^ v[c]).rotate_right(63);
+}
+
+#[inline(always)]
+const fn round(round: usize, m: &[Word; 16], v: &mut [Word; 16]) {
+    let schedule = SIGMA[round % SIGMA.len()];
+
+    g(v, 0, 4, 8, 12, m[schedule[0] as usize], m[schedule[1] as usize]);
+    g(v, 1, 5, 9, 13, m[schedule[2] as usize], m[schedule[3] as usize]);
+    g(v, 2, 6, 10, 14, m[schedule[4] as usize], m[schedule[5] as usize]);
+    g(v, 3, 7, 11, 15, m[schedule[6] as usize], m[schedule[7] as usize]);
+
+    g(v, 0, 5, 10, 15, m[schedule[8] as usize], m[schedule[9] as usize]);
+    g(v, 1, 6, 11, 12, m[schedule[10] as usize], m[schedule[11] as usize]);
+    g(v, 2, 7, 8, 13, m[schedule[12] as usize], m[schedule[13] as usize]);
+    g(v, 3, 4, 9, 14, m[schedule[14] as usize], m[schedule[15] as usize]);
+}
+
+fn compress(rounds: u32, h: &mut [Word; 8], m: &[Word; 16], t: &[Word; 2], f: bool) {
+    let mut v = [
+        h[0],
+        h[1],
+        h[2],
+        h[3],
+        h[4],
+        h[5],
+        h[6],
+        h[7],
+        IV[0],
+        IV[1],
+        IV[2],
+        IV[3],
+        IV[4] ^ t[0],
+        IV[5] ^ t[1],
+        IV[6] ^ if f { Word::MAX } else { 0 },
+        IV[7],
+    ];
+
+    for round_index in 0..rounds as usize {
+        round(round_index, m, &mut v);
+    }
+
+    for (index, word) in h.iter_mut().enumerate() {
+        *word ^= v[index] ^ v[index + 8];
+    }
+}
diff --git a/crates/accelerators/src/bls12_381/codec.rs b/crates/accelerators/src/bls12_381/codec.rs
new file mode 100644
index 000000000..205be15ba
--- /dev/null
+++ b/crates/accelerators/src/bls12_381/codec.rs
@@ -0,0 +1,90 @@
+//! EIP-2537 BLS12-381 point and scalar codecs.
+
+use openvm_curve_utils::SubgroupCheck;
+use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint, Group};
+use openvm_pairing::bls12_381 as bls;
+
+use crate::error::Error;
+
+const FP_LEN: usize = 48;
+
+#[inline]
+fn read_fp(input: &[u8]) -> Result<bls::Fp, Error> {
+    bls::Fp::from_be_bytes(input).ok_or(Error::FieldElementInvalid)
+}
+
+#[inline]
+fn read_fp2(c0: &[u8], c1: &[u8]) -> Result<bls::Fp2, Error> {
+    Ok(bls::Fp2::new(read_fp(c0)?, read_fp(c1)?))
+}
+
+#[inline]
+pub(super) fn read_g1_no_subgroup_check(input: &[u8; 96]) -> Result<bls::G1Affine, Error> {
+    let x = read_fp(&input[..FP_LEN])?;
+    let y = read_fp(&input[FP_LEN..])?;
+    // SAFETY: the coordinates are canonical; `from_xy` checks the curve equation.
+    unsafe { bls::G1Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)
+}
+
+#[inline]
+pub(super) fn read_g1(input: &[u8; 96]) -> Result<bls::G1Affine, Error> {
+    let point = read_g1_no_subgroup_check(input)?;
+    point.is_in_correct_subgroup().then_some(point).ok_or(Error::PointNotInSubgroup)
+}
+
+#[inline]
+pub(super) fn read_g2_no_subgroup_check(input: &[u8; 192]) -> Result<bls::G2Affine, Error> {
+    let x = read_fp2(&input[..FP_LEN], &input[FP_LEN..2 * FP_LEN])?;
+    let y = read_fp2(&input[2 * FP_LEN..3 * FP_LEN], &input[3 * FP_LEN..])?;
+    // SAFETY: the coordinates are canonical; `from_xy` checks the twist equation.
+    unsafe { bls::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)
+}
+
+#[inline]
+pub(super) fn read_g2(input: &[u8; 192]) -> Result<bls::G2Affine, Error> {
+    let point = read_g2_no_subgroup_check(input)?;
+    point.is_in_correct_subgroup().then_some(point).ok_or(Error::PointNotInSubgroup)
+}
+
+#[inline]
+pub(super) fn read_scalar(input: &[u8; 32]) -> bls::Scalar {
+    bls::Scalar::from_be_bytes_unchecked(input)
+}
+
+#[inline]
+pub(super) fn encode_g1(point: &bls::G1Affine) -> [u8; 96] {
+    let mut output = [0; 96];
+    if point.is_identity() {
+        return output;
+    }
+
+    let x: &[u8] = point.x().as_le_bytes();
+    let y: &[u8] = point.y().as_le_bytes();
+    for index in 0..FP_LEN {
+        output[index] = x[FP_LEN - 1 - index];
+        output[index + FP_LEN] = y[FP_LEN - 1 - index];
+    }
+    output
+}
+
+#[inline]
+pub(super) fn encode_g2(point: &bls::G2Affine) -> [u8; 192] {
+    let mut output = [0; 192];
+    if point.is_identity() {
+        return output;
+    }
+
+    let x = point.x();
+    let y = point.y();
+    let x_c0 = x.c0.as_le_bytes();
+    let x_c1 = x.c1.as_le_bytes();
+    let y_c0 = y.c0.as_le_bytes();
+    let y_c1 = y.c1.as_le_bytes();
+    for index in 0..FP_LEN {
+        output[index] = x_c0[FP_LEN - 1 - index];
+        output[index + FP_LEN] = x_c1[FP_LEN - 1 - index];
+        output[index + 2 * FP_LEN] = y_c0[FP_LEN - 1 - index];
+        output[index + 3 * FP_LEN] = y_c1[FP_LEN - 1 - index];
+    }
+    output
+}
diff --git a/crates/accelerators/src/bls12_381/map.rs b/crates/accelerators/src/bls12_381/map.rs
new file mode 100644
index 000000000..51cd772e1
--- /dev/null
+++ b/crates/accelerators/src/bls12_381/map.rs
@@ -0,0 +1,64 @@
+//! BLS12-381 map-to-curve operations.
+
+use ark_bls12_381::{Fq, Fq2, G1Affine, G2Affine};
+use ark_ec::{
+    hashing::{curve_maps::wb::WBMap, map_to_curve_hasher::MapToCurve},
+    AffineRepr,
+};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+
+use crate::error::Error;
+
+const FP_LEN: usize = 48;
+
+#[inline]
+pub(super) fn fp_to_g1(input: &[u8; 48]) -> Result<[u8; 96], Error> {
+    let point = WBMap::map_to_curve(read_fq(input)?)
+        .expect("the arkworks WB map is defined for every field element")
+        .clear_cofactor();
+    Ok(encode_g1(&point))
+}
+
+#[inline]
+pub(super) fn fp2_to_g2(input: &[u8; 96]) -> Result<[u8; 192], Error> {
+    let c0 = read_fq(&input[..FP_LEN])?;
+    let c1 = read_fq(&input[FP_LEN..])?;
+    let point = WBMap::map_to_curve(Fq2::new(c0, c1))
+        .expect("the arkworks WB map is defined for every field element")
+        .clear_cofactor();
+    Ok(encode_g2(&point))
+}
+
+fn read_fq(input_be: &[u8]) -> Result<Fq, Error> {
+    let mut input_le = [0; FP_LEN];
+    input_le.copy_from_slice(input_be);
+    input_le.reverse();
+    Fq::deserialize_uncompressed(&input_le[..]).map_err(|_| Error::FieldElementInvalid)
+}
+
+fn encode_fq(fq: &Fq, output: &mut [u8]) {
+    fq.serialize_uncompressed(&mut output[..]).expect("field element serialization is infallible");
+    output.reverse();
+}
+
+fn encode_g1(point: &G1Affine) -> [u8; 96] {
+    let mut output = [0; 96];
+    let Some((x, y)) = point.xy() else {
+        return output;
+    };
+    encode_fq(&x, &mut output[..FP_LEN]);
+    encode_fq(&y, &mut output[FP_LEN..]);
+    output
+}
+
+fn encode_g2(point: &G2Affine) -> [u8; 192] {
+    let mut output = [0; 192];
+    let Some((x, y)) = point.xy() else {
+        return output;
+    };
+    encode_fq(&x.c0, &mut output[..FP_LEN]);
+    encode_fq(&x.c1, &mut output[FP_LEN..2 * FP_LEN]);
+    encode_fq(&y.c0, &mut output[2 * FP_LEN..3 * FP_LEN]);
+    encode_fq(&y.c1, &mut output[3 * FP_LEN..]);
+    output
+}
diff --git a/crates/accelerators/src/bls12_381/mod.rs b/crates/accelerators/src/bls12_381/mod.rs
new file mode 100644
index 000000000..95173f371
--- /dev/null
+++ b/crates/accelerators/src/bls12_381/mod.rs
@@ -0,0 +1,290 @@
+//! BLS12-381 accelerators (EIP-2537).
+
+mod codec;
+mod map;
+
+use alloc::vec::Vec;
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+use codec::{
+    encode_g1, encode_g2, read_g1, read_g1_no_subgroup_check, read_g2, read_g2_no_subgroup_check,
+    read_scalar,
+};
+use openvm_ecc_guest::{
+    weierstrass::{IntrinsicCurve, WeierstrassPoint},
+    AffinePoint,
+};
+use openvm_pairing::{bls12_381::Bls12_381, PairingCheck};
+
+use crate::error::Error;
+
+pub type zkvm_bls12_381_g1_point = ZkvmBytes<96>;
+pub type zkvm_bls12_381_g2_point = ZkvmBytes<192>;
+pub type zkvm_bls12_381_scalar = ZkvmBytes<32>;
+pub type zkvm_bls12_381_fp = ZkvmBytes<48>;
+pub type zkvm_bls12_381_fp2 = ZkvmBytes<96>;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct zkvm_bls12_381_g1_msm_pair {
+    pub point: zkvm_bls12_381_g1_point,
+    pub scalar: zkvm_bls12_381_scalar,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct zkvm_bls12_381_g2_msm_pair {
+    pub point: zkvm_bls12_381_g2_point,
+    pub scalar: zkvm_bls12_381_scalar,
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct zkvm_bls12_381_pairing_pair {
+    pub g1: zkvm_bls12_381_g1_point,
+    pub g2: zkvm_bls12_381_g2_point,
+}
+
+/// BLS12-381 G1 point addition.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g1_add(
+    p1: *const zkvm_bls12_381_g1_point,
+    p2: *const zkvm_bls12_381_g1_point,
+    result: *mut zkvm_bls12_381_g1_point,
+) -> zkvm_status {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees valid reads. The output is written only after these
+    // shared borrows are no longer used, so overlapping storage is supported.
+    let value = unsafe { g1_add(&(*p1).data, &(*p2).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g1_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// BLS12-381 G1 multi-scalar multiplication.
+///
+/// # Safety
+///
+/// `pairs` must be valid for `num_pairs` reads when non-empty, and `result`
+/// must be non-NULL and valid for one write.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g1_msm(
+    pairs: *const zkvm_bls12_381_g1_msm_pair,
+    num_pairs: usize,
+    result: *mut zkvm_bls12_381_g1_point,
+) -> zkvm_status {
+    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that non-empty input is valid for `num_pairs` reads.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    match g1_msm(pairs) {
+        Ok(data) => {
+            // SAFETY: all input reads are complete; `result` is valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g1_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// BLS12-381 G2 point addition.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g2_add(
+    p1: *const zkvm_bls12_381_g2_point,
+    p2: *const zkvm_bls12_381_g2_point,
+    result: *mut zkvm_bls12_381_g2_point,
+) -> zkvm_status {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees valid reads. The output is written only after these
+    // shared borrows are no longer used, so overlapping storage is supported.
+    let value = unsafe { g2_add(&(*p1).data, &(*p2).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g2_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// BLS12-381 G2 multi-scalar multiplication.
+///
+/// # Safety
+///
+/// `pairs` must be valid for `num_pairs` reads when non-empty, and `result`
+/// must be non-NULL and valid for one write.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_g2_msm(
+    pairs: *const zkvm_bls12_381_g2_msm_pair,
+    num_pairs: usize,
+    result: *mut zkvm_bls12_381_g2_point,
+) -> zkvm_status {
+    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that non-empty input is valid for `num_pairs` reads.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    match g2_msm(pairs) {
+        Ok(data) => {
+            // SAFETY: all input reads are complete; `result` is valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g2_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// BLS12-381 pairing check.
+///
+/// # Safety
+///
+/// `pairs` must be valid for `num_pairs` reads when non-empty, and `verified`
+/// must be non-NULL and valid for one write.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_pairing(
+    pairs: *const zkvm_bls12_381_pairing_pair,
+    num_pairs: usize,
+    verified: *mut bool,
+) -> zkvm_status {
+    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that non-empty input is valid for `num_pairs` reads.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    match pairing(pairs) {
+        Ok(value) => {
+            // SAFETY: all input reads are complete; `verified` is valid for writes.
+            unsafe { verified.write(value) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// Map a BLS12-381 base-field element to G1.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_map_fp_to_g1(
+    field_element: *const zkvm_bls12_381_fp,
+    result: *mut zkvm_bls12_381_g1_point,
+) -> zkvm_status {
+    if field_element.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees a valid read. The output is written only after this
+    // shared borrow is no longer used, so overlapping storage is supported.
+    let value = unsafe { map::fp_to_g1(&(*field_element).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g1_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// Map a BLS12-381 quadratic-extension-field element to G2.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
+    field_element: *const zkvm_bls12_381_fp2,
+    result: *mut zkvm_bls12_381_g2_point,
+) -> zkvm_status {
+    if field_element.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees a valid read. The output is written only after this
+    // shared borrow is no longer used, so overlapping storage is supported.
+    let value = unsafe { map::fp2_to_g2(&(*field_element).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bls12_381_g2_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+#[inline]
+fn g1_add(p1: &[u8; 96], p2: &[u8; 96]) -> Result<[u8; 96], Error> {
+    Ok(encode_g1(&(read_g1_no_subgroup_check(p1)? + read_g1_no_subgroup_check(p2)?)))
+}
+
+fn g1_msm(pairs: &[zkvm_bls12_381_g1_msm_pair]) -> Result<[u8; 96], Error> {
+    let mut points = Vec::with_capacity(pairs.len());
+    let mut scalars = Vec::with_capacity(pairs.len());
+    for pair in pairs {
+        points.push(read_g1(&pair.point.data)?);
+        scalars.push(read_scalar(&pair.scalar.data));
+    }
+    if points.is_empty() {
+        Ok([0; 96])
+    } else {
+        Ok(encode_g1(&Bls12_381::msm(&scalars, &points)))
+    }
+}
+
+#[inline]
+fn g2_add(p1: &[u8; 192], p2: &[u8; 192]) -> Result<[u8; 192], Error> {
+    Ok(encode_g2(&(read_g2_no_subgroup_check(p1)? + read_g2_no_subgroup_check(p2)?)))
+}
+
+fn g2_msm(pairs: &[zkvm_bls12_381_g2_msm_pair]) -> Result<[u8; 192], Error> {
+    let mut points = Vec::with_capacity(pairs.len());
+    let mut scalars = Vec::with_capacity(pairs.len());
+    for pair in pairs {
+        points.push(read_g2(&pair.point.data)?);
+        scalars.push(read_scalar(&pair.scalar.data));
+    }
+    if points.is_empty() {
+        Ok([0; 192])
+    } else {
+        Ok(encode_g2(&openvm_ecc_guest::msm(&scalars, &points)))
+    }
+}
+
+fn pairing(pairs: &[zkvm_bls12_381_pairing_pair]) -> Result<bool, Error> {
+    let mut g1_points = Vec::with_capacity(pairs.len());
+    let mut g2_points = Vec::with_capacity(pairs.len());
+    for pair in pairs {
+        let (g1_x, g1_y) = read_g1(&pair.g1.data)?.into_coords();
+        let (g2_x, g2_y) = read_g2(&pair.g2.data)?.into_coords();
+        g1_points.push(AffinePoint::new(g1_x, g1_y));
+        g2_points.push(AffinePoint::new(g2_x, g2_y));
+    }
+    if g1_points.is_empty() {
+        Ok(true)
+    } else {
+        Ok(Bls12_381::pairing_check(&g1_points, &g2_points).is_ok())
+    }
+}
diff --git a/crates/accelerators/src/bn254/codec.rs b/crates/accelerators/src/bn254/codec.rs
new file mode 100644
index 000000000..b766e5712
--- /dev/null
+++ b/crates/accelerators/src/bn254/codec.rs
@@ -0,0 +1,54 @@
+use openvm_curve_utils::SubgroupCheck;
+use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint};
+use openvm_pairing::bn254 as bn;
+
+use crate::error::Error;
+
+const FQ_LEN: usize = 32;
+
+#[inline]
+fn read_fq(input: &[u8]) -> Result<bn::Fp, Error> {
+    bn::Fp::from_be_bytes(input).ok_or(Error::FieldElementInvalid)
+}
+
+#[inline]
+fn read_fq2(input: &[u8; 64]) -> Result<bn::Fp2, Error> {
+    let imag = read_fq(&input[..FQ_LEN])?;
+    let real = read_fq(&input[FQ_LEN..])?;
+    Ok(bn::Fp2::new(real, imag))
+}
+
+#[inline]
+pub(super) fn read_g1(input: &[u8; 64]) -> Result<bn::G1Affine, Error> {
+    let x = read_fq(&input[..FQ_LEN])?;
+    let y = read_fq(&input[FQ_LEN..])?;
+    // SAFETY: the coordinates are canonical; `from_xy` checks the curve equation.
+    let point = unsafe { bn::G1Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)?;
+    point.is_in_correct_subgroup().then_some(point).ok_or(Error::PointNotInSubgroup)
+}
+
+#[inline]
+pub(super) fn read_g2(input: &[u8; 128]) -> Result<bn::G2Affine, Error> {
+    let x = read_fq2(input[..64].try_into().unwrap())?;
+    let y = read_fq2(input[64..].try_into().unwrap())?;
+    // SAFETY: the coordinates are canonical; `from_xy` checks the curve equation.
+    let point = unsafe { bn::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)?;
+    point.is_in_correct_subgroup().then_some(point).ok_or(Error::PointNotInSubgroup)
+}
+
+#[inline]
+pub(super) fn read_scalar(input: &[u8; 32]) -> bn::Scalar {
+    bn::Scalar::from_be_bytes_unchecked(input)
+}
+
+#[inline]
+pub(super) fn encode_g1(point: bn::G1Affine) -> [u8; 64] {
+    let mut output = [0; 64];
+    let x: &[u8] = point.x().as_le_bytes();
+    let y: &[u8] = point.y().as_le_bytes();
+    for index in 0..FQ_LEN {
+        output[index] = x[FQ_LEN - 1 - index];
+        output[index + FQ_LEN] = y[FQ_LEN - 1 - index];
+    }
+    output
+}
diff --git a/crates/accelerators/src/bn254/mod.rs b/crates/accelerators/src/bn254/mod.rs
new file mode 100644
index 000000000..e8549f2ce
--- /dev/null
+++ b/crates/accelerators/src/bn254/mod.rs
@@ -0,0 +1,136 @@
+//! BN254 accelerators (EIP-196 and EIP-197).
+
+mod codec;
+
+use alloc::vec::Vec;
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+use codec::{encode_g1, read_g1, read_g2, read_scalar};
+use openvm_ecc_guest::{
+    weierstrass::{IntrinsicCurve, WeierstrassPoint},
+    AffinePoint,
+};
+use openvm_pairing::{bn254::Bn254, PairingCheck};
+
+use crate::error::Error;
+
+pub type zkvm_bn254_g1_point = ZkvmBytes<64>;
+pub type zkvm_bn254_g2_point = ZkvmBytes<128>;
+pub type zkvm_bn254_scalar = ZkvmBytes<32>;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug)]
+pub struct zkvm_bn254_pairing_pair {
+    pub g1: zkvm_bn254_g1_point,
+    pub g2: zkvm_bn254_g2_point,
+}
+
+/// Add two BN254 G1 points.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_g1_add(
+    p1: *const zkvm_bn254_g1_point,
+    p2: *const zkvm_bn254_g1_point,
+    result: *mut zkvm_bn254_g1_point,
+) -> zkvm_status {
+    if p1.is_null() || p2.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees valid reads. The output is written only after these
+    // shared borrows are no longer used, so overlapping storage is supported.
+    let value = unsafe { g1_add(&(*p1).data, &(*p2).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bn254_g1_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// Multiply a BN254 G1 point by a scalar.
+///
+/// # Safety
+///
+/// Each pointer must be non-NULL and valid for one value of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_g1_mul(
+    point: *const zkvm_bn254_g1_point,
+    scalar: *const zkvm_bn254_scalar,
+    result: *mut zkvm_bn254_g1_point,
+) -> zkvm_status {
+    if point.is_null() || scalar.is_null() || result.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees valid reads. The output is written only after these
+    // shared borrows are no longer used, so overlapping storage is supported.
+    let value = unsafe { g1_mul(&(*point).data, &(*scalar).data) };
+    match value {
+        Ok(data) => {
+            // SAFETY: `result` is non-NULL and valid for writes.
+            unsafe { result.write(zkvm_bn254_g1_point { data }) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+/// Check a BN254 pairing equation.
+///
+/// # Safety
+///
+/// `pairs` must be valid for `num_pairs` reads when non-empty, and `verified`
+/// must be non-NULL and valid for one write.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_bn254_pairing(
+    pairs: *const zkvm_bn254_pairing_pair,
+    num_pairs: usize,
+    verified: *mut bool,
+) -> zkvm_status {
+    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that non-empty input is valid for `num_pairs` reads.
+    let pairs =
+        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
+    let value = pairing(pairs.iter().map(|pair| (&pair.g1.data, &pair.g2.data)));
+    match value {
+        Ok(value) => {
+            // SAFETY: `verified` is non-NULL and all input reads are complete.
+            unsafe { verified.write(value) };
+            ZKVM_EOK
+        }
+        Err(_) => ZKVM_EFAIL,
+    }
+}
+
+fn g1_add(p1: &[u8; 64], p2: &[u8; 64]) -> Result<[u8; 64], Error> {
+    Ok(encode_g1(read_g1(p1)? + read_g1(p2)?))
+}
+
+fn g1_mul(point: &[u8; 64], scalar: &[u8; 32]) -> Result<[u8; 64], Error> {
+    Ok(encode_g1(Bn254::msm(&[read_scalar(scalar)], &[read_g1(point)?])))
+}
+
+fn pairing<'a>(
+    pairs: impl IntoIterator<Item = (&'a [u8; 64], &'a [u8; 128])>,
+) -> Result<bool, Error> {
+    let pairs = pairs.into_iter();
+    let mut g1_points = Vec::with_capacity(pairs.size_hint().0);
+    let mut g2_points = Vec::with_capacity(pairs.size_hint().0);
+    for (g1, g2) in pairs {
+        let (g1_x, g1_y) = read_g1(g1)?.into_coords();
+        let (g2_x, g2_y) = read_g2(g2)?.into_coords();
+        g1_points.push(AffinePoint::new(g1_x, g1_y));
+        g2_points.push(AffinePoint::new(g2_x, g2_y));
+    }
+    if g1_points.is_empty() {
+        Ok(true)
+    } else {
+        Ok(Bn254::pairing_check(&g1_points, &g2_points).is_ok())
+    }
+}
diff --git a/crates/accelerators/src/error.rs b/crates/accelerators/src/error.rs
new file mode 100644
index 000000000..3928c2744
--- /dev/null
+++ b/crates/accelerators/src/error.rs
@@ -0,0 +1,8 @@
+//! Shared curve-decoding errors.
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) enum Error {
+    FieldElementInvalid,
+    PointNotOnCurve,
+    PointNotInSubgroup,
+}
diff --git a/crates/accelerators/src/ffi/blake2.rs b/crates/accelerators/src/ffi/blake2.rs
deleted file mode 100644
index 3fda48d18..000000000
--- a/crates/accelerators/src/ffi/blake2.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-//! C ABI for the BLAKE2 compression function.
-
-use crate::{
-    ops,
-    types::{ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus},
-};
-
-/// Apply the BLAKE2 compression function F (EIP-152) to `h` in place.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL, or if `f` is neither
-/// 0 nor 1.
-///
-/// # Safety
-///
-/// - `h`, if non-NULL, must be valid for reads and writes of 64 bytes.
-/// - `m`, if non-NULL, must be valid for reads of 128 bytes.
-/// - `t`, if non-NULL, must be valid for reads of 16 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_blake2f(
-    rounds: u32,
-    h: *mut ZkvmBlake2fState,
-    m: *const ZkvmBlake2fMessage,
-    t: *const ZkvmBlake2fOffset,
-    f: u8,
-) -> ZkvmStatus {
-    if h.is_null() || m.is_null() || t.is_null() || f > 1 {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (state, message, offset) = unsafe { (h.read(), m.read(), t.read()) };
-
-    let mut state_words = [0; 8];
-    for (word, bytes) in state_words.iter_mut().zip(state.data.as_chunks::<8>().0) {
-        *word = u64::from_le_bytes(*bytes);
-    }
-    let mut message_words = [0; 16];
-    for (word, bytes) in message_words.iter_mut().zip(message.data.as_chunks::<8>().0) {
-        *word = u64::from_le_bytes(*bytes);
-    }
-    let offset_words = [
-        u64::from_le_bytes(offset.data[..8].try_into().unwrap()),
-        u64::from_le_bytes(offset.data[8..].try_into().unwrap()),
-    ];
-
-    ops::blake2f(rounds, &mut state_words, &message_words, &offset_words, f == 1);
-
-    let mut value = ZkvmBlake2fState { data: [0; 64] };
-    for (bytes, word) in value.data.as_chunks_mut::<8>().0.iter_mut().zip(state_words) {
-        *bytes = word.to_le_bytes();
-    }
-    // SAFETY: `h` is non-NULL and valid for writes.
-    unsafe { h.write(value) };
-    ZkvmStatus::Ok
-}
diff --git a/crates/accelerators/src/ffi/bls12_381.rs b/crates/accelerators/src/ffi/bls12_381.rs
deleted file mode 100644
index b7e78d1ad..000000000
--- a/crates/accelerators/src/ffi/bls12_381.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-//! C ABI for the BLS12-381 add/MSM/map accelerators (EIP-2537).
-
-use crate::{
-    ops,
-    types::{
-        ZkvmBls12381Fp, ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point,
-        ZkvmBls12381G2MsmPair, ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmStatus,
-    },
-};
-
-/// BLS12-381 G1 point addition (precompile 0x0b, EIP-2537).
-///
-/// Inputs must be on the curve but, per EIP-2537 G1ADD, need not be in the
-/// prime-order subgroup.
-///
-/// # Safety
-///
-/// - `p1` and `p2`, if non-NULL, must be valid for reads of 96 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_g1_add(
-    p1: *const ZkvmBls12381G1Point,
-    p2: *const ZkvmBls12381G1Point,
-    result: *mut ZkvmBls12381G1Point,
-) -> ZkvmStatus {
-    if p1.is_null() || p2.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    match ops::bls12_381_g1_add(&bls_g1(p1.data), &bls_g1(p2.data)) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBls12381G1Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BLS12-381 G1 multi-scalar multiplication (precompile 0x0c, EIP-2537).
-///
-/// Inputs must be in the prime-order subgroup. Scalars need not be canonical.
-/// `num_pairs == 0` yields the identity (all-zero) point.
-///
-/// # Safety
-///
-/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
-/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_g1_msm(
-    pairs: *const ZkvmBls12381G1MsmPair,
-    num_pairs: usize,
-    result: *mut ZkvmBls12381G1Point,
-) -> ZkvmStatus {
-    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
-    let pairs =
-        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let pairs = pairs.iter().map(|pair| {
-        Ok::<_, core::convert::Infallible>((bls_g1(pair.point.data), pair.scalar.data))
-    });
-    match ops::bls12_381_g1_msm(pairs) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
-            unsafe { result.write(ZkvmBls12381G1Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BLS12-381 G2 point addition (precompile 0x0d, EIP-2537).
-///
-/// Inputs must be on the curve but, per EIP-2537 G2ADD, need not be in the
-/// prime-order subgroup.
-///
-/// # Safety
-///
-/// - `p1` and `p2`, if non-NULL, must be valid for reads of 192 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_g2_add(
-    p1: *const ZkvmBls12381G2Point,
-    p2: *const ZkvmBls12381G2Point,
-    result: *mut ZkvmBls12381G2Point,
-) -> ZkvmStatus {
-    if p1.is_null() || p2.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    match ops::bls12_381_g2_add(&bls_g2(p1.data), &bls_g2(p2.data)) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBls12381G2Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BLS12-381 G2 multi-scalar multiplication (precompile 0x0e, EIP-2537).
-///
-/// Inputs must be in the prime-order subgroup. Scalars need not be canonical.
-/// `num_pairs == 0` yields the identity (all-zero) point.
-///
-/// # Safety
-///
-/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
-/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_g2_msm(
-    pairs: *const ZkvmBls12381G2MsmPair,
-    num_pairs: usize,
-    result: *mut ZkvmBls12381G2Point,
-) -> ZkvmStatus {
-    if result.is_null() || (pairs.is_null() && num_pairs != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
-    let pairs =
-        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let pairs = pairs.iter().map(|pair| {
-        Ok::<_, core::convert::Infallible>((bls_g2(pair.point.data), pair.scalar.data))
-    });
-    match ops::bls12_381_g2_msm(pairs) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes; input reads are complete.
-            unsafe { result.write(ZkvmBls12381G2Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BLS12-381 pairing check (precompile 0x0f, EIP-2537).
-///
-/// Sets `verified` to whether the product of pairings equals one. Inputs must
-/// be in the prime-order subgroup; malformed points return
-/// [`ZkvmStatus::Fail`]. `num_pairs == 0` verifies trivially.
-///
-/// # Safety
-///
-/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
-/// - `verified`, if non-NULL, must be valid for writes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_pairing(
-    pairs: *const ZkvmBls12381PairingPair,
-    num_pairs: usize,
-    verified: *mut bool,
-) -> ZkvmStatus {
-    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
-    let pairs =
-        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let pairs = pairs.iter().map(|pair| (bls_g1(pair.g1.data), bls_g2(pair.g2.data)));
-    match ops::bls12_381_pairing_check(pairs) {
-        Ok(value) => {
-            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
-            unsafe { verified.write(value) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => {
-            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
-            unsafe { verified.write(false) };
-            ZkvmStatus::Fail
-        }
-    }
-}
-
-fn bls_g1(data: [u8; 96]) -> ([u8; 48], [u8; 48]) {
-    (data[..48].try_into().unwrap(), data[48..].try_into().unwrap())
-}
-
-fn bls_g2(data: [u8; 192]) -> ([u8; 48], [u8; 48], [u8; 48], [u8; 48]) {
-    (
-        data[..48].try_into().unwrap(),
-        data[48..96].try_into().unwrap(),
-        data[96..144].try_into().unwrap(),
-        data[144..].try_into().unwrap(),
-    )
-}
-
-/// BLS12-381 map field element to G1 (precompile 0x10, EIP-2537).
-///
-/// Returns [`ZkvmStatus::Fail`] if either pointer is NULL or the field element
-/// is not canonical.
-///
-/// # Safety
-///
-/// - `field_element`, if non-NULL, must be valid for reads of 48 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 96 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_map_fp_to_g1(
-    field_element: *const ZkvmBls12381Fp,
-    result: *mut ZkvmBls12381G1Point,
-) -> ZkvmStatus {
-    if field_element.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
-    let field_element = unsafe { field_element.read() };
-    match ops::bls12_381_map_fp_to_g1(&field_element.data) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBls12381G1Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BLS12-381 map field element to G2 (precompile 0x11, EIP-2537).
-///
-/// Returns [`ZkvmStatus::Fail`] if either pointer is NULL or either half of
-/// the field element is not canonical.
-///
-/// # Safety
-///
-/// - `field_element`, if non-NULL, must be valid for reads of 96 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 192 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bls12_map_fp2_to_g2(
-    field_element: *const ZkvmBls12381Fp2,
-    result: *mut ZkvmBls12381G2Point,
-) -> ZkvmStatus {
-    if field_element.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL input is valid for reads. Copy before writing to support overlap.
-    let field_element = unsafe { field_element.read() };
-    let fp2 = (
-        field_element.data[..48].try_into().unwrap(),
-        field_element.data[48..].try_into().unwrap(),
-    );
-    match ops::bls12_381_map_fp2_to_g2(&fp2) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBls12381G2Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
diff --git a/crates/accelerators/src/ffi/bn254.rs b/crates/accelerators/src/ffi/bn254.rs
deleted file mode 100644
index d0d34b884..000000000
--- a/crates/accelerators/src/ffi/bn254.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-//! C ABI for the BN254 (alt_bn128) accelerators.
-
-use crate::{
-    ops,
-    types::{ZkvmBn254G1Point, ZkvmBn254PairingPair, ZkvmBn254Scalar, ZkvmStatus},
-};
-
-/// BN254 G1 point addition (precompile 0x06, EIP-196).
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or an input point is
-/// malformed.
-///
-/// # Safety
-///
-/// - `p1` and `p2`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 64 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bn254_g1_add(
-    p1: *const ZkvmBn254G1Point,
-    p2: *const ZkvmBn254G1Point,
-    result: *mut ZkvmBn254G1Point,
-) -> ZkvmStatus {
-    if p1.is_null() || p2.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (p1, p2) = unsafe { (p1.read(), p2.read()) };
-    match ops::bn254_g1_add(&p1.data, &p2.data) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBn254G1Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BN254 G1 scalar multiplication (precompile 0x07, EIP-196).
-///
-/// The scalar need not be canonical.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL or the input point is
-/// malformed.
-///
-/// # Safety
-///
-/// - `point`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `scalar`, if non-NULL, must be valid for reads of 32 bytes.
-/// - `result`, if non-NULL, must be valid for writes of 64 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bn254_g1_mul(
-    point: *const ZkvmBn254G1Point,
-    scalar: *const ZkvmBn254Scalar,
-    result: *mut ZkvmBn254G1Point,
-) -> ZkvmStatus {
-    if point.is_null() || scalar.is_null() || result.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copy before writing to support overlap.
-    let (point, scalar) = unsafe { (point.read(), scalar.read()) };
-    match ops::bn254_g1_mul(&point.data, &scalar.data) {
-        Ok(data) => {
-            // SAFETY: `result` is non-NULL and valid for writes.
-            unsafe { result.write(ZkvmBn254G1Point { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// BN254 pairing check (precompile 0x08, EIP-197).
-///
-/// Sets `verified` to whether the product of pairings equals one. Malformed
-/// points return [`ZkvmStatus::Fail`]. `num_pairs == 0` verifies trivially.
-///
-/// # Safety
-///
-/// - `pairs`, if non-NULL, must be valid for reads of `num_pairs` elements.
-/// - `verified`, if non-NULL, must be valid for writes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_bn254_pairing(
-    pairs: *const ZkvmBn254PairingPair,
-    num_pairs: usize,
-    verified: *mut bool,
-) -> ZkvmStatus {
-    if verified.is_null() || (pairs.is_null() && num_pairs != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above for non-empty input; validity is guaranteed by the caller.
-    let pairs =
-        if num_pairs == 0 { &[] } else { unsafe { core::slice::from_raw_parts(pairs, num_pairs) } };
-    let pairs = pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()));
-    match ops::bn254_pairing_check(pairs) {
-        Ok(value) => {
-            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
-            unsafe { verified.write(value) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => {
-            // SAFETY: `verified` is non-NULL and valid for writes; input reads are complete.
-            unsafe { verified.write(false) };
-            ZkvmStatus::Fail
-        }
-    }
-}
diff --git a/crates/accelerators/src/ffi/ecdsa.rs b/crates/accelerators/src/ffi/ecdsa.rs
deleted file mode 100644
index a262a360c..000000000
--- a/crates/accelerators/src/ffi/ecdsa.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-//! C ABI for the ECDSA accelerators.
-
-use crate::{
-    ops,
-    types::{
-        ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey, ZkvmSecp256k1Signature, ZkvmSecp256r1Hash,
-        ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature, ZkvmStatus,
-    },
-};
-
-/// Recover the uncompressed secp256k1 public key from an ECDSA signature
-/// over `msg` into `output`.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL, the signature cannot
-/// be parsed, or the recovery id is invalid.
-///
-/// # Safety
-///
-/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
-/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `output`, if non-NULL, must be valid for writes of 64 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
-    msg: *const ZkvmSecp256k1Hash,
-    sig: *const ZkvmSecp256k1Signature,
-    recid: u8,
-    output: *mut ZkvmSecp256k1Pubkey,
-) -> ZkvmStatus {
-    if msg.is_null() || sig.is_null() || output.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads. Copying before writing supports overlap.
-    let (msg, sig) = unsafe { (msg.read(), sig.read()) };
-    match ops::secp256k1_ecrecover(&msg.data, &sig.data, recid) {
-        Ok(data) => {
-            // SAFETY: `output` is non-NULL and valid for writes.
-            unsafe { output.write(ZkvmSecp256k1Pubkey { data }) };
-            ZkvmStatus::Ok
-        }
-        Err(_) => ZkvmStatus::Fail,
-    }
-}
-
-/// Verify an ECDSA signature over secp256k1 against an uncompressed public
-/// key, writing the result to `verified`.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
-/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
-///
-/// # Safety
-///
-/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
-/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `pubkey`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `verified`, if non-NULL, must be valid for writes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_secp256k1_verify(
-    msg: *const ZkvmSecp256k1Hash,
-    sig: *const ZkvmSecp256k1Signature,
-    pubkey: *const ZkvmSecp256k1Pubkey,
-    verified: *mut bool,
-) -> ZkvmStatus {
-    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads.
-    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
-    let value = ops::secp256k1_verify(&msg.data, &sig.data, &pubkey.data);
-    // SAFETY: `verified` is non-NULL and valid for writes.
-    unsafe { verified.write(value) };
-    ZkvmStatus::Ok
-}
-
-/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed
-/// public key, writing the result to `verified`.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
-/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
-///
-/// # Safety
-///
-/// - `msg`, if non-NULL, must be valid for reads of 32 bytes.
-/// - `sig`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `pubkey`, if non-NULL, must be valid for reads of 64 bytes.
-/// - `verified`, if non-NULL, must be valid for writes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_secp256r1_verify(
-    msg: *const ZkvmSecp256r1Hash,
-    sig: *const ZkvmSecp256r1Signature,
-    pubkey: *const ZkvmSecp256r1Pubkey,
-    verified: *mut bool,
-) -> ZkvmStatus {
-    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads.
-    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
-    let value = ops::secp256r1_verify(&msg.data, &sig.data, &pubkey.data);
-    // SAFETY: `verified` is non-NULL and valid for writes.
-    unsafe { verified.write(value) };
-    ZkvmStatus::Ok
-}
diff --git a/crates/accelerators/src/ffi/hash.rs b/crates/accelerators/src/ffi/hash.rs
deleted file mode 100644
index 50978a19b..000000000
--- a/crates/accelerators/src/ffi/hash.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-//! C ABI for the hash accelerators.
-
-use crate::{
-    ops,
-    types::{ZkvmKeccak256Hash, ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus},
-};
-
-/// Compute the Keccak-256 hash of `data[..len]` into `output`.
-///
-/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
-/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
-/// input.
-///
-/// # Safety
-///
-/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
-/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_keccak256(
-    data: *const u8,
-    len: usize,
-    output: *mut ZkvmKeccak256Hash,
-) -> ZkvmStatus {
-    if output.is_null() || (data.is_null() && len != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let value = ZkvmKeccak256Hash { data: ops::keccak256(data) };
-    // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
-    // overlapping input/output storage is supported.
-    unsafe { output.write(value) };
-    ZkvmStatus::Ok
-}
-
-/// Compute the SHA-256 hash of `data[..len]` into `output`.
-///
-/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
-/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
-/// input.
-///
-/// # Safety
-///
-/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
-/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_sha256(
-    data: *const u8,
-    len: usize,
-    output: *mut ZkvmSha256Hash,
-) -> ZkvmStatus {
-    if output.is_null() || (data.is_null() && len != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let value = ZkvmSha256Hash { data: ops::sha256(data) };
-    // SAFETY: see `zkvm_keccak256`.
-    unsafe { output.write(value) };
-    ZkvmStatus::Ok
-}
-
-/// Compute the RIPEMD-160 hash of `data[..len]` into `output`.
-///
-/// The 20-byte digest is written to `output.data[12..]`; the first 12 bytes
-/// are zeroed.
-///
-/// Returns [`ZkvmStatus::Fail`] if `output` is NULL, or if `data` is NULL
-/// with a non-zero `len`; a NULL `data` with `len == 0` hashes the empty
-/// input.
-///
-/// # Safety
-///
-/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
-/// - `output`, if non-NULL, must be valid for writes of 32 bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_ripemd160(
-    data: *const u8,
-    len: usize,
-    output: *mut ZkvmRipemd160Hash,
-) -> ZkvmStatus {
-    if output.is_null() || (data.is_null() && len != 0) {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
-    let value = ZkvmRipemd160Hash { data: ops::ripemd160(data) };
-    // SAFETY: see `zkvm_keccak256`.
-    unsafe { output.write(value) };
-    ZkvmStatus::Ok
-}
diff --git a/crates/accelerators/src/ffi/kzg.rs b/crates/accelerators/src/ffi/kzg.rs
deleted file mode 100644
index e2310f5df..000000000
--- a/crates/accelerators/src/ffi/kzg.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-//! C ABI for KZG point evaluation.
-
-use crate::{
-    ops,
-    types::{ZkvmKzgCommitment, ZkvmKzgFieldElement, ZkvmKzgProof, ZkvmStatus},
-};
-
-/// Verify a KZG proof that the blob committed to by `commitment` evaluates
-/// to `y` at point `z`, writing the result to `verified`.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL. Malformed or invalid
-/// cryptographic inputs return [`ZkvmStatus::Ok`] with `verified == false`.
-///
-/// # Safety
-///
-/// - `commitment` and `proof`, if non-NULL, must be valid for reads of 48 bytes.
-/// - `z` and `y`, if non-NULL, must be valid for reads of 32 bytes.
-/// - `verified`, if non-NULL, must be valid for writes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_kzg_point_eval(
-    commitment: *const ZkvmKzgCommitment,
-    z: *const ZkvmKzgFieldElement,
-    y: *const ZkvmKzgFieldElement,
-    proof: *const ZkvmKzgProof,
-    verified: *mut bool,
-) -> ZkvmStatus {
-    if commitment.is_null() || z.is_null() || y.is_null() || proof.is_null() || verified.is_null() {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: the non-NULL inputs are valid for reads.
-    let (commitment, z, y, proof) =
-        unsafe { (commitment.read(), z.read(), y.read(), proof.read()) };
-    let value =
-        ops::kzg_point_eval(&commitment.data, &z.data, &y.data, &proof.data).unwrap_or(false);
-    // SAFETY: `verified` is non-NULL and valid for writes.
-    unsafe { verified.write(value) };
-    ZkvmStatus::Ok
-}
diff --git a/crates/accelerators/src/ffi/mod.rs b/crates/accelerators/src/ffi/mod.rs
deleted file mode 100644
index 3ecddb08c..000000000
--- a/crates/accelerators/src/ffi/mod.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-//! The `extern "C"` layer: `zkvm_*` symbols matching `zkvm_accelerators.h`.
-//!
-//! Each function validates the ABI inputs, converts their representation,
-//! calls [`crate::ops`], and maps the result to [`crate::types::ZkvmStatus`].
-
-mod blake2;
-mod bls12_381;
-mod bn254;
-mod ecdsa;
-mod hash;
-mod kzg;
-mod modexp;
-
-pub use blake2::*;
-pub use bls12_381::*;
-pub use bn254::*;
-pub use ecdsa::*;
-pub use hash::*;
-pub use kzg::*;
-pub use modexp::*;
diff --git a/crates/accelerators/src/ffi/modexp.rs b/crates/accelerators/src/ffi/modexp.rs
deleted file mode 100644
index 652eaabba..000000000
--- a/crates/accelerators/src/ffi/modexp.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-//! C ABI for modular exponentiation.
-
-use crate::{ops, types::ZkvmStatus};
-
-/// Compute `base[..base_len] ^ exp[..exp_len] % modulus[..mod_len]` into
-/// `output`, which receives exactly `mod_len` bytes, left-padded with zeros.
-///
-/// Returns [`ZkvmStatus::Fail`] if any pointer is NULL while its length is
-/// non-zero; a NULL pointer with a zero length is the empty input.
-///
-/// # Safety
-///
-/// - `base`, `exp` and `modulus`, if non-NULL, must be valid for reads of their respective lengths.
-/// - `output`, if non-NULL, must be valid for writes of `mod_len` bytes.
-#[unsafe(no_mangle)]
-pub unsafe extern "C" fn zkvm_modexp(
-    base: *const u8,
-    base_len: usize,
-    exp: *const u8,
-    exp_len: usize,
-    modulus: *const u8,
-    mod_len: usize,
-    output: *mut u8,
-) -> ZkvmStatus {
-    if (base.is_null() && base_len != 0) ||
-        (exp.is_null() && exp_len != 0) ||
-        (modulus.is_null() && mod_len != 0) ||
-        (output.is_null() && mod_len != 0)
-    {
-        return ZkvmStatus::Fail;
-    }
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let base =
-        if base_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(base, base_len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let exp = if exp_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(exp, exp_len) } };
-    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
-    let modulus =
-        if mod_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(modulus, mod_len) } };
-    let value = ops::modexp(base, exp, modulus);
-    if mod_len != 0 {
-        // SAFETY: `output` is non-NULL and valid for `mod_len` writes. `value` cannot overlap it,
-        // and all caller-provided input reads are complete.
-        unsafe { core::ptr::copy_nonoverlapping(value.as_ptr(), output, mod_len) };
-    }
-    ZkvmStatus::Ok
-}
diff --git a/crates/accelerators/src/keccak256.rs b/crates/accelerators/src/keccak256.rs
new file mode 100644
index 000000000..bc111693c
--- /dev/null
+++ b/crates/accelerators/src/keccak256.rs
@@ -0,0 +1,31 @@
+//! Keccak-256 accelerator.
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+
+pub type zkvm_keccak256_hash = ZkvmBytes<32>;
+
+/// Compute the Keccak-256 hash of `data[..len]` into `output`.
+///
+/// A NULL `data` pointer is accepted only when `len == 0`.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of one [`zkvm_keccak256_hash`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_keccak256(
+    data: *const u8,
+    len: usize,
+    output: *mut zkvm_keccak256_hash,
+) -> zkvm_status {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    let value = zkvm_keccak256_hash { data: openvm_keccak256::keccak256(data) };
+    // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
+    // overlapping input/output storage is supported.
+    unsafe { output.write(value) };
+    ZKVM_EOK
+}
diff --git a/crates/accelerators/src/kzg.rs b/crates/accelerators/src/kzg.rs
new file mode 100644
index 000000000..83982e247
--- /dev/null
+++ b/crates/accelerators/src/kzg.rs
@@ -0,0 +1,48 @@
+//! KZG point-evaluation accelerator (EIP-4844).
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+use openvm_kzg::{Bytes32, Bytes48, KzgProof};
+
+pub type zkvm_kzg_commitment = ZkvmBytes<48>;
+pub type zkvm_kzg_proof = ZkvmBytes<48>;
+pub type zkvm_kzg_field_element = ZkvmBytes<32>;
+
+/// Verify a KZG point-evaluation proof.
+///
+/// # Safety
+///
+/// Every pointer must be non-NULL and valid for one read or write of its pointee type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_kzg_point_eval(
+    commitment: *const zkvm_kzg_commitment,
+    z: *const zkvm_kzg_field_element,
+    y: *const zkvm_kzg_field_element,
+    proof: *const zkvm_kzg_proof,
+    verified: *mut bool,
+) -> zkvm_status {
+    if commitment.is_null() || z.is_null() || y.is_null() || proof.is_null() || verified.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees valid reads. `verified` is written only after these
+    // shared borrows are no longer used, so overlapping storage is supported.
+    let value = unsafe { verify(&(*commitment).data, &(*z).data, &(*y).data, &(*proof).data) }
+        .unwrap_or(false);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZKVM_EOK
+}
+
+fn verify(commitment: &[u8; 48], z: &[u8; 32], y: &[u8; 32], proof: &[u8; 48]) -> Result<bool, ()> {
+    let commitment = Bytes48::from_slice(commitment).map_err(|_| ())?;
+    let z = Bytes32::from_slice(z).map_err(|_| ())?;
+    let y = Bytes32::from_slice(y).map_err(|_| ())?;
+    let proof = Bytes48::from_slice(proof).map_err(|_| ())?;
+    KzgProof::verify_kzg_proof(
+        &commitment,
+        &z,
+        &y,
+        &proof,
+        openvm_kzg::EnvKzgSettings::default().get(),
+    )
+    .map_err(|_| ())
+}
diff --git a/crates/accelerators/src/lib.rs b/crates/accelerators/src/lib.rs
index affa9e773..1ae378709 100644
--- a/crates/accelerators/src/lib.rs
+++ b/crates/accelerators/src/lib.rs
@@ -1,21 +1,44 @@
-//! OpenVM implementation of the zkVM cryptographic accelerator interface.
-//!
-//! Points and scalars use fixed-size big-endian encodings. BLS12-381 G2 uses
-//! `x_c0 || x_c1 || y_c0 || y_c1`; BN254 G2 uses the EIP-197
-//! `x_c1 || x_c0 || y_c1 || y_c0` order.
+//! OpenVM implementation of the standard zkVM accelerator C interface.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+#![allow(non_camel_case_types)]
 
 extern crate alloc;
 
-#[cfg(feature = "ffi")]
-mod ffi;
-mod ops;
-#[cfg(feature = "ffi")]
+mod blake2f;
+mod bls12_381;
+mod bn254;
+mod error;
+mod keccak256;
+mod kzg;
+mod modexp;
+mod ripemd160;
+mod secp256k1;
+mod secp256r1;
+mod sha256;
 mod types;
 
-#[cfg(feature = "ffi")]
-pub use ffi::*;
-pub use ops::*;
-#[cfg(feature = "ffi")]
-pub use types::*;
+pub use blake2f::{zkvm_blake2f, zkvm_blake2f_message, zkvm_blake2f_offset, zkvm_blake2f_state};
+pub use bls12_381::{
+    zkvm_bls12_381_fp, zkvm_bls12_381_fp2, zkvm_bls12_381_g1_msm_pair, zkvm_bls12_381_g1_point,
+    zkvm_bls12_381_g2_msm_pair, zkvm_bls12_381_g2_point, zkvm_bls12_381_pairing_pair,
+    zkvm_bls12_381_scalar, zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add,
+    zkvm_bls12_g2_msm, zkvm_bls12_map_fp2_to_g2, zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing,
+};
+pub use bn254::{
+    zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_g1_point, zkvm_bn254_g2_point,
+    zkvm_bn254_pairing, zkvm_bn254_pairing_pair, zkvm_bn254_scalar,
+};
+pub use keccak256::{zkvm_keccak256, zkvm_keccak256_hash};
+pub use kzg::{zkvm_kzg_commitment, zkvm_kzg_field_element, zkvm_kzg_point_eval, zkvm_kzg_proof};
+pub use modexp::zkvm_modexp;
+pub use ripemd160::{zkvm_ripemd160, zkvm_ripemd160_hash};
+pub use secp256k1::{
+    zkvm_secp256k1_ecrecover, zkvm_secp256k1_hash, zkvm_secp256k1_pubkey, zkvm_secp256k1_signature,
+    zkvm_secp256k1_verify,
+};
+pub use secp256r1::{
+    zkvm_secp256r1_hash, zkvm_secp256r1_pubkey, zkvm_secp256r1_signature, zkvm_secp256r1_verify,
+};
+pub use sha256::{zkvm_sha256, zkvm_sha256_hash};
+pub use types::{zkvm_status, ZKVM_EFAIL, ZKVM_EOK};
diff --git a/crates/accelerators/src/modexp.rs b/crates/accelerators/src/modexp.rs
new file mode 100644
index 000000000..8319314e4
--- /dev/null
+++ b/crates/accelerators/src/modexp.rs
@@ -0,0 +1,139 @@
+//! Modular exponentiation accelerator.
+
+use alloc::{vec, vec::Vec};
+
+use crate::types::{zkvm_status, ZKVM_EFAIL, ZKVM_EOK};
+use openvm_ecc_guest::algebra::{ExpBytes, IntMod, Reduce};
+use openvm_pairing::bn254 as bn;
+
+const BN_SCALAR_LEN: usize = 32;
+
+/// Compute `base^exp mod modulus`.
+///
+/// # Safety
+///
+/// Each non-empty input must be valid for its corresponding length, and `output`
+/// must be valid for `mod_len` writes when `mod_len != 0`.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_modexp(
+    base: *const u8,
+    base_len: usize,
+    exp: *const u8,
+    exp_len: usize,
+    modulus: *const u8,
+    mod_len: usize,
+    output: *mut u8,
+) -> zkvm_status {
+    if (base.is_null() && base_len != 0) ||
+        (exp.is_null() && exp_len != 0) ||
+        (modulus.is_null() && mod_len != 0) ||
+        (output.is_null() && mod_len != 0)
+    {
+        return ZKVM_EFAIL;
+    }
+
+    // SAFETY: non-NULL pointers and lengths were checked above; the caller guarantees validity.
+    let base =
+        if base_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(base, base_len) } };
+    // SAFETY: see above.
+    let exp = if exp_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(exp, exp_len) } };
+    // SAFETY: see above.
+    let modulus =
+        if mod_len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(modulus, mod_len) } };
+    let value = modexp(base, exp, modulus);
+    if mod_len != 0 {
+        // SAFETY: all input reads are complete and `output` is valid for `mod_len` writes.
+        unsafe { core::ptr::copy_nonoverlapping(value.as_ptr(), output, mod_len) };
+    }
+    ZKVM_EOK
+}
+
+fn modexp(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
+    let mut result = if is_bn254_fr(modulus) {
+        accelerated_modexp_bn254_fr(base, exp)
+    } else {
+        aurora_engine_modexp::modexp(base, exp, modulus)
+    };
+
+    let output_len = modulus.len();
+    match result.len().cmp(&output_len) {
+        core::cmp::Ordering::Greater => {
+            let start = result.len() - output_len;
+            result.copy_within(start.., 0);
+            result.truncate(output_len);
+        }
+        core::cmp::Ordering::Less => {
+            let value_len = result.len();
+            let padding = output_len - value_len;
+            result.resize(output_len, 0);
+            result.copy_within(0..value_len, padding);
+            result[..padding].fill(0);
+        }
+        core::cmp::Ordering::Equal => {}
+    }
+    result
+}
+
+fn is_bn254_fr(modulus: &[u8]) -> bool {
+    let stripped = match modulus.iter().position(|&byte| byte != 0) {
+        Some(index) => &modulus[index..],
+        None => return false,
+    };
+    stripped.len() == BN_SCALAR_LEN && stripped.iter().rev().eq(bn::Scalar::MODULUS.as_ref().iter())
+}
+
+fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
+    let padded_len = base.len().next_multiple_of(BN_SCALAR_LEN).max(BN_SCALAR_LEN);
+    let mut padded = vec![0u8; padded_len];
+    padded[padded_len - base.len()..].copy_from_slice(base);
+    let base_fr = bn::Scalar::reduce_be_bytes(&padded);
+    base_fr.exp_bytes(true, exp).to_be_bytes().as_ref().to_vec()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const BN254_FR: [u8; 32] = [
+        0x30, 0x64, 0x4e, 0x72, 0xe1, 0x31, 0xa0, 0x29, 0xb8, 0x50, 0x45, 0xb6, 0x81, 0x81, 0x58,
+        0x5d, 0x28, 0x33, 0xe8, 0x48, 0x79, 0xb9, 0x70, 0x91, 0x43, 0xe1, 0xf5, 0x93, 0xf0, 0x00,
+        0x00, 0x01,
+    ];
+
+    fn check(base: &[u8], exp: &[u8]) {
+        let expected = aurora_engine_modexp::modexp(base, exp, &BN254_FR);
+        let actual = accelerated_modexp_bn254_fr(base, exp);
+        let mut expected_padded = vec![0u8; BN_SCALAR_LEN];
+        let offset = BN_SCALAR_LEN - expected.len();
+        expected_padded[offset..].copy_from_slice(&expected);
+        assert_eq!(actual, expected_padded, "base={base:?}, exp={exp:?}");
+    }
+
+    #[test]
+    fn recognizes_bn254_fr() {
+        assert!(is_bn254_fr(&BN254_FR));
+        let mut padded = vec![0u8; 10];
+        padded.extend_from_slice(&BN254_FR);
+        assert!(is_bn254_fr(&padded));
+        assert!(!is_bn254_fr(&[0u8; 32]));
+        let mut wrong = BN254_FR;
+        *wrong.last_mut().unwrap() ^= 1;
+        assert!(!is_bn254_fr(&wrong));
+    }
+
+    #[test]
+    fn accelerated_bn254_fr_matches_software() {
+        for (base, exp) in [
+            (&[3][..], &[5][..]),
+            (&[0], &[5]),
+            (&[3], &[0]),
+            (&[][..], &[][..]),
+            (&[0xff; 32], &[1]),
+            (&[0xab; 64], &[3]),
+            (&[0x42; 100], &[2]),
+            (&[2], &[0xff; 32]),
+        ] {
+            check(base, exp);
+        }
+    }
+}
diff --git a/crates/accelerators/src/ops/blake2/mod.rs b/crates/accelerators/src/ops/blake2/mod.rs
deleted file mode 100644
index 800b08e69..000000000
--- a/crates/accelerators/src/ops/blake2/mod.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-//! BLAKE2b compression function F (EIP-152).
-//!
-//! Operates on raw BLAKE2b state with an arbitrary round count.
-
-mod portable;
-
-type Word = u64;
-
-const IV: [Word; 8] = [
-    0x6A09E667F3BCC908,
-    0xBB67AE8584CAA73B,
-    0x3C6EF372FE94F82B,
-    0xA54FF53A5F1D36F1,
-    0x510E527FADE682D1,
-    0x9B05688C2B3E6C1F,
-    0x1F83D9ABFB41BD6B,
-    0x5BE0CD19137E2179,
-];
-
-// The message schedule has period 10 (RFC 7693 section 2.7). EIP-152 permits
-// arbitrary round counts, so rounds beyond the standard 12 must use `r % 10`.
-const SIGMA: [[u8; 16]; 10] = [
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
-    [14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3],
-    [11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4],
-    [7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8],
-    [9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13],
-    [2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9],
-    [12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11],
-    [13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10],
-    [6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5],
-    [10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0],
-];
-
-/// Apply BLAKE2 compression to word-oriented state without byte conversion.
-#[inline]
-pub fn blake2f(rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
-    portable::compress(rounds, h, m, t, f);
-}
diff --git a/crates/accelerators/src/ops/blake2/portable.rs b/crates/accelerators/src/ops/blake2/portable.rs
deleted file mode 100644
index 9bc4cc1db..000000000
--- a/crates/accelerators/src/ops/blake2/portable.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Ported from revm-precompile 36.0.3's EIP-152 adaptation:
-// https://docs.rs/crate/revm-precompile/36.0.3/source/src/blake2/portable.rs
-// That implementation is adapted from blake2b_simd:
-// https://github.com/oconnor663/blake2_simd
-//
-// Copyright (c) 2018 Jack O'Connor
-// Copyright (c) 2021-2026 draganrakita
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-use super::{Word, IV, SIGMA};
-
-#[inline(always)]
-const fn g(v: &mut [Word; 16], a: usize, b: usize, c: usize, d: usize, x: Word, y: Word) {
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(x);
-    v[d] = (v[d] ^ v[a]).rotate_right(32);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(24);
-    v[a] = v[a].wrapping_add(v[b]).wrapping_add(y);
-    v[d] = (v[d] ^ v[a]).rotate_right(16);
-    v[c] = v[c].wrapping_add(v[d]);
-    v[b] = (v[b] ^ v[c]).rotate_right(63);
-}
-
-#[inline(always)]
-const fn round(round: usize, m: &[Word; 16], v: &mut [Word; 16]) {
-    let schedule = SIGMA[round % SIGMA.len()];
-
-    g(v, 0, 4, 8, 12, m[schedule[0] as usize], m[schedule[1] as usize]);
-    g(v, 1, 5, 9, 13, m[schedule[2] as usize], m[schedule[3] as usize]);
-    g(v, 2, 6, 10, 14, m[schedule[4] as usize], m[schedule[5] as usize]);
-    g(v, 3, 7, 11, 15, m[schedule[6] as usize], m[schedule[7] as usize]);
-
-    g(v, 0, 5, 10, 15, m[schedule[8] as usize], m[schedule[9] as usize]);
-    g(v, 1, 6, 11, 12, m[schedule[10] as usize], m[schedule[11] as usize]);
-    g(v, 2, 7, 8, 13, m[schedule[12] as usize], m[schedule[13] as usize]);
-    g(v, 3, 4, 9, 14, m[schedule[14] as usize], m[schedule[15] as usize]);
-}
-
-pub(super) fn compress(rounds: u32, h: &mut [Word; 8], m: &[Word; 16], t: &[Word; 2], f: bool) {
-    let mut v = [
-        h[0],
-        h[1],
-        h[2],
-        h[3],
-        h[4],
-        h[5],
-        h[6],
-        h[7],
-        IV[0],
-        IV[1],
-        IV[2],
-        IV[3],
-        IV[4] ^ t[0],
-        IV[5] ^ t[1],
-        IV[6] ^ if f { Word::MAX } else { 0 },
-        IV[7],
-    ];
-
-    for round_index in 0..rounds as usize {
-        round(round_index, m, &mut v);
-    }
-
-    for (index, word) in h.iter_mut().enumerate() {
-        *word ^= v[index] ^ v[index + 8];
-    }
-}
diff --git a/crates/accelerators/src/ops/bls12_381/codec.rs b/crates/accelerators/src/ops/bls12_381/codec.rs
deleted file mode 100644
index 7f72feeaf..000000000
--- a/crates/accelerators/src/ops/bls12_381/codec.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-//! Byte codecs for BLS12-381: EIP-2537 point encodings, including the
-//! on-curve and subgroup validation performed while decoding.
-
-use openvm_curve_utils::SubgroupCheck;
-use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint, Group};
-use openvm_pairing::bls12_381 as bls;
-
-use super::BLS_FP_LEN;
-use crate::ops::{BlsG1, BlsG2, Error};
-
-#[inline]
-fn read_bls_fp(input: &[u8]) -> Result<bls::Fp, Error> {
-    bls::Fp::from_be_bytes(input).ok_or(Error::FieldElementInvalid)
-}
-
-#[inline]
-fn read_bls_fp2(c0: &[u8], c1: &[u8]) -> Result<bls::Fp2, Error> {
-    let real = read_bls_fp(c0)?;
-    let imag = read_bls_fp(c1)?;
-    Ok(bls::Fp2::new(real, imag))
-}
-
-#[inline]
-pub(super) fn read_bls_g1_point_no_subgroup_check(point: &BlsG1) -> Result<bls::G1Affine, Error> {
-    let px = read_bls_fp(&point.0)?;
-    let py = read_bls_fp(&point.1)?;
-    // SAFETY: `read_bls_fp` produces canonical Fp elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(px, py)` is not on the curve.
-    unsafe { bls::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)
-}
-
-#[inline]
-pub(super) fn read_bls_g1_point(point: &BlsG1) -> Result<bls::G1Affine, Error> {
-    let point = read_bls_g1_point_no_subgroup_check(point)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(Error::PointNotInSubgroup)
-    }
-}
-
-#[inline]
-pub(super) fn read_bls_g2_point_no_subgroup_check(point: &BlsG2) -> Result<bls::G2Affine, Error> {
-    let x = read_bls_fp2(&point.0, &point.1)?;
-    let y = read_bls_fp2(&point.2, &point.3)?;
-    // SAFETY: `read_bls_fp2` produces canonical Fp2 elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(x, y)` is not on the twist.
-    unsafe { bls::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)
-}
-
-#[inline]
-pub(super) fn read_bls_g2_point(point: &BlsG2) -> Result<bls::G2Affine, Error> {
-    let point = read_bls_g2_point_no_subgroup_check(point)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(Error::PointNotInSubgroup)
-    }
-}
-
-#[inline]
-pub(super) fn read_bls_scalar(input: &[u8; 32]) -> bls::Scalar {
-    bls::Scalar::from_be_bytes_unchecked(input)
-}
-
-#[inline]
-pub(super) fn encode_bls_g1_point(point: &bls::G1Affine) -> [u8; 96] {
-    let mut output = [0; 96];
-    if point.is_identity() {
-        return output;
-    }
-
-    let x_bytes: &[u8] = point.x().as_le_bytes();
-    let y_bytes: &[u8] = point.y().as_le_bytes();
-    for i in 0..BLS_FP_LEN {
-        output[i] = x_bytes[BLS_FP_LEN - 1 - i];
-        output[i + BLS_FP_LEN] = y_bytes[BLS_FP_LEN - 1 - i];
-    }
-    output
-}
-
-#[inline]
-pub(super) fn encode_bls_g2_point(point: &bls::G2Affine) -> [u8; 192] {
-    let mut output = [0; 192];
-    if point.is_identity() {
-        return output;
-    }
-
-    let x = point.x();
-    let y = point.y();
-    let x_c0 = x.c0.as_le_bytes();
-    let x_c1 = x.c1.as_le_bytes();
-    let y_c0 = y.c0.as_le_bytes();
-    let y_c1 = y.c1.as_le_bytes();
-    for i in 0..BLS_FP_LEN {
-        output[i] = x_c0[BLS_FP_LEN - 1 - i];
-        output[i + BLS_FP_LEN] = x_c1[BLS_FP_LEN - 1 - i];
-        output[i + (2 * BLS_FP_LEN)] = y_c0[BLS_FP_LEN - 1 - i];
-        output[i + (3 * BLS_FP_LEN)] = y_c1[BLS_FP_LEN - 1 - i];
-    }
-    output
-}
diff --git a/crates/accelerators/src/ops/bls12_381/map.rs b/crates/accelerators/src/ops/bls12_381/map.rs
deleted file mode 100644
index 5fba2b2dd..000000000
--- a/crates/accelerators/src/ops/bls12_381/map.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-//! BLS12-381 map-to-curve (EIP-2537).
-//!
-//! Implemented using arkworks.
-
-use ark_bls12_381::{Fq, Fq2, G1Affine, G2Affine};
-use ark_ec::{
-    hashing::{curve_maps::wb::WBMap, map_to_curve_hasher::MapToCurve},
-    AffineRepr,
-};
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
-
-use super::BLS_FP_LEN;
-use crate::ops::Error;
-
-/// BLS12-381 map field element to G1 (precompile 0x10).
-#[inline]
-pub fn bls12_381_map_fp_to_g1(fp: &[u8; 48]) -> Result<[u8; 96], Error> {
-    let fp = read_fq(fp)?;
-    let point = WBMap::map_to_curve(fp)
-        .expect("the arkworks WB map is defined for every field element")
-        .clear_cofactor();
-
-    Ok(encode_g1_point(&point))
-}
-
-/// BLS12-381 map field element to G2 (precompile 0x11).
-#[inline]
-pub fn bls12_381_map_fp2_to_g2(fp2: &([u8; 48], [u8; 48])) -> Result<[u8; 192], Error> {
-    let c0 = read_fq(&fp2.0)?;
-    let c1 = read_fq(&fp2.1)?;
-    let point = WBMap::map_to_curve(Fq2::new(c0, c1))
-        .expect("the arkworks WB map is defined for every field element")
-        .clear_cofactor();
-
-    Ok(encode_g2_point(&point))
-}
-
-/// Reads a big-endian field element, rejecting non-canonical encodings.
-fn read_fq(input_be: &[u8]) -> Result<Fq, Error> {
-    let mut input_le = [0u8; BLS_FP_LEN];
-    input_le.copy_from_slice(input_be);
-    input_le.reverse();
-
-    Fq::deserialize_uncompressed(&input_le[..]).map_err(|_| Error::FieldElementInvalid)
-}
-
-/// Writes a field element as big-endian bytes.
-fn encode_fq(fq: &Fq, output: &mut [u8]) {
-    fq.serialize_uncompressed(&mut output[..]).expect("field element serialization is infallible");
-    output.reverse();
-}
-
-/// Writes a G1 point as `x || y`; the point at infinity encodes as zeros.
-fn encode_g1_point(point: &G1Affine) -> [u8; 96] {
-    let mut output = [0; 96];
-    let Some((x, y)) = point.xy() else {
-        return output;
-    };
-
-    encode_fq(&x, &mut output[..BLS_FP_LEN]);
-    encode_fq(&y, &mut output[BLS_FP_LEN..]);
-    output
-}
-
-/// Writes a G2 point as `x_c0 || x_c1 || y_c0 || y_c1`; the point at infinity
-/// encodes as zeros.
-fn encode_g2_point(point: &G2Affine) -> [u8; 192] {
-    let mut output = [0; 192];
-    let Some((x, y)) = point.xy() else {
-        return output;
-    };
-
-    encode_fq(&x.c0, &mut output[..BLS_FP_LEN]);
-    encode_fq(&x.c1, &mut output[BLS_FP_LEN..2 * BLS_FP_LEN]);
-    encode_fq(&y.c0, &mut output[2 * BLS_FP_LEN..3 * BLS_FP_LEN]);
-    encode_fq(&y.c1, &mut output[3 * BLS_FP_LEN..]);
-    output
-}
diff --git a/crates/accelerators/src/ops/bls12_381/mod.rs b/crates/accelerators/src/ops/bls12_381/mod.rs
deleted file mode 100644
index dcd2cd905..000000000
--- a/crates/accelerators/src/ops/bls12_381/mod.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-//! BLS12-381 group operations (EIP-2537).
-
-mod codec;
-mod map;
-
-pub use map::{bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1};
-
-use alloc::vec::Vec;
-
-use codec::{
-    encode_bls_g1_point, encode_bls_g2_point, read_bls_g1_point,
-    read_bls_g1_point_no_subgroup_check, read_bls_g2_point, read_bls_g2_point_no_subgroup_check,
-    read_bls_scalar,
-};
-use openvm_ecc_guest::{
-    weierstrass::{IntrinsicCurve, WeierstrassPoint},
-    AffinePoint,
-};
-use openvm_pairing::{bls12_381::Bls12_381, PairingCheck};
-
-use crate::ops::{BlsG1, BlsG2, Error, StreamError};
-
-/// The number of bytes needed to represent an element of the base field Fp.
-const BLS_FP_LEN: usize = 48;
-
-/// BLS12-381 G1 point addition (precompile 0x0b). Inputs are `x || y`.
-///
-/// Per EIP-2537 G1ADD, inputs are validated on-curve only, not for subgroup
-/// membership.
-#[inline]
-pub fn bls12_381_g1_add(p1: &BlsG1, p2: &BlsG1) -> Result<[u8; 96], Error> {
-    let p1 = read_bls_g1_point_no_subgroup_check(p1)?;
-    let p2 = read_bls_g1_point_no_subgroup_check(p2)?;
-    Ok(encode_bls_g1_point(&(p1 + p2)))
-}
-
-/// BLS12-381 G1 multi-scalar multiplication (precompile 0x0c).
-///
-/// Points must be in the prime-order subgroup; scalars need not be canonical.
-/// An empty input yields the identity (all-zero) encoding.
-pub fn bls12_381_g1_msm<E>(
-    pairs: impl IntoIterator<Item = Result<(BlsG1, [u8; 32]), E>>,
-) -> Result<[u8; 96], StreamError<E>> {
-    let pairs = pairs.into_iter();
-    let capacity = pairs.size_hint().0;
-
-    let mut points = Vec::with_capacity(capacity);
-    let mut scalars = Vec::with_capacity(capacity);
-    for pair in pairs {
-        let (point, scalar) = pair.map_err(StreamError::Source)?;
-        points.push(read_bls_g1_point(&point).map_err(StreamError::Operation)?);
-        scalars.push(read_bls_scalar(&scalar));
-    }
-    if points.is_empty() {
-        Ok([0; 96])
-    } else {
-        Ok(encode_bls_g1_point(&Bls12_381::msm(&scalars, &points)))
-    }
-}
-
-/// BLS12-381 G2 point addition (precompile 0x0d).
-///
-/// Per EIP-2537 G2ADD, inputs are validated on-curve only, not for subgroup
-/// membership.
-#[inline]
-pub fn bls12_381_g2_add(p1: &BlsG2, p2: &BlsG2) -> Result<[u8; 192], Error> {
-    let p1 = read_bls_g2_point_no_subgroup_check(p1)?;
-    let p2 = read_bls_g2_point_no_subgroup_check(p2)?;
-    Ok(encode_bls_g2_point(&(p1 + p2)))
-}
-
-/// BLS12-381 G2 multi-scalar multiplication (precompile 0x0e).
-///
-/// Points must be in the prime-order subgroup; scalars need not be canonical.
-/// An empty input yields the identity (all-zero) encoding.
-pub fn bls12_381_g2_msm<E>(
-    pairs: impl IntoIterator<Item = Result<(BlsG2, [u8; 32]), E>>,
-) -> Result<[u8; 192], StreamError<E>> {
-    let pairs = pairs.into_iter();
-    let capacity = pairs.size_hint().0;
-
-    let mut points = Vec::with_capacity(capacity);
-    let mut scalars = Vec::with_capacity(capacity);
-    for pair in pairs {
-        let (point, scalar) = pair.map_err(StreamError::Source)?;
-        points.push(read_bls_g2_point(&point).map_err(StreamError::Operation)?);
-        scalars.push(read_bls_scalar(&scalar));
-    }
-    if points.is_empty() {
-        Ok([0; 192])
-    } else {
-        Ok(encode_bls_g2_point(&openvm_ecc_guest::msm(&scalars, &points)))
-    }
-}
-
-/// BLS12-381 pairing check (precompile 0x0f).
-///
-/// Points must be in the prime-order subgroup.
-pub fn bls12_381_pairing_check(
-    pairs: impl IntoIterator<Item = (BlsG1, BlsG2)>,
-) -> Result<bool, Error> {
-    let pairs = pairs.into_iter();
-    let capacity = pairs.size_hint().0;
-
-    let mut g1_points = Vec::with_capacity(capacity);
-    let mut g2_points = Vec::with_capacity(capacity);
-
-    for (g1, g2) in pairs {
-        let g1 = read_bls_g1_point(&g1).map_err(|error| match error {
-            Error::PointNotOnCurve => Error::BlsG1PointNotOnCurve,
-            Error::PointNotInSubgroup => Error::BlsG1PointNotInSubgroup,
-            error => error,
-        })?;
-        let g2 = read_bls_g2_point(&g2).map_err(|error| match error {
-            Error::PointNotOnCurve => Error::BlsG2PointNotOnCurve,
-            Error::PointNotInSubgroup => Error::BlsG2PointNotInSubgroup,
-            error => error,
-        })?;
-
-        let (g1_x, g1_y) = g1.into_coords();
-        let (g2_x, g2_y) = g2.into_coords();
-
-        g1_points.push(AffinePoint::new(g1_x, g1_y));
-        g2_points.push(AffinePoint::new(g2_x, g2_y));
-    }
-
-    if g1_points.is_empty() {
-        return Ok(true);
-    }
-    Ok(Bls12_381::pairing_check(&g1_points, &g2_points).is_ok())
-}
diff --git a/crates/accelerators/src/ops/bn254/codec.rs b/crates/accelerators/src/ops/bn254/codec.rs
deleted file mode 100644
index 4ac9b7439..000000000
--- a/crates/accelerators/src/ops/bn254/codec.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-//! Byte codecs for BN254: EIP-196/197 point encodings, including the
-//! on-curve and subgroup validation performed while decoding.
-
-use openvm_curve_utils::SubgroupCheck;
-use openvm_ecc_guest::{algebra::IntMod, weierstrass::WeierstrassPoint};
-use openvm_pairing::bn254 as bn;
-
-use crate::ops::Error;
-
-const BN_FQ_LEN: usize = 32;
-const BN_G1_LEN: usize = BN_FQ_LEN * 2;
-const BN_G2_LEN: usize = BN_G1_LEN * 2;
-
-#[inline]
-fn read_bn_fq(input: &[u8]) -> Result<bn::Fp, Error> {
-    bn::Fp::from_be_bytes(&input[..BN_FQ_LEN]).ok_or(Error::FieldElementInvalid)
-}
-
-#[inline]
-fn read_bn_fq2(input: &[u8]) -> Result<bn::Fp2, Error> {
-    // EIP-197 encodes the imaginary part first.
-    let imag = read_bn_fq(&input[..BN_FQ_LEN])?;
-    let real = read_bn_fq(&input[BN_FQ_LEN..BN_FQ_LEN * 2])?;
-    Ok(bn::Fp2::new(real, imag))
-}
-
-#[inline]
-pub(super) fn read_bn_g1_point(input: &[u8]) -> Result<bn::G1Affine, Error> {
-    if input.len() != BN_G1_LEN {
-        return Err(Error::InvalidLength);
-    }
-    let px = read_bn_fq(&input[..BN_FQ_LEN])?;
-    let py = read_bn_fq(&input[BN_FQ_LEN..])?;
-    // SAFETY: `read_bn_fq` produces canonical Fp elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(px, py)` is not on the curve.
-    let point = unsafe { bn::G1Affine::from_xy(px, py) }.ok_or(Error::PointNotOnCurve)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(Error::PointNotInSubgroup)
-    }
-}
-
-#[inline]
-pub(super) fn read_bn_g2_point(input: &[u8]) -> Result<bn::G2Affine, Error> {
-    if input.len() != BN_G2_LEN {
-        return Err(Error::InvalidLength);
-    }
-    let x = read_bn_fq2(&input[..BN_G1_LEN])?;
-    let y = read_bn_fq2(&input[BN_G1_LEN..])?;
-    // SAFETY: `read_bn_fq2` produces canonical Fp2 elements; `from_xy` itself checks the curve
-    // equation and returns `None` if `(x, y)` is not on the twist.
-    let point = unsafe { bn::G2Affine::from_xy(x, y) }.ok_or(Error::PointNotOnCurve)?;
-    if point.is_in_correct_subgroup() {
-        Ok(point)
-    } else {
-        Err(Error::PointNotInSubgroup)
-    }
-}
-
-#[inline]
-pub(super) fn read_bn_scalar(input: &[u8]) -> Result<bn::Scalar, Error> {
-    if input.len() != BN_FQ_LEN {
-        return Err(Error::InvalidLength);
-    }
-    Ok(bn::Scalar::from_be_bytes_unchecked(input))
-}
-
-#[inline]
-pub(super) fn encode_bn_g1_point(point: bn::G1Affine) -> [u8; BN_G1_LEN] {
-    let mut output = [0; BN_G1_LEN];
-    let x_bytes: &[u8] = point.x().as_le_bytes();
-    let y_bytes: &[u8] = point.y().as_le_bytes();
-    for i in 0..BN_FQ_LEN {
-        output[i] = x_bytes[BN_FQ_LEN - 1 - i];
-        output[i + BN_FQ_LEN] = y_bytes[BN_FQ_LEN - 1 - i];
-    }
-    output
-}
diff --git a/crates/accelerators/src/ops/bn254/mod.rs b/crates/accelerators/src/ops/bn254/mod.rs
deleted file mode 100644
index 394752f6d..000000000
--- a/crates/accelerators/src/ops/bn254/mod.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-//! BN254 (alt_bn128) group operations (EIP-196 / EIP-197).
-
-mod codec;
-
-use alloc::vec::Vec;
-
-use codec::{encode_bn_g1_point, read_bn_g1_point, read_bn_g2_point, read_bn_scalar};
-use openvm_ecc_guest::{
-    weierstrass::{IntrinsicCurve, WeierstrassPoint},
-    AffinePoint,
-};
-use openvm_pairing::{bn254::Bn254, PairingCheck};
-
-use crate::ops::Error;
-
-/// BN254 G1 point addition (precompile 0x06).
-pub fn bn254_g1_add(p1: &[u8], p2: &[u8]) -> Result<[u8; 64], Error> {
-    let p1 = read_bn_g1_point(p1)?;
-    let p2 = read_bn_g1_point(p2)?;
-    Ok(encode_bn_g1_point(p1 + p2))
-}
-
-/// BN254 G1 scalar multiplication (precompile 0x07).
-pub fn bn254_g1_mul(point: &[u8], scalar: &[u8]) -> Result<[u8; 64], Error> {
-    let p = read_bn_g1_point(point)?;
-    let s = read_bn_scalar(scalar)?;
-    Ok(encode_bn_g1_point(Bn254::msm(&[s], &[p])))
-}
-
-/// BN254 pairing check (precompile 0x08).
-pub fn bn254_pairing_check<'a>(
-    pairs: impl IntoIterator<Item = (&'a [u8], &'a [u8])>,
-) -> Result<bool, Error> {
-    let pairs = pairs.into_iter();
-    let capacity = pairs.size_hint().0;
-
-    let mut g1_points = Vec::with_capacity(capacity);
-    let mut g2_points = Vec::with_capacity(capacity);
-
-    for (g1, g2) in pairs {
-        let g1 = read_bn_g1_point(g1)?;
-        let g2 = read_bn_g2_point(g2)?;
-
-        let (g1_x, g1_y) = g1.into_coords();
-        let (g2_x, g2_y) = g2.into_coords();
-
-        g1_points.push(AffinePoint::new(g1_x, g1_y));
-        g2_points.push(AffinePoint::new(g2_x, g2_y));
-    }
-
-    if g1_points.is_empty() {
-        return Ok(true);
-    }
-    Ok(Bn254::pairing_check(&g1_points, &g2_points).is_ok())
-}
diff --git a/crates/accelerators/src/ops/ecdsa/mod.rs b/crates/accelerators/src/ops/ecdsa/mod.rs
deleted file mode 100644
index e25e45ee3..000000000
--- a/crates/accelerators/src/ops/ecdsa/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-//! ECDSA operations.
-//!
-//! Split by curve: the two crates providing them use the same type names, and
-//! secp256k1 additionally needs a guest/host split that secp256r1 does not.
-
-mod secp256k1;
-mod secp256r1;
-
-pub use secp256k1::{secp256k1_ecrecover, secp256k1_verify};
-pub use secp256r1::secp256r1_verify;
diff --git a/crates/accelerators/src/ops/ecdsa/secp256k1.rs b/crates/accelerators/src/ops/ecdsa/secp256k1.rs
deleted file mode 100644
index 8ee8ca338..000000000
--- a/crates/accelerators/src/ops/ecdsa/secp256k1.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-//! ECDSA over the secp256k1 curve.
-
-// In the guest, secp256k1 operations use the OpenVM-accelerated k256; on
-// the host they use upstream RustCrypto k256 (the ECDSA recovery
-// relies on zkVM hints and is unimplemented outside the guest).
-#[cfg(any(target_os = "none", target_os = "openvm"))]
-use openvm_k256 as k256;
-
-use k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
-
-use crate::ops::Error;
-
-/// Recover the uncompressed secp256k1 public key from an ECDSA signature
-/// over `msg`.
-///
-/// Both low-s and high-s signatures are accepted.
-pub fn secp256k1_ecrecover(
-    msg: &[u8; 32],
-    sig: &[u8; 64],
-    mut recid: u8,
-) -> Result<[u8; 64], Error> {
-    let mut signature = Signature::from_slice(sig).map_err(|_| Error::InvalidSignature)?;
-    // k256 requires a low-s signature for recovery; normalizing flips the
-    // recovery id parity but recovers the same key.
-    if let Some(normalized) = signature.normalize_s() {
-        signature = normalized;
-        recid ^= 1;
-    }
-    let recovery_id = RecoveryId::from_byte(recid).ok_or(Error::InvalidSignature)?;
-
-    #[cfg(any(target_os = "none", target_os = "openvm"))]
-    let key = VerifyingKey::recover_from_prehash_noverify(msg, &signature.to_bytes(), recovery_id)
-        .map_err(|_| Error::InvalidSignature)?;
-    #[cfg(not(any(target_os = "none", target_os = "openvm")))]
-    let key = VerifyingKey::recover_from_prehash(msg, &signature, recovery_id)
-        .map_err(|_| Error::InvalidSignature)?;
-
-    let point = key.to_encoded_point(false);
-    Ok(point.as_bytes()[1..65].try_into().unwrap())
-}
-
-/// Verify an ECDSA signature over secp256k1 against an uncompressed public key.
-///
-/// Both low-s and high-s signatures are accepted.
-pub fn secp256k1_verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
-    let mut sec1 = [0u8; 65];
-    sec1[0] = 0x04;
-    sec1[1..].copy_from_slice(pubkey);
-    let Ok(key) = VerifyingKey::from_sec1_bytes(&sec1) else {
-        return false;
-    };
-    let Ok(mut signature) = Signature::from_slice(sig) else {
-        return false;
-    };
-    // k256 rejects high-s signatures in verification. Normalize to accept both forms.
-    if let Some(normalized) = signature.normalize_s() {
-        signature = normalized;
-    }
-    key.verify_prehash(msg, &signature).is_ok()
-}
diff --git a/crates/accelerators/src/ops/ecdsa/secp256r1.rs b/crates/accelerators/src/ops/ecdsa/secp256r1.rs
deleted file mode 100644
index 3a355a36a..000000000
--- a/crates/accelerators/src/ops/ecdsa/secp256r1.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-//! ECDSA over the secp256r1 (P-256) curve.
-
-use openvm_p256::{
-    ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey},
-    EncodedPoint,
-};
-
-/// Verify an ECDSA signature over secp256r1 (P-256) against an uncompressed public key.
-pub fn secp256r1_verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
-    let encoded_point = EncodedPoint::from_untagged_bytes(&(*pubkey).into());
-    let Ok(key) = VerifyingKey::from_encoded_point(&encoded_point) else {
-        return false;
-    };
-    let Ok(signature) = Signature::from_slice(sig) else {
-        return false;
-    };
-    key.verify_prehash(msg, &signature).is_ok()
-}
diff --git a/crates/accelerators/src/ops/hash.rs b/crates/accelerators/src/ops/hash.rs
deleted file mode 100644
index 847186648..000000000
--- a/crates/accelerators/src/ops/hash.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-//! Hash operations.
-
-/// Compute the Keccak-256 hash of `data`.
-#[inline]
-pub fn keccak256(data: &[u8]) -> [u8; 32] {
-    openvm_keccak256::keccak256(data)
-}
-
-/// Compute the SHA-256 hash of `data`.
-#[inline]
-pub fn sha256(data: &[u8]) -> [u8; 32] {
-    #[cfg(not(openvm_intrinsics))]
-    use openvm_sha2::Digest;
-    openvm_sha2::Sha256::digest(data).into()
-}
-
-/// Compute the RIPEMD-160 hash of `data`.
-///
-/// The 20-byte digest is written to the final 20 bytes; the first 12 bytes are
-/// zeroed, matching the EVM word layout.
-#[inline]
-pub fn ripemd160(data: &[u8]) -> [u8; 32] {
-    use ripemd::Digest;
-    let mut hasher = ripemd::Ripemd160::new();
-    hasher.update(data);
-
-    let mut output = [0; 32];
-    hasher.finalize_into((&mut output[12..]).into());
-    output
-}
diff --git a/crates/accelerators/src/ops/kzg.rs b/crates/accelerators/src/ops/kzg.rs
deleted file mode 100644
index d7df493fb..000000000
--- a/crates/accelerators/src/ops/kzg.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! KZG point-evaluation proof verification (EIP-4844).
-
-use openvm_kzg::{Bytes32, Bytes48, KzgProof};
-
-use crate::ops::Error;
-
-/// Verify a KZG proof that the blob committed to by `commitment` evaluates
-/// to `y` at point `z`.
-///
-/// Errors mean the check could not run — a commitment or proof that is not
-/// a valid compressed G1 point, or an out-of-range field element. `Ok(false)`
-/// means a well-formed proof did not verify.
-pub fn kzg_point_eval(
-    commitment: &[u8; 48],
-    z: &[u8; 32],
-    y: &[u8; 32],
-    proof: &[u8; 48],
-) -> Result<bool, Error> {
-    let env = openvm_kzg::EnvKzgSettings::default();
-    let kzg_settings = env.get();
-
-    let commitment = Bytes48::from_slice(commitment).map_err(|_| Error::KzgInvalidInput)?;
-    let z = Bytes32::from_slice(z).map_err(|_| Error::KzgInvalidInput)?;
-    let y = Bytes32::from_slice(y).map_err(|_| Error::KzgInvalidInput)?;
-    let proof = Bytes48::from_slice(proof).map_err(|_| Error::KzgInvalidInput)?;
-
-    KzgProof::verify_kzg_proof(&commitment, &z, &y, &proof, kzg_settings)
-        .map_err(|_| Error::KzgInvalidInput)
-}
diff --git a/crates/accelerators/src/ops/mod.rs b/crates/accelerators/src/ops/mod.rs
deleted file mode 100644
index b43fff455..000000000
--- a/crates/accelerators/src/ops/mod.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-//! OpenVM-accelerated implementations of the zkVM accelerator operations.
-//!
-//! Functions use ordinary Rust arrays, slices and tuples. BLS12-381 G2 is
-//! `(x_c0, x_c1, y_c0, y_c1)`; BN254 G2 byte slices use the EIP-197
-//! `x_c1 || x_c0 || y_c1 || y_c0` order.
-
-mod blake2;
-mod bls12_381;
-mod bn254;
-mod ecdsa;
-mod hash;
-mod kzg;
-mod modexp;
-
-pub use blake2::blake2f;
-pub use bls12_381::{
-    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check,
-};
-pub use bn254::{bn254_g1_add, bn254_g1_mul, bn254_pairing_check};
-pub use ecdsa::{secp256k1_ecrecover, secp256k1_verify, secp256r1_verify};
-pub use hash::{keccak256, ripemd160, sha256};
-pub use kzg::kzg_point_eval;
-pub use modexp::modexp;
-
-/// Uncompressed BLS12-381 G1 coordinates `(x, y)`, big-endian.
-pub type BlsG1 = ([u8; 48], [u8; 48]);
-
-/// Uncompressed BLS12-381 G2 coordinates `(x_c0, x_c1, y_c0, y_c1)`, big-endian.
-pub type BlsG2 = ([u8; 48], [u8; 48], [u8; 48], [u8; 48]);
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum StreamError<E> {
-    /// The input iterator produced an error.
-    Source(E),
-    /// An accelerator operation rejected an input.
-    Operation(Error),
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Error {
-    /// An input does not have the length required by the operation.
-    InvalidLength,
-    /// A field element is out of range or otherwise not a field member.
-    FieldElementInvalid,
-    /// A point encoding does not satisfy the curve equation.
-    PointNotOnCurve,
-    /// A point is on the curve but not in the prime-order subgroup.
-    PointNotInSubgroup,
-    /// A BLS12-381 pairing G1 point does not satisfy the curve equation.
-    BlsG1PointNotOnCurve,
-    /// A BLS12-381 pairing G1 point is not in the prime-order subgroup.
-    BlsG1PointNotInSubgroup,
-    /// A BLS12-381 pairing G2 point does not satisfy the curve equation.
-    BlsG2PointNotOnCurve,
-    /// A BLS12-381 pairing G2 point is not in the prime-order subgroup.
-    BlsG2PointNotInSubgroup,
-    /// A signature could not be parsed or key recovery failed.
-    InvalidSignature,
-    /// KZG commitment/proof/field-element inputs are malformed.
-    KzgInvalidInput,
-}
diff --git a/crates/accelerators/src/ops/modexp.rs b/crates/accelerators/src/ops/modexp.rs
deleted file mode 100644
index 223d87aff..000000000
--- a/crates/accelerators/src/ops/modexp.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-//! Modular exponentiation with a BN254-Fr fast path.
-
-use alloc::{vec, vec::Vec};
-
-use openvm_ecc_guest::algebra::{ExpBytes, IntMod, Reduce};
-use openvm_pairing::bn254 as bn;
-
-/// The number of bytes needed to represent an element of BN254's scalar
-/// field Fr.
-const BN_SCALAR_LEN: usize = 32;
-
-/// Compute `base^exp % modulus`, returning exactly `modulus.len()` bytes.
-pub fn modexp(base: &[u8], exp: &[u8], modulus: &[u8]) -> Vec<u8> {
-    let mut result = if is_bn254_fr(modulus) {
-        accelerated_modexp_bn254_fr(base, exp)
-    } else {
-        aurora_engine_modexp::modexp(base, exp, modulus)
-    };
-
-    // The result is numerically reduced, but its byte representation may not
-    // be modulus-sized. Reuse its allocation while right-aligning it.
-    let output_len = modulus.len();
-    match result.len().cmp(&output_len) {
-        core::cmp::Ordering::Greater => {
-            let start = result.len() - output_len;
-            result.copy_within(start.., 0);
-            result.truncate(output_len);
-        }
-        core::cmp::Ordering::Less => {
-            let value_len = result.len();
-            let padding = output_len - value_len;
-            result.resize(output_len, 0);
-            result.copy_within(0..value_len, padding);
-            result[..padding].fill(0);
-        }
-        core::cmp::Ordering::Equal => {}
-    }
-    result
-}
-
-/// Returns true if the modulus (big-endian, possibly with leading zeros) equals BN254 Fr.
-fn is_bn254_fr(modulus: &[u8]) -> bool {
-    // Strip leading zeros
-    let stripped = match modulus.iter().position(|&b| b != 0) {
-        Some(i) => &modulus[i..],
-        None => return false, // all zeros
-    };
-    // bn::Scalar::MODULUS is little-endian; compare against reversed input
-    stripped.len() == BN_SCALAR_LEN && stripped.iter().rev().eq(bn::Scalar::MODULUS.as_ref().iter())
-}
-
-/// Accelerated modexp for BN254 Fr using field arithmetic intrinsics.
-fn accelerated_modexp_bn254_fr(base: &[u8], exp: &[u8]) -> Vec<u8> {
-    // OpenVM's field reduction requires inputs to be aligned to the field byte size.
-    let padded_len = base.len().next_multiple_of(BN_SCALAR_LEN).max(BN_SCALAR_LEN);
-    let mut padded = vec![0u8; padded_len];
-    padded[padded_len - base.len()..].copy_from_slice(base);
-    let base_fr = bn::Scalar::reduce_be_bytes(&padded);
-
-    base_fr.exp_bytes(true, exp).to_be_bytes().as_ref().to_vec()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// EIP-197 BN254 scalar-field modulus, independently specified in big-endian order.
-    const BN254_FR: [u8; 32] = [
-        0x30, 0x64, 0x4e, 0x72, 0xe1, 0x31, 0xa0, 0x29, 0xb8, 0x50, 0x45, 0xb6, 0x81, 0x81, 0x58,
-        0x5d, 0x28, 0x33, 0xe8, 0x48, 0x79, 0xb9, 0x70, 0x91, 0x43, 0xe1, 0xf5, 0x93, 0xf0, 0x00,
-        0x00, 0x01,
-    ];
-
-    /// Helper: run the accelerated path and compare against the aurora
-    /// reference. The accelerated path always returns BN_SCALAR_LEN bytes,
-    /// so the reference output is left-padded to match.
-    fn check(base: &[u8], exp: &[u8]) {
-        let expected = aurora_engine_modexp::modexp(base, exp, &BN254_FR);
-        let actual = accelerated_modexp_bn254_fr(base, exp);
-        let mut expected_padded = vec![0u8; BN_SCALAR_LEN];
-        let offset = BN_SCALAR_LEN - expected.len();
-        expected_padded[offset..].copy_from_slice(&expected);
-        assert_eq!(actual, expected_padded, "base={base:?}, exp={exp:?}");
-    }
-
-    #[test]
-    fn test_is_bn254_fr() {
-        // Exact modulus
-        assert!(is_bn254_fr(&BN254_FR));
-
-        // With leading zeros
-        let mut padded = vec![0u8; 10];
-        padded.extend_from_slice(&BN254_FR);
-        assert!(is_bn254_fr(&padded));
-
-        // All zeros → false
-        assert!(!is_bn254_fr(&[0u8; 32]));
-
-        // Wrong modulus (flip last bit)
-        let mut m = BN254_FR;
-        *m.last_mut().unwrap() ^= 1;
-        assert!(!is_bn254_fr(&m));
-    }
-
-    #[test]
-    fn test_accelerated_modexp_bn254_fr() {
-        // --- short base (<=32 bytes), value < modulus ---
-        check(&[3], &[5]); // 3^5 mod Fr
-        check(&[0], &[5]); // 0^5 = 0
-        check(&[3], &[0]); // 3^0 = 1
-        check(&[0], &[0]); // 0^0 = 1 by convention
-        check(&[], &[]); // empty inputs
-        check(&[0, 0, 0, 3], &[5]); // leading zeros in base
-
-        // --- short base, value >= modulus (triggers the reduce fallback) ---
-        check(&BN254_FR, &[1]); // Fr mod Fr = 0, so 0^1 = 0
-        let mut m_plus_1 = BN254_FR;
-        *m_plus_1.last_mut().unwrap() += 1;
-        check(&m_plus_1, &[2]); // (Fr+1)^2 mod Fr = 1
-        check(&[0xff; 32], &[1]); // max 256-bit value, >= modulus
-
-        // --- large base (> 32 bytes, reduce_be_bytes path) ---
-        check(&[0xab; 64], &[3]); // aligned (multiple of 32)
-        check(&[0x42; 100], &[2]); // unaligned (tests the padding)
-        check(&[0xab; 64], &[0xff; 32]); // large base + large exponent
-
-        // --- larger exponents ---
-        check(&[2], &[0xff; 32]); // 2^(2^256-1) mod Fr
-        check(&[2], &[0, 0, 0, 5]); // leading zeros in exponent
-        check(&[3], &[0xab; 64]); // exponent > 32 bytes
-
-        // --- same value through both base-parsing code paths ---
-        let base_32 = [0xab; 32];
-        let mut base_33 = vec![0u8];
-        base_33.extend_from_slice(&base_32);
-        let exp = &[7];
-        assert_eq!(
-            accelerated_modexp_bn254_fr(&base_32, exp),
-            accelerated_modexp_bn254_fr(&base_33, exp),
-            "33-byte base with leading zero must match 32-byte base"
-        );
-    }
-}
diff --git a/crates/accelerators/src/ripemd160.rs b/crates/accelerators/src/ripemd160.rs
new file mode 100644
index 000000000..339f7ded2
--- /dev/null
+++ b/crates/accelerators/src/ripemd160.rs
@@ -0,0 +1,42 @@
+//! RIPEMD-160 accelerator.
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+
+pub type zkvm_ripemd160_hash = ZkvmBytes<32>;
+
+/// Compute the RIPEMD-160 hash of `data[..len]` into `output`.
+///
+/// A NULL `data` pointer is accepted only when `len == 0`.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of one [`zkvm_ripemd160_hash`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_ripemd160(
+    data: *const u8,
+    len: usize,
+    output: *mut zkvm_ripemd160_hash,
+) -> zkvm_status {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    let value = zkvm_ripemd160_hash { data: ripemd160(data) };
+    // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
+    // overlapping input/output storage is supported.
+    unsafe { output.write(value) };
+    ZKVM_EOK
+}
+
+#[inline]
+fn ripemd160(data: &[u8]) -> [u8; 32] {
+    use ripemd::Digest;
+    let mut hasher = ripemd::Ripemd160::new();
+    hasher.update(data);
+
+    let mut output = [0; 32];
+    hasher.finalize_into((&mut output[12..]).into());
+    output
+}
diff --git a/crates/accelerators/src/secp256k1.rs b/crates/accelerators/src/secp256k1.rs
new file mode 100644
index 000000000..bed812a20
--- /dev/null
+++ b/crates/accelerators/src/secp256k1.rs
@@ -0,0 +1,95 @@
+//! secp256k1 ECDSA accelerator.
+
+#[cfg(any(target_os = "none", target_os = "openvm"))]
+use openvm_k256 as k256;
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+use k256::ecdsa::{signature::hazmat::PrehashVerifier, RecoveryId, Signature, VerifyingKey};
+
+pub type zkvm_secp256k1_hash = ZkvmBytes<32>;
+pub type zkvm_secp256k1_signature = ZkvmBytes<64>;
+pub type zkvm_secp256k1_pubkey = ZkvmBytes<64>;
+
+/// Recover an uncompressed public key from a signature and recovery ID.
+///
+/// # Safety
+///
+/// Every non-NULL pointer must be valid for a read or write of its pointed-to type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256k1_ecrecover(
+    msg: *const zkvm_secp256k1_hash,
+    sig: *const zkvm_secp256k1_signature,
+    recid: u8,
+    output: *mut zkvm_secp256k1_pubkey,
+) -> zkvm_status {
+    if msg.is_null() || sig.is_null() || output.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that the non-NULL inputs are valid for reads. Copying both
+    // inputs before writing supports overlap with `output`.
+    let (msg, sig) = unsafe { (msg.read(), sig.read()) };
+    let Some(data) = recover(&msg.data, &sig.data, recid) else {
+        return ZKVM_EFAIL;
+    };
+    // SAFETY: `output` is non-NULL and valid for writes.
+    unsafe { output.write(zkvm_secp256k1_pubkey { data }) };
+    ZKVM_EOK
+}
+
+/// Verify a signature, writing `false` for malformed or invalid cryptographic inputs.
+///
+/// # Safety
+///
+/// Every non-NULL pointer must be valid for a read or write of its pointed-to type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256k1_verify(
+    msg: *const zkvm_secp256k1_hash,
+    sig: *const zkvm_secp256k1_signature,
+    pubkey: *const zkvm_secp256k1_pubkey,
+    verified: *mut bool,
+) -> zkvm_status {
+    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that the non-NULL inputs are valid for reads. Copying every
+    // input before writing supports overlap with `verified`.
+    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
+    let value = verify(&msg.data, &sig.data, &pubkey.data);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZKVM_EOK
+}
+
+fn recover(msg: &[u8; 32], sig: &[u8; 64], mut recid: u8) -> Option<[u8; 64]> {
+    let mut signature = Signature::from_slice(sig).ok()?;
+    // k256 recovery requires low-s; changing s to -s also flips the recovery-ID parity.
+    if let Some(normalized) = signature.normalize_s() {
+        signature = normalized;
+        recid ^= 1;
+    }
+    let recovery_id = RecoveryId::from_byte(recid)?;
+
+    #[cfg(any(target_os = "none", target_os = "openvm"))]
+    let key = VerifyingKey::recover_from_prehash_noverify(msg, &signature.to_bytes(), recovery_id)
+        .ok()?;
+    #[cfg(not(any(target_os = "none", target_os = "openvm")))]
+    let key = VerifyingKey::recover_from_prehash(msg, &signature, recovery_id).ok()?;
+
+    key.to_encoded_point(false).as_bytes().get(1..65)?.try_into().ok()
+}
+
+fn verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
+    let mut sec1 = [0u8; 65];
+    sec1[0] = 0x04;
+    sec1[1..].copy_from_slice(pubkey);
+    let Ok(key) = VerifyingKey::from_sec1_bytes(&sec1) else {
+        return false;
+    };
+    let Ok(mut signature) = Signature::from_slice(sig) else {
+        return false;
+    };
+    if let Some(normalized) = signature.normalize_s() {
+        signature = normalized;
+    }
+    key.verify_prehash(msg, &signature).is_ok()
+}
diff --git a/crates/accelerators/src/secp256r1.rs b/crates/accelerators/src/secp256r1.rs
new file mode 100644
index 000000000..d8ae7608f
--- /dev/null
+++ b/crates/accelerators/src/secp256r1.rs
@@ -0,0 +1,46 @@
+//! secp256r1 ECDSA accelerator.
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+use openvm_p256::{
+    ecdsa::{signature::hazmat::PrehashVerifier, Signature, VerifyingKey},
+    EncodedPoint,
+};
+
+pub type zkvm_secp256r1_hash = ZkvmBytes<32>;
+pub type zkvm_secp256r1_signature = ZkvmBytes<64>;
+pub type zkvm_secp256r1_pubkey = ZkvmBytes<64>;
+
+/// Verify a signature, writing `false` for malformed or invalid cryptographic inputs.
+///
+/// # Safety
+///
+/// Every non-NULL pointer must be valid for a read or write of its pointed-to type.
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_secp256r1_verify(
+    msg: *const zkvm_secp256r1_hash,
+    sig: *const zkvm_secp256r1_signature,
+    pubkey: *const zkvm_secp256r1_pubkey,
+    verified: *mut bool,
+) -> zkvm_status {
+    if msg.is_null() || sig.is_null() || pubkey.is_null() || verified.is_null() {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: the caller guarantees that the non-NULL inputs are valid for reads. Copying every
+    // input before writing supports overlap with `verified`.
+    let (msg, sig, pubkey) = unsafe { (msg.read(), sig.read(), pubkey.read()) };
+    let value = verify(&msg.data, &sig.data, &pubkey.data);
+    // SAFETY: `verified` is non-NULL and valid for writes.
+    unsafe { verified.write(value) };
+    ZKVM_EOK
+}
+
+fn verify(msg: &[u8; 32], sig: &[u8; 64], pubkey: &[u8; 64]) -> bool {
+    let encoded_point = EncodedPoint::from_untagged_bytes(&(*pubkey).into());
+    let Ok(key) = VerifyingKey::from_encoded_point(&encoded_point) else {
+        return false;
+    };
+    let Ok(signature) = Signature::from_slice(sig) else {
+        return false;
+    };
+    key.verify_prehash(msg, &signature).is_ok()
+}
diff --git a/crates/accelerators/src/sha256.rs b/crates/accelerators/src/sha256.rs
new file mode 100644
index 000000000..4bb824bf2
--- /dev/null
+++ b/crates/accelerators/src/sha256.rs
@@ -0,0 +1,33 @@
+//! SHA-256 accelerator.
+
+use crate::types::{zkvm_status, ZkvmBytes, ZKVM_EFAIL, ZKVM_EOK};
+#[cfg(not(openvm_intrinsics))]
+use openvm_sha2::Digest;
+
+pub type zkvm_sha256_hash = ZkvmBytes<32>;
+
+/// Compute the SHA-256 hash of `data[..len]` into `output`.
+///
+/// A NULL `data` pointer is accepted only when `len == 0`.
+///
+/// # Safety
+///
+/// - `data`, if non-NULL, must be valid for reads of `len` bytes.
+/// - `output`, if non-NULL, must be valid for writes of one [`zkvm_sha256_hash`].
+#[unsafe(no_mangle)]
+pub unsafe extern "C" fn zkvm_sha256(
+    data: *const u8,
+    len: usize,
+    output: *mut zkvm_sha256_hash,
+) -> zkvm_status {
+    if output.is_null() || (data.is_null() && len != 0) {
+        return ZKVM_EFAIL;
+    }
+    // SAFETY: non-NULL checked above; validity is guaranteed by the caller.
+    let data = if len == 0 { &[] } else { unsafe { core::slice::from_raw_parts(data, len) } };
+    let value = zkvm_sha256_hash { data: openvm_sha2::Sha256::digest(data).into() };
+    // SAFETY: `output` is non-NULL and valid for writes. All input reads are complete, so
+    // overlapping input/output storage is supported.
+    unsafe { output.write(value) };
+    ZKVM_EOK
+}
diff --git a/crates/accelerators/src/types.rs b/crates/accelerators/src/types.rs
index b76b7da11..47cd563fc 100644
--- a/crates/accelerators/src/types.rs
+++ b/crates/accelerators/src/types.rs
@@ -1,150 +1,12 @@
-//! Types mirroring the complete interface standard header.
+//! Types for the standard zkVM accelerator C interface.
 
-/// Status code returned by every accelerator function (`zkvm_status`).
-///
-/// Pinned to `i32` so the layout does not depend on target conventions.
-#[repr(i32)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ZkvmStatus {
-    /// Success (`ZKVM_EOK`).
-    Ok = 0,
-    /// Failure (`ZKVM_EFAIL`).
-    Fail = -1,
-}
-
-/// 16-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes16 {
-    pub data: [u8; 16],
-}
-
-/// 32-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes32 {
-    pub data: [u8; 32],
-}
-
-/// 48-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes48 {
-    pub data: [u8; 48],
-}
+pub type zkvm_status = core::ffi::c_int;
 
-/// 64-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes64 {
-    pub data: [u8; 64],
-}
-
-/// 96-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes96 {
-    pub data: [u8; 96],
-}
-
-/// 128-byte buffer.
-#[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes128 {
-    pub data: [u8; 128],
-}
+pub const ZKVM_EOK: zkvm_status = 0;
+pub const ZKVM_EFAIL: zkvm_status = -1;
 
-/// 192-byte buffer.
 #[repr(C, align(8))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBytes192 {
-    pub data: [u8; 192],
+#[derive(Clone, Copy, Debug)]
+pub struct ZkvmBytes<const N: usize> {
+    pub data: [u8; N],
 }
-
-/* Hash types */
-pub type ZkvmKeccak256Hash = ZkvmBytes32;
-pub type ZkvmSha256Hash = ZkvmBytes32;
-/// 20-byte hash padded to 32 bytes, first 12 bytes zero.
-pub type ZkvmRipemd160Hash = ZkvmBytes32;
-
-/* secp256k1 types */
-pub type ZkvmSecp256k1Hash = ZkvmBytes32;
-/// `r || s`, 32 bytes each, big-endian.
-pub type ZkvmSecp256k1Signature = ZkvmBytes64;
-/// uncompressed `x || y`, 32 bytes each, big-endian.
-pub type ZkvmSecp256k1Pubkey = ZkvmBytes64;
-
-/* secp256r1 (P-256) types */
-pub type ZkvmSecp256r1Hash = ZkvmBytes32;
-/// `r || s`, 32 bytes each, big-endian.
-pub type ZkvmSecp256r1Signature = ZkvmBytes64;
-/// uncompressed `x || y`, 32 bytes each, big-endian.
-pub type ZkvmSecp256r1Pubkey = ZkvmBytes64;
-
-/* BN254 types */
-/// `x || y`, 32 bytes each, big-endian.
-pub type ZkvmBn254G1Point = ZkvmBytes64;
-/// `x_c1 || x_c0 || y_c1 || y_c0` (EIP-197 order).
-pub type ZkvmBn254G2Point = ZkvmBytes128;
-pub type ZkvmBn254Scalar = ZkvmBytes32;
-
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBn254PairingPair {
-    pub g1: ZkvmBn254G1Point,
-    pub g2: ZkvmBn254G2Point,
-}
-
-/* BLS12-381 types */
-/// `x || y`, 48 bytes each, big-endian.
-pub type ZkvmBls12381G1Point = ZkvmBytes96;
-/// `x_c0 || x_c1 || y_c0 || y_c1` (EIP-2537 order).
-pub type ZkvmBls12381G2Point = ZkvmBytes192;
-pub type ZkvmBls12381Scalar = ZkvmBytes32;
-pub type ZkvmBls12381Fp = ZkvmBytes48;
-/// `c0 || c1`, 48 bytes each, big-endian.
-pub type ZkvmBls12381Fp2 = ZkvmBytes96;
-
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBls12381G1MsmPair {
-    pub point: ZkvmBls12381G1Point,
-    pub scalar: ZkvmBls12381Scalar,
-}
-
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBls12381G2MsmPair {
-    pub point: ZkvmBls12381G2Point,
-    pub scalar: ZkvmBls12381Scalar,
-}
-
-#[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct ZkvmBls12381PairingPair {
-    pub g1: ZkvmBls12381G1Point,
-    pub g2: ZkvmBls12381G2Point,
-}
-
-/* BLAKE2f types */
-/// 8 × u64 little-endian.
-pub type ZkvmBlake2fState = ZkvmBytes64;
-/// 16 × u64 little-endian.
-pub type ZkvmBlake2fMessage = ZkvmBytes128;
-/// 2 × u64 little-endian.
-pub type ZkvmBlake2fOffset = ZkvmBytes16;
-
-/* KZG types */
-pub type ZkvmKzgCommitment = ZkvmBytes48;
-pub type ZkvmKzgProof = ZkvmBytes48;
-pub type ZkvmKzgFieldElement = ZkvmBytes32;
-
-// Pin the non-trivial aggregate layouts exposed by the canonical C header.
-const _: () = {
-    use core::mem::size_of;
-
-    assert!(size_of::<ZkvmBn254PairingPair>() == 192);
-    assert!(size_of::<ZkvmBls12381G1MsmPair>() == 128);
-    assert!(size_of::<ZkvmBls12381G2MsmPair>() == 224);
-    assert!(size_of::<ZkvmBls12381PairingPair>() == 288);
-};
diff --git a/crates/accelerators/tests/blake2.rs b/crates/accelerators/tests/blake2f.rs
similarity index 54%
rename from crates/accelerators/tests/blake2.rs
rename to crates/accelerators/tests/blake2f.rs
index 2c0c03a52..aeb287b3c 100644
--- a/crates/accelerators/tests/blake2.rs
+++ b/crates/accelerators/tests/blake2f.rs
@@ -1,10 +1,9 @@
-//! BLAKE2f conformance: the official EIP-152 test vectors 4-7.
-
-#![cfg(feature = "ffi")]
+//! BLAKE2f conformance using the official EIP-152 test vectors 4-7.
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    blake2f, zkvm_blake2f, ZkvmBlake2fMessage, ZkvmBlake2fOffset, ZkvmBlake2fState, ZkvmStatus,
+    zkvm_blake2f, zkvm_blake2f_message, zkvm_blake2f_offset, zkvm_blake2f_state, ZKVM_EFAIL,
+    ZKVM_EOK,
 };
 
 /// EIP-152 vectors 4-7 share the same h, m and t inputs.
@@ -14,28 +13,20 @@ const H: [u8; 64] = hex!(
 );
 const T: [u8; 16] = hex!("03000000000000000000000000000000");
 
-fn m() -> ZkvmBlake2fMessage {
-    let mut m = ZkvmBlake2fMessage { data: [0; 128] };
+fn m() -> zkvm_blake2f_message {
+    let mut m = zkvm_blake2f_message { data: [0; 128] };
     m.data[..3].copy_from_slice(b"abc");
     m
 }
 
-fn state_words(bytes: &[u8; 64]) -> [u64; 8] {
-    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
-}
-
-fn message_words(bytes: &[u8; 128]) -> [u64; 16] {
-    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
-}
-
-fn offset_words(bytes: &[u8; 16]) -> [u64; 2] {
-    core::array::from_fn(|i| u64::from_le_bytes(bytes[i * 8..(i + 1) * 8].try_into().unwrap()))
-}
-
 fn check(rounds: u32, f: u8, expected: [u8; 64]) {
-    let mut h = state_words(&H);
-    blake2f(rounds, &mut h, &message_words(&m().data), &offset_words(&T), f == 1);
-    assert_eq!(h, state_words(&expected), "rounds={rounds}, f={f}");
+    let mut h = zkvm_blake2f_state { data: H };
+    let m = m();
+    let t = zkvm_blake2f_offset { data: T };
+
+    let status = unsafe { zkvm_blake2f(rounds, &mut h, &m, &t, f) };
+    assert_eq!(status, ZKVM_EOK, "rounds={rounds}, f={f}");
+    assert_eq!(h.data, expected, "rounds={rounds}, f={f}");
 }
 
 #[test]
@@ -87,42 +78,30 @@ fn blake2f_eip152_vector_7_one_round() {
 }
 
 #[test]
-fn zkvm_blake2f_smoke() {
-    let mut h = ZkvmBlake2fState { data: H };
+fn zkvm_blake2f_invalid_final_flag_preserves_state() {
+    let mut h = zkvm_blake2f_state { data: H };
     let m = m();
-    let t = ZkvmBlake2fOffset { data: T };
+    let t = zkvm_blake2f_offset { data: T };
 
-    let status = unsafe { zkvm_blake2f(12, &mut h, &m, &t, 1) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        h.data,
-        hex!(
-            "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d1"
-            "7d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923"
-        )
-    );
-
-    // An invalid final flag maps to the failure status.
-    let valid_output = h;
     let status = unsafe { zkvm_blake2f(12, &mut h, &m, &t, 2) };
-    assert_eq!(status, ZkvmStatus::Fail);
-    assert_eq!(h, valid_output);
+    assert_eq!(status, ZKVM_EFAIL);
+    assert_eq!(h.data, H);
 }
 
 #[test]
 fn zkvm_blake2f_null_pointers() {
-    let mut h = ZkvmBlake2fState { data: H };
+    let mut h = zkvm_blake2f_state { data: H };
     let m = m();
-    let t = ZkvmBlake2fOffset { data: T };
+    let t = zkvm_blake2f_offset { data: T };
 
     let status = unsafe { zkvm_blake2f(12, core::ptr::null_mut(), &m, &t, 1) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_blake2f(12, &mut h, core::ptr::null(), &t, 1) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_blake2f(12, &mut h, &m, core::ptr::null(), 1) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
     // The state must be untouched when a pointer is NULL.
     assert_eq!(h.data, H);
 }
diff --git a/crates/accelerators/tests/bls12_381.rs b/crates/accelerators/tests/bls12_381.rs
index f78efe76c..906a90c5a 100644
--- a/crates/accelerators/tests/bls12_381.rs
+++ b/crates/accelerators/tests/bls12_381.rs
@@ -1,44 +1,22 @@
 //! BLS12-381 add/MSM/pairing/map conformance vectors.
 
-#![cfg(feature = "ffi")]
-
-use core::convert::Infallible;
-
 use hex_literal::hex;
 use openvm_accelerators::{
-    bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, zkvm_bls12_g1_add,
-    zkvm_bls12_g1_msm, zkvm_bls12_g2_add, zkvm_bls12_g2_msm, zkvm_bls12_map_fp2_to_g2,
-    zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing, BlsG1, BlsG2, Error, ZkvmBls12381Fp,
-    ZkvmBls12381Fp2, ZkvmBls12381G1MsmPair, ZkvmBls12381G1Point, ZkvmBls12381G2MsmPair,
-    ZkvmBls12381G2Point, ZkvmBls12381PairingPair, ZkvmBls12381Scalar, ZkvmStatus,
+    zkvm_bls12_381_fp, zkvm_bls12_381_fp2, zkvm_bls12_381_g1_msm_pair, zkvm_bls12_381_g1_point,
+    zkvm_bls12_381_g2_msm_pair, zkvm_bls12_381_g2_point, zkvm_bls12_381_pairing_pair,
+    zkvm_bls12_381_scalar, zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add,
+    zkvm_bls12_g2_msm, zkvm_bls12_map_fp2_to_g2, zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing,
+    ZKVM_EFAIL, ZKVM_EOK,
 };
 
-fn scalar(value: u8) -> ZkvmBls12381Scalar {
-    let mut scalar = ZkvmBls12381Scalar { data: [0; 32] };
+fn scalar(value: u8) -> zkvm_bls12_381_scalar {
+    let mut scalar = zkvm_bls12_381_scalar { data: [0; 32] };
     scalar.data[31] = value;
     scalar
 }
 
-fn bls_g1(point: ZkvmBls12381G1Point) -> BlsG1 {
-    (point.data[..48].try_into().unwrap(), point.data[48..].try_into().unwrap())
-}
-
-fn bls_g2(point: ZkvmBls12381G2Point) -> BlsG2 {
-    (
-        point.data[..48].try_into().unwrap(),
-        point.data[48..96].try_into().unwrap(),
-        point.data[96..144].try_into().unwrap(),
-        point.data[144..].try_into().unwrap(),
-    )
-}
-
-fn bls_fp2(input: [u8; 96]) -> ([u8; 48], [u8; 48]) {
-    (input[..48].try_into().unwrap(), input[48..].try_into().unwrap())
-}
-
 /// BLS12-381 G1 generator (`x || y`).
-const BLS_G1_GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
+const BLS_G1_GEN: zkvm_bls12_381_g1_point = zkvm_bls12_381_g1_point {
     data: hex!(
         "17f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb"
         "08b3f481e3aaa0f1a09e30ed741d8ae4fcf5e095d5d00af600db18cb2c04b3edd03cc744a2888ae40caa232946c5e7e1"
@@ -46,7 +24,7 @@ const BLS_G1_GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
 };
 
 /// Doubled BLS12-381 G1 generator, stripped from the EIP-2537 test-vector padding.
-const BLS_G1_2GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
+const BLS_G1_2GEN: zkvm_bls12_381_g1_point = zkvm_bls12_381_g1_point {
     data: hex!(
         "0572cbea904d67468808c8eb50a9450c9721db309128012543902d0ac358a62ae28f75bb8f1c7c42c39a8c5529bf0f4e"
         "166a9d8cabc673a322fda673779d8e3822ba3ecb8670e461f73bb9021d5fd76a4c56d9d4cd16bd1bba86881979749d28"
@@ -54,7 +32,7 @@ const BLS_G1_2GEN: ZkvmBls12381G1Point = ZkvmBls12381G1Point {
 };
 
 /// BLS12-381 G2 generator in EIP-2537 order (`x_c0 || x_c1 || y_c0 || y_c1`).
-const BLS_G2_GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
+const BLS_G2_GEN: zkvm_bls12_381_g2_point = zkvm_bls12_381_g2_point {
     data: hex!(
         "024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8"
         "13e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e"
@@ -64,7 +42,7 @@ const BLS_G2_GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
 };
 
 /// Doubled BLS12-381 G2 generator, stripped from the EIP-2537 test-vector padding.
-const BLS_G2_2GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
+const BLS_G2_2GEN: zkvm_bls12_381_g2_point = zkvm_bls12_381_g2_point {
     data: hex!(
         "1638533957d540a9d2370f17cc7ed5863bc0b995b8825e0ee1ea1e1e4d00dbae81f14b0bf3611b78c952aacab827a053"
         "0a4edef9c1ed7f729f520e47730a124fd70662a904ba1074728114d1031e1572c6c886f6b57ec72a6178288c47c33577"
@@ -74,93 +52,61 @@ const BLS_G2_2GEN: ZkvmBls12381G2Point = ZkvmBls12381G2Point {
 };
 
 /// BLS12-381 scalar field order minus one; multiplying by it negates a point.
-const BLS_R_MINUS_1: ZkvmBls12381Scalar = ZkvmBls12381Scalar {
+const BLS_R_MINUS_1: zkvm_bls12_381_scalar = zkvm_bls12_381_scalar {
     data: hex!("73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000"),
 };
 
-fn neg_g1_generator() -> ZkvmBls12381G1Point {
-    let pairs = [Ok::<_, Infallible>((bls_g1(BLS_G1_GEN), BLS_R_MINUS_1.data))];
-    ZkvmBls12381G1Point { data: bls12_381_g1_msm(pairs).unwrap() }
+fn neg_g1_generator() -> zkvm_bls12_381_g1_point {
+    let pairs = [zkvm_bls12_381_g1_msm_pair { point: BLS_G1_GEN, scalar: BLS_R_MINUS_1 }];
+    let mut output = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_msm(pairs.as_ptr(), pairs.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    output
 }
 
 #[test]
 fn bls12_g1_add_msm_vectors() {
-    let output = bls12_381_g1_add(&bls_g1(BLS_G1_GEN), &bls_g1(BLS_G1_GEN)).unwrap();
-    assert_eq!(output, BLS_G1_2GEN.data);
-
-    let pairs = [Ok::<_, Infallible>((bls_g1(BLS_G1_GEN), scalar(2).data))];
-    let output = bls12_381_g1_msm(pairs).unwrap();
-    assert_eq!(output, BLS_G1_2GEN.data);
-
-    let output =
-        bls12_381_g1_msm(core::iter::empty::<Result<(BlsG1, [u8; 32]), Infallible>>()).unwrap();
-    assert_eq!(output, [0u8; 96]);
+    let mut output = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BLS_G1_2GEN.data);
+
+    let pairs = [zkvm_bls12_381_g1_msm_pair { point: BLS_G1_GEN, scalar: scalar(2) }];
+    output.data.fill(0);
+    let status = unsafe { zkvm_bls12_g1_msm(pairs.as_ptr(), pairs.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BLS_G1_2GEN.data);
 }
 
 #[test]
 fn bls12_g2_add_msm_vectors() {
-    let output = bls12_381_g2_add(&bls_g2(BLS_G2_GEN), &bls_g2(BLS_G2_GEN)).unwrap();
-    assert_eq!(output, BLS_G2_2GEN.data);
-
-    let pairs = [Ok::<_, Infallible>((bls_g2(BLS_G2_GEN), scalar(2).data))];
-    let output = bls12_381_g2_msm(pairs).unwrap();
-    assert_eq!(output, BLS_G2_2GEN.data);
-
-    let output =
-        bls12_381_g2_msm(core::iter::empty::<Result<(BlsG2, [u8; 32]), Infallible>>()).unwrap();
-    assert_eq!(output, [0u8; 192]);
+    let mut output = zkvm_bls12_381_g2_point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BLS_G2_2GEN.data);
+
+    let pairs = [zkvm_bls12_381_g2_msm_pair { point: BLS_G2_GEN, scalar: scalar(2) }];
+    output.data.fill(0);
+    let status = unsafe { zkvm_bls12_g2_msm(pairs.as_ptr(), pairs.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BLS_G2_2GEN.data);
 }
 
 #[test]
 fn bls12_pairing_vectors() {
-    let neg_g1 = neg_g1_generator();
-    let pairs = [(bls_g1(BLS_G1_GEN), bls_g2(BLS_G2_GEN)), (bls_g1(neg_g1), bls_g2(BLS_G2_GEN))];
-
-    assert!(bls12_381_pairing_check(pairs).unwrap());
-    assert!(!bls12_381_pairing_check(pairs[..1].iter().copied()).unwrap());
-    assert!(bls12_381_pairing_check(core::iter::empty::<(BlsG1, BlsG2)>()).unwrap());
-}
-
-#[test]
-fn zkvm_bls12_add_msm_smoke() {
-    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
-    let status = unsafe { zkvm_bls12_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, &mut g1_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g1_output, BLS_G1_2GEN);
-
-    let g1_pairs = [ZkvmBls12381G1MsmPair { point: BLS_G1_GEN, scalar: scalar(2) }];
-    g1_output.data = [0; 96];
-    let status = unsafe { zkvm_bls12_g1_msm(g1_pairs.as_ptr(), g1_pairs.len(), &mut g1_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g1_output, BLS_G1_2GEN);
-
-    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
-    let status = unsafe { zkvm_bls12_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, &mut g2_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g2_output, BLS_G2_2GEN);
-
-    let g2_pairs = [ZkvmBls12381G2MsmPair { point: BLS_G2_GEN, scalar: scalar(2) }];
-    g2_output.data = [0; 192];
-    let status = unsafe { zkvm_bls12_g2_msm(g2_pairs.as_ptr(), g2_pairs.len(), &mut g2_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g2_output, BLS_G2_2GEN);
-}
-
-#[test]
-fn zkvm_bls12_pairing_smoke() {
     let neg_g1 = neg_g1_generator();
     let pairs = [
-        ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN },
-        ZkvmBls12381PairingPair { g1: neg_g1, g2: BLS_G2_GEN },
+        zkvm_bls12_381_pairing_pair { g1: BLS_G1_GEN, g2: BLS_G2_GEN },
+        zkvm_bls12_381_pairing_pair { g1: neg_g1, g2: BLS_G2_GEN },
     ];
     let mut verified = false;
 
     let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(verified);
 
     let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), 1, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(!verified);
 }
 
@@ -168,58 +114,67 @@ fn zkvm_bls12_pairing_smoke() {
 fn bls12_rejects_invalid_points() {
     let mut off_curve_g1 = BLS_G1_GEN;
     off_curve_g1.data[95] ^= 1;
-    assert!(bls12_381_g1_add(&bls_g1(off_curve_g1), &bls_g1(BLS_G1_GEN)).is_err());
+    let mut g1_output = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_add(&off_curve_g1, &BLS_G1_GEN, &mut g1_output) };
+    assert_eq!(status, ZKVM_EFAIL);
 
     let mut off_curve_g2 = BLS_G2_GEN;
     off_curve_g2.data[191] ^= 1;
-    assert!(bls12_381_g2_add(&bls_g2(off_curve_g2), &bls_g2(BLS_G2_GEN)).is_err());
+    let mut g2_output = zkvm_bls12_381_g2_point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_g2_add(&off_curve_g2, &BLS_G2_GEN, &mut g2_output) };
+    assert_eq!(status, ZKVM_EFAIL);
 
-    let pairs = [(bls_g1(off_curve_g1), bls_g2(BLS_G2_GEN))];
-    assert_eq!(bls12_381_pairing_check(pairs), Err(Error::BlsG1PointNotOnCurve));
+    let pairs = [zkvm_bls12_381_pairing_pair { g1: off_curve_g1, g2: BLS_G2_GEN }];
+    let mut verified = true;
+    let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
+    assert_eq!(status, ZKVM_EFAIL);
+    assert!(verified);
 }
 
 #[test]
 fn zkvm_bls12_null_pointers() {
-    let mut g1_output = ZkvmBls12381G1Point { data: [0; 96] };
+    let mut g1_output = zkvm_bls12_381_g1_point { data: [0; 96] };
     let status = unsafe { zkvm_bls12_g1_add(core::ptr::null(), &BLS_G1_GEN, &mut g1_output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bls12_g1_add(&BLS_G1_GEN, &BLS_G1_GEN, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
+    g1_output.data.fill(0xff);
     let status = unsafe { zkvm_bls12_g1_msm(core::ptr::null(), 0, &mut g1_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert_eq!(g1_output.data, [0u8; 96]);
 
     let status = unsafe { zkvm_bls12_g1_msm(core::ptr::null(), 1, &mut g1_output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
-    let mut g2_output = ZkvmBls12381G2Point { data: [0; 192] };
+    let mut g2_output = zkvm_bls12_381_g2_point { data: [0; 192] };
     let status = unsafe { zkvm_bls12_g2_add(core::ptr::null(), &BLS_G2_GEN, &mut g2_output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bls12_g2_add(&BLS_G2_GEN, &BLS_G2_GEN, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
+    g2_output.data.fill(0xff);
     let status = unsafe { zkvm_bls12_g2_msm(core::ptr::null(), 0, &mut g2_output) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert_eq!(g2_output.data, [0u8; 192]);
 
     let status = unsafe { zkvm_bls12_g2_msm(core::ptr::null(), 1, &mut g2_output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
-    let pairs = [ZkvmBls12381PairingPair { g1: BLS_G1_GEN, g2: BLS_G2_GEN }];
+    let pairs = [zkvm_bls12_381_pairing_pair { g1: BLS_G1_GEN, g2: BLS_G2_GEN }];
     let mut verified = false;
 
     let status = unsafe { zkvm_bls12_pairing(core::ptr::null(), 0, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(verified);
 
     let status = unsafe { zkvm_bls12_pairing(core::ptr::null(), 1, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 }
 
 /* ============================================================================
@@ -287,16 +242,22 @@ const BLS_FP_MODULUS: [u8; 48] =
 #[test]
 fn bls12_map_fp_to_g1_vectors() {
     for (input, expected) in MAP_FP_TO_G1_VECTORS {
-        let output = bls12_381_map_fp_to_g1(&input).unwrap();
-        assert_eq!(output, expected, "input={input:?}");
+        let field_element = zkvm_bls12_381_fp { data: input };
+        let mut output = zkvm_bls12_381_g1_point { data: [0; 96] };
+        let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, &mut output) };
+        assert_eq!(status, ZKVM_EOK, "input={input:?}");
+        assert_eq!(output.data, expected, "input={input:?}");
     }
 }
 
 #[test]
 fn bls12_map_fp2_to_g2_vectors() {
     for (input, expected) in MAP_FP2_TO_G2_VECTORS {
-        let output = bls12_381_map_fp2_to_g2(&bls_fp2(input)).unwrap();
-        assert_eq!(output, expected, "input={input:?}");
+        let field_element = zkvm_bls12_381_fp2 { data: input };
+        let mut output = zkvm_bls12_381_g2_point { data: [0; 192] };
+        let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, &mut output) };
+        assert_eq!(status, ZKVM_EOK, "input={input:?}");
+        assert_eq!(output.data, expected, "input={input:?}");
     }
 }
 
@@ -307,74 +268,67 @@ fn bls12_map_fp2_to_g2_vectors() {
 /// return the point itself.
 #[test]
 fn bls12_map_lands_in_prime_order_subgroup() {
-    let mapped = bls12_381_map_fp_to_g1(&MAP_FP_TO_G1_VECTORS[0].0).unwrap();
-    let pairs =
-        [Ok::<_, Infallible>((bls_g1(ZkvmBls12381G1Point { data: mapped }), scalar(1).data))];
-    let output =
-        bls12_381_g1_msm(pairs).expect("mapped G1 point must be in the prime-order subgroup");
-    assert_eq!(output, mapped);
-
-    let mapped = bls12_381_map_fp2_to_g2(&bls_fp2(MAP_FP2_TO_G2_VECTORS[0].0)).unwrap();
-    let pairs =
-        [Ok::<_, Infallible>((bls_g2(ZkvmBls12381G2Point { data: mapped }), scalar(1).data))];
-    let output =
-        bls12_381_g2_msm(pairs).expect("mapped G2 point must be in the prime-order subgroup");
-    assert_eq!(output, mapped);
+    let fp = zkvm_bls12_381_fp { data: MAP_FP_TO_G1_VECTORS[0].0 };
+    let mut mapped_g1 = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(&fp, &mut mapped_g1) };
+    assert_eq!(status, ZKVM_EOK);
+
+    let pairs = [zkvm_bls12_381_g1_msm_pair { point: mapped_g1, scalar: scalar(1) }];
+    let mut output_g1 = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let status = unsafe { zkvm_bls12_g1_msm(pairs.as_ptr(), pairs.len(), &mut output_g1) };
+    assert_eq!(status, ZKVM_EOK, "mapped G1 point must pass the subgroup check");
+    assert_eq!(output_g1.data, mapped_g1.data);
+
+    let fp2 = zkvm_bls12_381_fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 };
+    let mut mapped_g2 = zkvm_bls12_381_g2_point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_map_fp2_to_g2(&fp2, &mut mapped_g2) };
+    assert_eq!(status, ZKVM_EOK);
+
+    let pairs = [zkvm_bls12_381_g2_msm_pair { point: mapped_g2, scalar: scalar(1) }];
+    let mut output_g2 = zkvm_bls12_381_g2_point { data: [0; 192] };
+    let status = unsafe { zkvm_bls12_g2_msm(pairs.as_ptr(), pairs.len(), &mut output_g2) };
+    assert_eq!(status, ZKVM_EOK, "mapped G2 point must pass the subgroup check");
+    assert_eq!(output_g2.data, mapped_g2.data);
 }
 
 #[test]
 fn bls12_map_field_element_range() {
     // The largest canonical element is accepted, the modulus itself is not.
-    assert!(bls12_381_map_fp_to_g1(&BLS_FP_MAX).is_ok());
-    assert_eq!(bls12_381_map_fp_to_g1(&BLS_FP_MODULUS), Err(Error::FieldElementInvalid));
-    assert_eq!(bls12_381_map_fp_to_g1(&[0xff; 48]), Err(Error::FieldElementInvalid));
+    let mut output = zkvm_bls12_381_g1_point { data: [0; 96] };
+    let field_element = zkvm_bls12_381_fp { data: BLS_FP_MAX };
+    let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+
+    for input in [BLS_FP_MODULUS, [0xff; 48]] {
+        let field_element = zkvm_bls12_381_fp { data: input };
+        let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, &mut output) };
+        assert_eq!(status, ZKVM_EFAIL);
+    }
 
     // Either half of an Fp2 input is checked.
-    assert_eq!(
-        bls12_381_map_fp2_to_g2(&(BLS_FP_MODULUS, [0; 48])),
-        Err(Error::FieldElementInvalid)
-    );
-    assert_eq!(
-        bls12_381_map_fp2_to_g2(&([0; 48], BLS_FP_MODULUS)),
-        Err(Error::FieldElementInvalid)
-    );
-}
-
-#[test]
-fn zkvm_bls12_map_smoke() {
-    let (fp, expected) = MAP_FP_TO_G1_VECTORS[0];
-    let field_element = ZkvmBls12381Fp { data: fp };
-    let mut g1 = ZkvmBls12381G1Point { data: [0xff; 96] };
-    let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, &mut g1) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g1.data, expected);
-
-    let (fp2, expected) = MAP_FP2_TO_G2_VECTORS[0];
-    let field_element = ZkvmBls12381Fp2 { data: fp2 };
-    let mut g2 = ZkvmBls12381G2Point { data: [0xff; 192] };
-    let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, &mut g2) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(g2.data, expected);
-
-    // A non-canonical field element maps to the failure status.
-    let not_canonical = ZkvmBls12381Fp { data: BLS_FP_MODULUS };
-    let status = unsafe { zkvm_bls12_map_fp_to_g1(&not_canonical, &mut g1) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    let mut g2 = zkvm_bls12_381_g2_point { data: [0; 192] };
+    for modulus_offset in [0, 48] {
+        let mut input = [0; 96];
+        input[modulus_offset..modulus_offset + 48].copy_from_slice(&BLS_FP_MODULUS);
+        let field_element = zkvm_bls12_381_fp2 { data: input };
+        let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, &mut g2) };
+        assert_eq!(status, ZKVM_EFAIL);
+    }
 }
 
 #[test]
 fn zkvm_bls12_map_null_pointers() {
-    let field_element = ZkvmBls12381Fp { data: MAP_FP_TO_G1_VECTORS[0].0 };
-    let mut g1 = ZkvmBls12381G1Point { data: [0; 96] };
+    let field_element = zkvm_bls12_381_fp { data: MAP_FP_TO_G1_VECTORS[0].0 };
+    let mut g1 = zkvm_bls12_381_g1_point { data: [0; 96] };
     let status = unsafe { zkvm_bls12_map_fp_to_g1(core::ptr::null(), &mut g1) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
     let status = unsafe { zkvm_bls12_map_fp_to_g1(&field_element, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
-    let field_element = ZkvmBls12381Fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 };
-    let mut g2 = ZkvmBls12381G2Point { data: [0; 192] };
+    let field_element = zkvm_bls12_381_fp2 { data: MAP_FP2_TO_G2_VECTORS[0].0 };
+    let mut g2 = zkvm_bls12_381_g2_point { data: [0; 192] };
     let status = unsafe { zkvm_bls12_map_fp2_to_g2(core::ptr::null(), &mut g2) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
     let status = unsafe { zkvm_bls12_map_fp2_to_g2(&field_element, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 }
diff --git a/crates/accelerators/tests/bn254.rs b/crates/accelerators/tests/bn254.rs
index c5a77666d..1d9d95dba 100644
--- a/crates/accelerators/tests/bn254.rs
+++ b/crates/accelerators/tests/bn254.rs
@@ -1,12 +1,11 @@
 //! BN254 add/mul/pairing conformance vectors.
 
-#![cfg(feature = "ffi")]
-
 use hex_literal::hex;
 use openvm_accelerators::{
-    bn254_g1_add, bn254_g1_mul, bn254_pairing_check, zkvm_bn254_g1_add, zkvm_bn254_g1_mul,
-    zkvm_bn254_pairing, Error, ZkvmBn254G1Point, ZkvmBn254G2Point, ZkvmBn254PairingPair,
-    ZkvmBn254Scalar, ZkvmStatus,
+    zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_g1_point as ZkvmBn254G1Point,
+    zkvm_bn254_g2_point as ZkvmBn254G2Point, zkvm_bn254_pairing,
+    zkvm_bn254_pairing_pair as ZkvmBn254PairingPair, zkvm_bn254_scalar as ZkvmBn254Scalar,
+    ZKVM_EFAIL, ZKVM_EOK,
 };
 
 fn scalar(value: u8) -> ZkvmBn254Scalar {
@@ -49,39 +48,19 @@ const BN254_G2_GEN: ZkvmBn254G2Point = ZkvmBn254G2Point {
     ),
 };
 
-#[test]
-fn bn254_add_mul_vectors() {
-    let point = generator();
-    assert_eq!(bn254_g1_add(&point.data, &point.data).unwrap(), BN254_2GEN.data);
-    assert_eq!(bn254_g1_mul(&point.data, &scalar(2).data).unwrap(), BN254_2GEN.data);
-}
-
-#[test]
-fn bn254_pairing_vectors() {
-    let pairs = [
-        ZkvmBn254PairingPair { g1: generator(), g2: BN254_G2_GEN },
-        ZkvmBn254PairingPair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
-    ];
-    let raw = pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()));
-    assert!(bn254_pairing_check(raw).unwrap());
-    assert!(!bn254_pairing_check([(pairs[0].g1.data.as_slice(), pairs[0].g2.data.as_slice(),)])
-        .unwrap());
-    assert!(bn254_pairing_check(core::iter::empty()).unwrap());
-}
-
 #[test]
 fn zkvm_bn254_add_mul_smoke() {
     let point = generator();
     let mut output = ZkvmBn254G1Point { data: [0; 64] };
 
     let status = unsafe { zkvm_bn254_g1_add(&point, &point, &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(output, BN254_2GEN);
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BN254_2GEN.data);
 
     output.data = [0; 64];
     let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar(2), &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(output, BN254_2GEN);
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(output.data, BN254_2GEN.data);
 }
 
 #[test]
@@ -93,11 +72,11 @@ fn zkvm_bn254_pairing_smoke() {
     let mut verified = false;
 
     let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(verified);
 
     let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), 1, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(!verified);
 }
 
@@ -107,18 +86,14 @@ fn bn254_rejects_invalid_point() {
     not_on_curve.data[63] = 3;
     let mut output = ZkvmBn254G1Point { data: [0; 64] };
 
-    assert_eq!(bn254_g1_add(&not_on_curve.data, &generator().data), Err(Error::PointNotOnCurve));
-
     let status = unsafe { zkvm_bn254_g1_mul(&not_on_curve, &scalar(2), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let pairs = [ZkvmBn254PairingPair { g1: not_on_curve, g2: BN254_G2_GEN }];
-    assert_eq!(
-        bn254_pairing_check(
-            pairs.iter().map(|pair| (pair.g1.data.as_slice(), pair.g2.data.as_slice()))
-        ),
-        Err(Error::PointNotOnCurve)
-    );
+    let mut verified = true;
+    let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
+    assert_eq!(status, ZKVM_EFAIL);
+    assert!(verified);
 }
 
 #[test]
@@ -128,33 +103,33 @@ fn zkvm_bn254_null_pointers() {
     let mut output = ZkvmBn254G1Point { data: [0; 64] };
 
     let status = unsafe { zkvm_bn254_g1_add(core::ptr::null(), &point, &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_g1_add(&point, core::ptr::null(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_g1_add(&point, &point, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_g1_mul(core::ptr::null(), &scalar, &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_g1_mul(&point, core::ptr::null(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let pairs = [ZkvmBn254PairingPair { g1: point, g2: BN254_G2_GEN }];
     let mut verified = false;
 
     let status = unsafe { zkvm_bn254_pairing(core::ptr::null(), 0, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(verified);
 
     let status = unsafe { zkvm_bn254_pairing(core::ptr::null(), 1, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 }
diff --git a/crates/accelerators/tests/ecdsa.rs b/crates/accelerators/tests/ecdsa.rs
deleted file mode 100644
index 3ba682cd8..000000000
--- a/crates/accelerators/tests/ecdsa.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-//! ECDSA conformance vectors.
-//!
-//! Tested with vectors from https://github.com/daimo-eth/p256-verifier/tree/master/test-vectors.
-
-#![cfg(feature = "ffi")]
-
-use hex_literal::hex;
-use openvm_accelerators::{
-    keccak256, secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, zkvm_secp256k1_ecrecover,
-    zkvm_secp256k1_verify, zkvm_secp256r1_verify, Error, ZkvmSecp256k1Hash, ZkvmSecp256k1Pubkey,
-    ZkvmSecp256k1Signature, ZkvmSecp256r1Hash, ZkvmSecp256r1Pubkey, ZkvmSecp256r1Signature,
-    ZkvmStatus,
-};
-
-/// Splits a 160-byte P256VERIFY input (msg || sig || pk) into its parts.
-fn parts(input: &[u8; 160]) -> (ZkvmSecp256r1Hash, ZkvmSecp256r1Signature, ZkvmSecp256r1Pubkey) {
-    (
-        ZkvmSecp256r1Hash { data: input[..32].try_into().unwrap() },
-        ZkvmSecp256r1Signature { data: input[32..96].try_into().unwrap() },
-        ZkvmSecp256r1Pubkey { data: input[96..].try_into().unwrap() },
-    )
-}
-
-const VALID: [u8; 160] = hex!(
-    "4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4d"
-    "a73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac"
-    "36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d60"
-    "4aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff3"
-    "7618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"
-);
-
-#[test]
-fn secp256r1_verify_vectors() {
-    let (msg, sig, pubkey) = parts(&VALID);
-    assert!(secp256r1_verify(&msg.data, &sig.data, &pubkey.data));
-
-    let mut wrong_msg = msg;
-    wrong_msg.data[0] = 0x3c;
-    assert!(!secp256r1_verify(&wrong_msg.data, &sig.data, &pubkey.data));
-}
-
-#[test]
-fn secp256r1_verify_malformed_inputs() {
-    let (msg, sig, _) = parts(&VALID);
-    let bad_sig = ZkvmSecp256r1Signature { data: [0xff; 64] };
-    assert!(!secp256r1_verify(&msg.data, &bad_sig.data, &parts(&VALID).2.data));
-
-    let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
-    assert!(!secp256r1_verify(&msg.data, &sig.data, &bad_pubkey.data));
-}
-
-#[test]
-fn zkvm_secp256r1_verify_smoke() {
-    let (msg, sig, pubkey) = parts(&VALID);
-    let mut verified = false;
-
-    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert!(verified);
-
-    // Malformed cryptographic inputs are a completed verification with a false result.
-    let bad_pubkey = ZkvmSecp256r1Pubkey { data: [0; 64] };
-    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert!(!verified);
-}
-
-#[test]
-fn zkvm_secp256r1_verify_null_pointers() {
-    let (msg, sig, pubkey) = parts(&VALID);
-    let mut verified = false;
-
-    let status = unsafe { zkvm_secp256r1_verify(core::ptr::null(), &sig, &pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_secp256r1_verify(&msg, core::ptr::null(), &pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, core::ptr::null(), &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
-}
-
-const K1_MSG: ZkvmSecp256k1Hash = ZkvmSecp256k1Hash {
-    data: hex!("456e9aea5e197a1f1af7a3e85a3212fa4049a3ba34c2289b4c860fc0b0c64ef3"),
-};
-const K1_SIG: ZkvmSecp256k1Signature = ZkvmSecp256k1Signature {
-    data: hex!(
-        "9242685bf161793cc25603c231bc2f568eb630ea16aa137d2664ac8038825608"
-        "4f8ae3bd7535248d0bd448298cc2e2071e56992d0774dc340c368ae950852ada"
-    ),
-};
-const K1_ADDRESS: [u8; 20] = hex!("7156526fbd7a3c72969b54f64e42c10fbb768c8a");
-
-#[test]
-fn secp256k1_ecrecover_vector() {
-    let pubkey = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 1).unwrap();
-
-    // The Ethereum address is keccak(pubkey)[12..], derived here exactly as
-    // a caller of the interface would.
-    assert_eq!(keccak256(&pubkey)[12..], K1_ADDRESS);
-}
-
-#[test]
-fn secp256k1_ecrecover_invalid_inputs() {
-    // Recovery ids above 3 are invalid.
-    let result = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 4);
-    assert_eq!(result, Err(Error::InvalidSignature));
-
-    // The zero signature cannot be parsed.
-    let zero_sig = ZkvmSecp256k1Signature { data: [0; 64] };
-    let result = secp256k1_ecrecover(&K1_MSG.data, &zero_sig.data, 0);
-    assert_eq!(result, Err(Error::InvalidSignature));
-}
-
-#[test]
-fn secp256k1_verify_roundtrip() {
-    let pubkey = secp256k1_ecrecover(&K1_MSG.data, &K1_SIG.data, 1).unwrap();
-    assert!(secp256k1_verify(&K1_MSG.data, &K1_SIG.data, &pubkey));
-
-    let mut wrong_msg = K1_MSG;
-    wrong_msg.data[0] ^= 1;
-    assert!(!secp256k1_verify(&wrong_msg.data, &K1_SIG.data, &pubkey));
-
-    let bad_pubkey = ZkvmSecp256k1Pubkey { data: [0xff; 64] };
-    assert!(!secp256k1_verify(&K1_MSG.data, &K1_SIG.data, &bad_pubkey.data));
-}
-
-#[test]
-fn zkvm_secp256k1_recover_and_verify() {
-    let mut pubkey = core::mem::MaybeUninit::<ZkvmSecp256k1Pubkey>::uninit();
-    let status = unsafe { zkvm_secp256k1_ecrecover(&K1_MSG, &K1_SIG, 1, pubkey.as_mut_ptr()) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    let pubkey = unsafe { pubkey.assume_init() };
-
-    let mut verified = core::mem::MaybeUninit::<bool>::uninit();
-    let status = unsafe { zkvm_secp256k1_verify(&K1_MSG, &K1_SIG, &pubkey, verified.as_mut_ptr()) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    let mut verified = unsafe { verified.assume_init() };
-    assert!(verified);
-
-    let bad_pubkey = ZkvmSecp256k1Pubkey { data: [0xff; 64] };
-    let status = unsafe { zkvm_secp256k1_verify(&K1_MSG, &K1_SIG, &bad_pubkey, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert!(!verified);
-}
diff --git a/crates/accelerators/tests/hash.rs b/crates/accelerators/tests/hash.rs
deleted file mode 100644
index 7c909bd4a..000000000
--- a/crates/accelerators/tests/hash.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-#![cfg(feature = "ffi")]
-
-//! Hash conformance vectors.
-
-use hex_literal::hex;
-use openvm_accelerators::{
-    keccak256, ripemd160, sha256, zkvm_keccak256, zkvm_ripemd160, zkvm_sha256, ZkvmKeccak256Hash,
-    ZkvmRipemd160Hash, ZkvmSha256Hash, ZkvmStatus,
-};
-
-#[test]
-fn keccak256_vectors() {
-    assert_eq!(
-        keccak256(b""),
-        hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
-    );
-
-    assert_eq!(
-        keccak256(b"abc"),
-        hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
-    );
-}
-
-#[test]
-fn zkvm_keccak256_smoke() {
-    let data = *b"abc";
-    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
-    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
-    );
-}
-
-#[test]
-fn zkvm_keccak256_null_pointers() {
-    let data = *b"abc";
-    let mut output = ZkvmKeccak256Hash { data: [0; 32] };
-
-    // A NULL `data` with `len == 0` is the empty input.
-    let status = unsafe { zkvm_keccak256(core::ptr::null(), 0, &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
-    );
-
-    let status = unsafe { zkvm_keccak256(core::ptr::null(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
-}
-
-#[test]
-fn sha256_vectors() {
-    assert_eq!(
-        sha256(b""),
-        hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
-    );
-
-    assert_eq!(
-        sha256(b"abc"),
-        hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
-    );
-}
-
-#[test]
-fn zkvm_sha256_smoke() {
-    let data = *b"abc";
-    let mut output = ZkvmSha256Hash { data: [0; 32] };
-    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
-    );
-}
-
-#[test]
-fn zkvm_sha256_null_pointers() {
-    let data = *b"abc";
-    let mut output = ZkvmSha256Hash { data: [0; 32] };
-
-    // A NULL `data` with `len == 0` is the empty input.
-    let status = unsafe { zkvm_sha256(core::ptr::null(), 0, &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
-    );
-
-    let status = unsafe { zkvm_sha256(core::ptr::null(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
-}
-
-#[test]
-fn ripemd160_vectors() {
-    assert_eq!(
-        ripemd160(b""),
-        hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
-    );
-
-    assert_eq!(
-        ripemd160(b"abc"),
-        hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
-    );
-}
-
-#[test]
-fn zkvm_ripemd160_smoke() {
-    let data = *b"abc";
-    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
-    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
-    );
-}
-
-#[test]
-fn zkvm_ripemd160_null_pointers() {
-    let data = *b"abc";
-    let mut output = ZkvmRipemd160Hash { data: [0xff; 32] };
-
-    // A NULL `data` with `len == 0` is the empty input.
-    let status = unsafe { zkvm_ripemd160(core::ptr::null(), 0, &mut output) };
-    assert_eq!(status, ZkvmStatus::Ok);
-    assert_eq!(
-        output.data,
-        hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
-    );
-
-    let status = unsafe { zkvm_ripemd160(core::ptr::null(), data.len(), &mut output) };
-    assert_eq!(status, ZkvmStatus::Fail);
-
-    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
-}
diff --git a/crates/accelerators/tests/keccak256.rs b/crates/accelerators/tests/keccak256.rs
new file mode 100644
index 000000000..db11e8a4e
--- /dev/null
+++ b/crates/accelerators/tests/keccak256.rs
@@ -0,0 +1,36 @@
+//! Keccak-256 C-interface conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{zkvm_keccak256, zkvm_keccak256_hash, ZKVM_EFAIL, ZKVM_EOK};
+
+#[test]
+fn keccak256_abc() {
+    let data = *b"abc";
+    let mut output = zkvm_keccak256_hash { data: [0; 32] };
+    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45")
+    );
+}
+
+#[test]
+fn keccak256_null_pointers() {
+    let data = *b"abc";
+    let mut output = zkvm_keccak256_hash { data: [0; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_keccak256(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")
+    );
+
+    let status = unsafe { zkvm_keccak256(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EFAIL);
+
+    let status = unsafe { zkvm_keccak256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZKVM_EFAIL);
+}
diff --git a/crates/accelerators/tests/kzg.rs b/crates/accelerators/tests/kzg.rs
index 9505446c6..de0471148 100644
--- a/crates/accelerators/tests/kzg.rs
+++ b/crates/accelerators/tests/kzg.rs
@@ -1,13 +1,20 @@
-//! KZG point-evaluation conformance using the point-at-infinity commitment,
-//! which commits to the zero polynomial (p(z) = 0 for every z).
-
-#![cfg(feature = "ffi")]
+//! KZG point-evaluation conformance.
 
+use hex_literal::hex;
 use openvm_accelerators::{
-    kzg_point_eval, zkvm_kzg_point_eval, Error, ZkvmKzgCommitment, ZkvmKzgFieldElement,
-    ZkvmKzgProof, ZkvmStatus,
+    zkvm_kzg_commitment as ZkvmKzgCommitment, zkvm_kzg_field_element as ZkvmKzgFieldElement,
+    zkvm_kzg_point_eval, zkvm_kzg_proof as ZkvmKzgProof, ZKVM_EFAIL, ZKVM_EOK,
 };
 
+// ethereum/consensus-spec-tests:
+// verify_kzg_proof_case_correct_proof_1ce8e4f69d5df899.
+const COMMITMENT: [u8; 48] =
+    hex!("93efc82d2017e9c57834a1246463e64774e56183bb247c8fc9dd98c56817e878d97b05f5c8d900acf1fbbbca6f146556");
+const Z: [u8; 32] = hex!("73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000");
+const Y: [u8; 32] = [0; 32];
+const PROOF: [u8; 48] =
+    hex!("92c51ff81dd71dab71cefecd79e8274b4b7ba36a0f40e2dc086bc4061c7f63249877db23297212991fd63e07b7ebc348");
+
 /// The compressed point at infinity: 0xc0 followed by zeros.
 fn infinity() -> ZkvmKzgCommitment {
     let mut point = ZkvmKzgCommitment { data: [0; 48] };
@@ -21,52 +28,23 @@ fn scalar(value: u8) -> ZkvmKzgFieldElement {
     s
 }
 
-#[test]
-fn kzg_point_eval_infinity_commitment() {
-    let commitment = infinity();
-    let proof: ZkvmKzgProof = infinity();
-    let z = scalar(2);
-    // The zero polynomial evaluates to 0 at every z; the infinity proof
-    // attests it.
-    assert!(kzg_point_eval(&commitment.data, &z.data, &scalar(0).data, &proof.data).unwrap());
-
-    // Claiming y = 1 for the zero polynomial must not verify.
-    assert!(!kzg_point_eval(&commitment.data, &z.data, &scalar(1).data, &proof.data).unwrap());
-}
-
-#[test]
-fn kzg_point_eval_malformed_inputs() {
-    let z = scalar(2);
-    let y = scalar(0);
-    // Not a valid compressed-point prefix.
-    let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
-    garbage.data[0] = 0x01;
-    let result = kzg_point_eval(&garbage.data, &z.data, &y.data, &infinity().data);
-    assert_eq!(result, Err(Error::KzgInvalidInput));
-
-    // An out-of-range evaluation point (>= the BLS scalar field order).
-    let big_z = ZkvmKzgFieldElement { data: [0xff; 32] };
-    let result = kzg_point_eval(&infinity().data, &big_z.data, &y.data, &infinity().data);
-    assert_eq!(result, Err(Error::KzgInvalidInput));
-}
-
 #[test]
 fn zkvm_kzg_point_eval_smoke() {
-    let commitment = infinity();
-    let proof: ZkvmKzgProof = infinity();
-    let z = scalar(2);
-    let y = scalar(0);
+    let commitment = ZkvmKzgCommitment { data: COMMITMENT };
+    let proof = ZkvmKzgProof { data: PROOF };
+    let z = ZkvmKzgFieldElement { data: Z };
+    let y = ZkvmKzgFieldElement { data: Y };
     let mut verified = false;
 
     let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(verified);
 
     // Malformed cryptographic inputs are a completed verification with a false result.
     let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
     garbage.data[0] = 0x01;
     let status = unsafe { zkvm_kzg_point_eval(&garbage, &z, &y, &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert!(!verified);
 }
 
@@ -79,20 +57,20 @@ fn zkvm_kzg_point_eval_null_pointers() {
     let mut verified = false;
 
     let status = unsafe { zkvm_kzg_point_eval(core::ptr::null(), &z, &y, &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status =
         unsafe { zkvm_kzg_point_eval(&commitment, core::ptr::null(), &y, &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status =
         unsafe { zkvm_kzg_point_eval(&commitment, &z, core::ptr::null(), &proof, &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status =
         unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, core::ptr::null(), &mut verified) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, core::ptr::null_mut()) };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 }
diff --git a/crates/accelerators/tests/modexp.rs b/crates/accelerators/tests/modexp.rs
index b97baa3f1..d47f4acfb 100644
--- a/crates/accelerators/tests/modexp.rs
+++ b/crates/accelerators/tests/modexp.rs
@@ -1,42 +1,33 @@
 //! Modexp conformance vectors.
 
-#![cfg(feature = "ffi")]
-
 use hex_literal::hex;
-use openvm_accelerators::{modexp, zkvm_modexp, ZkvmStatus};
+use openvm_accelerators::{zkvm_modexp, ZKVM_EFAIL, ZKVM_EOK};
 
 /// BN254 Fr (the scalar field) modulus, big-endian. Not to be confused with
 /// the base field prime, which shares the leading bytes.
 const BN254_FR: [u8; 32] = hex!("30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001");
 
 #[test]
-fn modexp_small() {
-    // 3^5 mod 7 = 5
-    assert_eq!(modexp(&[3], &[5], &[7]), [5]);
-
-    // Output is left-padded to the modulus length.
-    assert_eq!(modexp(&[3], &[5], &[0, 7]), [0, 5]);
-
-    assert!(modexp(&[3], &[5], &[]).is_empty());
-}
-
-#[test]
-fn modexp_matches_reference() {
-    // The BN254-Fr accelerated path, compared right-aligned against the
-    // aurora reference.
-    let output = modexp(&[0xab; 32], &[0x07], &BN254_FR);
+fn bn254_fr_accelerated_path_matches_reference() {
+    let base = [0xab; 32];
+    let exp = [0x07];
+    let mut output = [0; 32];
+    let status = unsafe {
+        zkvm_modexp(
+            base.as_ptr(),
+            base.len(),
+            exp.as_ptr(),
+            exp.len(),
+            BN254_FR.as_ptr(),
+            BN254_FR.len(),
+            output.as_mut_ptr(),
+        )
+    };
+    assert_eq!(status, ZKVM_EOK);
     let reference = aurora_engine_modexp::modexp(&[0xab; 32], &[0x07], &BN254_FR);
     let mut expected = [0; 32];
     expected[32 - reference.len()..].copy_from_slice(&reference);
     assert_eq!(output, expected);
-
-    // The generic path with a non-special modulus.
-    let modulus = [0xef; 24];
-    let output = modexp(&[0x12; 40], &[0x34; 3], &modulus);
-    let reference = aurora_engine_modexp::modexp(&[0x12; 40], &[0x34; 3], &modulus);
-    let mut expected = [0; 24];
-    expected[24 - reference.len()..].copy_from_slice(&reference);
-    assert_eq!(output, expected);
 }
 
 #[test]
@@ -49,7 +40,7 @@ fn zkvm_modexp_smoke() {
     let status = unsafe {
         zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, output.as_mut_ptr())
     };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert_eq!(output, [5]);
 }
 
@@ -72,14 +63,14 @@ fn zkvm_modexp_null_pointers() {
             output.as_mut_ptr(),
         )
     };
-    assert_eq!(status, ZkvmStatus::Ok);
+    assert_eq!(status, ZKVM_EOK);
     assert_eq!(output, [1]);
 
     // A NULL pointer with a non-zero length fails.
     let status = unsafe {
         zkvm_modexp(core::ptr::null(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, output.as_mut_ptr())
     };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe {
         zkvm_modexp(
@@ -92,15 +83,15 @@ fn zkvm_modexp_null_pointers() {
             output.as_mut_ptr(),
         )
     };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe {
         zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, core::ptr::null(), 1, output.as_mut_ptr())
     };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 
     let status = unsafe {
         zkvm_modexp(base.as_ptr(), 1, exp.as_ptr(), 1, modulus.as_ptr(), 1, core::ptr::null_mut())
     };
-    assert_eq!(status, ZkvmStatus::Fail);
+    assert_eq!(status, ZKVM_EFAIL);
 }
diff --git a/crates/accelerators/tests/ripemd160.rs b/crates/accelerators/tests/ripemd160.rs
new file mode 100644
index 000000000..502eb8aa1
--- /dev/null
+++ b/crates/accelerators/tests/ripemd160.rs
@@ -0,0 +1,36 @@
+//! RIPEMD-160 C-interface conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{zkvm_ripemd160, zkvm_ripemd160_hash, ZKVM_EFAIL, ZKVM_EOK};
+
+#[test]
+fn ripemd160_abc() {
+    let data = *b"abc";
+    let mut output = zkvm_ripemd160_hash { data: [0xff; 32] };
+    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc")
+    );
+}
+
+#[test]
+fn ripemd160_null_pointers() {
+    let data = *b"abc";
+    let mut output = zkvm_ripemd160_hash { data: [0xff; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_ripemd160(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
+    );
+
+    let status = unsafe { zkvm_ripemd160(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EFAIL);
+
+    let status = unsafe { zkvm_ripemd160(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZKVM_EFAIL);
+}
diff --git a/crates/accelerators/tests/secp256k1.rs b/crates/accelerators/tests/secp256k1.rs
new file mode 100644
index 000000000..6c8573fc6
--- /dev/null
+++ b/crates/accelerators/tests/secp256k1.rs
@@ -0,0 +1,103 @@
+//! secp256k1 C-interface conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    zkvm_keccak256, zkvm_keccak256_hash, zkvm_secp256k1_ecrecover, zkvm_secp256k1_hash,
+    zkvm_secp256k1_pubkey, zkvm_secp256k1_signature, zkvm_secp256k1_verify, ZKVM_EFAIL, ZKVM_EOK,
+};
+
+const MSG: zkvm_secp256k1_hash = zkvm_secp256k1_hash {
+    data: hex!("456e9aea5e197a1f1af7a3e85a3212fa4049a3ba34c2289b4c860fc0b0c64ef3"),
+};
+const SIG: zkvm_secp256k1_signature = zkvm_secp256k1_signature {
+    data: hex!(
+        "9242685bf161793cc25603c231bc2f568eb630ea16aa137d2664ac8038825608"
+        "4f8ae3bd7535248d0bd448298cc2e2071e56992d0774dc340c368ae950852ada"
+    ),
+};
+const ADDRESS: [u8; 20] = hex!("7156526fbd7a3c72969b54f64e42c10fbb768c8a");
+
+#[test]
+fn secp256k1_ecrecover_vector() {
+    let mut pubkey = zkvm_secp256k1_pubkey { data: [0; 64] };
+    let status = unsafe { zkvm_secp256k1_ecrecover(&MSG, &SIG, 1, &mut pubkey) };
+    assert_eq!(status, ZKVM_EOK);
+
+    let mut digest = zkvm_keccak256_hash { data: [0; 32] };
+    let status = unsafe { zkvm_keccak256(pubkey.data.as_ptr(), pubkey.data.len(), &mut digest) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(digest.data[12..], ADDRESS);
+}
+
+#[test]
+fn secp256k1_ecrecover_invalid_inputs() {
+    let unchanged = [0x55; 64];
+    let mut pubkey = zkvm_secp256k1_pubkey { data: unchanged };
+
+    let status = unsafe { zkvm_secp256k1_ecrecover(&MSG, &SIG, 4, &mut pubkey) };
+    assert_eq!(status, ZKVM_EFAIL);
+    assert_eq!(pubkey.data, unchanged);
+
+    let zero_sig = zkvm_secp256k1_signature { data: [0; 64] };
+    let status = unsafe { zkvm_secp256k1_ecrecover(&MSG, &zero_sig, 0, &mut pubkey) };
+    assert_eq!(status, ZKVM_EFAIL);
+    assert_eq!(pubkey.data, unchanged);
+}
+
+#[test]
+fn secp256k1_recover_and_verify() {
+    let mut pubkey = zkvm_secp256k1_pubkey { data: [0; 64] };
+    let status = unsafe { zkvm_secp256k1_ecrecover(&MSG, &SIG, 1, &mut pubkey) };
+    assert_eq!(status, ZKVM_EOK);
+
+    let mut verified = false;
+    let status = unsafe { zkvm_secp256k1_verify(&MSG, &SIG, &pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(verified);
+
+    let mut wrong_msg = MSG;
+    wrong_msg.data[0] ^= 1;
+    let status = unsafe { zkvm_secp256k1_verify(&wrong_msg, &SIG, &pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(!verified);
+
+    let bad_pubkey = zkvm_secp256k1_pubkey { data: [0xff; 64] };
+    let status = unsafe { zkvm_secp256k1_verify(&MSG, &SIG, &bad_pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(!verified);
+}
+
+#[test]
+fn secp256k1_null_pointers() {
+    let mut pubkey = zkvm_secp256k1_pubkey { data: [0; 64] };
+    assert_eq!(
+        unsafe { zkvm_secp256k1_ecrecover(core::ptr::null(), &SIG, 1, &mut pubkey) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256k1_ecrecover(&MSG, core::ptr::null(), 1, &mut pubkey) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256k1_ecrecover(&MSG, &SIG, 1, core::ptr::null_mut()) },
+        ZKVM_EFAIL
+    );
+
+    let mut verified = false;
+    assert_eq!(
+        unsafe { zkvm_secp256k1_verify(core::ptr::null(), &SIG, &pubkey, &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256k1_verify(&MSG, core::ptr::null(), &pubkey, &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256k1_verify(&MSG, &SIG, core::ptr::null(), &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256k1_verify(&MSG, &SIG, &pubkey, core::ptr::null_mut()) },
+        ZKVM_EFAIL
+    );
+}
diff --git a/crates/accelerators/tests/secp256r1.rs b/crates/accelerators/tests/secp256r1.rs
new file mode 100644
index 000000000..f8356b7bf
--- /dev/null
+++ b/crates/accelerators/tests/secp256r1.rs
@@ -0,0 +1,81 @@
+//! secp256r1 C-interface conformance vectors.
+//!
+//! Vectors are from https://github.com/daimo-eth/p256-verifier/tree/master/test-vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{
+    zkvm_secp256r1_hash, zkvm_secp256r1_pubkey, zkvm_secp256r1_signature, zkvm_secp256r1_verify,
+    ZKVM_EFAIL, ZKVM_EOK,
+};
+
+fn parts(
+    input: &[u8; 160],
+) -> (zkvm_secp256r1_hash, zkvm_secp256r1_signature, zkvm_secp256r1_pubkey) {
+    (
+        zkvm_secp256r1_hash { data: input[..32].try_into().unwrap() },
+        zkvm_secp256r1_signature { data: input[32..96].try_into().unwrap() },
+        zkvm_secp256r1_pubkey { data: input[96..].try_into().unwrap() },
+    )
+}
+
+const VALID: [u8; 160] = hex!(
+    "4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4d"
+    "a73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac"
+    "36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d60"
+    "4aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff3"
+    "7618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"
+);
+
+#[test]
+fn secp256r1_verify_vectors() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = false;
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(verified);
+
+    let mut wrong_msg = msg;
+    wrong_msg.data[0] = 0x3c;
+    let status = unsafe { zkvm_secp256r1_verify(&wrong_msg, &sig, &pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(!verified);
+}
+
+#[test]
+fn secp256r1_verify_malformed_inputs() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = true;
+
+    let bad_sig = zkvm_secp256r1_signature { data: [0xff; 64] };
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &bad_sig, &pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(!verified);
+
+    let bad_pubkey = zkvm_secp256r1_pubkey { data: [0; 64] };
+    let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &bad_pubkey, &mut verified) };
+    assert_eq!(status, ZKVM_EOK);
+    assert!(!verified);
+}
+
+#[test]
+fn secp256r1_verify_null_pointers() {
+    let (msg, sig, pubkey) = parts(&VALID);
+    let mut verified = false;
+
+    assert_eq!(
+        unsafe { zkvm_secp256r1_verify(core::ptr::null(), &sig, &pubkey, &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256r1_verify(&msg, core::ptr::null(), &pubkey, &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256r1_verify(&msg, &sig, core::ptr::null(), &mut verified) },
+        ZKVM_EFAIL
+    );
+    assert_eq!(
+        unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, core::ptr::null_mut()) },
+        ZKVM_EFAIL
+    );
+}
diff --git a/crates/accelerators/tests/sha256.rs b/crates/accelerators/tests/sha256.rs
new file mode 100644
index 000000000..a4bf78cfc
--- /dev/null
+++ b/crates/accelerators/tests/sha256.rs
@@ -0,0 +1,36 @@
+//! SHA-256 C-interface conformance vectors.
+
+use hex_literal::hex;
+use openvm_accelerators::{zkvm_sha256, zkvm_sha256_hash, ZKVM_EFAIL, ZKVM_EOK};
+
+#[test]
+fn sha256_abc() {
+    let data = *b"abc";
+    let mut output = zkvm_sha256_hash { data: [0; 32] };
+    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad")
+    );
+}
+
+#[test]
+fn sha256_null_pointers() {
+    let data = *b"abc";
+    let mut output = zkvm_sha256_hash { data: [0; 32] };
+
+    // A NULL `data` with `len == 0` is the empty input.
+    let status = unsafe { zkvm_sha256(core::ptr::null(), 0, &mut output) };
+    assert_eq!(status, ZKVM_EOK);
+    assert_eq!(
+        output.data,
+        hex!("e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")
+    );
+
+    let status = unsafe { zkvm_sha256(core::ptr::null(), data.len(), &mut output) };
+    assert_eq!(status, ZKVM_EFAIL);
+
+    let status = unsafe { zkvm_sha256(data.as_ptr(), data.len(), core::ptr::null_mut()) };
+    assert_eq!(status, ZKVM_EFAIL);
+}
diff --git a/crates/revm-crypto/src/alloy.rs b/crates/revm-crypto/src/alloy.rs
new file mode 100644
index 000000000..2c0980d24
--- /dev/null
+++ b/crates/revm-crypto/src/alloy.rs
@@ -0,0 +1,67 @@
+//! Alloy signer adapter for the standard zkVM accelerator C interface.
+
+use alloc::{boxed::Box, sync::Arc};
+use core::error::Error;
+
+use crate::status_ok;
+use alloy_consensus::crypto::{
+    backend::{install_default_provider, CryptoProvider},
+    RecoveryError,
+};
+use alloy_primitives::Address;
+use openvm_accelerators::{
+    zkvm_keccak256, zkvm_keccak256_hash, zkvm_secp256k1_ecrecover, zkvm_secp256k1_hash,
+    zkvm_secp256k1_pubkey, zkvm_secp256k1_signature, zkvm_secp256k1_verify,
+};
+
+#[derive(Debug, Default)]
+struct OpenVmK256Provider;
+
+impl CryptoProvider for OpenVmK256Provider {
+    fn recover_signer_unchecked(
+        &self,
+        signature: &[u8; 65],
+        msg: &[u8; 32],
+    ) -> Result<Address, RecoveryError> {
+        let msg = zkvm_secp256k1_hash { data: *msg };
+        let sig = zkvm_secp256k1_signature { data: signature[..64].try_into().unwrap() };
+        let mut pubkey = zkvm_secp256k1_pubkey { data: [0; 64] };
+        let status = unsafe { zkvm_secp256k1_ecrecover(&msg, &sig, signature[64], &mut pubkey) };
+        if !status_ok(status) {
+            return Err(RecoveryError::new());
+        }
+        Ok(address_from_pubkey(&pubkey.data))
+    }
+
+    fn verify_and_compute_signer_unchecked(
+        &self,
+        pubkey: &[u8; 65],
+        sig: &[u8; 64],
+        msg: &[u8; 32],
+    ) -> Result<Address, RecoveryError> {
+        if pubkey[0] != 0x04 {
+            return Err(RecoveryError::new());
+        }
+        let msg = zkvm_secp256k1_hash { data: *msg };
+        let sig = zkvm_secp256k1_signature { data: *sig };
+        let pubkey = zkvm_secp256k1_pubkey { data: pubkey[1..].try_into().unwrap() };
+        let mut verified = false;
+        let status = unsafe { zkvm_secp256k1_verify(&msg, &sig, &pubkey, &mut verified) };
+        if !status_ok(status) || !verified {
+            return Err(RecoveryError::new());
+        }
+        Ok(address_from_pubkey(&pubkey.data))
+    }
+}
+
+fn address_from_pubkey(pubkey: &[u8; 64]) -> Address {
+    let mut hash = zkvm_keccak256_hash { data: [0; 32] };
+    let status = unsafe { zkvm_keccak256(pubkey.as_ptr(), pubkey.len(), &mut hash) };
+    assert!(status_ok(status), "zkVM accelerator call failed");
+    Address::from_slice(&hash.data[12..])
+}
+
+pub(super) fn install() -> Result<(), Box<dyn Error>> {
+    install_default_provider(Arc::new(OpenVmK256Provider))?;
+    Ok(())
+}
diff --git a/crates/revm-crypto/src/lib.rs b/crates/revm-crypto/src/lib.rs
index fe33a80ab..c3fe83c15 100644
--- a/crates/revm-crypto/src/lib.rs
+++ b/crates/revm-crypto/src/lib.rs
@@ -1,368 +1,24 @@
 //! OpenVM crypto providers for REVM and Alloy.
 //!
-//! Cryptographic operations live in `openvm-accelerators`; this crate only
-//! adapts their byte-oriented API to REVM and Alloy's provider traits.
+//! These adapters use the standard zkVM accelerator C interface.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate alloc;
 
-use alloc::{boxed::Box, sync::Arc, vec::Vec};
+mod alloy;
+mod revm;
 
-use alloy_consensus::crypto::{
-    backend::{install_default_provider, CryptoProvider},
-    RecoveryError,
-};
-use alloy_primitives::Address;
-use openvm_accelerators::{
-    blake2f, bls12_381_g1_add, bls12_381_g1_msm, bls12_381_g2_add, bls12_381_g2_msm,
-    bls12_381_map_fp2_to_g2, bls12_381_map_fp_to_g1, bls12_381_pairing_check, bn254_g1_add,
-    bn254_g1_mul, bn254_pairing_check, keccak256, kzg_point_eval, modexp, ripemd160,
-    secp256k1_ecrecover, secp256k1_verify, secp256r1_verify, sha256, Error, StreamError,
-};
-use revm::{
-    install_crypto,
-    precompile::{
-        bls12_381::{
-            G1Point as BlsG1Point, G1PointScalar as BlsG1PointScalar, G2Point as BlsG2Point,
-            G2PointScalar as BlsG2PointScalar,
-        },
-        bls12_381_const::{
-            FP_LENGTH as BLS_FP_LEN, G1_LENGTH as BLS_G1_LEN, G2_LENGTH as BLS_G2_LEN,
-        },
-        Crypto, PrecompileHalt,
-    },
-};
+use alloc::boxed::Box;
+use core::error::Error;
+use openvm_accelerators::{zkvm_status, ZKVM_EOK};
 
-#[derive(Debug, Default)]
-struct OpenVmK256Provider;
-
-impl CryptoProvider for OpenVmK256Provider {
-    fn recover_signer_unchecked(
-        &self,
-        sig: &[u8; 65],
-        msg: &[u8; 32],
-    ) -> Result<Address, RecoveryError> {
-        let pubkey = secp256k1_ecrecover(msg, sig[..64].try_into().unwrap(), sig[64])
-            .map_err(|_| RecoveryError::new())?;
-        Ok(address_from_pubkey(&pubkey))
-    }
-
-    fn verify_and_compute_signer_unchecked(
-        &self,
-        pubkey: &[u8; 65],
-        sig: &[u8; 64],
-        msg: &[u8; 32],
-    ) -> Result<Address, RecoveryError> {
-        if pubkey[0] != 0x04 {
-            return Err(RecoveryError::new());
-        }
-
-        let pubkey: &[u8; 64] = pubkey[1..].try_into().unwrap();
-        if !secp256k1_verify(msg, sig, pubkey) {
-            return Err(RecoveryError::new());
-        }
-
-        Ok(address_from_pubkey(pubkey))
-    }
-}
-
-fn address_from_pubkey(pubkey: &[u8; 64]) -> Address {
-    Address::from_slice(&keccak256(pubkey)[12..])
-}
-
-#[derive(Debug, Default)]
-struct OpenVmCrypto;
-
-impl Crypto for OpenVmCrypto {
-    fn sha256(&self, input: &[u8]) -> [u8; 32] {
-        sha256(input)
-    }
-
-    fn ripemd160(&self, input: &[u8]) -> [u8; 32] {
-        ripemd160(input)
-    }
-
-    fn bn254_g1_add(&self, p1: &[u8], p2: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
-        bn254_g1_add(p1, p2).map_err(map_bn_error)
-    }
-
-    fn bn254_g1_mul(&self, point: &[u8], scalar: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
-        bn254_g1_mul(point, scalar).map_err(map_bn_error)
-    }
-
-    fn bn254_pairing_check(&self, pairs: &[(&[u8], &[u8])]) -> Result<bool, PrecompileHalt> {
-        bn254_pairing_check(pairs.iter().copied()).map_err(map_bn_error)
-    }
-
-    fn secp256k1_ecrecover(
-        &self,
-        sig: &[u8; 64],
-        recid: u8,
-        msg: &[u8; 32],
-    ) -> Result<[u8; 32], PrecompileHalt> {
-        let pubkey = secp256k1_ecrecover(msg, sig, recid)
-            .map_err(|_| PrecompileHalt::Secp256k1RecoverFailed)?;
-
-        let mut hash = keccak256(&pubkey);
-        hash[..12].fill(0);
-        Ok(hash)
-    }
-
-    fn modexp(&self, base: &[u8], exp: &[u8], modulus: &[u8]) -> Result<Vec<u8>, PrecompileHalt> {
-        Ok(modexp(base, exp, modulus))
-    }
-
-    fn blake2_compress(&self, rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
-        blake2f(rounds, h, m, t, f);
-    }
-
-    fn secp256r1_verify_signature(&self, msg: &[u8; 32], sig: &[u8; 64], pk: &[u8; 64]) -> bool {
-        secp256r1_verify(msg, sig, pk)
-    }
-
-    fn verify_kzg_proof(
-        &self,
-        z: &[u8; 32],
-        y: &[u8; 32],
-        commitment: &[u8; 48],
-        proof: &[u8; 48],
-    ) -> Result<(), PrecompileHalt> {
-        let verified = kzg_point_eval(commitment, z, y, proof)
-            .map_err(|_| PrecompileHalt::BlobVerifyKzgProofFailed)?;
-        if verified {
-            Ok(())
-        } else {
-            Err(PrecompileHalt::BlobVerifyKzgProofFailed)
-        }
-    }
-
-    fn bls12_381_g1_add(
-        &self,
-        a: BlsG1Point,
-        b: BlsG1Point,
-    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        bls12_381_g1_add(&a, &b).map_err(map_bls_g1_error)
-    }
-
-    fn bls12_381_g1_msm(
-        &self,
-        pairs: &mut dyn Iterator<Item = Result<BlsG1PointScalar, PrecompileHalt>>,
-    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        bls12_381_g1_msm(pairs).map_err(|error| map_stream_error(error, map_bls_g1_error))
-    }
-
-    fn bls12_381_g2_add(
-        &self,
-        a: BlsG2Point,
-        b: BlsG2Point,
-    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        bls12_381_g2_add(&a, &b).map_err(map_bls_g2_error)
-    }
-
-    fn bls12_381_g2_msm(
-        &self,
-        pairs: &mut dyn Iterator<Item = Result<BlsG2PointScalar, PrecompileHalt>>,
-    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        bls12_381_g2_msm(pairs).map_err(|error| map_stream_error(error, map_bls_g2_error))
-    }
-
-    fn bls12_381_pairing_check(
-        &self,
-        pairs: &[(BlsG1Point, BlsG2Point)],
-    ) -> Result<bool, PrecompileHalt> {
-        bls12_381_pairing_check(pairs.iter().copied()).map_err(map_bls_pairing_error)
-    }
-
-    fn bls12_381_fp_to_g1(
-        &self,
-        fp: &[u8; BLS_FP_LEN],
-    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
-        bls12_381_map_fp_to_g1(fp).map_err(map_bls_field_error)
-    }
-
-    fn bls12_381_fp2_to_g2(
-        &self,
-        fp2: ([u8; BLS_FP_LEN], [u8; BLS_FP_LEN]),
-    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
-        bls12_381_map_fp2_to_g2(&fp2).map_err(map_bls_field_error)
-    }
-}
-
-fn map_stream_error(
-    error: StreamError<PrecompileHalt>,
-    map_operation: fn(Error) -> PrecompileHalt,
-) -> PrecompileHalt {
-    match error {
-        StreamError::Source(error) => error,
-        StreamError::Operation(error) => map_operation(error),
-    }
-}
-
-fn map_bn_error(error: Error) -> PrecompileHalt {
-    match error {
-        Error::InvalidLength => PrecompileHalt::Bn254PairLength,
-        Error::FieldElementInvalid => PrecompileHalt::Bn254FieldPointNotAMember,
-        Error::PointNotOnCurve | Error::PointNotInSubgroup => {
-            PrecompileHalt::Bn254AffineGFailedToCreate
-        }
-        _ => PrecompileHalt::other("unexpected BN254 accelerator error"),
-    }
-}
-
-fn map_bls_g1_error(error: Error) -> PrecompileHalt {
-    match error {
-        Error::PointNotInSubgroup => PrecompileHalt::Bls12381G1NotInSubgroup,
-        Error::PointNotOnCurve => PrecompileHalt::Bls12381G1NotOnCurve,
-        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
-        _ => PrecompileHalt::other("unexpected BLS12-381 G1 accelerator error"),
-    }
-}
-
-fn map_bls_g2_error(error: Error) -> PrecompileHalt {
-    match error {
-        Error::PointNotInSubgroup => PrecompileHalt::Bls12381G2NotInSubgroup,
-        Error::PointNotOnCurve => PrecompileHalt::Bls12381G2NotOnCurve,
-        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
-        _ => PrecompileHalt::other("unexpected BLS12-381 G2 accelerator error"),
-    }
-}
-
-fn map_bls_pairing_error(error: Error) -> PrecompileHalt {
-    match error {
-        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
-        Error::BlsG1PointNotOnCurve => PrecompileHalt::Bls12381G1NotOnCurve,
-        Error::BlsG1PointNotInSubgroup => PrecompileHalt::Bls12381G1NotInSubgroup,
-        Error::BlsG2PointNotOnCurve => PrecompileHalt::Bls12381G2NotOnCurve,
-        Error::BlsG2PointNotInSubgroup => PrecompileHalt::Bls12381G2NotInSubgroup,
-        _ => PrecompileHalt::other("unexpected BLS12-381 pairing accelerator error"),
-    }
-}
-
-fn map_bls_field_error(error: Error) -> PrecompileHalt {
-    match error {
-        Error::FieldElementInvalid => PrecompileHalt::NonCanonicalFp,
-        _ => PrecompileHalt::other("unexpected BLS12-381 map accelerator error"),
-    }
+fn status_ok(status: zkvm_status) -> bool {
+    status == ZKVM_EOK
 }
 
 /// Install the OpenVM implementations globally.
-pub fn install_openvm_crypto() -> Result<bool, Box<dyn core::error::Error>> {
-    install_default_provider(Arc::new(OpenVmK256Provider))?;
-    Ok(install_crypto(OpenVmCrypto))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use revm::precompile::DefaultCrypto;
-
-    fn p256_verify_input(input_hex: &str) -> bool {
-        let input = alloy_primitives::hex::decode(input_hex).unwrap();
-        assert_eq!(input.len(), 160);
-        OpenVmCrypto.secp256r1_verify_signature(
-            input[..32].try_into().unwrap(),
-            input[32..96].try_into().unwrap(),
-            input[96..160].try_into().unwrap(),
-        )
-    }
-
-    // Vectors from daimo-eth/p256-verifier, also used by revm-precompile.
-    #[test]
-    fn secp256r1_verify_signature() {
-        assert!(p256_verify_input("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"));
-        assert!(!p256_verify_input("3cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e"));
-    }
-
-    #[test]
-    fn modexp_dispatch_and_padding() {
-        let modulus = alloy_primitives::hex::decode(
-            "30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
-        )
-        .unwrap();
-        let accelerated = OpenVmCrypto.modexp(&[3], &[5], &modulus).unwrap();
-        assert_eq!(accelerated.len(), 32);
-        assert!(accelerated[..31].iter().all(|byte| *byte == 0));
-        assert_eq!(accelerated[31], 243);
-
-        assert_eq!(OpenVmCrypto.modexp(&[3], &[4], &[7]).unwrap(), [4]);
-    }
-
-    #[test]
-    fn ripemd160_adapter_uses_evm_padding() {
-        assert_eq!(
-            OpenVmCrypto.ripemd160(b"abc"),
-            alloy_primitives::hex!(
-                "0000000000000000000000008eb208f7e05d987a9b044a8e98c6b087f15a0bfc"
-            )
-        );
-    }
-
-    #[test]
-    fn adapters_match_revm_for_portable_primitives() {
-        let input = b"OpenVM accelerator provider";
-        assert_eq!(OpenVmCrypto.sha256(input), DefaultCrypto.sha256(input));
-        assert_eq!(OpenVmCrypto.ripemd160(input), DefaultCrypto.ripemd160(input));
-        assert_eq!(
-            OpenVmCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24]),
-            DefaultCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24])
-        );
-
-        let mut actual = [
-            0x6a09e667f3bcc908,
-            0xbb67ae8584caa73b,
-            0x3c6ef372fe94f82b,
-            0xa54ff53a5f1d36f1,
-            0x510e527fade682d1,
-            0x9b05688c2b3e6c1f,
-            0x1f83d9abfb41bd6b,
-            0x5be0cd19137e2179,
-        ];
-        let mut expected = actual;
-        let message = [0x0123_4567_89ab_cdef; 16];
-        let offset = [0x1020_3040_5060_7080, 0x90a0_b0c0_d0e0_f000];
-        OpenVmCrypto.blake2_compress(12, &mut actual, &message, &offset, true);
-        DefaultCrypto.blake2_compress(12, &mut expected, &message, &offset, true);
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn adapters_preserve_revm_error_variants() {
-        let invalid_bn_point = [0xff; 64];
-        let actual = OpenVmCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]);
-        assert_eq!(actual, Err(PrecompileHalt::Bn254FieldPointNotAMember));
-        assert_eq!(actual, DefaultCrypto.bn254_g1_add(&invalid_bn_point, &[0; 64]));
-
-        let noncanonical_fp = [0xff; BLS_FP_LEN];
-        let actual = OpenVmCrypto.bls12_381_fp_to_g1(&noncanonical_fp);
-        assert_eq!(actual, Err(PrecompileHalt::NonCanonicalFp));
-        assert_eq!(actual, DefaultCrypto.bls12_381_fp_to_g1(&noncanonical_fp));
-
-        assert_eq!(
-            OpenVmCrypto.secp256k1_ecrecover(&[0; 64], 0, &[0; 32]),
-            Err(PrecompileHalt::Secp256k1RecoverFailed)
-        );
-    }
-
-    #[test]
-    fn streaming_adapters_report_the_first_invalid_pair() {
-        let invalid_bn_g1 = [0xff; 64];
-        let identity_bn_g2 = [0; 128];
-        let identity_bn_g1 = [0; 64];
-        let short_bn_g2 = [0; 127];
-        let bn_pairs =
-            [(&invalid_bn_g1[..], &identity_bn_g2[..]), (&identity_bn_g1[..], &short_bn_g2[..])];
-        assert_eq!(
-            OpenVmCrypto.bn254_pairing_check(&bn_pairs),
-            Err(PrecompileHalt::Bn254FieldPointNotAMember)
-        );
-
-        let invalid_g1 = ([0xff; BLS_FP_LEN], [0xff; BLS_FP_LEN]);
-        let mut g1_pairs =
-            [Ok((invalid_g1, [0; 32])), Err(PrecompileHalt::Bls12381ScalarInputLength)].into_iter();
-        assert_eq!(
-            OpenVmCrypto.bls12_381_g1_msm(&mut g1_pairs),
-            Err(PrecompileHalt::NonCanonicalFp)
-        );
-    }
+pub fn install_openvm_crypto() -> Result<bool, Box<dyn Error>> {
+    alloy::install()?;
+    Ok(revm::install())
 }
diff --git a/crates/revm-crypto/src/revm.rs b/crates/revm-crypto/src/revm.rs
new file mode 100644
index 000000000..ba7468a8a
--- /dev/null
+++ b/crates/revm-crypto/src/revm.rs
@@ -0,0 +1,391 @@
+//! REVM adapter for the standard zkVM accelerator C interface.
+
+use alloc::vec::Vec;
+use core::mem::MaybeUninit;
+
+use crate::status_ok;
+use openvm_accelerators::{
+    zkvm_blake2f, zkvm_blake2f_message, zkvm_blake2f_offset, zkvm_blake2f_state, zkvm_bls12_381_fp,
+    zkvm_bls12_381_fp2, zkvm_bls12_381_g1_msm_pair, zkvm_bls12_381_g1_point,
+    zkvm_bls12_381_g2_msm_pair, zkvm_bls12_381_g2_point, zkvm_bls12_381_pairing_pair,
+    zkvm_bls12_381_scalar, zkvm_bls12_g1_add, zkvm_bls12_g1_msm, zkvm_bls12_g2_add,
+    zkvm_bls12_g2_msm, zkvm_bls12_map_fp2_to_g2, zkvm_bls12_map_fp_to_g1, zkvm_bls12_pairing,
+    zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_g1_point, zkvm_bn254_g2_point,
+    zkvm_bn254_pairing, zkvm_bn254_pairing_pair, zkvm_bn254_scalar, zkvm_keccak256,
+    zkvm_keccak256_hash, zkvm_kzg_commitment, zkvm_kzg_field_element, zkvm_kzg_point_eval,
+    zkvm_kzg_proof, zkvm_modexp, zkvm_ripemd160, zkvm_ripemd160_hash, zkvm_secp256k1_ecrecover,
+    zkvm_secp256k1_hash, zkvm_secp256k1_pubkey, zkvm_secp256k1_signature, zkvm_secp256r1_hash,
+    zkvm_secp256r1_pubkey, zkvm_secp256r1_signature, zkvm_secp256r1_verify, zkvm_sha256,
+    zkvm_sha256_hash,
+};
+use revm::precompile::{
+    bls12_381::{
+        G1Point as BlsG1Point, G1PointScalar as BlsG1PointScalar, G2Point as BlsG2Point,
+        G2PointScalar as BlsG2PointScalar,
+    },
+    bls12_381_const::{FP_LENGTH as BLS_FP_LEN, G1_LENGTH as BLS_G1_LEN, G2_LENGTH as BLS_G2_LEN},
+    Crypto, PrecompileHalt,
+};
+
+fn bls_g1((x, y): BlsG1Point) -> zkvm_bls12_381_g1_point {
+    let mut data = [0; BLS_G1_LEN];
+    data[..BLS_FP_LEN].copy_from_slice(&x);
+    data[BLS_FP_LEN..].copy_from_slice(&y);
+    zkvm_bls12_381_g1_point { data }
+}
+
+fn bls_g2((x0, x1, y0, y1): BlsG2Point) -> zkvm_bls12_381_g2_point {
+    let mut data = [0; BLS_G2_LEN];
+    for (output, coordinate) in data.chunks_exact_mut(BLS_FP_LEN).zip([x0, x1, y0, y1]) {
+        output.copy_from_slice(&coordinate);
+    }
+    zkvm_bls12_381_g2_point { data }
+}
+
+fn write_words<const N: usize>(words: &[u64; N], bytes: &mut [u8]) {
+    for (output, word) in bytes.chunks_exact_mut(8).zip(words) {
+        output.copy_from_slice(&word.to_le_bytes());
+    }
+}
+
+#[derive(Debug, Default)]
+struct OpenVmCrypto;
+
+impl Crypto for OpenVmCrypto {
+    fn sha256(&self, input: &[u8]) -> [u8; 32] {
+        let mut output = zkvm_sha256_hash { data: [0; 32] };
+        let status = unsafe { zkvm_sha256(input.as_ptr(), input.len(), &mut output) };
+        assert!(status_ok(status), "zkVM accelerator call failed");
+        output.data
+    }
+
+    fn ripemd160(&self, input: &[u8]) -> [u8; 32] {
+        let mut output = zkvm_ripemd160_hash { data: [0; 32] };
+        let status = unsafe { zkvm_ripemd160(input.as_ptr(), input.len(), &mut output) };
+        assert!(status_ok(status), "zkVM accelerator call failed");
+        output.data
+    }
+
+    fn bn254_g1_add(&self, p1: &[u8], p2: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
+        let p1 = zkvm_bn254_g1_point {
+            data: p1.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let p2 = zkvm_bn254_g1_point {
+            data: p2.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let mut output = zkvm_bn254_g1_point { data: [0; 64] };
+        let status = unsafe { zkvm_bn254_g1_add(&p1, &p2, &mut output) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bn254AffineGFailedToCreate);
+        }
+        Ok(output.data)
+    }
+
+    fn bn254_g1_mul(&self, point: &[u8], scalar: &[u8]) -> Result<[u8; 64], PrecompileHalt> {
+        let point = zkvm_bn254_g1_point {
+            data: point.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let scalar = zkvm_bn254_scalar {
+            data: scalar.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+        };
+        let mut output = zkvm_bn254_g1_point { data: [0; 64] };
+        let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar, &mut output) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bn254AffineGFailedToCreate);
+        }
+        Ok(output.data)
+    }
+
+    fn bn254_pairing_check(&self, pairs: &[(&[u8], &[u8])]) -> Result<bool, PrecompileHalt> {
+        let pairs: Result<Vec<_>, _> = pairs
+            .iter()
+            .map(|&(g1, g2)| {
+                Ok(zkvm_bn254_pairing_pair {
+                    g1: zkvm_bn254_g1_point {
+                        data: g1.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+                    },
+                    g2: zkvm_bn254_g2_point {
+                        data: g2.try_into().map_err(|_| PrecompileHalt::Bn254PairLength)?,
+                    },
+                })
+            })
+            .collect();
+        let pairs = pairs?;
+        let mut verified = false;
+        let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bn254AffineGFailedToCreate);
+        }
+        Ok(verified)
+    }
+
+    fn secp256k1_ecrecover(
+        &self,
+        sig: &[u8; 64],
+        recid: u8,
+        msg: &[u8; 32],
+    ) -> Result<[u8; 32], PrecompileHalt> {
+        let msg = zkvm_secp256k1_hash { data: *msg };
+        let sig = zkvm_secp256k1_signature { data: *sig };
+        let mut pubkey = zkvm_secp256k1_pubkey { data: [0; 64] };
+        let status = unsafe { zkvm_secp256k1_ecrecover(&msg, &sig, recid, &mut pubkey) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Secp256k1RecoverFailed);
+        }
+        let mut hash = zkvm_keccak256_hash { data: [0; 32] };
+        let status = unsafe { zkvm_keccak256(pubkey.data.as_ptr(), pubkey.data.len(), &mut hash) };
+        assert!(status_ok(status), "zkVM accelerator call failed");
+        hash.data[..12].fill(0);
+        Ok(hash.data)
+    }
+
+    fn modexp(&self, base: &[u8], exp: &[u8], modulus: &[u8]) -> Result<Vec<u8>, PrecompileHalt> {
+        let mut output = alloc::vec![0; modulus.len()];
+        let status = unsafe {
+            zkvm_modexp(
+                base.as_ptr(),
+                base.len(),
+                exp.as_ptr(),
+                exp.len(),
+                modulus.as_ptr(),
+                modulus.len(),
+                output.as_mut_ptr(),
+            )
+        };
+        assert!(status_ok(status), "zkVM accelerator call failed");
+        Ok(output)
+    }
+
+    fn blake2_compress(&self, rounds: u32, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
+        let mut state = zkvm_blake2f_state { data: [0; 64] };
+        let mut message = zkvm_blake2f_message { data: [0; 128] };
+        let mut offset = zkvm_blake2f_offset { data: [0; 16] };
+        write_words(h, &mut state.data);
+        write_words(m, &mut message.data);
+        write_words(t, &mut offset.data);
+        let status = unsafe { zkvm_blake2f(rounds, &mut state, &message, &offset, u8::from(f)) };
+        assert!(status_ok(status), "zkVM accelerator call failed");
+        for (word, bytes) in h.iter_mut().zip(state.data.as_chunks::<8>().0) {
+            *word = u64::from_le_bytes(*bytes);
+        }
+    }
+
+    fn secp256r1_verify_signature(&self, msg: &[u8; 32], sig: &[u8; 64], pk: &[u8; 64]) -> bool {
+        let msg = zkvm_secp256r1_hash { data: *msg };
+        let sig = zkvm_secp256r1_signature { data: *sig };
+        let pubkey = zkvm_secp256r1_pubkey { data: *pk };
+        let mut verified = false;
+        let status = unsafe { zkvm_secp256r1_verify(&msg, &sig, &pubkey, &mut verified) };
+        status_ok(status) && verified
+    }
+
+    fn verify_kzg_proof(
+        &self,
+        z: &[u8; 32],
+        y: &[u8; 32],
+        commitment: &[u8; 48],
+        proof: &[u8; 48],
+    ) -> Result<(), PrecompileHalt> {
+        let commitment = zkvm_kzg_commitment { data: *commitment };
+        let z = zkvm_kzg_field_element { data: *z };
+        let y = zkvm_kzg_field_element { data: *y };
+        let proof = zkvm_kzg_proof { data: *proof };
+        let mut verified = false;
+        let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, &mut verified) };
+        if status_ok(status) && verified {
+            Ok(())
+        } else {
+            Err(PrecompileHalt::BlobVerifyKzgProofFailed)
+        }
+    }
+
+    fn bls12_381_g1_add(
+        &self,
+        a: BlsG1Point,
+        b: BlsG1Point,
+    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
+        let (a, b) = (bls_g1(a), bls_g1(b));
+        let mut output = MaybeUninit::<zkvm_bls12_381_g1_point>::uninit();
+        let status = unsafe { zkvm_bls12_g1_add(&a, &b, output.as_mut_ptr()) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bls12381G1NotOnCurve);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+
+    fn bls12_381_g1_msm(
+        &self,
+        pairs: &mut dyn Iterator<Item = Result<BlsG1PointScalar, PrecompileHalt>>,
+    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
+        let mut wire_pairs = Vec::with_capacity(pairs.size_hint().0);
+        for pair in pairs {
+            let (point, scalar) = pair?;
+            wire_pairs.push(zkvm_bls12_381_g1_msm_pair {
+                point: bls_g1(point),
+                scalar: zkvm_bls12_381_scalar { data: scalar },
+            });
+        }
+        let mut output = MaybeUninit::<zkvm_bls12_381_g1_point>::uninit();
+        let status = unsafe {
+            zkvm_bls12_g1_msm(wire_pairs.as_ptr(), wire_pairs.len(), output.as_mut_ptr())
+        };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bls12381G1NotInSubgroup);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+
+    fn bls12_381_g2_add(
+        &self,
+        a: BlsG2Point,
+        b: BlsG2Point,
+    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
+        let (a, b) = (bls_g2(a), bls_g2(b));
+        let mut output = MaybeUninit::<zkvm_bls12_381_g2_point>::uninit();
+        let status = unsafe { zkvm_bls12_g2_add(&a, &b, output.as_mut_ptr()) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bls12381G2NotOnCurve);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+
+    fn bls12_381_g2_msm(
+        &self,
+        pairs: &mut dyn Iterator<Item = Result<BlsG2PointScalar, PrecompileHalt>>,
+    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
+        let mut wire_pairs = Vec::with_capacity(pairs.size_hint().0);
+        for pair in pairs {
+            let (point, scalar) = pair?;
+            wire_pairs.push(zkvm_bls12_381_g2_msm_pair {
+                point: bls_g2(point),
+                scalar: zkvm_bls12_381_scalar { data: scalar },
+            });
+        }
+        let mut output = MaybeUninit::<zkvm_bls12_381_g2_point>::uninit();
+        let status = unsafe {
+            zkvm_bls12_g2_msm(wire_pairs.as_ptr(), wire_pairs.len(), output.as_mut_ptr())
+        };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bls12381G2NotInSubgroup);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+
+    fn bls12_381_pairing_check(
+        &self,
+        pairs: &[(BlsG1Point, BlsG2Point)],
+    ) -> Result<bool, PrecompileHalt> {
+        let pairs: Vec<_> = pairs
+            .iter()
+            .copied()
+            .map(|(p1, p2)| zkvm_bls12_381_pairing_pair { g1: bls_g1(p1), g2: bls_g2(p2) })
+            .collect();
+        let mut verified = MaybeUninit::<bool>::uninit();
+        let status =
+            unsafe { zkvm_bls12_pairing(pairs.as_ptr(), pairs.len(), verified.as_mut_ptr()) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::Bls12381G1NotInSubgroup);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { verified.assume_init() })
+    }
+
+    fn bls12_381_fp_to_g1(
+        &self,
+        fp: &[u8; BLS_FP_LEN],
+    ) -> Result<[u8; BLS_G1_LEN], PrecompileHalt> {
+        let fp = zkvm_bls12_381_fp { data: *fp };
+        let mut output = MaybeUninit::<zkvm_bls12_381_g1_point>::uninit();
+        let status = unsafe { zkvm_bls12_map_fp_to_g1(&fp, output.as_mut_ptr()) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::NonCanonicalFp);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+
+    fn bls12_381_fp2_to_g2(
+        &self,
+        fp2: ([u8; BLS_FP_LEN], [u8; BLS_FP_LEN]),
+    ) -> Result<[u8; BLS_G2_LEN], PrecompileHalt> {
+        let mut data = [0; BLS_FP_LEN * 2];
+        data[..BLS_FP_LEN].copy_from_slice(&fp2.0);
+        data[BLS_FP_LEN..].copy_from_slice(&fp2.1);
+        let fp2 = zkvm_bls12_381_fp2 { data };
+        let mut output = MaybeUninit::<zkvm_bls12_381_g2_point>::uninit();
+        let status = unsafe { zkvm_bls12_map_fp2_to_g2(&fp2, output.as_mut_ptr()) };
+        if !status_ok(status) {
+            return Err(PrecompileHalt::NonCanonicalFp);
+        }
+        // SAFETY: the C interface initializes the output when it returns success.
+        Ok(unsafe { output.assume_init() }.data)
+    }
+}
+
+pub(super) fn install() -> bool {
+    revm::install_crypto(OpenVmCrypto)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use revm::precompile::DefaultCrypto;
+
+    #[test]
+    fn portable_operations_match_revm() {
+        let input = b"OpenVM accelerator C interface";
+        assert_eq!(OpenVmCrypto.sha256(input), DefaultCrypto.sha256(input));
+        assert_eq!(OpenVmCrypto.ripemd160(input), DefaultCrypto.ripemd160(input));
+        assert_eq!(
+            OpenVmCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24]),
+            DefaultCrypto.modexp(&[0x12; 40], &[0x34; 3], &[0xef; 24])
+        );
+
+        let mut actual = [
+            0x6a09e667f3bcc908,
+            0xbb67ae8584caa73b,
+            0x3c6ef372fe94f82b,
+            0xa54ff53a5f1d36f1,
+            0x510e527fade682d1,
+            0x9b05688c2b3e6c1f,
+            0x1f83d9abfb41bd6b,
+            0x5be0cd19137e2179,
+        ];
+        let mut expected = actual;
+        let message = [0x0123_4567_89ab_cdef; 16];
+        let offset = [0x1020_3040_5060_7080, 0x90a0_b0c0_d0e0_f000];
+        OpenVmCrypto.blake2_compress(12, &mut actual, &message, &offset, true);
+        DefaultCrypto.blake2_compress(12, &mut expected, &message, &offset, true);
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn p256_accepts_valid_and_rejects_invalid_signatures() {
+        let input = alloy_primitives::hex::decode("4cee90eb86eaa050036147a12d49004b6b9c72bd725d39d4785011fe190f0b4da73bd4903f0ce3b639bbbf6e8e80d16931ff4bcf5993d58468e8fb19086e8cac36dbcd03009df8c59286b162af3bd7fcc0450c9aa81be5d10d312af6c66b1d604aebd3099c618202fcfe16ae7770b0c49ab5eadf74b754204a3bb6060e44eff37618b065f9832de4ca6ca971a7a1adc826d0f7c00181a5fb2ddf79ae00b4e10e").unwrap();
+        let msg = input[..32].try_into().unwrap();
+        let signature = input[32..96].try_into().unwrap();
+        let public_key = input[96..].try_into().unwrap();
+        assert!(OpenVmCrypto.secp256r1_verify_signature(msg, signature, public_key));
+        assert!(!OpenVmCrypto.secp256r1_verify_signature(msg, &[0; 64], public_key));
+    }
+
+    #[test]
+    fn c_status_failures_are_mapped_at_the_client_boundary() {
+        assert_eq!(
+            OpenVmCrypto.secp256k1_ecrecover(&[0; 64], 0, &[0; 32]),
+            Err(PrecompileHalt::Secp256k1RecoverFailed)
+        );
+        assert_eq!(
+            OpenVmCrypto.bls12_381_fp_to_g1(&[0xff; BLS_FP_LEN]),
+            Err(PrecompileHalt::NonCanonicalFp)
+        );
+        assert_eq!(
+            OpenVmCrypto.bn254_g1_add(&[0; 63], &[0; 64]),
+            Err(PrecompileHalt::Bn254PairLength)
+        );
+    }
+}

From 52b29b4363e6585405081634021353f007c69e6d Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 12 Aug 2026 10:25:54 -0400
Subject: [PATCH 91/94] refactor: remove old upper case naming

---
 crates/accelerators/tests/bn254.rs | 34 ++++++++++++++----------------
 crates/accelerators/tests/kzg.rs   | 24 ++++++++++-----------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/crates/accelerators/tests/bn254.rs b/crates/accelerators/tests/bn254.rs
index 1d9d95dba..44b975748 100644
--- a/crates/accelerators/tests/bn254.rs
+++ b/crates/accelerators/tests/bn254.rs
@@ -2,28 +2,26 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_g1_point as ZkvmBn254G1Point,
-    zkvm_bn254_g2_point as ZkvmBn254G2Point, zkvm_bn254_pairing,
-    zkvm_bn254_pairing_pair as ZkvmBn254PairingPair, zkvm_bn254_scalar as ZkvmBn254Scalar,
-    ZKVM_EFAIL, ZKVM_EOK,
+    zkvm_bn254_g1_add, zkvm_bn254_g1_mul, zkvm_bn254_g1_point, zkvm_bn254_g2_point,
+    zkvm_bn254_pairing, zkvm_bn254_pairing_pair, zkvm_bn254_scalar, ZKVM_EFAIL, ZKVM_EOK,
 };
 
-fn scalar(value: u8) -> ZkvmBn254Scalar {
-    let mut scalar = ZkvmBn254Scalar { data: [0; 32] };
+fn scalar(value: u8) -> zkvm_bn254_scalar {
+    let mut scalar = zkvm_bn254_scalar { data: [0; 32] };
     scalar.data[31] = value;
     scalar
 }
 
 /// BN254 generator (1, 2).
-fn generator() -> ZkvmBn254G1Point {
-    let mut point = ZkvmBn254G1Point { data: [0; 64] };
+fn generator() -> zkvm_bn254_g1_point {
+    let mut point = zkvm_bn254_g1_point { data: [0; 64] };
     point.data[31] = 1;
     point.data[63] = 2;
     point
 }
 
 /// Doubled BN254 generator, from the EIP-196 reference vectors.
-const BN254_2GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
+const BN254_2GEN: zkvm_bn254_g1_point = zkvm_bn254_g1_point {
     data: hex!(
         "030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd3"
         "15ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"
@@ -31,7 +29,7 @@ const BN254_2GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
 };
 
 /// BN254 negated generator (1, p - 2).
-const BN254_NEG_GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
+const BN254_NEG_GEN: zkvm_bn254_g1_point = zkvm_bn254_g1_point {
     data: hex!(
         "0000000000000000000000000000000000000000000000000000000000000001"
         "30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
@@ -39,7 +37,7 @@ const BN254_NEG_GEN: ZkvmBn254G1Point = ZkvmBn254G1Point {
 };
 
 /// BN254 G2 generator in EIP-197 order (`x_c1 || x_c0 || y_c1 || y_c0`).
-const BN254_G2_GEN: ZkvmBn254G2Point = ZkvmBn254G2Point {
+const BN254_G2_GEN: zkvm_bn254_g2_point = zkvm_bn254_g2_point {
     data: hex!(
         "198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
         "1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
@@ -51,7 +49,7 @@ const BN254_G2_GEN: ZkvmBn254G2Point = ZkvmBn254G2Point {
 #[test]
 fn zkvm_bn254_add_mul_smoke() {
     let point = generator();
-    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+    let mut output = zkvm_bn254_g1_point { data: [0; 64] };
 
     let status = unsafe { zkvm_bn254_g1_add(&point, &point, &mut output) };
     assert_eq!(status, ZKVM_EOK);
@@ -66,8 +64,8 @@ fn zkvm_bn254_add_mul_smoke() {
 #[test]
 fn zkvm_bn254_pairing_smoke() {
     let pairs = [
-        ZkvmBn254PairingPair { g1: generator(), g2: BN254_G2_GEN },
-        ZkvmBn254PairingPair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
+        zkvm_bn254_pairing_pair { g1: generator(), g2: BN254_G2_GEN },
+        zkvm_bn254_pairing_pair { g1: BN254_NEG_GEN, g2: BN254_G2_GEN },
     ];
     let mut verified = false;
 
@@ -84,12 +82,12 @@ fn zkvm_bn254_pairing_smoke() {
 fn bn254_rejects_invalid_point() {
     let mut not_on_curve = generator();
     not_on_curve.data[63] = 3;
-    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+    let mut output = zkvm_bn254_g1_point { data: [0; 64] };
 
     let status = unsafe { zkvm_bn254_g1_mul(&not_on_curve, &scalar(2), &mut output) };
     assert_eq!(status, ZKVM_EFAIL);
 
-    let pairs = [ZkvmBn254PairingPair { g1: not_on_curve, g2: BN254_G2_GEN }];
+    let pairs = [zkvm_bn254_pairing_pair { g1: not_on_curve, g2: BN254_G2_GEN }];
     let mut verified = true;
     let status = unsafe { zkvm_bn254_pairing(pairs.as_ptr(), pairs.len(), &mut verified) };
     assert_eq!(status, ZKVM_EFAIL);
@@ -100,7 +98,7 @@ fn bn254_rejects_invalid_point() {
 fn zkvm_bn254_null_pointers() {
     let point = generator();
     let scalar = scalar(2);
-    let mut output = ZkvmBn254G1Point { data: [0; 64] };
+    let mut output = zkvm_bn254_g1_point { data: [0; 64] };
 
     let status = unsafe { zkvm_bn254_g1_add(core::ptr::null(), &point, &mut output) };
     assert_eq!(status, ZKVM_EFAIL);
@@ -120,7 +118,7 @@ fn zkvm_bn254_null_pointers() {
     let status = unsafe { zkvm_bn254_g1_mul(&point, &scalar, core::ptr::null_mut()) };
     assert_eq!(status, ZKVM_EFAIL);
 
-    let pairs = [ZkvmBn254PairingPair { g1: point, g2: BN254_G2_GEN }];
+    let pairs = [zkvm_bn254_pairing_pair { g1: point, g2: BN254_G2_GEN }];
     let mut verified = false;
 
     let status = unsafe { zkvm_bn254_pairing(core::ptr::null(), 0, &mut verified) };
diff --git a/crates/accelerators/tests/kzg.rs b/crates/accelerators/tests/kzg.rs
index de0471148..d4fb894a8 100644
--- a/crates/accelerators/tests/kzg.rs
+++ b/crates/accelerators/tests/kzg.rs
@@ -2,8 +2,8 @@
 
 use hex_literal::hex;
 use openvm_accelerators::{
-    zkvm_kzg_commitment as ZkvmKzgCommitment, zkvm_kzg_field_element as ZkvmKzgFieldElement,
-    zkvm_kzg_point_eval, zkvm_kzg_proof as ZkvmKzgProof, ZKVM_EFAIL, ZKVM_EOK,
+    zkvm_kzg_commitment, zkvm_kzg_field_element, zkvm_kzg_point_eval, zkvm_kzg_proof, ZKVM_EFAIL,
+    ZKVM_EOK,
 };
 
 // ethereum/consensus-spec-tests:
@@ -16,24 +16,24 @@ const PROOF: [u8; 48] =
     hex!("92c51ff81dd71dab71cefecd79e8274b4b7ba36a0f40e2dc086bc4061c7f63249877db23297212991fd63e07b7ebc348");
 
 /// The compressed point at infinity: 0xc0 followed by zeros.
-fn infinity() -> ZkvmKzgCommitment {
-    let mut point = ZkvmKzgCommitment { data: [0; 48] };
+fn infinity() -> zkvm_kzg_commitment {
+    let mut point = zkvm_kzg_commitment { data: [0; 48] };
     point.data[0] = 0xc0;
     point
 }
 
-fn scalar(value: u8) -> ZkvmKzgFieldElement {
-    let mut s = ZkvmKzgFieldElement { data: [0; 32] };
+fn scalar(value: u8) -> zkvm_kzg_field_element {
+    let mut s = zkvm_kzg_field_element { data: [0; 32] };
     s.data[31] = value;
     s
 }
 
 #[test]
 fn zkvm_kzg_point_eval_smoke() {
-    let commitment = ZkvmKzgCommitment { data: COMMITMENT };
-    let proof = ZkvmKzgProof { data: PROOF };
-    let z = ZkvmKzgFieldElement { data: Z };
-    let y = ZkvmKzgFieldElement { data: Y };
+    let commitment = zkvm_kzg_commitment { data: COMMITMENT };
+    let proof = zkvm_kzg_proof { data: PROOF };
+    let z = zkvm_kzg_field_element { data: Z };
+    let y = zkvm_kzg_field_element { data: Y };
     let mut verified = false;
 
     let status = unsafe { zkvm_kzg_point_eval(&commitment, &z, &y, &proof, &mut verified) };
@@ -41,7 +41,7 @@ fn zkvm_kzg_point_eval_smoke() {
     assert!(verified);
 
     // Malformed cryptographic inputs are a completed verification with a false result.
-    let mut garbage = ZkvmKzgCommitment { data: [0; 48] };
+    let mut garbage = zkvm_kzg_commitment { data: [0; 48] };
     garbage.data[0] = 0x01;
     let status = unsafe { zkvm_kzg_point_eval(&garbage, &z, &y, &proof, &mut verified) };
     assert_eq!(status, ZKVM_EOK);
@@ -51,7 +51,7 @@ fn zkvm_kzg_point_eval_smoke() {
 #[test]
 fn zkvm_kzg_point_eval_null_pointers() {
     let commitment = infinity();
-    let proof: ZkvmKzgProof = infinity();
+    let proof: zkvm_kzg_proof = infinity();
     let z = scalar(2);
     let y = scalar(0);
     let mut verified = false;

From de915060773f357c9b9674c7c7361fb237fc794d Mon Sep 17 00:00:00 2001
From: Mansur Mukimbekov <mansur20478@gmail.com>
Date: Wed, 12 Aug 2026 10:53:02 -0400
Subject: [PATCH 92/94] ci: run OpenVM REVM Crypto Tests on accelerator crate
 changes

---
 .github/workflows/tests-revm-crypto.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests-revm-crypto.yml b/.github/workflows/tests-revm-crypto.yml
index 0333bd062..bdc30d44d 100644
--- a/.github/workflows/tests-revm-crypto.yml
+++ b/.github/workflows/tests-revm-crypto.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - "crates/revm-crypto/**"
+      - "crates/accelerators/**"
       - "crates/kzg/**"
       - "crates/curve-utils/**"
       - "Cargo.toml"

From 09c74e81e6f5f8db39124771a1217cc7831450f6 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Thu, 13 Aug 2026 01:18:54 +0200
Subject: [PATCH 93/94] perf: use thin LTO for faster builds

---
 Cargo.toml                     | 2 +-
 bin/stateless-guest/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7606f8b2f..fad55dd1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -161,7 +161,7 @@ strip = "none"
 
 [profile.maxperf]
 inherits = "release"
-lto = "fat"
+lto = "thin"
 codegen-units = 1
 
 [profile.dev]
diff --git a/bin/stateless-guest/Cargo.toml b/bin/stateless-guest/Cargo.toml
index 0b4cf8229..50b0050af 100644
--- a/bin/stateless-guest/Cargo.toml
+++ b/bin/stateless-guest/Cargo.toml
@@ -39,7 +39,7 @@ heap-embedded-alloc = ["openvm/heap-embedded-alloc"]
 
 [profile.release]
 panic = "abort"
-lto = "fat"
+lto = "thin"
 strip = true
 
 [profile.profiling]

From 83578fe71f7ec34fda79ca3d83df1a83ff7eb03c Mon Sep 17 00:00:00 2001
From: Ayush Shukla <ayush@axiom.xyz>
Date: Thu, 13 Aug 2026 12:11:20 +0200
Subject: [PATCH 94/94] chore: update OpenVM develop revision

---
 Cargo.lock                     | 170 +++++++++++++++++----------------
 bin/stateless-guest/Cargo.lock |  40 ++++----
 2 files changed, 106 insertions(+), 104 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 05abc19af..a0d351c96 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -919,7 +919,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde 2.1.1",
  "alloy-sol-types",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -1127,7 +1127,7 @@ checksum = "b273587487921274f4f5d0ef2c7ef36944dcbb75a4e2318e69eae822bd263f91"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
- "itertools 0.14.0",
+ "itertools 0.13.0",
  "reqwest 0.13.4",
  "serde_json",
  "tower",
@@ -2177,7 +2177,7 @@ version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.23.0",
+ "darling 0.20.11",
  "ident_case",
  "prettyplease",
  "proc-macro2",
@@ -2625,7 +2625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3626,7 +3626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5552,7 +5552,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -6774,7 +6774,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "bytemuck",
  "num-bigint",
@@ -6810,7 +6810,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -6849,7 +6849,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -6859,7 +6859,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "halo2curves-axiom 0.7.3",
  "num-bigint",
@@ -6875,7 +6875,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -6887,7 +6887,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-algebra-guest",
  "openvm-decoder",
@@ -6901,7 +6901,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-utils"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -6911,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-platform",
  "strum_macros 0.26.4",
@@ -6949,7 +6949,7 @@ dependencies = [
 [[package]]
 name = "openvm-bigint-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-bigint-guest",
  "openvm-decoder",
@@ -6964,7 +6964,7 @@ dependencies = [
 [[package]]
 name = "openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cargo_metadata 0.18.1",
  "eyre",
@@ -6986,7 +6986,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "backtrace",
  "bytemuck",
@@ -7035,7 +7035,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7046,7 +7046,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7066,7 +7066,7 @@ dependencies = [
 [[package]]
 name = "openvm-circuit-primitives-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
@@ -7088,7 +7088,7 @@ dependencies = [
 [[package]]
 name = "openvm-continuations"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "derivative",
@@ -7208,7 +7208,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7218,12 +7218,12 @@ dependencies = [
 [[package]]
 name = "openvm-decoder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 
 [[package]]
 name = "openvm-deferral-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "dashmap",
@@ -7255,7 +7255,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7264,7 +7264,7 @@ dependencies = [
 [[package]]
 name = "openvm-deferral-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "eyre",
  "openvm-deferral-guest",
@@ -7280,7 +7280,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "blstrs",
  "cfg-if 1.0.4",
@@ -7318,7 +7318,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -7337,7 +7337,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -7347,7 +7347,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-decoder",
  "openvm-ecc-guest",
@@ -7361,7 +7361,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "backtrace",
  "derive-new 0.6.0",
@@ -7378,7 +7378,7 @@ dependencies = [
 [[package]]
 name = "openvm-instructions-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7387,7 +7387,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -7397,7 +7397,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "derive-new 0.6.0",
  "derive_more 1.0.0",
@@ -7427,7 +7427,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-platform",
 ]
@@ -7435,7 +7435,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7474,7 +7474,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -7482,12 +7482,12 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 
 [[package]]
 name = "openvm-mod-circuit-builder"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "itertools 0.14.0",
  "num-bigint",
@@ -7544,7 +7544,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "group 0.13.0",
  "halo2curves-axiom 0.7.3",
@@ -7568,7 +7568,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7602,7 +7602,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "blst",
  "halo2curves-axiom 0.7.3",
@@ -7623,7 +7623,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7636,8 +7636,9 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
+ "critical-section",
  "libm",
  "openvm-custom-insn",
  "openvm-riscv-guest",
@@ -7646,7 +7647,7 @@ dependencies = [
 [[package]]
 name = "openvm-poseidon2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "derivative",
  "lazy_static",
@@ -7664,7 +7665,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7692,7 +7693,7 @@ dependencies = [
 [[package]]
 name = "openvm-recursion-circuit-derive"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "quote",
  "syn 2.0.118",
@@ -7759,7 +7760,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-adapters"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "derive-new 0.6.0",
  "itertools 0.14.0",
@@ -7776,7 +7777,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -7809,7 +7810,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -7818,7 +7819,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -7871,7 +7872,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "alloy-sol-types",
  "bitcode",
@@ -7911,7 +7912,7 @@ dependencies = [
 [[package]]
 name = "openvm-sdk-config"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "bon",
  "cfg-if 1.0.4",
@@ -7949,7 +7950,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-sha2-guest",
  "sha2 0.10.9",
@@ -7958,7 +7959,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-air"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ndarray",
  "num_enum",
@@ -7972,7 +7973,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cfg-if 1.0.4",
  "derive-new 0.6.0",
@@ -8003,7 +8004,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-platform",
 ]
@@ -8011,7 +8012,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-decoder",
  "openvm-instructions",
@@ -8147,7 +8148,7 @@ dependencies = [
 [[package]]
 name = "openvm-static-verifier"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "halo2-base",
  "itertools 0.14.0",
@@ -8171,7 +8172,7 @@ dependencies = [
 [[package]]
 name = "openvm-transpiler"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "elf",
  "eyre",
@@ -8186,7 +8187,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-circuit"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "bitcode",
  "cfg-if 1.0.4",
@@ -8216,7 +8217,7 @@ dependencies = [
 [[package]]
 name = "openvm-verify-stark-host"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "bitcode",
  "eyre",
@@ -8255,7 +8256,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -9055,7 +9056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
 dependencies = [
  "anyhow",
- "itertools 0.14.0",
+ "itertools 0.11.0",
  "proc-macro2",
  "quote",
  "syn 2.0.118",
@@ -9136,7 +9137,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.5",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12624,7 +12625,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12683,7 +12684,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 0.26.11",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12704,7 +12705,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs 1.0.8",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -12746,7 +12747,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-instructions",
  "openvm-platform",
@@ -12760,12 +12761,12 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-build"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 
 [[package]]
 name = "rvr-openvm-ext-algebra"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "cc",
  "num-bigint",
@@ -12782,7 +12783,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-bigint"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-bigint-transpiler",
  "openvm-instructions",
@@ -12796,7 +12797,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-deferral"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12810,7 +12811,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-ecc"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-ecc-transpiler",
  "openvm-instructions",
@@ -12823,7 +12824,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-keccak"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-instructions",
  "openvm-keccak256-transpiler",
@@ -12836,7 +12837,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-instructions",
  "openvm-pairing-transpiler",
@@ -12848,7 +12849,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-riscv"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "libloading",
  "openvm-circuit",
@@ -12863,7 +12864,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ext-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-instructions",
  "openvm-sha2-air",
@@ -12876,7 +12877,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-ir"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "serde",
 ]
@@ -12884,7 +12885,7 @@ dependencies = [
 [[package]]
 name = "rvr-openvm-lift"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "libloading",
  "openvm-instructions",
@@ -12892,12 +12893,13 @@ dependencies = [
  "rustc-hash 2.1.3",
  "rvr-openvm-ir",
  "thiserror 1.0.69",
+ "tracing",
 ]
 
 [[package]]
 name = "rvr-state"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 
 [[package]]
 name = "ryu"
@@ -13755,7 +13757,7 @@ dependencies = [
  "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14996,7 +14998,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
diff --git a/bin/stateless-guest/Cargo.lock b/bin/stateless-guest/Cargo.lock
index 330271d54..4b66c0719 100644
--- a/bin/stateless-guest/Cargo.lock
+++ b/bin/stateless-guest/Cargo.lock
@@ -318,7 +318,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-serde",
  "alloy-sol-types",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -2125,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "k256"
 version = "0.13.4"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2450,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "openvm"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "bytemuck",
  "getrandom 0.2.17",
@@ -2487,7 +2487,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-complex-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2497,7 +2497,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "halo2curves-axiom",
  "num-bigint",
@@ -2513,7 +2513,7 @@ dependencies = [
 [[package]]
 name = "openvm-algebra-moduli-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "num-bigint",
  "num-prime",
@@ -2544,7 +2544,7 @@ dependencies = [
 [[package]]
 name = "openvm-custom-insn"
 version = "0.1.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2554,7 +2554,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
@@ -2573,7 +2573,7 @@ dependencies = [
 [[package]]
 name = "openvm-ecc-sw-macros"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-macros-common",
  "quote",
@@ -2583,7 +2583,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-keccak256-guest",
  "spin 0.10.1",
@@ -2593,7 +2593,7 @@ dependencies = [
 [[package]]
 name = "openvm-keccak256-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-platform",
 ]
@@ -2617,7 +2617,7 @@ dependencies = [
 [[package]]
 name = "openvm-macros-common"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "syn 2.0.118",
 ]
@@ -2625,7 +2625,7 @@ dependencies = [
 [[package]]
 name = "openvm-mem"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 
 [[package]]
 name = "openvm-mpt"
@@ -2645,7 +2645,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "group",
  "halo2curves-axiom",
@@ -2669,7 +2669,7 @@ dependencies = [
 [[package]]
 name = "openvm-pairing-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "halo2curves-axiom",
  "hex-literal",
@@ -2689,7 +2689,7 @@ dependencies = [
 [[package]]
 name = "openvm-platform"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "critical-section",
  "embedded-alloc",
@@ -2712,7 +2712,7 @@ dependencies = [
 [[package]]
 name = "openvm-riscv-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-custom-insn",
  "strum_macros 0.26.4",
@@ -2721,7 +2721,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-sha2-guest",
  "sha2",
@@ -2730,7 +2730,7 @@ dependencies = [
 [[package]]
 name = "openvm-sha2-guest"
 version = "2.0.0"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "openvm-platform",
 ]
@@ -2788,7 +2788,7 @@ dependencies = [
 [[package]]
 name = "p256"
 version = "0.13.2"
-source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#ec5180e9ee15234aff8070febcbb2733a2adad74"
+source = "git+https://github.com/openvm-org/openvm.git?branch=develop-v2.1.0#7a530c6df3b1ff4a54e5871d440874cd19ffbe2e"
 dependencies = [
  "ecdsa",
  "elliptic-curve",