Skip to content
This repository has been archived by the owner on Dec 26, 2024. It is now read-only.

Commit

Permalink
feat: bump blockifier and cairo dependencies (#1688)
Browse files Browse the repository at this point in the history
  • Loading branch information
yair-starkware authored Feb 8, 2024
1 parent c2439a4 commit 6457bee
Show file tree
Hide file tree
Showing 33 changed files with 307 additions and 246 deletions.
195 changes: 92 additions & 103 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ async-trait = "0.1.56"
axum = "0.6.12"
base64 = "0.13.0"
bitvec = "1.0.1"
blockifier = { git = "https://github.com/starkware-libs/blockifier", branch = "yair/bump_sn_api" }
blockifier = "0.5.0-rc.0"
bytes = "1"
byteorder = "1.4.3"
cairo-lang-starknet = "=2.5.0-dev.1"
cairo-lang-casm = "=2.5.0-dev.1"
cairo-lang-utils = "=2.5.0-dev.1"
cairo-lang-casm = "=2.6.0-rc.0"
cairo-lang-utils = "=2.6.0-rc.0"
cairo-lang-starknet-classes = "=2.6.0-rc.0"
cairo-vm = "0.9.1"
camelpaste = "0.1.0"
chrono = "0.4.26"
Expand Down Expand Up @@ -101,7 +101,7 @@ serde_repr = "0.1"
serde_yaml = "0.9.16"
sha3 = "0.10.8"
simple_logger = "4.0.0"
starknet_api = "0.7.0-rc.0"
starknet_api = "0.8.0"
starknet-core = "0.6.0"
starknet-crypto = "0.5.1"
strum = "0.25.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/papyrus_common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description = "Common utils and objects for a Starknet node."

[dependencies]
bitvec.workspace = true
cairo-lang-starknet.workspace = true
cairo-lang-starknet-classes.workspace = true
hex.workspace = true
lazy_static.workspace = true
serde.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/papyrus_common/src/pending_classes.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::sync::Arc;

use cairo_lang_starknet::casm_contract_class::CasmContractClass;
use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
use starknet_api::core::ClassHash;
use starknet_api::deprecated_contract_class::ContractClass as DeprecatedContractClass;
use starknet_api::state::ContractClass;
Expand Down
2 changes: 1 addition & 1 deletion crates/papyrus_execution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ testing = ["rand", "rand_chacha", "test_utils"]
[dependencies]
anyhow.workspace = true
blockifier.workspace = true
cairo-lang-starknet.workspace = true
cairo-lang-starknet-classes.workspace = true
cairo-vm.workspace = true
indexmap.workspace = true
itertools.workspace = true
Expand Down
7 changes: 4 additions & 3 deletions crates/papyrus_execution/src/execution_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use std::sync::Arc;

use assert_matches::assert_matches;
use blockifier::abi::abi_utils::get_storage_var_address;
use blockifier::abi::constants::STEP_GAS_COST;
use blockifier::execution::call_info::Retdata;
use blockifier::transaction::errors::TransactionExecutionError as BlockifierTransactionExecutionError;
use blockifier::versioned_constants::VersionedConstants;
use indexmap::indexmap;
use papyrus_storage::test_utils::get_test_storage;
use pretty_assertions::assert_eq;
Expand Down Expand Up @@ -669,8 +669,9 @@ fn test_default_execution_config() {
invoke_tx_max_n_steps: 3_000_000,
validate_tx_max_n_steps: 1_000_000,
max_recursion_depth: 50,
step_gas_cost: STEP_GAS_COST,
initial_gas_cost: 10_u64.pow(8) * STEP_GAS_COST,
step_gas_cost: VersionedConstants::latest_constants().gas_cost("step_gas_cost"),
initial_gas_cost: 10_u64.pow(8)
* VersionedConstants::latest_constants().gas_cost("step_gas_cost"),
vm_resource_fee_cost,
};
let mut execution_config_segments = BTreeMap::new();
Expand Down
Loading

0 comments on commit 6457bee

Please sign in to comment.