Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ cairo-lang-syntax = "2.12.0"
cairo-lang-test-plugin = "2.12.0"
cairo-lang-starknet-classes = "2.12.0"
cairo-lang-parser = "2.12.0"
cairo-lang-sierra-to-casm = "2.12.0"
cairo-vm = "2.2.0"
cairo-annotations = "=0.5.0"
dirs = "6.0.0"
Expand Down
16 changes: 9 additions & 7 deletions crates/debugging/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ version = "1.0.0"
edition.workspace = true

[dependencies]
starknet_api.workspace = true
blockifier.workspace = true
ptree.workspace = true
paste.workspace = true
console.workspace = true
starknet-types-core.workspace = true
starknet.workspace = true
cairo-lang-sierra.workspace = true
cairo-lang-sierra-to-casm.workspace = true
cairo-lang-starknet-classes.workspace = true
cheatnet = { path = "../cheatnet" }
console.workspace = true
data-transformer = { path = "../data-transformer" }
serde_json.workspace = true
paste.workspace = true
ptree.workspace = true
rayon.workspace = true
serde_json.workspace = true
starknet-types-core.workspace = true
starknet.workspace = true
starknet_api.workspace = true
thiserror.workspace = true
55 changes: 52 additions & 3 deletions crates/debugging/src/contracts_data_store.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
use crate::trace::types::{ContractName, Selector};
use cairo_lang_sierra::program::ProgramArtifact;
use cairo_lang_sierra_to_casm::compiler::CairoProgramDebugInfo;
use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
use cairo_lang_starknet_classes::contract_class::ContractClass;
use cheatnet::forking::data::ForkData;
use cheatnet::runtime_extensions::forge_runtime_extension::contracts_data::ContractsData;
Expand All @@ -8,6 +10,7 @@ use rayon::iter::ParallelIterator;
use starknet::core::types::contract::{AbiEntry, SierraClass};
use starknet_api::core::{ClassHash, EntryPointSelector};
use std::collections::HashMap;
use std::hash::Hash;

/// Data structure containing information about contracts,
/// including their ABI, names, selectors and programs that will be used to create a [`Trace`](crate::Trace).
Expand All @@ -16,6 +19,8 @@ pub struct ContractsDataStore {
contract_names: HashMap<ClassHash, ContractName>,
selectors: HashMap<EntryPointSelector, Selector>,
programs: HashMap<ClassHash, ProgramArtifact>,
// FIXME(https://github.com/software-mansion/universal-sierra-compiler/issues/98): Use CASM debug info from USC once it provides it.
casm_debug_infos: HashMap<ClassHash, CairoProgramDebugInfo>,
}

impl ContractsDataStore {
Expand Down Expand Up @@ -46,7 +51,7 @@ impl ContractsDataStore {
.chain(fork_data.abi.clone())
.collect();

let programs = contracts_data
let program_data = contracts_data
.contracts
.par_iter()
.map(|(_, contract_data)| {
Expand All @@ -65,15 +70,27 @@ impl ContractsDataStore {
debug_info,
};

(contract_data.class_hash, program_artifact)
let casm_debug_info = compile(ContractClass {
// Debug info is unused in the compilation. This saves us a costly clone.
sierra_program_debug_info: None,
..contract_class
});

(
contract_data.class_hash,
(program_artifact, casm_debug_info),
)
})
.collect();
.collect::<Vec<_>>();

let (programs, casm_debug_infos) = split_maps(program_data);

Self {
abi,
contract_names,
selectors,
programs,
casm_debug_infos,
}
}

Expand All @@ -99,4 +116,36 @@ impl ContractsDataStore {
pub fn get_program_artifact(&self, class_hash: &ClassHash) -> Option<&ProgramArtifact> {
self.programs.get(class_hash)
}

/// Gets the [`CairoProgramDebugInfo`] for a given contract [`ClassHash`].
#[must_use]
pub fn get_casm_debug_info(&self, class_hash: &ClassHash) -> Option<&CairoProgramDebugInfo> {
self.casm_debug_infos.get(class_hash)
}
}

/// Compile the given [`ContractClass`] to `casm` and return [`CairoProgramDebugInfo`]
fn compile(contract_class: ContractClass) -> CairoProgramDebugInfo {
let (_, casm_debug_info) =
CasmContractClass::from_contract_class_with_debug_info(contract_class, false, usize::MAX)
.expect("compilation should succeed");
casm_debug_info
}

/// Splits an iterator of `(K, (V1, V2))` into two `HashMaps`:
/// `HashMap<K, V1>` and `HashMap<K, V2>`
fn split_maps<K, V1, V2, I>(iter: I) -> (HashMap<K, V1>, HashMap<K, V2>)
where
K: Copy + Eq + Hash,
I: IntoIterator<Item = (K, (V1, V2))>,
{
let mut map1 = HashMap::new();
let mut map2 = HashMap::new();

for (key, (v1, v2)) in iter {
map1.insert(key, v1);
map2.insert(key, v2);
}

(map1, map2)
}
Loading