feat(starknet_patricia,starknet_committer): stop using custom Compile…

…dClassHash type

crates/starknet_committer/src/block_committer/input.rs

@@ -1,15 +1,15 @@
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
 
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::{LeafModifications, SkeletonLeaf};
 use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
 use starknet_patricia::storage::storage_trait::{StorageKey, StorageValue};
 use starknet_types_core::felt::Felt;
 use tracing::level_filters::LevelFilter;
 
-use crate::patricia_merkle_tree::types::{from_class_hash_for_node_index, CompiledClassHash};
+use crate::patricia_merkle_tree::types::from_class_hash_for_node_index;
 
 #[cfg(test)]
 #[path = "input_test.rs"]

crates/starknet_committer/src/forest/filled_forest.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::filled_tree::tree::FilledTree;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
@@ -18,12 +18,7 @@ use crate::forest::forest_errors::{ForestError, ForestResult};
 use crate::forest::updated_skeleton_forest::UpdatedSkeletonForest;
 use crate::hash_function::hash::ForestHashFunction;
 use crate::patricia_merkle_tree::leaf::leaf_impl::{ContractState, ContractStateInput};
-use crate::patricia_merkle_tree::types::{
-    ClassesTrie,
-    CompiledClassHash,
-    ContractsTrie,
-    StorageTrieMap,
-};
+use crate::patricia_merkle_tree::types::{ClassesTrie, ContractsTrie, StorageTrieMap};
 
 pub struct FilledForest {
     pub storage_tries: StorageTrieMap,

crates/starknet_committer/src/forest/original_skeleton_forest.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use starknet_api::core::ContractAddress;
+use starknet_api::core::{CompiledClassHash, ContractAddress};
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::LeafModifications;
 use starknet_patricia::patricia_merkle_tree::original_skeleton_tree::tree::{
@@ -22,7 +22,6 @@ use crate::patricia_merkle_tree::tree::{
     OriginalSkeletonContractsTrieConfig,
     OriginalSkeletonStorageTrieConfig,
 };
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 #[derive(Debug, PartialEq)]
 pub(crate) struct OriginalSkeletonForest<'a> {

crates/starknet_committer/src/forest/skeleton_forest_test.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use pretty_assertions::assert_eq;
 use rstest::rstest;
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::external_test_utils::{
     create_32_bytes_entry,
@@ -33,7 +33,6 @@ use crate::block_committer::input::{
 };
 use crate::forest::original_skeleton_forest::{ForestSortedIndices, OriginalSkeletonForest};
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 macro_rules! compare_skeleton_tree {
     ($actual_skeleton:expr, $expected_skeleton:expr, $expected_indices:expr) => {{

crates/starknet_committer/src/hash_function/hash.rs

@@ -1,3 +1,4 @@
+use starknet_api::core::CompiledClassHash;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::inner_node::NodeData;
 use starknet_patricia::patricia_merkle_tree::updated_skeleton_tree::hash_function::{
@@ -9,7 +10,6 @@ use starknet_types_core::hash::{Pedersen, Poseidon, StarkHash};
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 /// Implementation of HashFunction for Pedersen hash function.
 pub struct PedersenHashFunction;

crates/starknet_committer/src/hash_function/hash_test.rs

@@ -1,6 +1,6 @@
 use hex;
 use rstest::rstest;
-use starknet_api::core::{ClassHash, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, Nonce};
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::inner_node::{
     BinaryData,
@@ -16,7 +16,6 @@ use starknet_types_core::hash::Pedersen;
 use crate::block_committer::input::StarknetStorageValue;
 use crate::hash_function::hash::TreeHashFunctionImpl;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 #[rstest]
 // Random StateTreeTuples and the expected hash results were generated and computed elsewhere.

crates/starknet_committer/src/patricia_merkle_tree/leaf/leaf_impl.rs

@@ -9,7 +9,6 @@ use starknet_types_core::felt::Felt;
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::hash_function::hash::TreeHashFunctionImpl;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct ContractState {
@@ -31,19 +30,6 @@ impl Leaf for StarknetStorageValue {
     }
 }
 
-impl Leaf for CompiledClassHash {
-    type Input = Self;
-    type Output = ();
-
-    fn is_empty(&self) -> bool {
-        self.0 == Felt::ZERO
-    }
-
-    async fn create(input: Self::Input) -> LeafResult<(Self, Self::Output)> {
-        Ok((input, ()))
-    }
-}
-
 impl Leaf for ContractState {
     type Input = ContractStateInput;
     type Output = FilledTreeImpl<StarknetStorageValue>;

crates/starknet_committer/src/patricia_merkle_tree/leaf/leaf_serde.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use serde_json::Value;
 use starknet_api::core::{ClassHash, Nonce};
 use starknet_patricia::hash::hash_trait::HashOutput;
@@ -11,7 +9,7 @@ use starknet_types_core::felt::Felt;
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::{fixed_hex_string_no_prefix, CompiledClassHash};
+use crate::patricia_merkle_tree::types::fixed_hex_string_no_prefix;
 
 impl DBObject for StarknetStorageValue {
     /// Serializes the value into a 32-byte vector.
@@ -24,18 +22,6 @@ impl DBObject for StarknetStorageValue {
     }
 }
 
-impl DBObject for CompiledClassHash {
-    /// Creates a json string describing the leaf and casts it into a byte vector.
-    fn serialize(&self) -> StorageValue {
-        let json_string = format!(r#"{{"compiled_class_hash": "{}"}}"#, self.0.to_hex_string());
-        StorageValue(json_string.into_bytes())
-    }
-
-    fn get_prefix(&self) -> Vec<u8> {
-        StarknetPrefix::CompiledClassLeaf.to_storage_prefix()
-    }
-}
-
 impl DBObject for ContractState {
     /// Creates a json string describing the leaf and casts it into a byte vector.
     fn serialize(&self) -> StorageValue {
@@ -64,21 +50,6 @@ impl Deserializable for StarknetStorageValue {
     }
 }
 
-impl Deserializable for CompiledClassHash {
-    fn deserialize(value: &StorageValue) -> Result<Self, DeserializationError> {
-        let json_str = std::str::from_utf8(&value.0)?;
-        let map: HashMap<String, String> = serde_json::from_str(json_str)?;
-        let hash_as_hex = map
-            .get("compiled_class_hash")
-            .ok_or(DeserializationError::NonExistingKey("compiled_class_hash".to_string()))?;
-        Ok(Self::from_hex(hash_as_hex)?)
-    }
-
-    fn prefix() -> Vec<u8> {
-        StarknetPrefix::CompiledClassLeaf.to_storage_prefix()
-    }
-}
-
 impl Deserializable for ContractState {
     fn deserialize(value: &StorageValue) -> Result<Self, DeserializationError> {
         let json_str = std::str::from_utf8(&value.0)?;

crates/starknet_committer/src/patricia_merkle_tree/leaf/leaf_serde_test.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
 use rstest::rstest;
-use starknet_api::core::{ClassHash, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, Nonce};
 use starknet_api::felt;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::node_data::leaf::Leaf;
@@ -11,7 +11,6 @@ use starknet_types_core::felt::Felt;
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 #[rstest]
 #[case::zero_storage_leaf(StarknetStorageValue(Felt::ZERO))]

crates/starknet_committer/src/patricia_merkle_tree/tree.rs

@@ -1,9 +1,9 @@
+use starknet_api::core::CompiledClassHash;
 use starknet_patricia::generate_trie_config;
 use starknet_patricia::patricia_merkle_tree::original_skeleton_tree::config::OriginalSkeletonTreeConfig;
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
-use crate::patricia_merkle_tree::types::CompiledClassHash;
 
 generate_trie_config!(OriginalSkeletonStorageTrieConfig, StarknetStorageValue);
 

crates/starknet_committer/src/patricia_merkle_tree/types.rs

@@ -1,10 +1,8 @@
 use std::collections::HashMap;
 
-use starknet_api::core::{ClassHash, ContractAddress};
-use starknet_patricia::impl_from_hex_for_felt_wrapper;
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress};
 use starknet_patricia::patricia_merkle_tree::filled_tree::tree::FilledTreeImpl;
 use starknet_patricia::patricia_merkle_tree::types::NodeIndex;
-use starknet_types_core::felt::{Felt, FromStrError};
 
 use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
@@ -17,11 +15,6 @@ pub fn from_class_hash_for_node_index(class_hash: &ClassHash) -> NodeIndex {
     NodeIndex::from_leaf_felt(&class_hash.0)
 }
 
-#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
-pub struct CompiledClassHash(pub Felt);
-
-impl_from_hex_for_felt_wrapper!(CompiledClassHash);
-
 pub type StorageTrie = FilledTreeImpl<StarknetStorageValue>;
 pub type ClassesTrie = FilledTreeImpl<CompiledClassHash>;
 pub type ContractsTrie = FilledTreeImpl<ContractState>;

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/cast.rs

@@ -1,14 +1,13 @@
 use std::collections::HashMap;
 
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_committer::block_committer::input::{
     ConfigImpl,
     Input,
     StarknetStorageKey,
     StarknetStorageValue,
     StateDiff,
 };
-use starknet_committer::patricia_merkle_tree::types::CompiledClassHash;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::storage::errors::DeserializationError;
 use starknet_patricia::storage::storage_trait::{StorageKey, StorageValue};

crates/starknet_committer_and_os_cli/src/committer_cli/parse_input/read_test.rs

@@ -2,15 +2,14 @@ use std::collections::HashMap;
 
 use assert_matches::assert_matches;
 use pretty_assertions::assert_eq;
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_committer::block_committer::input::{
     ConfigImpl,
     Input,
     StarknetStorageKey,
     StarknetStorageValue,
     StateDiff,
 };
-use starknet_committer::patricia_merkle_tree::types::CompiledClassHash;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::storage::errors::DeserializationError;
 use starknet_patricia::storage::storage_trait::{StorageKey, StorageValue};

crates/starknet_committer_and_os_cli/src/committer_cli/tests/python_tests.rs

@@ -3,7 +3,7 @@ use std::fmt::Debug;
 
 use ethnum::U256;
 use serde_json::json;
-use starknet_api::core::{ClassHash, ContractAddress, Nonce};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
 use starknet_committer::block_committer::input::{
     StarknetStorageKey,
     StarknetStorageValue,
@@ -13,7 +13,6 @@ use starknet_committer::forest::filled_forest::FilledForest;
 use starknet_committer::hash_function::hash::TreeHashFunctionImpl;
 use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use starknet_committer::patricia_merkle_tree::tree::OriginalSkeletonStorageTrieConfig;
-use starknet_committer::patricia_merkle_tree::types::CompiledClassHash;
 use starknet_patricia::hash::hash_trait::HashOutput;
 use starknet_patricia::patricia_merkle_tree::external_test_utils::single_tree_flow_test;
 use starknet_patricia::patricia_merkle_tree::filled_tree::node::FilledNode;

crates/starknet_committer_and_os_cli/src/committer_cli/tests/utils/random_structs.rs

@@ -6,14 +6,19 @@ use rand::prelude::IteratorRandom;
 use rand::Rng;
 use rand_distr::num_traits::ToPrimitive;
 use rand_distr::{Distribution, Geometric};
-use starknet_api::core::{ClassHash, ContractAddress, Nonce, PATRICIA_KEY_UPPER_BOUND};
+use starknet_api::core::{
+    ClassHash,
+    CompiledClassHash,
+    ContractAddress,
+    Nonce,
+    PATRICIA_KEY_UPPER_BOUND,
+};
 use starknet_api::felt;
 use starknet_committer::block_committer::input::StarknetStorageValue;
 use starknet_committer::forest::filled_forest::FilledForest;
 use starknet_committer::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use starknet_committer::patricia_merkle_tree::types::{
     ClassesTrie,
-    CompiledClassHash,
     ContractsTrie,
     StorageTrie,
     StorageTrieMap,

crates/starknet_patricia/src/patricia_merkle_tree/node_data.rs

@@ -1,3 +1,4 @@
 pub mod errors;
 pub mod inner_node;
 pub mod leaf;
+pub mod leaf_impls;

crates/starknet_patricia/src/patricia_merkle_tree/node_data/leaf_impls.rs

@@ -0,0 +1,50 @@
+use std::collections::HashMap;
+
+use starknet_api::core::CompiledClassHash;
+use starknet_types_core::felt::Felt;
+
+use crate::patricia_merkle_tree::node_data::errors::LeafResult;
+use crate::patricia_merkle_tree::node_data::leaf::Leaf;
+use crate::storage::db_object::{DBObject, Deserializable};
+use crate::storage::errors::DeserializationError;
+use crate::storage::storage_trait::{StarknetPrefix, StorageValue};
+
+impl Deserializable for CompiledClassHash {
+    fn deserialize(value: &StorageValue) -> Result<Self, DeserializationError> {
+        let json_str = std::str::from_utf8(&value.0)?;
+        let map: HashMap<String, String> = serde_json::from_str(json_str)?;
+        let hash_as_hex = map
+            .get("compiled_class_hash")
+            .ok_or(DeserializationError::NonExistingKey("compiled_class_hash".to_string()))?;
+        Ok(Self(Felt::from_hex(hash_as_hex)?))
+    }
+
+    fn prefix() -> Vec<u8> {
+        StarknetPrefix::CompiledClassLeaf.to_storage_prefix()
+    }
+}
+
+impl DBObject for CompiledClassHash {
+    /// Creates a json string describing the leaf and casts it into a byte vector.
+    fn serialize(&self) -> StorageValue {
+        let json_string = format!(r#"{{"compiled_class_hash": "{}"}}"#, self.0.to_hex_string());
+        StorageValue(json_string.into_bytes())
+    }
+
+    fn get_prefix(&self) -> Vec<u8> {
+        StarknetPrefix::CompiledClassLeaf.to_storage_prefix()
+    }
+}
+
+impl Leaf for CompiledClassHash {
+    type Input = Self;
+    type Output = ();
+
+    fn is_empty(&self) -> bool {
+        self.0 == Felt::ZERO
+    }
+
+    async fn create(input: Self::Input) -> LeafResult<(Self, Self::Output)> {
+        Ok((input, ()))
+    }
+}