Merge pull request #14 from iosis-tech/layouts

Layouts

.cargo/config.toml

@@ -0,0 +1,3 @@
+[env]
+RUST_LOG = "info"
+RUST_MIN_STACK = "16777216"

README.md

@@ -26,9 +26,9 @@ cargo test
   - [x] dex
   - [x] recursive
   - [x] recursive_with_poseidon
-  - [ ] small
-  - [ ] starknet
-  - [ ] starknet_with_keccak
+  - [x] small
+  - [x] starknet
+  - [x] starknet_with_keccak
 
 - **WASM Support:**
   - [ ] Wasm bindings for integration with web applications

crates/air/src/layout/dex/mod.rs

@@ -330,7 +330,7 @@ impl LayoutTrait for RecursiveLayout {
                     segment: crate::layout::segments::OUTPUT,
                 })?
                 .begin_addr)
-            .field_div(&NonZeroFelt::from_felt_unchecked(Felt::from(0x5)));
+            .field_div(&NonZeroFelt::from_felt_unchecked(Felt::TWO));
         ensure!(ecdsa_uses < ecdsa_copies, PublicInputError::UsesInvalid);
         Ok(())
     }

crates/air/src/layout/mod.rs

@@ -5,6 +5,9 @@ use starknet_crypto::Felt;
 pub mod dex;
 pub mod recursive;
 pub mod recursive_with_poseidon;
+pub mod small;
+pub mod starknet;
+pub mod starknet_with_keccak;
 
 // StarkCurve
 pub mod stark_curve {

crates/air/src/layout/recursive/autogenerated.rs

@@ -1,5 +1,5 @@
 use super::global_values::GlobalValues;
-use crate::layout::recursive::{CONSTRAINT_DEGREE, NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND};
+use super::{CONSTRAINT_DEGREE, NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND};
 use starknet_core::types::NonZeroFelt;
 use starknet_crypto::Felt;
 

crates/air/src/layout/recursive_with_poseidon/autogenerated.rs

@@ -1,5 +1,5 @@
 use super::global_values::GlobalValues;
-use crate::layout::recursive::{CONSTRAINT_DEGREE, NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND};
+use super::{CONSTRAINT_DEGREE, NUM_COLUMNS_FIRST, NUM_COLUMNS_SECOND};
 use starknet_core::types::NonZeroFelt;
 use starknet_crypto::Felt;
 

crates/air/src/layout/small/global_values.rs

@@ -0,0 +1,102 @@
+use cairovm_verifier_transcript::transcript::Transcript;
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
+use starknet_core::serde::unsigned_field_element::UfeHex;
+use starknet_crypto::Felt;
+
+#[serde_as]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct EcPoint {
+    #[serde_as(as = "UfeHex")]
+    pub x: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub y: Felt,
+}
+
+#[serde_as]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct EcdsaSigConfig {
+    #[serde_as(as = "UfeHex")]
+    pub alpha: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub beta: Felt,
+    pub shift_point: EcPoint,
+}
+
+// Accumulation of member expressions for auto generated composition polynomial code.
+#[serde_as]
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct GlobalValues {
+    // Public input.
+    #[serde_as(as = "UfeHex")]
+    pub trace_length: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub initial_pc: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub final_pc: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub initial_ap: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub final_ap: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub initial_pedersen_addr: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub initial_range_check_addr: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub initial_ecdsa_addr: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub range_check_min: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub range_check_max: Felt,
+    // Constants.
+    #[serde_as(as = "UfeHex")]
+    pub offset_size: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub half_offset_size: Felt,
+    pub pedersen_shift_point: EcPoint,
+    pub ecdsa_sig_config: EcdsaSigConfig,
+    // Periodic columns.
+    #[serde_as(as = "UfeHex")]
+    pub pedersen_points_x: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub pedersen_points_y: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub ecdsa_generator_points_x: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub ecdsa_generator_points_y: Felt,
+    // Interaction elements.
+    #[serde_as(as = "UfeHex")]
+    pub memory_multi_column_perm_perm_interaction_elm: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub memory_multi_column_perm_hash_interaction_elm0: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub range_check16_perm_interaction_elm: Felt,
+    // Permutation products.
+    #[serde_as(as = "UfeHex")]
+    pub memory_multi_column_perm_perm_public_memory_prod: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub range_check16_perm_public_memory_prod: Felt,
+}
+
+// Elements that are sent from the prover after the commitment on the original trace.
+// Used for components after the first interaction, e.g., memory and range check.
+#[serde_as]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct InteractionElements {
+    #[serde_as(as = "UfeHex")]
+    pub memory_multi_column_perm_perm_interaction_elm: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub memory_multi_column_perm_hash_interaction_elm0: Felt,
+    #[serde_as(as = "UfeHex")]
+    pub range_check16_perm_interaction_elm: Felt,
+}
+
+impl InteractionElements {
+    pub fn new(transcript: &mut Transcript) -> Self {
+        Self {
+            memory_multi_column_perm_perm_interaction_elm: transcript.random_felt_to_prover(),
+            memory_multi_column_perm_hash_interaction_elm0: transcript.random_felt_to_prover(),
+            range_check16_perm_interaction_elm: transcript.random_felt_to_prover(),
+        }
+    }
+}