Skip to content

Commit

Permalink
chore: move contract class structs to common
Browse files Browse the repository at this point in the history
  • Loading branch information
ArniStarkware committed Aug 14, 2024
1 parent 0aa4641 commit 8bc2e61
Show file tree
Hide file tree
Showing 51 changed files with 421 additions and 321 deletions.
18 changes: 18 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ members = [
"crates/batcher_types",
"crates/blockifier",
"crates/committer_cli",
"crates/common",
"crates/consensus_manager",
"crates/consensus_manager_types",
"crates/gateway",
Expand Down Expand Up @@ -84,6 +85,7 @@ camelpaste = "0.1.0"
chrono = "0.4.26"
clap = "4.5.4"
colored = "2.1.0"
common = { path = "crates/common", version = "0.0" }
const_format = "0.2.30"
criterion = "0.5.1"
deadqueue = "0.2.4"
Expand Down
1 change: 1 addition & 0 deletions crates/blockifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cairo-lang-runner.workspace = true
cairo-lang-starknet-classes.workspace = true
cairo-lang-utils.workspace = true
cairo-vm.workspace = true
common.workspace = true
derive_more.workspace = true
indexmap.workspace = true
itertools.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/blockifier/src/blockifier/transaction_executor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use crate::bouncer::{Bouncer, BouncerWeights};
#[cfg(feature = "concurrency")]
use crate::concurrency::worker_logic::WorkerExecutor;
use crate::context::BlockContext;
use crate::execution::contract_class::ContractClassExt;
use crate::state::cached_state::{CachedState, CommitmentStateDiff, TransactionalState};
use crate::state::errors::StateError;
use crate::state::state_api::StateReader;
Expand Down
1 change: 1 addition & 0 deletions crates/blockifier/src/bouncer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::blockifier::transaction_executor::{
TransactionExecutorResult,
};
use crate::execution::call_info::ExecutionSummary;
use crate::execution::contract_class::ContractClassExt;
use crate::fee::gas_usage::get_onchain_data_segment_length;
use crate::state::cached_state::{StateChangesKeys, StorageEntry};
use crate::state::state_api::StateReader;
Expand Down
2 changes: 1 addition & 1 deletion crates/blockifier/src/concurrency/versioned_state.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use std::collections::{HashMap, HashSet};
use std::sync::{Arc, Mutex, MutexGuard};

use common::contract_class::ContractClass;
use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
use starknet_api::state::StorageKey;
use starknet_types_core::felt::Felt;

use crate::concurrency::versioned_storage::VersionedStorage;
use crate::concurrency::TxIndex;
use crate::execution::contract_class::ContractClass;
use crate::state::cached_state::{ContractClassMapping, StateMaps};
use crate::state::errors::StateError;
use crate::state::state_api::{StateReader, StateResult, UpdatableState};
Expand Down
Loading

0 comments on commit 8bc2e61

Please sign in to comment.