dynamic layout integration

HerodotusDev · Aug 28, 2024 · a2659dd · a2659dd
1 parent 1c4498a
commit a2659dd
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 39 deletions.
diff --git a/src/air/air.cairo b/src/air/air.cairo
@@ -10,13 +10,14 @@ trait AIRComposition<IE, PI> {
     ) -> felt252;
 }
 
-trait AIROods {
+trait AIROods<DY> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DY,
     ) -> felt252;
 }
diff --git a/src/air/layouts.cairo b/src/air/layouts.cairo
@@ -17,7 +17,7 @@ mod recursive;
 // mod starknet_with_keccak;
 // === STARKNET_WITH_KECCAK END ===
 // === DYNAMIC BEGIN ===
-mod dynamic;
+// mod dynamic;
 // === DYNAMIC END ===
 
 
diff --git a/src/air/layouts/dex.cairo b/src/air/layouts/dex.cairo
@@ -12,7 +12,7 @@ use cairo_verifier::{
             global_values::{GlobalValues, InteractionElements, EcPoint, EcdsaSigConfig},
             public_input::DexPublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, PEDERSEN_BUILTIN_RATIO, ECDSA_BUILTIN_RATIO,
+                DynamicParams, PUBLIC_MEMORY_STEP, PEDERSEN_BUILTIN_RATIO, ECDSA_BUILTIN_RATIO,
                 ECDSA_BUILTIN_REPETITIONS, PEDERSEN_BUILTIN_REPETITIONS, segments,
             },
         },
@@ -95,17 +95,18 @@ impl DexAIRCompositionImpl of AIRComposition<InteractionElements, PublicInput> {
     }
 }
 
-impl DexAIROodsImpl of AIROods {
+impl DexAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
-            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
+            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator
         )
     }
 }
diff --git a/src/air/layouts/dex/constants.cairo b/src/air/layouts/dex/constants.cairo
@@ -33,6 +33,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 8;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 128;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const ECDSA: usize = 5;
     const EXECUTION: usize = 1;

diff --git a/src/air/layouts/dynamic.cairo b/src/air/layouts/dynamic.cairo
@@ -31,7 +31,7 @@ use cairo_verifier::{
     common::{math::{Felt252Div, Felt252PartialOrd, pow}, asserts::assert_range_u128}
 };
 
-impl StarknetAIRCompositionImpl of AIRComposition<InteractionElements, PublicInput> {
+impl DynamicAIRCompositionImpl of AIRComposition<InteractionElements, PublicInput> {
     fn eval_composition_polynomial(
         interaction_elements: InteractionElements,
         public_input: @PublicInput,
@@ -203,25 +203,29 @@ impl StarknetAIRCompositionImpl of AIRComposition<InteractionElements, PublicInp
         };
 
         eval_composition_polynomial_inner(
-            mask_values,
-            constraint_coefficients,
-            point,
-            trace_generator,
-            global_values,
-            dynamic_params
+            mask_values, constraint_coefficients, point, trace_generator, global_values,
         )
     }
 }
 
-impl StarknetAIROodsImpl of AIROods {
+impl DynamicAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
-        0
+        eval_oods_polynomial_inner(
+            column_values,
+            oods_values,
+            constraint_coefficients,
+            point,
+            oods_point,
+            trace_generator,
+            dynamic_params,
+        )
     }
 }
diff --git a/src/air/layouts/dynamic/autogenerated.cairo b/src/air/layouts/dynamic/autogenerated.cairo
@@ -13,8 +13,8 @@ fn eval_composition_polynomial_inner(
     point: felt252,
     trace_generator: felt252,
     global_values: GlobalValues,
-    dynamic_params: DynamicParams
 ) -> felt252 {
+    let dynamic_params = global_values.dynamic_params;
     let add_mod_a0_suboffset = dynamic_params.add_mod_a0_suboffset;
     let add_mod_a1_suboffset = dynamic_params.add_mod_a1_suboffset;
     let add_mod_a2_suboffset = dynamic_params.add_mod_a2_suboffset;

diff --git a/src/air/layouts/recursive.cairo b/src/air/layouts/recursive.cairo
@@ -12,8 +12,8 @@ use cairo_verifier::{
             global_values::{GlobalValues, InteractionElements, EcPoint},
             public_input::RecursivePublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING, PEDERSEN_BUILTIN_RATIO,
-                PEDERSEN_BUILTIN_REPETITIONS, segments,
+                DynamicParams, PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING,
+                PEDERSEN_BUILTIN_RATIO, PEDERSEN_BUILTIN_REPETITIONS, segments,
             },
         },
         air::{AIRComposition, AIROods}, diluted::get_diluted_product,
@@ -96,17 +96,18 @@ impl RecursiveAIRCompositionImpl of AIRComposition<InteractionElements, PublicIn
     }
 }
 
