feat(starknet_os,starknet_patricia,starknet_committer): deserializabl…

…e commitment info

Cargo.toml

@@ -241,6 +241,7 @@ starknet_mempool_p2p = { path = "crates/starknet_mempool_p2p", version = "0.0.0"
 starknet_mempool_p2p_types = { path = "crates/starknet_mempool_p2p_types", version = "0.0.0" }
 starknet_mempool_types = { path = "crates/starknet_mempool_types", version = "0.0.0" }
 starknet_monitoring_endpoint = { path = "crates/starknet_monitoring_endpoint", version = "0.0.0" }
+starknet_os = { path = "crates/starknet_os", version = "0.0.0" }
 starknet_patricia = { path = "crates/starknet_patricia", version = "0.0.0" }
 starknet_sequencer_infra = { path = "crates/starknet_sequencer_infra", version = "0.0.0" }
 starknet_sequencer_metrics = { path = "crates/starknet_sequencer_metrics", version = "0.0.0" }

crates/starknet_committer/Cargo.toml

@@ -6,7 +6,6 @@ repository.workspace = true
 license.workspace = true
 description = "Computes and manages Starknet state."
 
-
 [dependencies]
 hex.workspace = true
 pretty_assertions.workspace = true

crates/starknet_os/Cargo.toml

@@ -7,14 +7,17 @@ license-file.workspace = true
 description = "The Starknet OS."
 
 [features]
+deserialize = ["serde", "starknet-types-core/serde", "starknet_patricia/deserialize"]
 testing = ["dep:strum", "dep:strum_macros"]
 
 [dependencies]
 blockifier.workspace = true
 cairo-vm.workspace = true
 indoc.workspace = true
+serde = { workspace = true, optional = true, features = ["derive"] }
 starknet-types-core.workspace = true
 starknet_api.workspace = true
+starknet_patricia.workspace = true
 strum = { workspace = true, optional = true }
 strum_macros = { workspace = true, optional = true }
 thiserror.workspace = true

crates/starknet_os/src/io/os_input.rs

@@ -1,4 +1,29 @@
+use std::collections::HashMap;
+
+use starknet_api::core::ContractAddress;
+use starknet_patricia::hash::hash_trait::HashOutput;
+use starknet_patricia::patricia_merkle_tree::types::SubTreeHeight;
+use starknet_types_core::felt::Felt;
+
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+pub struct CommitmentInfo {
+    _previous_root: HashOutput,
+    _updated_root: HashOutput,
+    _tree_height: SubTreeHeight,
+    // TODO(Dori, 1/8/2025): The value type here should probably be more specific (NodeData<L> for
+    //   L: Leaf). This poses a problem in deserialization, as a serialized edge node and a
+    //   serialized contract state leaf are both currently vectors of 3 field elements; as the
+    //   semantics of the values are unimportant for the OS commitments, we make do with a vector
+    //   of field elements as values for now.
+    _commitment_facts: HashMap<HashOutput, Vec<Felt>>,
+}
+
 /// All input needed to initialize the execution helper.
 // TODO(Dori): Add all fields needed to compute commitments, initialize a CachedState and other data
 //   required by the execution helper.
-pub struct StarknetOsInput {}
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+pub struct StarknetOsInput {
+    _contract_state_commitment_info: CommitmentInfo,
+    _address_to_storage_commitment_info: HashMap<ContractAddress, CommitmentInfo>,
+    _contract_class_commitment_info: CommitmentInfo,
+}

crates/starknet_patricia/Cargo.toml

@@ -10,6 +10,7 @@ description = "Library for computing and updating Patricia trees."
 workspace = true
 
 [features]
+deserialize = ["ethnum/serde"]
 testing = []
 
 [dev-dependencies]

crates/starknet_patricia/src/hash/hash_trait.rs

@@ -3,6 +3,7 @@ use starknet_types_core::felt::FromStrError;
 use crate::felt::Felt;
 use crate::impl_from_hex_for_felt_wrapper;
 
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash)]
 pub struct HashOutput(pub Felt);
 

crates/starknet_patricia/src/patricia_merkle_tree/types.rs

@@ -8,6 +8,7 @@ use crate::patricia_merkle_tree::node_data::inner_node::{EdgePathLength, PathToB
 #[path = "types_test.rs"]
 pub mod types_test;
 
+#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
 #[derive(Clone, Copy, Debug, Eq, PartialEq, derive_more::Sub, derive_more::Display)]
 pub struct SubTreeHeight(pub(crate) u8);