From e9a9f6700d976dd4c5e9981285ac933d742bb7d3 Mon Sep 17 00:00:00 2001 From: Yoni <78365039+Yoni-Starkware@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:52:44 +0300 Subject: [PATCH 1/4] chore: use BuiltinName enum in EntryPointV1 instead of string (#314) --- .../src/execution/contract_class.rs | 26 +++++++-------- .../src/execution/entry_point_execution.rs | 33 ++++--------------- crates/blockifier/src/execution/errors.rs | 4 +-- 3 files changed, 22 insertions(+), 41 deletions(-) diff --git a/crates/blockifier/src/execution/contract_class.rs b/crates/blockifier/src/execution/contract_class.rs index c6f1afe612..4e182ed837 100644 --- a/crates/blockifier/src/execution/contract_class.rs +++ b/crates/blockifier/src/execution/contract_class.rs @@ -347,7 +347,7 @@ pub struct ContractClassV1Inner { pub struct EntryPointV1 { pub selector: EntryPointSelector, pub offset: EntryPointOffset, - pub builtins: Vec, + pub builtins: Vec, } impl EntryPointV1 { @@ -403,15 +403,15 @@ impl TryFrom for ContractClassV1 { let mut entry_points_by_type = HashMap::new(); entry_points_by_type.insert( EntryPointType::Constructor, - convert_entry_points_v1(class.entry_points_by_type.constructor)?, + convert_entry_points_v1(class.entry_points_by_type.constructor), ); entry_points_by_type.insert( EntryPointType::External, - convert_entry_points_v1(class.entry_points_by_type.external)?, + convert_entry_points_v1(class.entry_points_by_type.external), ); entry_points_by_type.insert( EntryPointType::L1Handler, - convert_entry_points_v1(class.entry_points_by_type.l1_handler)?, + convert_entry_points_v1(class.entry_points_by_type.l1_handler), ); let bytecode_segment_lengths = class @@ -452,17 +452,17 @@ fn hint_to_hint_params(hint: &cairo_lang_casm::hints::Hint) -> Result, -) -> Result, ProgramError> { +fn convert_entry_points_v1(external: Vec) -> Vec { external .into_iter() - .map(|ep| -> Result<_, ProgramError> { - Ok(EntryPointV1 { - selector: EntryPointSelector(Felt::from(ep.selector)), - offset: EntryPointOffset(ep.offset), - builtins: ep.builtins.into_iter().map(|builtin| builtin + "_builtin").collect(), - }) + .map(|ep| EntryPointV1 { + selector: EntryPointSelector(Felt::from(ep.selector)), + offset: EntryPointOffset(ep.offset), + builtins: ep + .builtins + .into_iter() + .map(|builtin| BuiltinName::from_str(&builtin).expect("Unrecognized builtin.")) + .collect(), }) .collect() } diff --git a/crates/blockifier/src/execution/entry_point_execution.rs b/crates/blockifier/src/execution/entry_point_execution.rs index a2b546b495..3ebae0ad8e 100644 --- a/crates/blockifier/src/execution/entry_point_execution.rs +++ b/crates/blockifier/src/execution/entry_point_execution.rs @@ -163,20 +163,7 @@ pub fn initialize_execution_context<'a>( trace_enabled, )?; - // Initialize program with all builtins. - let program_builtins = [ - BuiltinName::bitwise, - BuiltinName::ec_op, - BuiltinName::ecdsa, - BuiltinName::pedersen, - BuiltinName::poseidon, - BuiltinName::range_check, - BuiltinName::segment_arena, - BuiltinName::range_check96, - BuiltinName::add_mod, - BuiltinName::mul_mod, - ]; - runner.initialize_function_runner_cairo_1(&program_builtins)?; + runner.initialize_function_runner_cairo_1(&entry_point.builtins)?; let mut read_only_segments = ReadOnlySegments::default(); let program_extra_data_length = prepare_program_extra_data(&mut runner, contract_class, &mut read_only_segments)?; @@ -239,16 +226,13 @@ pub fn prepare_call_arguments( // Push builtins. for builtin_name in &entrypoint.builtins { - if let Some(builtin) = runner - .vm - .get_builtin_runners() - .iter() - .find(|builtin| builtin.name().to_str_with_suffix() == builtin_name) + if let Some(builtin) = + runner.vm.get_builtin_runners().iter().find(|builtin| builtin.name() == *builtin_name) { args.extend(builtin.initial_stack().into_iter().map(CairoArg::Single)); continue; } - if builtin_name == BuiltinName::segment_arena.to_str_with_suffix() { + if builtin_name == &BuiltinName::segment_arena { let segment_arena = runner.vm.add_memory_segment(); // Write into segment_arena. @@ -263,7 +247,7 @@ pub fn prepare_call_arguments( args.push(CairoArg::Single(MaybeRelocatable::from(ptr))); continue; } - return Err(PreExecutionError::InvalidBuiltin(builtin_name.clone())); + return Err(PreExecutionError::InvalidBuiltin(*builtin_name)); } // Push gas counter. args.push(CairoArg::Single(MaybeRelocatable::from(Felt::from(call.initial_gas)))); @@ -315,11 +299,8 @@ fn maybe_fill_holes( entry_point: EntryPointV1, runner: &mut CairoRunner, ) -> Result<(), EntryPointExecutionError> { - let Some(rc96_offset) = entry_point - .builtins - .iter() - .rev() - .position(|name| name.as_str() == BuiltinName::range_check96.to_str_with_suffix()) + let Some(rc96_offset) = + entry_point.builtins.iter().rev().position(|name| *name == BuiltinName::range_check96) else { return Ok(()); }; diff --git a/crates/blockifier/src/execution/errors.rs b/crates/blockifier/src/execution/errors.rs index cc0e87a753..04bb87a484 100644 --- a/crates/blockifier/src/execution/errors.rs +++ b/crates/blockifier/src/execution/errors.rs @@ -27,8 +27,8 @@ pub enum PreExecutionError { EntryPointNotFound(EntryPointSelector), #[error("Fraud attempt blocked.")] FraudAttempt, - #[error("Invalid builtin {0:?}.")] - InvalidBuiltin(String), + #[error("Invalid builtin {0}.")] + InvalidBuiltin(BuiltinName), #[error("The constructor entry point must be named 'constructor'.")] InvalidConstructorEntryPointName, #[error(transparent)] From 9c1860bad29c5f37f9eb1dc66f2e641f4c7ac8d2 Mon Sep 17 00:00:00 2001 From: dorimedini-starkware Date: Tue, 6 Aug 2024 12:35:59 +0300 Subject: [PATCH 2/4] chore(ci): move local deps to root toml (#312) --- Cargo.toml | 25 ++++++++++++++++++ crates/blockifier/Cargo.toml | 2 +- crates/committer_cli/Cargo.toml | 4 +-- crates/gateway/Cargo.toml | 16 ++++++------ crates/mempool/Cargo.toml | 8 +++--- crates/mempool_node/Cargo.toml | 10 +++---- crates/mempool_test_utils/Cargo.toml | 4 +-- crates/mempool_types/Cargo.toml | 4 +-- crates/native_blockifier/Cargo.toml | 6 ++--- crates/papyrus_base_layer/Cargo.toml | 4 +-- crates/papyrus_common/Cargo.toml | 4 +-- crates/papyrus_config/Cargo.toml | 2 +- crates/papyrus_execution/Cargo.toml | 14 +++++----- crates/papyrus_monitoring_gateway/Cargo.toml | 8 +++--- crates/papyrus_network/Cargo.toml | 2 +- crates/papyrus_node/Cargo.toml | 26 +++++++++---------- crates/papyrus_p2p_sync/Cargo.toml | 18 ++++++------- crates/papyrus_proc_macros/Cargo.toml | 4 +-- crates/papyrus_protobuf/Cargo.toml | 8 +++--- crates/papyrus_rpc/Cargo.toml | 22 ++++++++-------- crates/papyrus_storage/Cargo.toml | 8 +++--- crates/papyrus_sync/Cargo.toml | 20 +++++++------- crates/papyrus_test_utils/Cargo.toml | 2 +- .../papyrus_block_builder/Cargo.toml | 6 ++--- .../sequencing/papyrus_consensus/Cargo.toml | 18 ++++++------- crates/starknet_client/Cargo.toml | 10 +++---- crates/starknet_sierra_compile/Cargo.toml | 4 +-- crates/tests-integration/Cargo.toml | 26 +++++++++---------- 28 files changed, 154 insertions(+), 131 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f190cb5610..8684ea29bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,6 +63,7 @@ base64 = "0.13.0" bincode = "1.3.3" bisection = "0.1.0" bitvec = "1.0.1" +blockifier = { path = "crates/blockifier", version = "0.8.0-rc.0" } byteorder = "1.4.3" bytes = "1" cached = "0.44.0" @@ -77,6 +78,7 @@ camelpaste = "0.1.0" chrono = "0.4.26" clap = "4.3.10" colored = "2.1.0" +committer = { path = "crates/committer", version = "0.1.0-rc.0" } const_format = "0.2.30" criterion = "0.3" deadqueue = "0.2.4" @@ -108,6 +110,7 @@ libp2p-swarm-test = "0.3.0" log = "0.4" lru = "0.12.0" memmap2 = "0.8.0" +mempool_test_utils = { path = "crates/mempool_test_utils", version = "0.0" } metrics = "0.21.0" metrics-exporter-prometheus = "0.12.1" mockall = "0.12.1" @@ -118,7 +121,20 @@ num-traits = "0.2.15" once_cell = "1.19.0" os_info = "3.6.0" page_size = "0.6.0" +papyrus_base_layer = { path = "crates/papyrus_base_layer", version = "0.4.0-rc.0" } +papyrus_common = { path = "crates/papyrus_common", version = "0.4.0-rc.0" } papyrus_config = { path = "crates/papyrus_config", version = "0.4.0-rc.0" } +papyrus_consensus = { path = "crates/sequencing/papyrus_consensus", version = "0.4.0-rc.0" } +papyrus_execution = { path = "crates/papyrus_execution", version = "0.4.0-rc.0" } +papyrus_monitoring_gateway = { path = "crates/papyrus_monitoring_gateway", version = "0.4.0-rc.0" } +papyrus_network = { path = "crates/papyrus_network", version = "0.4.0-rc.0" } +papyrus_p2p_sync = { path = "crates/papyrus_p2p_sync", version = "0.4.0-rc.0" } +papyrus_proc_macros = { path = "crates/papyrus_proc_macros", version = "0.4.0-rc.0" } +papyrus_protobuf = { path = "crates/papyrus_protobuf", version = "0.4.0-rc.0" } +papyrus_rpc = { path = "crates/papyrus_rpc", version = "0.4.0-rc.0" } +papyrus_storage = { path = "crates/papyrus_storage", version = "0.4.0-rc.0" } +papyrus_sync = { path = "crates/papyrus_sync", version = "0.4.0-rc.0" } +papyrus_test_utils = { path = "crates/papyrus_test_utils", version = "0.4.0-rc.0" } parity-scale-codec = "=3.6.9" parity-scale-codec-derive = "=3.6.9" paste = "1.0.15" @@ -151,6 +167,15 @@ simplelog = "0.12.2" starknet-core = "0.6.0" starknet-crypto = "0.5.1" starknet-types-core = { version = "0.1.5", features = ["hash", "prime-bigint", "std"] } +starknet_api = { path = "crates/starknet_api", version = "0.13.0-rc.0" } +starknet_client = { path = "crates/starknet_client", version = "0.4.0-rc.0" } +starknet_gateway = { path = "crates/gateway", version = "0.0" } +starknet_mempool = { path = "crates/mempool", version = "0.0" } +starknet_mempool_infra = { path = "crates/mempool_infra", version = "0.0" } +starknet_mempool_node = { path = "crates/mempool_node", version = "0.0" } +starknet_mempool_types = { path = "crates/mempool_types", version = "0.0" } +starknet_sierra_compile = { path = "crates/starknet_sierra_compile", version = "0.0" } +starknet_task_executor = { path = "crates/task_executor", version = "0.0" } static_assertions = "1.1.0" statistical = "1.0.0" strum = "0.25.0" diff --git a/crates/blockifier/Cargo.toml b/crates/blockifier/Cargo.toml index a3395538e1..d80abd865d 100644 --- a/crates/blockifier/Cargo.toml +++ b/crates/blockifier/Cargo.toml @@ -47,7 +47,7 @@ serde_json = { workspace = true, features = ["arbitrary_precision"] } sha2.workspace = true sha3.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } strum.workspace = true strum_macros.workspace = true thiserror.workspace = true diff --git a/crates/committer_cli/Cargo.toml b/crates/committer_cli/Cargo.toml index 70dec1303e..eec3cc99ec 100644 --- a/crates/committer_cli/Cargo.toml +++ b/crates/committer_cli/Cargo.toml @@ -17,7 +17,7 @@ tempfile.workspace = true [dependencies] clap = { version = "4.5.4", features = ["cargo", "derive"] } -committer = { path = "../committer", features = ["testing"] } +committer = { workspace = true, features = ["testing"] } derive_more.workspace = true ethnum.workspace = true indexmap.workspace = true @@ -29,7 +29,7 @@ serde_json = "1.0.116" serde_repr = "0.1.19" simplelog.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true strum.workspace = true strum_macros.workspace = true thiserror.workspace = true diff --git a/crates/gateway/Cargo.toml b/crates/gateway/Cargo.toml index 04820f4066..6d275ad32f 100644 --- a/crates/gateway/Cargo.toml +++ b/crates/gateway/Cargo.toml @@ -14,22 +14,22 @@ testing = [] [dependencies] async-trait.workspace = true axum.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] } +blockifier = { workspace = true, features = ["testing"] } cairo-lang-starknet-classes.workspace = true cairo-vm.workspace = true hyper.workspace = true -mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" } +mempool_test_utils.workspace = true num-traits.workspace = true papyrus_config.workspace = true -papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0" } +papyrus_rpc.workspace = true reqwest.workspace = true serde.workspace = true serde_json.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } -starknet_mempool_types = { path = "../mempool_types", version = "0.0" } -starknet_sierra_compile = { path = "../starknet_sierra_compile", version = "0.0" } +starknet_api.workspace = true +starknet_mempool_infra.workspace = true +starknet_mempool_types.workspace = true +starknet_sierra_compile.workspace = true thiserror.workspace = true tokio.workspace = true tracing.workspace = true @@ -42,4 +42,4 @@ mockito = "1.4.0" num-bigint.workspace = true pretty_assertions.workspace = true rstest.workspace = true -starknet_mempool = { path = "../mempool", version = "0.0" } +starknet_mempool.workspace = true diff --git a/crates/mempool/Cargo.toml b/crates/mempool/Cargo.toml index 4c48c6fc11..07a94a8816 100644 --- a/crates/mempool/Cargo.toml +++ b/crates/mempool/Cargo.toml @@ -11,9 +11,9 @@ workspace = true [dependencies] async-trait.workspace = true derive_more.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } -starknet_mempool_types = { path = "../mempool_types", version = "0.0" } +starknet_api.workspace = true +starknet_mempool_infra.workspace = true +starknet_mempool_types.workspace = true tokio.workspace = true [dev-dependencies] @@ -22,5 +22,5 @@ itertools.workspace = true pretty_assertions.workspace = true rstest.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } tokio.workspace = true diff --git a/crates/mempool_node/Cargo.toml b/crates/mempool_node/Cargo.toml index 252e361bc7..aa73ca92ff 100644 --- a/crates/mempool_node/Cargo.toml +++ b/crates/mempool_node/Cargo.toml @@ -15,10 +15,10 @@ const_format.workspace = true futures.workspace = true papyrus_config.workspace = true serde.workspace = true -starknet_gateway = { path = "../gateway", version = "0.0" } -starknet_mempool = { path = "../mempool", version = "0.0" } -starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } -starknet_mempool_types = { path = "../mempool_types", version = "0.0" } +starknet_gateway.workspace = true +starknet_mempool.workspace = true +starknet_mempool_infra.workspace = true +starknet_mempool_types.workspace = true tokio.workspace = true tracing.workspace = true validator.workspace = true @@ -27,6 +27,6 @@ validator.workspace = true assert-json-diff.workspace = true assert_matches.workspace = true colored.workspace = true -mempool_test_utils = { path = "../mempool_test_utils" } +mempool_test_utils.workspace = true pretty_assertions.workspace = true serde_json.workspace = true diff --git a/crates/mempool_test_utils/Cargo.toml b/crates/mempool_test_utils/Cargo.toml index 5ec0f40f11..3e2a6e44ea 100644 --- a/crates/mempool_test_utils/Cargo.toml +++ b/crates/mempool_test_utils/Cargo.toml @@ -9,7 +9,7 @@ license.workspace = true [dependencies] assert_matches.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] } +blockifier = { workspace = true, features = ["testing"] } serde_json.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true diff --git a/crates/mempool_types/Cargo.toml b/crates/mempool_types/Cargo.toml index 2edcc3ec21..ab2c1e46fc 100644 --- a/crates/mempool_types/Cargo.toml +++ b/crates/mempool_types/Cargo.toml @@ -11,6 +11,6 @@ workspace = true [dependencies] async-trait.workspace = true mockall.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_mempool_infra = { path = "../mempool_infra" } +starknet_api.workspace = true +starknet_mempool_infra.workspace = true thiserror.workspace = true diff --git a/crates/native_blockifier/Cargo.toml b/crates/native_blockifier/Cargo.toml index 46c7a8528b..37d59a8106 100644 --- a/crates/native_blockifier/Cargo.toml +++ b/crates/native_blockifier/Cargo.toml @@ -27,19 +27,19 @@ crate-type = ["cdylib"] [dependencies] # TODO(Dori, 1/1/2025): Add the "jemalloc" feature to the blockifier crate when possible. -blockifier = { path = "../blockifier", features = ["concurrency", "testing"] } +blockifier = { workspace = true, features = ["concurrency", "testing"] } cairo-lang-starknet-classes.workspace = true cairo-vm.workspace = true indexmap.workspace = true log.workspace = true num-bigint.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pyo3 = { workspace = true, features = ["hashbrown", "num-bigint"] } pyo3-log.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } thiserror.workspace = true [dev-dependencies] diff --git a/crates/papyrus_base_layer/Cargo.toml b/crates/papyrus_base_layer/Cargo.toml index e8b9a48ada..9a9cf8e899 100644 --- a/crates/papyrus_base_layer/Cargo.toml +++ b/crates/papyrus_base_layer/Cargo.toml @@ -12,7 +12,7 @@ papyrus_config.workspace = true rustc-hex.workspace = true serde.workspace = true serde_json.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["full", "sync"] } url.workspace = true @@ -21,7 +21,7 @@ url.workspace = true ethers-core = { version = "2.0.3" } pretty_assertions.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } tar = { version = "0.4.38" } tempfile.workspace = true test-with = { version = "0.9.3", default-features = false, features = ["executable"] } diff --git a/crates/papyrus_common/Cargo.toml b/crates/papyrus_common/Cargo.toml index aca3b30686..db3c7015ce 100644 --- a/crates/papyrus_common/Cargo.toml +++ b/crates/papyrus_common/Cargo.toml @@ -17,11 +17,11 @@ serde.workspace = true serde_json.workspace = true sha3.workspace = true starknet-types-core = { workspace = true, features = ["hash"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true thiserror.workspace = true [dev-dependencies] assert_matches.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true pretty_assertions.workspace = true serde_json = { workspace = true, features = ["arbitrary_precision"] } diff --git a/crates/papyrus_config/Cargo.toml b/crates/papyrus_config/Cargo.toml index ae614b1c5f..86f82f9ad0 100644 --- a/crates/papyrus_config/Cargo.toml +++ b/crates/papyrus_config/Cargo.toml @@ -22,5 +22,5 @@ validator = { workspace = true, features = ["derive"] } assert_matches.workspace = true itertools.workspace = true lazy_static.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true tempfile.workspace = true diff --git a/crates/papyrus_execution/Cargo.toml b/crates/papyrus_execution/Cargo.toml index 182e747ed6..fbfff50d3c 100644 --- a/crates/papyrus_execution/Cargo.toml +++ b/crates/papyrus_execution/Cargo.toml @@ -11,23 +11,23 @@ testing = ["papyrus_test_utils", "rand", "rand_chacha"] [dependencies] anyhow.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-rc.0" } +blockifier.workspace = true cairo-lang-starknet-classes.workspace = true cairo-vm.workspace = true indexmap.workspace = true itertools.workspace = true lazy_static.workspace = true once_cell.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true rand = { workspace = true, optional = true } rand_chacha = { workspace = true, optional = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true starknet-types-core.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils", optional = true } +papyrus_test_utils = { workspace = true, optional = true } thiserror.workspace = true tracing.workspace = true @@ -36,11 +36,11 @@ assert_matches.workspace = true cairo-lang-casm.workspace = true cairo-lang-utils.workspace = true indexmap = { workspace = true, features = ["serde"] } -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pretty_assertions.workspace = true rand.workspace = true rand_chacha.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true [package.metadata.cargo-machete] # The `rand` crate is used in the `testing` feature, which is optional. diff --git a/crates/papyrus_monitoring_gateway/Cargo.toml b/crates/papyrus_monitoring_gateway/Cargo.toml index 3b8e209c6d..fd0a325b2b 100644 --- a/crates/papyrus_monitoring_gateway/Cargo.toml +++ b/crates/papyrus_monitoring_gateway/Cargo.toml @@ -11,11 +11,11 @@ hyper = { workspace = true, features = ["full"] } metrics-exporter-prometheus = { version = "0.12.1" } metrics-process = { version = "1.0.11" } papyrus_config.workspace = true -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_storage.workspace = true rand.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } -starknet_client = { path = "../starknet_client" } +starknet_client.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["full", "sync"] } tracing.workspace = true @@ -24,7 +24,7 @@ validator = { workspace = true, features = ["derive"] } [dev-dependencies] http-body = { version = "0.4.5" } metrics.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } pretty_assertions.workspace = true -starknet_client = { path = "../starknet_client", features = ["testing"] } +starknet_client = { workspace = true, features = ["testing"] } tower = { workspace = true, features = ["util"] } diff --git a/crates/papyrus_network/Cargo.toml b/crates/papyrus_network/Cargo.toml index a4472aba8d..9869ed9193 100644 --- a/crates/papyrus_network/Cargo.toml +++ b/crates/papyrus_network/Cargo.toml @@ -33,7 +33,7 @@ libp2p = { workspace = true, features = [ "yamux", ] } metrics.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true replace_with.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/crates/papyrus_node/Cargo.toml b/crates/papyrus_node/Cargo.toml index 92d3419ead..c37e34bcf9 100644 --- a/crates/papyrus_node/Cargo.toml +++ b/crates/papyrus_node/Cargo.toml @@ -25,22 +25,22 @@ futures.workspace = true itertools.workspace = true lazy_static.workspace = true once_cell.workspace = true -papyrus_base_layer = { path = "../papyrus_base_layer", version = "0.4.0-rc.0" } -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_base_layer.workspace = true +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_consensus = { path = "../sequencing/papyrus_consensus", version = "0.4.0-rc.0" } -papyrus_monitoring_gateway = { path = "../papyrus_monitoring_gateway", version = "0.4.0-rc.0" } -papyrus_network = { path = "../papyrus_network", version = "0.4.0-rc.0" } -papyrus_p2p_sync = { path = "../papyrus_p2p_sync", version = "0.4.0-rc.0" } -papyrus_protobuf = { path = "../papyrus_protobuf", version = "0.4.0-rc.0" } -papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0", optional = true } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } -papyrus_sync = { path = "../papyrus_sync", version = "0.4.0-rc.0" } +papyrus_consensus.workspace = true +papyrus_monitoring_gateway.workspace = true +papyrus_network.workspace = true +papyrus_p2p_sync.workspace = true +papyrus_protobuf.workspace = true +papyrus_rpc = { workspace = true, optional = true } +papyrus_storage.workspace = true +papyrus_sync.workspace = true reqwest = { workspace = true, features = ["blocking", "json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } -starknet_client = { path = "../starknet_client" } +starknet_api = { workspace = true, features = ["testing"] } +starknet_client.workspace = true strum.workspace = true tokio = { workspace = true, features = ["full", "sync"] } tracing.workspace = true @@ -57,6 +57,6 @@ assert-json-diff.workspace = true colored.workspace = true insta = { workspace = true, features = ["json"] } metrics-exporter-prometheus.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true pretty_assertions.workspace = true tempfile.workspace = true diff --git a/crates/papyrus_p2p_sync/Cargo.toml b/crates/papyrus_p2p_sync/Cargo.toml index 5c7cf77318..12b62e4e74 100644 --- a/crates/papyrus_p2p_sync/Cargo.toml +++ b/crates/papyrus_p2p_sync/Cargo.toml @@ -12,14 +12,14 @@ futures.workspace = true indexmap.workspace = true lazy_static.workspace = true metrics.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_network = { path = "../papyrus_network", version = "0.4.0-rc.0" } -papyrus_proc_macros = { path = "../papyrus_proc_macros", version = "0.4.0-rc.0" } -papyrus_protobuf = { path = "../papyrus_protobuf", version = "0.4.0-rc.0" } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_network.workspace = true +papyrus_proc_macros.workspace = true +papyrus_protobuf.workspace = true +papyrus_storage.workspace = true serde.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true starknet-types-core.workspace = true thiserror.workspace = true tokio.workspace = true @@ -29,12 +29,12 @@ tracing.workspace = true [dev-dependencies] assert_matches.workspace = true lazy_static.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } static_assertions.workspace = true rand.workspace = true rand_chacha.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } -papyrus_protobuf = { path = "../papyrus_protobuf", features = ["testing"] } +papyrus_test_utils.workspace = true +papyrus_protobuf = { workspace = true, features = ["testing"] } # The `metrics` crate is used by `latency_histogram` proc macro, which is used in this crate. [package.metadata.cargo-machete] diff --git a/crates/papyrus_proc_macros/Cargo.toml b/crates/papyrus_proc_macros/Cargo.toml index 6b39f41d91..da3d40544f 100644 --- a/crates/papyrus_proc_macros/Cargo.toml +++ b/crates/papyrus_proc_macros/Cargo.toml @@ -13,8 +13,8 @@ syn = { version = "2.0.39", features = ["full"] } [dev-dependencies] metrics.workspace = true metrics-exporter-prometheus.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-dev.1" } -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_common.workspace = true +papyrus_test_utils.workspace = true prometheus-parse.workspace = true [lib] diff --git a/crates/papyrus_protobuf/Cargo.toml b/crates/papyrus_protobuf/Cargo.toml index 703d10d11c..7490af9f67 100644 --- a/crates/papyrus_protobuf/Cargo.toml +++ b/crates/papyrus_protobuf/Cargo.toml @@ -15,16 +15,16 @@ primitive-types.workspace = true prost.workspace = true rand = { workspace = true, optional = true } rand_chacha = { workspace = true, optional = true } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true starknet-types-core.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils", optional = true } +papyrus_test_utils = { workspace = true, optional = true } thiserror.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-dev.2" } +papyrus_common.workspace = true [dev-dependencies] rand.workspace = true rand_chacha.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true [build-dependencies] prost-build.workspace = true diff --git a/crates/papyrus_rpc/Cargo.toml b/crates/papyrus_rpc/Cargo.toml index 167fda2fd5..4d37f468e9 100644 --- a/crates/papyrus_rpc/Cargo.toml +++ b/crates/papyrus_rpc/Cargo.toml @@ -18,17 +18,17 @@ hyper = { workspace = true, features = ["full"] } jsonrpsee = { workspace = true, features = ["full"] } lazy_static.workspace = true metrics.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_execution = { path = "../papyrus_execution", version = "0.4.0-rc.0" } -papyrus_proc_macros = { path = "../papyrus_proc_macros", version = "0.4.0-rc.0" } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_execution.workspace = true +papyrus_proc_macros.workspace = true +papyrus_storage.workspace = true regex = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_client = { path = "../starknet_client", version = "0.4.0-rc.0" } +starknet_api.workspace = true +starknet_client.workspace = true tokio = { workspace = true, features = ["full", "sync"] } tower = { workspace = true, features = ["full"] } tracing.workspace = true @@ -48,16 +48,16 @@ jsonschema.workspace = true lazy_static.workspace = true metrics-exporter-prometheus.workspace = true mockall.workspace = true -papyrus_execution = { path = "../papyrus_execution", features = ["testing"] } -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_execution = { workspace = true, features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } +papyrus_test_utils.workspace = true pretty_assertions.workspace = true prometheus-parse.workspace = true rand.workspace = true rand_chacha.workspace = true reqwest.workspace = true starknet-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } -starknet_client = { path = "../starknet_client", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } +starknet_client = { workspace = true, features = ["testing"] } strum.workspace = true strum_macros.workspace = true diff --git a/crates/papyrus_storage/Cargo.toml b/crates/papyrus_storage/Cargo.toml index 5560fb3edf..099104a924 100644 --- a/crates/papyrus_storage/Cargo.toml +++ b/crates/papyrus_storage/Cargo.toml @@ -34,15 +34,15 @@ memmap2.workspace = true metrics.workspace = true num-bigint.workspace = true page_size.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_proc_macros = { path = "../papyrus_proc_macros", version = "0.4.0-rc.0" } +papyrus_proc_macros.workspace = true parity-scale-codec.workspace = true primitive-types.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } starknet-types-core = { workspace = true, features = ["papyrus-serialization"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true tempfile = { workspace = true, optional = true } thiserror.workspace = true tracing = { workspace = true, features = ["log"] } @@ -61,7 +61,7 @@ camelpaste.workspace = true insta = { workspace = true, features = ["yaml"] } metrics-exporter-prometheus.workspace = true num-traits.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_test_utils.workspace = true paste.workspace = true pretty_assertions.workspace = true prometheus-parse.workspace = true diff --git a/crates/papyrus_sync/Cargo.toml b/crates/papyrus_sync/Cargo.toml index f1f444b1df..34bf5080ee 100644 --- a/crates/papyrus_sync/Cargo.toml +++ b/crates/papyrus_sync/Cargo.toml @@ -16,16 +16,16 @@ indexmap = { workspace = true, features = ["serde"] } itertools.workspace = true lru.workspace = true metrics.workspace = true -papyrus_base_layer = { path = "../papyrus_base_layer", version = "0.4.0-rc.0" } -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_base_layer.workspace = true +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_proc_macros = { path = "../papyrus_proc_macros", version = "0.4.0-rc.0" } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +papyrus_proc_macros.workspace = true +papyrus_storage.workspace = true reqwest = { workspace = true, features = ["blocking", "json"] } serde = { workspace = true, features = ["derive"] } starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_client = { path = "../starknet_client" } +starknet_api.workspace = true +starknet_client.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["full", "sync"] } tracing.workspace = true @@ -33,10 +33,10 @@ tracing.workspace = true [dev-dependencies] assert_matches.workspace = true mockall.workspace = true -papyrus_storage = { path = "../papyrus_storage", features = ["testing"] } -papyrus_test_utils = { path = "../papyrus_test_utils" } +papyrus_storage = { workspace = true, features = ["testing"] } +papyrus_test_utils.workspace = true pretty_assertions.workspace = true simple_logger.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } -starknet_client = { path = "../starknet_client", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } +starknet_client = { workspace = true, features = ["testing"] } tokio-stream.workspace = true diff --git a/crates/papyrus_test_utils/Cargo.toml b/crates/papyrus_test_utils/Cargo.toml index 2f59bd7be8..aaeedc579e 100644 --- a/crates/papyrus_test_utils/Cargo.toml +++ b/crates/papyrus_test_utils/Cargo.toml @@ -21,7 +21,7 @@ reqwest = { workspace = true, features = ["json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } starknet-types-core = { workspace = true, features = ["hash"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } +starknet_api = { workspace = true, features = ["testing"] } [dev-dependencies] pretty_assertions.workspace = true diff --git a/crates/sequencing/papyrus_block_builder/Cargo.toml b/crates/sequencing/papyrus_block_builder/Cargo.toml index a38a5ba911..163943ec66 100644 --- a/crates/sequencing/papyrus_block_builder/Cargo.toml +++ b/crates/sequencing/papyrus_block_builder/Cargo.toml @@ -7,11 +7,11 @@ license-file.workspace = true description = "A block-builder for Starknet blocks" [dependencies] -papyrus_storage = { path = "../../papyrus_storage", version = "0.4.0-rc.0", features = ["testing"] } -starknet_api = { path = "../../starknet_api", version = "0.13.0-rc.0" } +papyrus_storage = { workspace = true, features = ["testing"] } +starknet_api.workspace = true thiserror.workspace = true tracing.workspace = true [dev-dependencies] -papyrus_test_utils = { path = "../../papyrus_test_utils" } +papyrus_test_utils.workspace = true pretty_assertions.workspace = true diff --git a/crates/sequencing/papyrus_consensus/Cargo.toml b/crates/sequencing/papyrus_consensus/Cargo.toml index 6304554e19..f9c075467c 100644 --- a/crates/sequencing/papyrus_consensus/Cargo.toml +++ b/crates/sequencing/papyrus_consensus/Cargo.toml @@ -10,23 +10,21 @@ description = "Reach consensus for Starknet" async-trait.workspace = true futures.workspace = true metrics.workspace = true -papyrus_common = { path = "../../papyrus_common", version = "0.4.0-dev.2" } +papyrus_common.workspace = true papyrus_config.workspace = true -papyrus_network = { path = "../../papyrus_network", version = "0.4.0-dev.2" } -papyrus_protobuf = { path = "../../papyrus_protobuf", version = "0.4.0-dev.2" } -papyrus_storage = { path = "../../papyrus_storage", version = "0.4.0-dev.2" } +papyrus_network.workspace = true +papyrus_protobuf.workspace = true +papyrus_storage.workspace = true serde = { workspace = true, features = ["derive"] } starknet-types-core.workspace = true -starknet_api = { path = "../../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true thiserror.workspace = true tokio = { workspace = true, features = ["full"] } tracing.workspace = true [dev-dependencies] mockall.workspace = true -papyrus_network = { path = "../../papyrus_network", version = "0.4.0-dev.2", features = [ - "testing", -] } -papyrus_storage = { path = "../../papyrus_storage", features = ["testing"] } -papyrus_test_utils = { path = "../../papyrus_test_utils" } +papyrus_network = { workspace = true, features = ["testing"] } +papyrus_storage = { workspace = true, features = ["testing"] } +papyrus_test_utils.workspace = true test-case.workspace = true diff --git a/crates/starknet_client/Cargo.toml b/crates/starknet_client/Cargo.toml index 57ffe7db59..6b6632f3a5 100644 --- a/crates/starknet_client/Cargo.toml +++ b/crates/starknet_client/Cargo.toml @@ -17,7 +17,7 @@ http.workspace = true indexmap = { workspace = true, features = ["serde"] } mockall = { workspace = true, optional = true } os_info.workspace = true -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } +papyrus_common.workspace = true papyrus_config.workspace = true rand = { workspace = true, optional = true } rand_chacha = { workspace = true, optional = true } @@ -25,11 +25,11 @@ reqwest = { workspace = true, features = ["blocking", "json"] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true, features = ["arbitrary_precision"] } serde_repr.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true starknet-types-core = { workspace = true, features = ["serde"] } strum.workspace = true strum_macros.workspace = true -papyrus_test_utils = { path = "../papyrus_test_utils", optional = true } +papyrus_test_utils = { workspace = true, optional = true } thiserror.workspace = true tokio = { workspace = true, features = ["full", "sync"] } tokio-retry.workspace = true @@ -45,8 +45,8 @@ rand.workspace = true rand_chacha.workspace = true pretty_assertions.workspace = true simple_logger.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0", features = ["testing"] } -papyrus_test_utils = { path = "../papyrus_test_utils" } +starknet_api = { workspace = true, features = ["testing"] } +papyrus_test_utils.workspace = true [package.metadata.cargo-machete] # The `rand` and `rand_chacha` crates are used in the `testing` feature, which is optional. diff --git a/crates/starknet_sierra_compile/Cargo.toml b/crates/starknet_sierra_compile/Cargo.toml index 641eadbb4a..ce02f26f92 100644 --- a/crates/starknet_sierra_compile/Cargo.toml +++ b/crates/starknet_sierra_compile/Cargo.toml @@ -15,9 +15,9 @@ cairo-lang-utils.workspace = true serde.workspace = true serde_json.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } +starknet_api.workspace = true thiserror.workspace = true [dev-dependencies] assert_matches.workspace = true -mempool_test_utils = { path = "../mempool_test_utils" } +mempool_test_utils.workspace = true diff --git a/crates/tests-integration/Cargo.toml b/crates/tests-integration/Cargo.toml index 8bfc220c85..186bd4e73f 100644 --- a/crates/tests-integration/Cargo.toml +++ b/crates/tests-integration/Cargo.toml @@ -10,24 +10,24 @@ workspace = true [dependencies] axum.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-rc.0" } +blockifier.workspace = true cairo-lang-starknet-classes.workspace = true indexmap.workspace = true itertools.workspace = true -mempool_test_utils = { path = "../mempool_test_utils", version = "0.0" } -papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" } -papyrus_rpc = { path = "../papyrus_rpc", version = "0.4.0-rc.0" } -papyrus_storage = { path = "../papyrus_storage", version = "0.4.0-rc.0" } +mempool_test_utils.workspace = true +papyrus_common.workspace = true +papyrus_rpc.workspace = true +papyrus_storage.workspace = true reqwest.workspace = true serde_json.workspace = true starknet-types-core.workspace = true -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_client = { path = "../starknet_client", version = "0.4.0-rc.0" } -starknet_gateway = { path = "../gateway", version = "0.0", features = ["testing"] } -starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } -starknet_mempool_node = { path = "../mempool_node", version = "0.0" } -starknet_mempool_types = { path = "../mempool_types", version = "0.0" } -starknet_task_executor = { path = "../task_executor", version = "0.0" } +starknet_api.workspace = true +starknet_client.workspace = true +starknet_gateway = { workspace = true, features = ["testing"] } +starknet_mempool_infra.workspace = true +starknet_mempool_node.workspace = true +starknet_mempool_types.workspace = true +starknet_task_executor.workspace = true strum.workspace = true tempfile.workspace = true tokio.workspace = true @@ -35,4 +35,4 @@ tokio.workspace = true [dev-dependencies] pretty_assertions.workspace = true rstest.workspace = true -starknet_mempool_infra = { path = "../mempool_infra", version = "0.0" } +starknet_mempool_infra.workspace = true From 3c970fd802519f8c580c63b8af924b7faab8a953 Mon Sep 17 00:00:00 2001 From: alon-dotan-starkware Date: Tue, 6 Aug 2024 12:38:31 +0300 Subject: [PATCH 3/4] * chore(ci): use large-runners to increase concurrency (#333) * chore(ci): fix protoc in blockifier compiled cairo --- .github/workflows/blockifier_ci.yml | 5 +++-- .../workflows/blockifier_compiled_cairo.yml | 13 ++++++++----- .github/workflows/blockifier_coverage.yml | 4 +++- .github/workflows/blockifier_post-merge.yml | 4 +++- .github/workflows/clean_stale_prs.yml | 2 +- .github/workflows/committer_ci.yml | 6 +++--- .github/workflows/lock_closed_prs.yml | 2 +- .github/workflows/main.yml | 18 +++++++++--------- .github/workflows/merge_paths_ci.yml | 2 +- .github/workflows/papyrus/helm-install.yml | 2 +- .github/workflows/papyrus_ci.yml | 16 ++++++++-------- .github/workflows/papyrus_docker-publish.yml | 4 +++- .github/workflows/papyrus_nightly-tests.yml | 4 ++-- .github/workflows/verify-deps.yml | 2 +- 14 files changed, 47 insertions(+), 37 deletions(-) diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml index 2b4ea730eb..025225cb64 100644 --- a/.github/workflows/blockifier_ci.yml +++ b/.github/workflows/blockifier_ci.yml @@ -18,6 +18,7 @@ on: - auto_merge_enabled - edited paths: + - '.github/workflows/blockifier_ci.yml' - 'crates/blockifier/**' - 'crates/native_blockifier/**' - 'build_native_blockifier_in_docker.sh' @@ -25,7 +26,7 @@ on: jobs: featureless-build: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -36,7 +37,7 @@ jobs: - run: cargo test -p blockifier native-blockifier-artifacts-push: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index c4111b1118..e2eed9636f 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -3,25 +3,28 @@ name: Blockifier-Compiled-Cairo on: push: branches: - - main + - main tags: - - v[0-9].** + - v[0-9].** paths: - - 'crates/blockifier/feature_contracts/cairo0/**' + - 'crates/blockifier/feature_contracts/cairo0/**' + - '.github/workflows/blockifier_compiled_cairo.yml' pull_request: types: - opened - reopened - synchronize paths: - - 'crates/blockifier/feature_contracts/cairo0/**' + - '.github/workflows/blockifier_compiled_cairo.yml' + - 'crates/blockifier/feature_contracts/cairo0/**' jobs: verify_cairo_file_dependencies: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable + - uses: Noelware/setup-protoc@1.1.0 - uses: Swatinem/rust-cache@v2 with: prefix-key: "v0-rust-ubuntu-20.04" diff --git a/.github/workflows/blockifier_coverage.yml b/.github/workflows/blockifier_coverage.yml index fd5541d041..1da1cdbbf2 100644 --- a/.github/workflows/blockifier_coverage.yml +++ b/.github/workflows/blockifier_coverage.yml @@ -3,14 +3,16 @@ name: Blockifier-Coverage on: pull_request: paths: + - '.github/workflows/blockifier_coverage.yml' - 'crates/blockifier/**' push: paths: + - '.github/workflows/blockifier_coverage.yml' - 'crates/blockifier/**' jobs: coverage: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium env: CARGO_TERM_COLOR: always steps: diff --git a/.github/workflows/blockifier_post-merge.yml b/.github/workflows/blockifier_post-merge.yml index 4de0e4e9a9..404ed09680 100644 --- a/.github/workflows/blockifier_post-merge.yml +++ b/.github/workflows/blockifier_post-merge.yml @@ -5,14 +5,16 @@ on: types: - closed paths: + - '.github/workflows/blockifier_post-merge.yml' - 'crates/blockifier/**' jobs: if_merged: if: github.event.pull_request.merged == true - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable + - uses: Noelware/setup-protoc@1.1.0 - uses: Swatinem/rust-cache@v2 with: prefix-key: "v0-rust-ubuntu-20.04" diff --git a/.github/workflows/clean_stale_prs.yml b/.github/workflows/clean_stale_prs.yml index 8d4efa091a..1ccbe73ac8 100644 --- a/.github/workflows/clean_stale_prs.yml +++ b/.github/workflows/clean_stale_prs.yml @@ -9,7 +9,7 @@ on: jobs: stale: name: ๐Ÿงน Clean up stale issues and PRs - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - name: ๐Ÿš€ Run stale uses: actions/stale@v3 diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index d82054465a..67837d145c 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -30,7 +30,7 @@ on: jobs: run-regression-tests: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -46,7 +46,7 @@ jobs: - run: cargo test -p committer_cli --release -- --include-ignored test_regression benchmarking: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: # Checkout the base branch to get the old code. - uses: actions/checkout@v4 @@ -112,7 +112,7 @@ jobs: }) gcs-push: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/lock_closed_prs.yml b/.github/workflows/lock_closed_prs.yml index f097fc6306..91b0175ffd 100644 --- a/.github/workflows/lock_closed_prs.yml +++ b/.github/workflows/lock_closed_prs.yml @@ -9,7 +9,7 @@ on: jobs: lock: name: ๐Ÿ”’ Lock closed issues and PRs - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: dessant/lock-threads@v2.0.3 with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f82154e63a..ec8673ed03 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ on: jobs: commitlint: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 with: @@ -41,7 +41,7 @@ jobs: run: echo "$TITLE" | commitlint --verbose format: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master @@ -54,7 +54,7 @@ jobs: - run: scripts/rust_fmt.sh --check clippy: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: Noelware/setup-protoc@1.1.0 @@ -78,7 +78,7 @@ jobs: - run: scripts/clippy.sh doc: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small # env: # RUSTDOCFLAGS: "-D warnings" steps: @@ -91,7 +91,7 @@ jobs: - run: cargo doc --workspace -r --document-private-items --no-deps run-tests: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 with: @@ -134,7 +134,7 @@ jobs: SEED: 0 taplo: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -147,14 +147,14 @@ jobs: - run: scripts/taplo.sh machete: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - name: Run Machete (detect unused dependencies) uses: bnjbvr/cargo-machete@main check: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small env: RUSTDOCFLAGS: "-D warnings" steps: @@ -167,7 +167,7 @@ jobs: - run: cargo check --workspace -r --all-features merge-gatekeeper: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small # Restrict permissions of the GITHUB_TOKEN. # Docs: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs permissions: diff --git a/.github/workflows/merge_paths_ci.yml b/.github/workflows/merge_paths_ci.yml index 454b784323..456a1bd694 100644 --- a/.github/workflows/merge_paths_ci.yml +++ b/.github/workflows/merge_paths_ci.yml @@ -30,7 +30,7 @@ on: jobs: merge-paths-test: - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/papyrus/helm-install.yml b/.github/workflows/papyrus/helm-install.yml index e06b2ca832..886f307f09 100644 --- a/.github/workflows/papyrus/helm-install.yml +++ b/.github/workflows/papyrus/helm-install.yml @@ -14,7 +14,7 @@ on: jobs: deploy-teardown: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small permissions: contents: "read" id-token: "write" diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index ad79a6784e..3fb238c381 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -38,7 +38,7 @@ env: jobs: executable-run: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -57,7 +57,7 @@ jobs: & sleep 30 ; kill $! executable-run-no-rpc: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -76,7 +76,7 @@ jobs: & sleep 30 ; kill $! integration-test: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -93,7 +93,7 @@ jobs: cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream" test-no-rpc: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -106,7 +106,7 @@ jobs: SEED: 0 codecov: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable @@ -135,7 +135,7 @@ jobs: version: "v0.1.15" check-starknet_api-dependency: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small if: github.base_ref == 'main' # this step is only run if the pr is to the main branch steps: - uses: actions/checkout@v4 @@ -143,7 +143,7 @@ jobs: - run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main build-papyrus-utilities-image: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx @@ -159,7 +159,7 @@ jobs: cache-to: type=gha,mode=max,scope=buildkit-ci random-table-test: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 # run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes. diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 70026edd4f..760b379ec8 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -6,10 +6,12 @@ on: branches: [main] tags: ["v*.*.*"] paths: + - '.github/workflows/papyrus_docker-publish.yml' - 'crates/papyrus**/**' pull_request: paths: + - '.github/workflows/papyrus_docker-publish.yml' - 'crates/papyrus**/**' env: @@ -18,7 +20,7 @@ env: jobs: docker-build-push: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-medium steps: - name: Checkout repository diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml index 5c4a038b6f..9c0a9bb09f 100644 --- a/.github/workflows/papyrus_nightly-tests.yml +++ b/.github/workflows/papyrus_nightly-tests.yml @@ -13,7 +13,7 @@ jobs: GW-integration-test-ubuntu: uses: ./.github/workflows/papyrus_nightly-tests-call.yml with: - os: ubuntu-latest + os: starkware-ubuntu-latest-small secrets: INTEGRATION_TESTNET_NODE_URL: ${{ secrets.INTEGRATION_TESTNET_NODE_URL }} INTEGRATION_TESTNET_SENDER_PRIVATE_KEY: ${{ secrets.INTEGRATION_TESTNET_SENDER_PRIVATE_KEY }} @@ -95,7 +95,7 @@ jobs: # TODO(dvir): make this run only if the path 'crates/papyrus_storage/src/db/**' (same path as in the CI) was changed on the # last day and increase the number of repetitions. random-table-test: - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index 5e11b67b97..3b410ef14c 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -7,7 +7,7 @@ on: jobs: latest_deps: name: Latest Dependencies - runs-on: ubuntu-20.04 + runs-on: starkware-ubuntu-latest-medium continue-on-error: true steps: - uses: actions/checkout@v4 From 09cd2b3283b143a96cabf6c6f8ffef1cf72d5c58 Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Tue, 6 Aug 2024 12:40:36 +0300 Subject: [PATCH 4/4] fix: conflict resolution Signed-off-by: Dori Medini --- .github/workflows/main.yml | 12 +----------- crates/mempool_test_utils/Cargo.toml | 8 -------- crates/mempool_types/Cargo.toml | 10 +--------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e064ada9e..562663e610 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,19 +78,9 @@ jobs: - run: scripts/clippy.sh doc: -<<<<<<< HEAD - runs-on: ubuntu-latest + runs-on: starkware-ubuntu-latest-small env: RUSTDOCFLAGS: "-D warnings" -||||||| 40b94928 - runs-on: ubuntu-latest - # env: - # RUSTDOCFLAGS: "-D warnings" -======= - runs-on: starkware-ubuntu-latest-small - # env: - # RUSTDOCFLAGS: "-D warnings" ->>>>>>> origin/main-v0.13.2 steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable diff --git a/crates/mempool_test_utils/Cargo.toml b/crates/mempool_test_utils/Cargo.toml index 93edfa2b3e..d01879b9e7 100644 --- a/crates/mempool_test_utils/Cargo.toml +++ b/crates/mempool_test_utils/Cargo.toml @@ -8,15 +8,7 @@ license.workspace = true [features] [dependencies] -<<<<<<< HEAD -blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] } -||||||| 40b94928 -assert_matches.workspace = true -blockifier = { path = "../blockifier", version = "0.8.0-rc.0", features = ["testing"] } -======= -assert_matches.workspace = true blockifier = { workspace = true, features = ["testing"] } ->>>>>>> origin/main-v0.13.2 serde_json.workspace = true starknet-types-core.workspace = true starknet_api.workspace = true diff --git a/crates/mempool_types/Cargo.toml b/crates/mempool_types/Cargo.toml index 0192b91b33..3217e1a8d5 100644 --- a/crates/mempool_types/Cargo.toml +++ b/crates/mempool_types/Cargo.toml @@ -11,16 +11,8 @@ workspace = true [dependencies] async-trait.workspace = true mockall.workspace = true -<<<<<<< HEAD -papyrus_proc_macros = { path = "../papyrus_proc_macros" } +papyrus_proc_macros.workspace = true serde = { workspace = true, features = ["derive"] } -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_mempool_infra = { path = "../mempool_infra" } -||||||| 40b94928 -starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" } -starknet_mempool_infra = { path = "../mempool_infra" } -======= starknet_api.workspace = true starknet_mempool_infra.workspace = true ->>>>>>> origin/main-v0.13.2 thiserror.workspace = true