Skip to content

Commit

Permalink
fix review comments:
Browse files Browse the repository at this point in the history
  • Loading branch information
@HermanObst
HermanObst committed Aug 30, 2024
1 parent 0d58878 commit 4fd6e23
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
20 changes: 3 additions & 17 deletions crates/bin/prove_block/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use starknet_types_core::felt::Felt;

use crate::reexecute::format_commitment_facts;
use crate::rpc_utils::{get_starknet_version, PathfinderClassProof};
use crate::state_utils::get_processed_state_update;
use crate::state_utils::get_formatted_state_update;
use crate::types::starknet_rs_tx_to_internal_tx;

mod reexecute;
Expand Down Expand Up @@ -146,9 +146,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
let transactions: Vec<_> =
block_with_txs.transactions.clone().into_iter().map(starknet_rs_tx_to_internal_tx).collect();

let processed_state_update = get_processed_state_update(&provider, block_id).await?;
let processed_state_update = get_formatted_state_update(&provider, block_id).await?;

let class_hash_to_compiled_class_hash = processed_state_update.class_hash_to_compiled_class_hash.clone();
let class_hash_to_compiled_class_hash = processed_state_update.class_hash_to_compiled_class_hash;

// Workaround for JsonRpcClient not implementing Clone
let provider_for_blockifier = JsonRpcClient::new(HttpTransport::new(
Expand Down Expand Up @@ -257,20 +257,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
})
.collect();

log::debug!("class_hash_to_compiled_class_hash ({}):", class_hash_to_compiled_class_hash.len());
for (class_hash, compiled_class_hash) in &class_hash_to_compiled_class_hash {
log::debug!(" 0x{:x} => 0x{:x}", class_hash, compiled_class_hash);
}

// Pass all contract addresses as expected accessed indices
// let contract_indices: HashSet<TreeIndex> =
// contract_states.keys().chain(contract_storages.keys()).map(|address|
// address.to_biguint()).collect(); let contract_indices: Vec<TreeIndex> =
// contract_indices.into_iter().collect();

// let final_state =
// initial_state.clone().apply_commitment_state_diff(blockifier_state.to_state_diff()).await?;

// We can extract data from any storage proof, use the one of the block hash contract
let block_hash_storage_proof =
storage_proofs.get(&Felt::ONE).expect("there should be a storage proof for the block hash contract");
Expand Down
46 changes: 30 additions & 16 deletions crates/bin/prove_block/src/state_utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use starknet::core::types::{BlockId, MaybePendingStateUpdate, StateDiff};
use starknet::providers::jsonrpc::HttpTransport;
use starknet::providers::{JsonRpcClient, Provider};
use starknet_os_types::casm_contract_class::GenericCasmContractClass;
use starknet_os_types::deprecated_compiled_class::GenericDeprecatedCompiledClass;
use starknet_os_types::sierra_contract_class::GenericSierraContractClass;

