starknet_committer: hash leaves of both layouts

Author: ArielElp

crates/starknet_committer/src/hash_function/hash.rs

@@ -43,35 +43,49 @@ impl TreeHashFunctionImpl {
 /// <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,
+        ),
+        &TreeHashFunctionImpl::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();
+    let contract_class_leaf_version: Felt = Felt::from_hex(
+        TreeHashFunctionImpl::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))
+}
+
 /// 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/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>;