-impl RecursiveAIROodsImpl of AIROods {
+impl RecursiveAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
-            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
+            column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator
         )
     }
 }
diff --git a/src/air/layouts/recursive/constants.cairo b/src/air/layouts/recursive/constants.cairo
@@ -33,6 +33,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 8;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 128;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const BITWISE: usize = 5;
     const EXECUTION: usize = 1;

diff --git a/src/air/layouts/recursive_with_poseidon.cairo b/src/air/layouts/recursive_with_poseidon.cairo
@@ -12,8 +12,8 @@ use cairo_verifier::{
             global_values::{GlobalValues, InteractionElements, EcPoint},
             public_input::RecursiveWithPoseidonPublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING, PEDERSEN_BUILTIN_RATIO,
-                PEDERSEN_BUILTIN_REPETITIONS, segments, POSEIDON_RATIO
+                DynamicParams, PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING,
+                PEDERSEN_BUILTIN_RATIO, PEDERSEN_BUILTIN_REPETITIONS, segments, POSEIDON_RATIO
             },
         },
         air::{AIRComposition, AIROods}, diluted::get_diluted_product,
@@ -125,14 +125,15 @@ impl RecursiveWithPoseidonAIRCompositionImpl of AIRComposition<InteractionElemen
     }
 }
 
-impl RecursiveWithPoseidonAIROodsImpl of AIROods {
+impl RecursiveWithPoseidonAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
             column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,

diff --git a/src/air/layouts/recursive_with_poseidon/constants.cairo b/src/air/layouts/recursive_with_poseidon/constants.cairo
@@ -38,6 +38,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 16;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 256;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const BITWISE: usize = 5;
     const EXECUTION: usize = 1;

diff --git a/src/air/layouts/small.cairo b/src/air/layouts/small.cairo
@@ -12,7 +12,7 @@ use cairo_verifier::{
             global_values::{GlobalValues, InteractionElements, EcPoint, EcdsaSigConfig},
             public_input::SmallPublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, PEDERSEN_BUILTIN_RATIO, ECDSA_BUILTIN_RATIO,
+                DynamicParams, PUBLIC_MEMORY_STEP, PEDERSEN_BUILTIN_RATIO, ECDSA_BUILTIN_RATIO,
                 ECDSA_BUILTIN_REPETITIONS, PEDERSEN_BUILTIN_REPETITIONS, segments,
             },
         },
@@ -95,14 +95,15 @@ impl SmallAIRCompositionImpl of AIRComposition<InteractionElements, PublicInput>
     }
 }
 
-impl SmallAIROodsImpl of AIROods {
+impl SmallAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
             column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,

diff --git a/src/air/layouts/small/constants.cairo b/src/air/layouts/small/constants.cairo
@@ -33,6 +33,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 8;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 128;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const ECDSA: usize = 5;
     const EXECUTION: usize = 1;

diff --git a/src/air/layouts/starknet.cairo b/src/air/layouts/starknet.cairo
@@ -14,8 +14,8 @@ use cairo_verifier::{
             },
             public_input::StarknetPublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING, PEDERSEN_BUILTIN_RATIO,
-                PEDERSEN_BUILTIN_REPETITIONS, segments, ECDSA_BUILTIN_RATIO,
+                DynamicParams, PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING,
+                PEDERSEN_BUILTIN_RATIO, PEDERSEN_BUILTIN_REPETITIONS, segments, ECDSA_BUILTIN_RATIO,
                 ECDSA_BUILTIN_REPETITIONS, POSEIDON_RATIO
             },
         },
@@ -145,14 +145,15 @@ impl StarknetAIRCompositionImpl of AIRComposition<InteractionElements, PublicInp
     }
 }
 
-impl StarknetAIROodsImpl of AIROods {
+impl StarknetAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
             column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,

diff --git a/src/air/layouts/starknet/constants.cairo b/src/air/layouts/starknet/constants.cairo
@@ -47,6 +47,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 16;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 256;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const BITWISE: usize = 6;
     const EC_OP: usize = 7;

diff --git a/src/air/layouts/starknet_with_keccak.cairo b/src/air/layouts/starknet_with_keccak.cairo
@@ -14,8 +14,8 @@ use cairo_verifier::{
             },
             public_input::StarknetWithKeccakPublicInputImpl,
             constants::{
-                PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING, PEDERSEN_BUILTIN_RATIO,
-                PEDERSEN_BUILTIN_REPETITIONS, segments, ECDSA_BUILTIN_RATIO,
+                DynamicParams, PUBLIC_MEMORY_STEP, DILUTED_N_BITS, DILUTED_SPACING,
+                PEDERSEN_BUILTIN_RATIO, PEDERSEN_BUILTIN_REPETITIONS, segments, ECDSA_BUILTIN_RATIO,
                 ECDSA_BUILTIN_REPETITIONS, POSEIDON_RATIO, KECCAK_RATIO
             },
         },
