Target 0xMiden Plonky3 repo and use AirScriptAir and AirScriptBuilder traits

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Fix regressions on MIR and list_comprehensions (#449).
 - Add Plonky3 codegen backend (#461).
 - Fixed a vector unrolling issue in nested match evaluations (#491).
+- In Plonky3 codegen, use AirScriptAir and AirScriptBuilder traits, and generate aux constraints (#508).
 
 ## 0.4.0 (2025-06-20)
 

air-script/Cargo.toml

@@ -30,18 +30,18 @@ mir = { package = "air-mir", path = "../mir", version = "0.5" }
 
 [dev-dependencies]
 expect-test = "1.4"
-p3-air = { package = "p3-air", version = "0.3", default-features = false }
-p3-challenger = { package = "p3-challenger", version = "0.3", default-features = false }
-p3-circle = { package = "p3-circle", version = "0.3", default-features = false }
-p3-commit = { package = "p3-commit", version = "0.3", default-features = false }
-p3-field = { package = "p3-field", version = "0.3", default-features = false }
-p3-fri = { package = "p3-fri", version = "0.3", default-features = false }
-p3-matrix = { package = "p3-matrix", version = "0.3", default-features = false }
-p3-merkle-tree = { package = "p3-merkle-tree", version = "0.3", default-features = false }
-p3-goldilocks = { package = "p3-goldilocks", version = "0.3", default-features = false }
-p3-sha256 = { package = "p3-sha256", version = "0.3", default-features = false }
-p3-symmetric = { package = "p3-symmetric", version = "0.3", default-features = false }
-p3-uni-stark = { package = "p3-uni-stark", version = "0.3.0", default-features = false }
+p3-air = { package = "p3-air", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-challenger = { package = "p3-challenger", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-circle = { package = "p3-circle", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-commit = { package = "p3-commit", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-field = { package = "p3-field", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-fri = { package = "p3-fri", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-matrix = { package = "p3-matrix", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-merkle-tree = { package = "p3-merkle-tree", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-goldilocks = { package = "p3-goldilocks", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-sha256 = { package = "p3-sha256", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-symmetric = { package = "p3-symmetric", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
+p3-uni-stark = { package = "p3-uni-stark", git="https://github.com/0xMiden/Plonky3", rev = "2e6ff23090b5bd5138695ceb757181443a523c6d", default-features = false }
 winter-air = { package = "winter-air", version = "0.12", default-features = false }
 winter-math = { package = "winter-math", version = "0.12", default-features = false }
 winter-utils = { package = "winter-utils", version = "0.12", default-features = false }

air-script/src/lib.rs

@@ -1,3 +1,8 @@
 pub use air_codegen_winter::CodeGenerator as WinterfellCodeGenerator;
 pub use air_ir::{Air, CompileError, compile};
 pub use air_parser::{parse, parse_file, transforms};
+
+#[cfg(test)]
+pub mod test_utils;
+#[cfg(test)]
+mod tests;

air-script/tests/helpers/macros.rs → air-script/src/test_utils/air_tester_macros.rs

@@ -36,12 +36,12 @@ macro_rules! generate_air_winterfell_test {
 /// * `test_name` - The identifier for the test function (e.g., `test_binary_air`)
 /// * `air_name` - The identifier for the AIR struct (e.g., `BinaryAir`)
 #[macro_export]
-macro_rules! generate_air_plonky3_test {
+macro_rules! generate_air_plonky3_test_with_airscript_traits {
     ($test_name:ident, $air_name:ident) => {
         #[test]
         fn $test_name() {
             type Val = Goldilocks;
-            type Challenge = BinomialExtensionField<Val, 3>;
+            type Challenge = BinomialExtensionField<Val, 5>;
 
             type ByteHash = Sha256;
             type FieldHash = SerializingHasher<ByteHash>;
@@ -67,18 +67,15 @@ macro_rules! generate_air_plonky3_test {
             let config = MyConfig::new(pcs, challenger);
 
             let inputs = generate_inputs();
-            let inputs_goldilocks: Vec<Val> =
-                inputs.iter().map(|&x| Val::from_u32(x)).collect();
+            let inputs_goldilocks: Vec<Val> = inputs.iter().map(|&x| Val::from_u32(x)).collect();
 
             let trace = generate_trace_rows::<Val>(inputs);
 
-            check_constraints_with_periodic_columns(&$air_name {}, &trace, &inputs_goldilocks);
-
-            /*let prove_with_periodic_columns = prove_with_periodic_columns(&config, &BitwiseAir {}, trace, &inputs_goldilocks);
-            verify_with_periodic_columns(&config, &BitwiseAir {}, &prove_with_periodic_columns, &inputs_goldilocks).expect("Verification failed");*/
-
-            /*let proof = prove(&config, &BitwiseAir {}, trace, &inputs_goldilocks);
-            verify(&config, &BitwiseAir {}, &proof, &inputs_goldilocks).expect("Verification failed");*/
+            check_constraints_with_airscript_traits::<Goldilocks, Challenge, $air_name>(
+                &$air_name {},
+                &trace,
+                &inputs_goldilocks,
+            );
         }
     };
 }

air-script/tests/codegen/helpers.rs → air-script/src/test_utils/codegen.rs

@@ -1,11 +1,12 @@
 use std::sync::Arc;
 
 use air_ir::{CodeGenerator, CompileError};
-use air_script::compile;
 use miden_diagnostics::{
     CodeMap, DefaultEmitter, DiagnosticsHandler, term::termcolor::ColorChoice,
 };
 
+use crate::compile;
+
 pub enum Target {
     Winterfell,
     Plonky3,

air-script/src/test_utils/mod.rs

@@ -0,0 +1,8 @@
+/// Macros to generate Air tester structs and tests for both Plonky3 and Winterfell backends.
+pub mod air_tester_macros;
+/// Code generation for tests/**/*.air files.
+pub mod codegen;
+/// Plonky3-specific traits, to be moved to 0xMiden/Plonky3 once stabilized.
+pub mod plonky3_traits;
+/// Winterfell-specific traits
+pub mod winterfell_traits;