use crate::utils::get_subcalled_contracts_from_tx_traces;
Expand All @@ -22,7 +23,7 @@ pub struct FormattedStateUpdate {
/// - Fetches block transaction traces to obtain all accessed contract addresses in that block.
/// - Formats the RPC state updates to be "SharedState compatible."
/// - Consolidates that information into a `FormattedStateUpdate`.
pub(crate) async fn get_processed_state_update(
pub(crate) async fn get_formatted_state_update(
provider: &JsonRpcClient<HttpTransport>,
block_id: BlockId,
) -> Result<FormattedStateUpdate, Error> {
Expand All @@ -40,35 +41,48 @@ pub(crate) async fn get_processed_state_update(
let accessed_addresses: HashSet<Felt252> = get_subcalled_contracts_from_tx_traces(&traces);

let address_to_class_hash = format_deployed_contracts(&state_diff);
// TODO: Handle deprecated clasees
let mut class_hash_to_compiled_class_hash: HashMap<Felt252, Felt252> = format_declared_classes(&state_diff);
let compiled_classes = build_compiled_class_and_maybe_update_class_hash_to_compiled_class_hash(
provider,
block_id,
&accessed_addresses,
&address_to_class_hash,
&mut class_hash_to_compiled_class_hash,
)
.await?;
let (compiled_contract_classes, _deprecated_compiled_contract_class) =
build_compiled_class_and_maybe_update_class_hash_to_compiled_class_hash(
provider,
block_id,
&accessed_addresses,
&address_to_class_hash,
&mut class_hash_to_compiled_class_hash,
)
.await?;

Ok(FormattedStateUpdate { class_hash_to_compiled_class_hash, compiled_classes })
Ok(FormattedStateUpdate { class_hash_to_compiled_class_hash, compiled_classes: compiled_contract_classes })
}

/// This function processes a set of accessed contract addresses to retrieve their
/// corresponding class hashes and compile them into `GenericCasmContractClass`.
/// If the class is already present in `address_to_class_hash`, it is used directly;
/// otherwise, it is fetched from the provided `JsonRpcClient`.
///
/// The resulting compiled classes and any associated mappings are returned, while
/// the `class_hash_to_compiled_class_hash` map is updated with new entries.
/// TODO: Handle deprecated classes
async fn build_compiled_class_and_maybe_update_class_hash_to_compiled_class_hash(
provider: &JsonRpcClient<HttpTransport>,
block_id: BlockId,
accessed_addresses: &HashSet<Felt252>,
address_to_class_hash: &HashMap<Felt252, Felt252>,
class_hash_to_compiled_class_hash: &mut HashMap<Felt252, Felt252>,
) -> Result<HashMap<Felt252, GenericCasmContractClass>, Error> {
let mut compiled_classes: HashMap<Felt252, GenericCasmContractClass> = HashMap::new();
) -> Result<(HashMap<Felt252, GenericCasmContractClass>, HashMap<Felt252, GenericDeprecatedCompiledClass>), Error> {
let mut compiled_contract_classes: HashMap<Felt252, GenericCasmContractClass> = HashMap::new();
// TODO: Handle deprecated classes
let mut _deprecated_compiled_contract_classes: HashMap<Felt252, GenericDeprecatedCompiledClass> = HashMap::new();

for contract_address in accessed_addresses {
let class_hash = match address_to_class_hash.get(contract_address) {
Some(class_hash) => class_hash,
None => &provider.get_class_hash_at(block_id, contract_address).await?,
};

let contract_class = provider.get_class(block_id, class_hash).await?;
let generic_sierra_cc = match contract_class {
let generic_cc = match contract_class {
starknet::core::types::ContractClass::Sierra(flattened_sierra_cc) => {
GenericSierraContractClass::from(flattened_sierra_cc)
}
Expand All @@ -77,15 +91,15 @@ async fn build_compiled_class_and_maybe_update_class_hash_to_compiled_class_hash
}
};

let generic_cc: GenericCasmContractClass = generic_sierra_cc.compile()?;
let generic_cc: GenericCasmContractClass = generic_cc.compile()?;
let compiled_contract_hash: starknet_os_types::hash::GenericClassHash = generic_cc.class_hash()?;

// TODO: Sanity check computed hash is the same that the one provided by RPC (when available)
// TODO: We are inserting class_hash -> compiled class hash again
class_hash_to_compiled_class_hash.insert(*class_hash, compiled_contract_hash.into());
compiled_classes.insert(compiled_contract_hash.into(), generic_cc.clone());
compiled_contract_classes.insert(compiled_contract_hash.into(), generic_cc.clone());
}
Ok(compiled_classes)
Ok((compiled_contract_classes, _deprecated_compiled_contract_classes))
}

/// Format StateDiff's DeclaredClassItem to a HashMap<class_hash, compiled_class_hash>
Expand Down

0 comments on commit 4fd6e23

Please sign in to comment.