Skip to content

Commit

Permalink
chore: add deserialization types and basic casting implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
nimrod-starkware committed Apr 18, 2024
1 parent f1572e3 commit 6803867
Show file tree
Hide file tree
Showing 13 changed files with 650 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -18,9 +18,9 @@ derive_more = "0.99.17"
pretty_assertions = "1.2.1"
rayon = "1.10.0"
rstest = "0.17.0"
starknet-types-core = { version = "0.0.11", features = ["hash"] }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.116"
starknet-types-core = { version = "0.0.11", features = ["hash"] }
thiserror = "1.0.58"

[workspace.lints.rust]
Expand Down
2 changes: 1 addition & 1 deletion crates/committer/Cargo.toml
Expand Up @@ -16,7 +16,7 @@ rstest.workspace = true
[dependencies]
derive_more.workspace = true
rayon.workspace = true
starknet-types-core.workspace = true
serde.workspace = true
serde_json.workspace = true
starknet-types-core.workspace = true
thiserror.workspace = true
4 changes: 4 additions & 0 deletions crates/committer/src/deserialization.rs
@@ -0,0 +1,4 @@
pub mod cast;
pub mod errors;
pub mod read;
pub mod types;
123 changes: 123 additions & 0 deletions crates/committer/src/deserialization/cast.rs
@@ -0,0 +1,123 @@
use crate::deserialization::errors::DeserializationError;
use crate::deserialization::types::{ContractAddress, ContractState};
use crate::deserialization::types::{
Input, RawInput, StarknetStorageKey, StarknetStorageValue, StateDiff,
};
use crate::hash::hash_trait::HashOutput;
use crate::patricia_merkle_tree::filled_node::{ClassHash, CompiledClassHash, Nonce};
use crate::patricia_merkle_tree::types::TreeHeight;
use crate::storage::storage_trait::{StorageKey, StorageValue};
use crate::types::Felt;

use std::collections::HashMap;

impl TryFrom<RawInput> for Input {
type Error = DeserializationError;
fn try_from(raw_input: RawInput) -> Result<Self, Self::Error> {
let mut storage = HashMap::new();
for entry in raw_input.storage {
add_unique(
&mut storage,
"storage",
StorageKey(entry.key),
StorageValue(entry.value),
)?;
}

let mut address_to_class_hash = HashMap::new();
for entry in raw_input.state_diff.address_to_class_hash {
add_unique(
&mut address_to_class_hash,
"address to class hash",
ContractAddress(Felt::from_bytes_be_slice(&entry.key)),
ClassHash(Felt::from_bytes_be_slice(&entry.value)),
)?;
}

let mut address_to_nonce = HashMap::new();
for entry in raw_input.state_diff.address_to_nonce {
add_unique(
&mut address_to_nonce,
"address to nonce",
ContractAddress(Felt::from_bytes_be_slice(&entry.key)),
Nonce(Felt::from_bytes_be_slice(&entry.value)),
)?;
}

let mut class_hash_to_compiled_class_hash = HashMap::new();
for entry in raw_input.state_diff.class_hash_to_compiled_class_hash {
add_unique(
&mut class_hash_to_compiled_class_hash,
"class hash to compiled class hash",
ClassHash(Felt::from_bytes_be_slice(&entry.key)),
CompiledClassHash(Felt::from_bytes_be_slice(&entry.value)),
)?;
}

let mut current_contract_state_leaves = HashMap::new();
for entry in raw_input.state_diff.current_contract_state_leaves {
add_unique(
&mut current_contract_state_leaves,
"current contract state leaves",
ContractAddress(Felt::from_bytes_be_slice(&entry.address)),
ContractState {
nonce: Nonce(Felt::from_bytes_be_slice(&entry.nonce)),
class_hash: ClassHash(Felt::from_bytes_be_slice(&entry.class_hash)),
storage_root_hash: HashOutput(Felt::from_bytes_be_slice(
&entry.storage_root_hash,
)),
},
)?;
}

let mut storage_updates = HashMap::new();
for outer_entry in raw_input.state_diff.storage_updates {
let inner_map = outer_entry
.storage_updates
.iter()
.map(|inner_entry| {
(
StarknetStorageKey(Felt::from_bytes_be_slice(&inner_entry.key)),
StarknetStorageValue(Felt::from_bytes_be_slice(&inner_entry.value)),
)
})
.collect();
add_unique(
&mut storage_updates,
"starknet storage updates",
ContractAddress(Felt::from_bytes_be_slice(&outer_entry.address)),
inner_map,
)?;
}

Ok(Input {
storage,
state_diff: StateDiff {
address_to_class_hash,
address_to_nonce,
class_hash_to_compiled_class_hash,
current_contract_state_leaves,
storage_updates,
},
tree_height: TreeHeight(raw_input.tree_height),
})
}
}

fn add_unique<K, V>(
map: &mut HashMap<K, V>,
map_name: &str,
key: K,
value: V,
) -> Result<(), DeserializationError>
where
K: std::cmp::Eq + std::hash::Hash + std::fmt::Debug,
{
if map.contains_key(&key) {
return Err(DeserializationError::KeyDuplicate(format!(
"{map_name}: {key:?}"
)));
}
map.insert(key, value);
Ok(())
}
12 changes: 12 additions & 0 deletions crates/committer/src/deserialization/errors.rs
@@ -0,0 +1,12 @@
use std::fmt::Debug;

use thiserror::Error;

#[allow(dead_code)]
#[derive(Debug, Error)]
pub(crate) enum DeserializationError {
#[error("There is a key duplicate at {0} mapping.")]
KeyDuplicate(String),
#[error("Couldn't read and parse the given input JSON: {0}")]
ParsingError(#[from] serde_json::Error),
}
14 changes: 14 additions & 0 deletions crates/committer/src/deserialization/read.rs
@@ -0,0 +1,14 @@
use crate::deserialization::types::Input;
use crate::deserialization::types::RawInput;

use crate::deserialization::errors::DeserializationError;
#[allow(dead_code)]
type DeserializationResult<T> = Result<T, DeserializationError>;
#[allow(dead_code)]
pub(crate) fn parse_input(input: String) -> DeserializationResult<Input> {
serde_json::from_str::<RawInput>(&input)?.try_into()
}

#[cfg(test)]
#[path = "read_test.rs"]
pub mod read_test;

0 comments on commit 6803867

Please sign in to comment.