@@ -167,14 +167,15 @@ impl StarknetWithKeccakAIRCompositionImpl of AIRComposition<InteractionElements,
     }
 }
 
-impl StarknetWithKeccakAIROodsImpl of AIROods {
+impl StarknetWithKeccakAIROodsImpl of AIROods<DynamicParams> {
     fn eval_oods_polynomial(
         column_values: Span<felt252>,
         oods_values: Span<felt252>,
         constraint_coefficients: Span<felt252>,
         point: felt252,
         oods_point: felt252,
         trace_generator: felt252,
+        dynamic_params: DynamicParams,
     ) -> felt252 {
         eval_oods_polynomial_inner(
             column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,

diff --git a/src/air/layouts/starknet_with_keccak/constants.cairo b/src/air/layouts/starknet_with_keccak/constants.cairo
@@ -49,6 +49,9 @@ const RANGE_CHECK_BUILTIN_RATIO: felt252 = 16;
 const RANGE_CHECK_BUILTIN_ROW_RATIO: felt252 = 256;
 const RANGE_CHECK_N_PARTS: felt252 = 8;
 
+#[derive(Drop, Copy, Serde)]
+struct DynamicParams {}
+
 mod segments {
     const BITWISE: usize = 6;
     const EC_OP: usize = 7;

diff --git a/src/air/public_input.cairo b/src/air/public_input.cairo
@@ -18,6 +18,9 @@ use cairo_verifier::{
     // === STARKNET_WITH_KECCAK BEGIN ===
     // air::layouts::starknet_with_keccak::constants::segments,
     // === STARKNET_WITH_KECCAK END ===
+    // === DYNAMIC BEGIN ===
+    // air::layouts::dynamic::constants::segments,
+    // === DYNAMIC END ===
     air::public_memory::{
         Page, PageTrait, ContinuousPageHeader, get_continuous_pages_product, AddrValueSize
     },

diff --git a/src/benches/stark/verify.cairo b/src/benches/stark/verify.cairo
@@ -5,12 +5,19 @@ use cairo_verifier::{
 };
 
 fn bench_stark_verify() {
+    let public_input = stone_proof_fibonacci_keccak::public_input::get();
     let queries = stone_proof_fibonacci_keccak::queries::get().span();
     let commitment = stone_proof_fibonacci_keccak::stark::commitment::get();
     let witness = stone_proof_fibonacci_keccak::stark::witness::get();
     let stark_domains = stone_proof_fibonacci_keccak::stark::domains::get();
 
     stark_verify(
-        NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND, queries, commitment, witness, stark_domains,
+        NUM_COLUMNS_FIRST,
+        NUM_COLUMNS_SECOND,
+        @public_input,
+        queries,
+        commitment,
+        witness,
+        stark_domains,
     )
 }
diff --git a/src/deserialization/stark.cairo b/src/deserialization/stark.cairo
@@ -21,6 +21,9 @@ use cairo_verifier::{
     // === STARKNET_WITH_KECCAK BEGIN ===
     // air::layouts::starknet_with_keccak::traces::TracesConfig,
     // === STARKNET_WITH_KECCAK END ===
+    // === DYNAMIC BEGIN ===
+    // air::layouts::dynamic::traces::TracesConfig,
+    // === DYNAMIC END ===
     deserialization::{
         traces::{
             TracesConfigWithSerde, TracesDecommitmentWithSerde, TracesWitnessWithSerde,

diff --git a/src/deserialization/traces.cairo b/src/deserialization/traces.cairo
@@ -29,6 +29,11 @@ use cairo_verifier::{
     // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
     // },
     // === STARKNET_WITH_KECCAK END ===
+    // === DYNAMIC BEGIN ===
+    // air::layouts::dynamic::{
+    // traces::TracesConfig, traces::{TracesUnsentCommitment, TracesDecommitment, TracesWitness}
+    // },
+    // === DYNAMIC END ===
     deserialization::{
         vector::{
             VectorCommitmentConfig, VectorCommitmentWitness, VectorCommitmentConfigWithSerde,

diff --git a/src/lib.cairo b/src/lib.cairo
@@ -39,6 +39,9 @@ use cairo_verifier::{
 // === STARKNET_WITH_KECCAK BEGIN ===
 // air::layouts::starknet_with_keccak::public_input::StarknetWithKeccakPublicInputImpl as PublicInputImpl,
 // === STARKNET_WITH_KECCAK END ===
+// === DYNAMIC BEGIN ===
+// air::layouts::dynamic::public_input::DynamicPublicInputImpl as PublicInputImpl,
+// === DYNAMIC END ===
 };
 
 const SECURITY_BITS: felt252 = 50;