starknet_committer: hash leaves of both layouts

Author: ArielElp

crates/starknet_committer/src/hash_function/hash.rs

@@ -11,6 +11,12 @@ use crate::block_committer::input::StarknetStorageValue;
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use crate::patricia_merkle_tree::types::CompiledClassHash;
 
+pub const CONTRACT_STATE_HASH_VERSION: Felt = Felt::ZERO;
+
+// The hex string corresponding to b'CONTRACT_CLASS_LEAF_V0' in big-endian.
+pub const CONTRACT_CLASS_LEAF_V0: Felt =
+    Felt::from_hex_unchecked("0x434f4e54524143545f434c4153535f4c4541465f5630");
+
 /// Implementation of HashFunction for Pedersen hash function.
 pub struct PedersenHashFunction;
 impl HashFunction for PedersenHashFunction {
@@ -29,49 +35,50 @@ impl HashFunction for PoseidonHashFunction {
 
 pub struct TreeHashFunctionImpl;
 
-impl TreeHashFunctionImpl {
-    // TODO(Aner, 11/4/24): Verify the correctness of the implementation.
-    pub const CONTRACT_STATE_HASH_VERSION: Felt = Felt::ZERO;
-
-    // The hex string corresponding to b'CONTRACT_CLASS_LEAF_V0' in big-endian.
-    pub const CONTRACT_CLASS_LEAF_V0: &'static str =
-        "0x434f4e54524143545f434c4153535f4c4541465f5630";
-}
-
 /// Implementation of TreeHashFunction for contracts trie.
 /// The implementation is based on the following reference:
 /// <https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/starknet-state/#trie_construction>
 impl TreeHashFunction<ContractState> for TreeHashFunctionImpl {
     fn compute_leaf_hash(contract_state: &ContractState) -> HashOutput {
-        HashOutput(Pedersen::hash(
-            &Pedersen::hash(
-                &Pedersen::hash(&contract_state.class_hash.0, &contract_state.storage_root_hash.0),
-                &contract_state.nonce.0,
-            ),
-            &Self::CONTRACT_STATE_HASH_VERSION,
-        ))
+        compute_contract_state_leaf_hash(contract_state)
     }
     fn compute_node_hash(node_data: &NodeData<ContractState, HashOutput>) -> HashOutput {
         Self::compute_node_hash_with_inner_hash_function::<PedersenHashFunction>(node_data)
     }
 }
 
+fn compute_contract_state_leaf_hash<L: AsRef<ContractState>>(
+    contract_state_leaf: &L,
+) -> HashOutput {
+    let contract_state: &ContractState = contract_state_leaf.as_ref();
+    HashOutput(Pedersen::hash(
+        &Pedersen::hash(
+            &Pedersen::hash(&contract_state.class_hash.0, &contract_state.storage_root_hash.0),
+            &contract_state.nonce.0,
+        ),
+        &CONTRACT_STATE_HASH_VERSION,
+    ))
+}
+
 /// Implementation of TreeHashFunction for the classes trie.
 /// The implementation is based on the following reference:
 /// <https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/starknet-state/#trie_construction>
 impl TreeHashFunction<CompiledClassHash> for TreeHashFunctionImpl {
     fn compute_leaf_hash(compiled_class_hash: &CompiledClassHash) -> HashOutput {
-        let contract_class_leaf_version: Felt = Felt::from_hex(Self::CONTRACT_CLASS_LEAF_V0)
-            .expect(
-                "could not parse hex string corresponding to b'CONTRACT_CLASS_LEAF_V0' to Felt",
-            );
-        HashOutput(Poseidon::hash(&contract_class_leaf_version, &compiled_class_hash.0))
+        compute_compiled_class_leaf_hash(compiled_class_hash)
     }
     fn compute_node_hash(node_data: &NodeData<CompiledClassHash, HashOutput>) -> HashOutput {
         Self::compute_node_hash_with_inner_hash_function::<PoseidonHashFunction>(node_data)
     }
 }
 
+fn compute_compiled_class_leaf_hash<L: AsRef<CompiledClassHash>>(
+    compiled_class_hash_leaf: &L,
+) -> HashOutput {
+    let compiled_class_hash: &CompiledClassHash = compiled_class_hash_leaf.as_ref();
+    HashOutput(Poseidon::hash(&CONTRACT_CLASS_LEAF_V0, &compiled_class_hash.0))
+}
+
 /// Implementation of TreeHashFunction for the storage trie.
 /// The implementation is based on the following reference:
 /// <https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/starknet-state/#trie_construction>

crates/starknet_committer/src/hash_function/hash_test.rs

@@ -14,7 +14,7 @@ use starknet_types_core::felt::Felt;
 use starknet_types_core::hash::Pedersen;
 
 use crate::block_committer::input::StarknetStorageValue;
-use crate::hash_function::hash::TreeHashFunctionImpl;
+use crate::hash_function::hash::{TreeHashFunctionImpl, CONTRACT_CLASS_LEAF_V0};
 use crate::patricia_merkle_tree::leaf::leaf_impl::ContractState;
 use crate::patricia_merkle_tree::types::CompiledClassHash;
 
@@ -134,7 +134,7 @@ fn test_tree_hash_function_impl_edge_node(
 #[rstest]
 fn test_constant_contract_class_leaf_v0() {
     assert_eq!(
-        hex::decode(TreeHashFunctionImpl::CONTRACT_CLASS_LEAF_V0.trim_start_matches("0x")).unwrap(),
+        hex::decode(CONTRACT_CLASS_LEAF_V0.to_hex_string().trim_start_matches("0x")).unwrap(),
         b"CONTRACT_CLASS_LEAF_V0".as_slice()
     );
 }

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

@@ -21,6 +21,12 @@ pub struct ContractState {
     pub class_hash: ClassHash,
 }
 
+impl AsRef<ContractState> for ContractState {
+    fn as_ref(&self) -> &ContractState {
+        self
+    }
+}
+
 impl HasStaticPrefix for StarknetStorageValue {
     type KeyContext = EmptyKeyContext;
     fn get_static_prefix(_key_context: &Self::KeyContext) -> DbKeyPrefix {

crates/starknet_committer/src/patricia_merkle_tree/types.rs

@@ -23,6 +23,12 @@ pub fn class_hash_into_node_index(class_hash: &ClassHash) -> NodeIndex {
 #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct CompiledClassHash(pub Felt);
 
+impl AsRef<CompiledClassHash> for CompiledClassHash {
+    fn as_ref(&self) -> &CompiledClassHash {
+        self
+    }
+}
+
 impl_from_hex_for_felt_wrapper!(CompiledClassHash);
 
 pub type StorageTrie = FilledTreeImpl<StarknetStorageValue>;

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

@@ -13,7 +13,11 @@ use starknet_committer::block_committer::input::{
 use starknet_committer::block_committer::random_structs::DummyRandomValue;
 use starknet_committer::db::external_test_utils::single_tree_flow_test;
 use starknet_committer::forest::filled_forest::FilledForest;
-use starknet_committer::hash_function::hash::TreeHashFunctionImpl;
+use starknet_committer::hash_function::hash::{
+    TreeHashFunctionImpl,
+    CONTRACT_CLASS_LEAF_V0,
+    CONTRACT_STATE_HASH_VERSION,
+};
 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;
@@ -492,10 +496,8 @@ pub(crate) async fn storage_serialize_test() -> CommitterPythonTestResult {
 fn python_hash_constants_compare() -> String {
     format!(
         "[{:?}, {:?}]",
-        TreeHashFunctionImpl::CONTRACT_STATE_HASH_VERSION.to_bytes_be(),
-        Felt::from_hex(TreeHashFunctionImpl::CONTRACT_CLASS_LEAF_V0).expect(
-        "could not parse hex string corresponding to b'CONTRACT_CLASS_LEAF_V0' to Felt",
-        ).to_bytes_be()
+        CONTRACT_STATE_HASH_VERSION.to_bytes_be(),
+        CONTRACT_CLASS_LEAF_V0.to_bytes_be()
     )
 }
 

crates/starknet_os/src/constants_test.rs

@@ -2,7 +2,7 @@ use apollo_starknet_os_program::OS_PROGRAM;
 use blockifier::abi::constants::{L1_TO_L2_MSG_HEADER_SIZE, L2_TO_L1_MSG_HEADER_SIZE};
 use starknet_api::contract_class::compiled_class_hash::COMPILED_CLASS_V1;
 use starknet_api::core::{GLOBAL_STATE_VERSION, L2_ADDRESS_UPPER_BOUND};
-use starknet_committer::hash_function::hash::TreeHashFunctionImpl;
+use starknet_committer::hash_function::hash::{TreeHashFunctionImpl, CONTRACT_CLASS_LEAF_V0};
 use starknet_types_core::felt::Felt;
 
 use crate::hints::hint_implementation::kzg::utils::FIELD_ELEMENTS_PER_BLOB;
@@ -26,7 +26,7 @@ fn test_blob_constants() {
 fn test_contract_class_hash_version() {
     assert_eq!(
         Const::ContractClassLeafVersion.fetch_from_os_program().unwrap(),
-        Felt::from_hex(TreeHashFunctionImpl::CONTRACT_CLASS_LEAF_V0).unwrap()
+        CONTRACT_CLASS_LEAF_V0
     );
 }