Merge branch 'main' into feat/ethrex-empty-block-v2

Author: ColoCarletti

.github/workflows/pr_spec.yaml

@@ -0,0 +1,25 @@
+name: Spec tests
+on:
+  pull_request:
+    branches:
+      - main
+      - 'spec/**'
+  push:
+    branches: ["**"]
+    paths: ["spec/**"]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  spec_structure:
+    name: Spec structure test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+      - run: python3 spec/tooling/chip.py spec/src/config.toml spec/src/signatures.toml spec/src/*.toml

prover/src/lib.rs

@@ -41,9 +41,8 @@ use crate::tables::types::BusId;
 use crate::test_utils::{
     E, F, VmAir, create_bitwise_air, create_branch_air, create_commit_air, create_cpu_air,
     create_decode_air, create_dvrm_air, create_halt_air, create_keccak_air, create_load_air,
-    create_lt_air, create_memw_air, create_memw_aligned_air, create_mul_air, create_page_air,
-    create_register_air,
-    create_shift_air,
+    create_lt_air, create_memw_air, create_memw_aligned_air, create_memw_register_air,
+    create_mul_air, create_page_air, create_register_air, create_shift_air,
 };
 
 use stark::proof::options::{GoldilocksCubicProofOptions, ProofOptions};
@@ -74,6 +73,7 @@ pub struct TableCounts {
     pub dvrm: usize,
     pub shift: usize,
     pub branch: usize,
+    pub memw_register: usize,
 }
 
 impl TableCounts {
@@ -92,6 +92,7 @@ impl TableCounts {
             + self.dvrm
             + self.shift
             + self.branch
+            + self.memw_register
     }
 
     /// Validate that all required tables have at least one chunk.
@@ -109,6 +110,7 @@ impl TableCounts {
             ("dvrm", self.dvrm),
             ("shift", self.shift),
             ("branch", self.branch),
+            ("memw_register", self.memw_register),
         ];
         for (name, count) in checks {
             if count == 0 {
@@ -197,6 +199,7 @@ pub(crate) struct VmAirs {
     pub register: VmAir,
     pub keccak: VmAir,
     pub pages: Vec<VmAir>,
+    pub memw_registers: Vec<VmAir>,
 }
 
 impl VmAirs {
@@ -245,6 +248,13 @@ impl VmAirs {
         for (air, trace) in self.pages.iter().zip(traces.pages.iter_mut()) {
             pairs.push((air, trace, &()));
         }
+        for (air, trace) in self
+            .memw_registers
+            .iter()
+            .zip(traces.memw_registers.iter_mut())
+        {
+            pairs.push((air, trace, &()));
+        }
 
         pairs
     }
@@ -290,6 +300,9 @@ impl VmAirs {
         for air in &self.pages {
             refs.push(air);
         }
+        for air in &self.memw_registers {
+            refs.push(air);
+        }
 
         refs
     }
@@ -363,6 +376,9 @@ impl VmAirs {
                 )
             })
             .collect();
+        let memw_registers: Vec<_> = (0..table_counts.memw_register)
+            .map(|i| create_memw_register_air(proof_options).with_name(&format!("MEMW_R[{}]", i)))
+            .collect();
 
         #[cfg(feature = "debug-checks")]
         debug_report::print_bus_legend();
@@ -384,6 +400,7 @@ impl VmAirs {
             register,
             keccak,
             pages,
+            memw_registers,
         }
     }
 }