Revert "Revert starknet and starknet_with_keccak split"

This reverts commit 1e0a656.
HerodotusDev · Sep 12, 2024 · 372244d · 372244d
1 parent 957a20d
commit 372244d
Show file tree

Hide file tree

Showing 6 changed files with 41,856 additions and 6,441 deletions.
diff --git a/src/air/layouts/starknet.cairo b/src/air/layouts/starknet.cairo
@@ -3,12 +3,16 @@ mod constants;
 mod global_values;
 mod public_input;
 mod traces;
+mod contract;
 
 use cairo_verifier::{
     air::{
         constants::{SHIFT_POINT_X, SHIFT_POINT_Y, StarkCurve},
         layouts::starknet::{
-            autogenerated::{eval_composition_polynomial_inner, eval_oods_polynomial_inner},
+            contract::{
+                IStarknetLayoutContract1Dispatcher, IStarknetLayoutContract1DispatcherTrait,
+                IStarknetLayoutContract2Dispatcher, IStarknetLayoutContract2DispatcherTrait,
+            },
             global_values::{
                 GlobalValues, InteractionElements, EcPoint, EcdsaSigConfig, CurveConfig
             },
@@ -141,7 +145,9 @@ impl StarknetAIRCompositionImpl of AIRComposition<InteractionElements, PublicInp
             diluted_check_final_cum_val: diluted_prod
         };
 
-        eval_composition_polynomial_inner(
+        IStarknetLayoutContract1Dispatcher {
+            contract_address: contract_address_1
+        }.eval_composition_polynomial_inner(
             mask_values, constraint_coefficients, point, trace_generator, global_values
         )
     }
@@ -157,7 +163,9 @@ impl StarknetAIROodsImpl of AIROods {
         trace_generator: felt252,
         contract_address: ContractAddress,
     ) -> felt252 {
-        eval_oods_polynomial_inner(
+        IStarknetLayoutContract2Dispatcher {
+            contract_address: contract_address_2
+        }.eval_oods_polynomial_inner(
             column_values, oods_values, constraint_coefficients, point, oods_point, trace_generator,
         )
     }