Skip to content

Commit e82adc0

Browse files
chore: resolve conflicts
Signed-off-by: Dori Medini <[email protected]>
1 parent 4995878 commit e82adc0

File tree

13 files changed

+23
-941
lines changed

13 files changed

+23
-941
lines changed

Cargo.lock

Lines changed: 0 additions & 694 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,7 @@ members = [
110110
]
111111

112112
[workspace.package]
113-
<<<<<<< HEAD
114113
version = "0.17.0-rc.0"
115-
||||||| d8037b916e
116-
version = "0.16.0-rc.1"
117-
=======
118-
version = "0.16.0-rc.2"
119-
>>>>>>> origin/main-v0.14.1
120114
edition = "2021"
121115
repository = "https://github.com/starkware-libs/sequencer/"
122116
license = "Apache-2.0"
@@ -135,30 +129,14 @@ apollo_central_sync_config.path = "crates/apollo_central_sync_config"
135129
apollo_class_manager.path = "crates/apollo_class_manager"
136130
apollo_class_manager_config.path = "crates/apollo_class_manager_config"
137131
apollo_class_manager_types.path = "crates/apollo_class_manager_types"
138-
<<<<<<< HEAD
139132
apollo_committer.path = "crates/apollo_committer"
140133
apollo_committer_types.path = "crates/apollo_committer_types"
141134
apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.17.0-rc.0" }
142-
||||||| d8037b916e
143-
apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.16.0-rc.1" }
144-
=======
145-
apollo_compilation_utils = { path = "crates/apollo_compilation_utils", version = "0.16.0-rc.2" }
146-
>>>>>>> origin/main-v0.14.1
147135
apollo_compile_to_casm.path = "crates/apollo_compile_to_casm"
148136
apollo_compile_to_casm_types.path = "crates/apollo_compile_to_casm_types"
149-
<<<<<<< HEAD
150137
apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.17.0-rc.0" }
151138
apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.17.0-rc.0" }
152139
apollo_config = { path = "crates/apollo_config", version = "0.17.0-rc.0" }
153-
||||||| d8037b916e
154-
apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.16.0-rc.1" }
155-
apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.16.0-rc.1" }
156-
apollo_config = { path = "crates/apollo_config", version = "0.16.0-rc.1" }
157-
=======
158-
apollo_compile_to_native = { path = "crates/apollo_compile_to_native", version = "0.16.0-rc.2" }
159-
apollo_compile_to_native_types = { path = "crates/apollo_compile_to_native_types", version = "0.16.0-rc.2" }
160-
apollo_config = { path = "crates/apollo_config", version = "0.16.0-rc.2" }
161-
>>>>>>> origin/main-v0.14.1
162140
apollo_config_manager.path = "crates/apollo_config_manager"
163141
apollo_config_manager_config.path = "crates/apollo_config_manager_config"
164142
apollo_config_manager_types.path = "crates/apollo_config_manager_types"
@@ -176,13 +154,7 @@ apollo_gateway_types.path = "crates/apollo_gateway_types"
176154
apollo_http_server.path = "crates/apollo_http_server"
177155
apollo_http_server_config.path = "crates/apollo_http_server_config"
178156
apollo_infra.path = "crates/apollo_infra"
179-
<<<<<<< HEAD
180157
apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.17.0-rc.0" }
181-
||||||| d8037b916e
182-
apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.16.0-rc.1" }
183-
=======
184-
apollo_infra_utils = { path = "crates/apollo_infra_utils", version = "0.16.0-rc.2" }
185-
>>>>>>> origin/main-v0.14.1
186158
apollo_integration_tests.path = "crates/apollo_integration_tests"
187159
apollo_l1_endpoint_monitor.path = "crates/apollo_l1_endpoint_monitor"
188160
apollo_l1_endpoint_monitor_config.path = "crates/apollo_l1_endpoint_monitor_config"
@@ -200,13 +172,7 @@ apollo_mempool_p2p.path = "crates/apollo_mempool_p2p"
200172
apollo_mempool_p2p_config.path = "crates/apollo_mempool_p2p_config"
201173
apollo_mempool_p2p_types.path = "crates/apollo_mempool_p2p_types"
202174
apollo_mempool_types.path = "crates/apollo_mempool_types"
203-
<<<<<<< HEAD
204175
apollo_metrics = { path = "crates/apollo_metrics", version = "0.17.0-rc.0" }
205-
||||||| d8037b916e
206-
apollo_metrics = { path = "crates/apollo_metrics", version = "0.16.0-rc.1" }
207-
=======
208-
apollo_metrics = { path = "crates/apollo_metrics", version = "0.16.0-rc.2" }
209-
>>>>>>> origin/main-v0.14.1
210176
apollo_monitoring_endpoint.path = "crates/apollo_monitoring_endpoint"
211177
apollo_monitoring_endpoint_config.path = "crates/apollo_monitoring_endpoint_config"
212178
apollo_network.path = "crates/apollo_network"
@@ -215,13 +181,7 @@ apollo_node.path = "crates/apollo_node"
215181
apollo_node_config.path = "crates/apollo_node_config"
216182
apollo_p2p_sync.path = "crates/apollo_p2p_sync"
217183
apollo_p2p_sync_config.path = "crates/apollo_p2p_sync_config"
218-
<<<<<<< HEAD
219184
apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.17.0-rc.0" }
220-
||||||| d8037b916e
221-
apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.16.0-rc.1" }
222-
=======
223-
apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.16.0-rc.2" }
224-
>>>>>>> origin/main-v0.14.1
225185
apollo_proc_macros_tests.path = "crates/apollo_proc_macros_tests"
226186
apollo_protobuf.path = "crates/apollo_protobuf"
227187
apollo_reverts.path = "crates/apollo_reverts"
@@ -230,25 +190,11 @@ apollo_rpc_execution.path = "crates/apollo_rpc_execution"
230190
apollo_sierra_compilation_config.path = "crates/apollo_sierra_compilation_config"
231191
apollo_signature_manager.path = "crates/apollo_signature_manager"
232192
apollo_signature_manager_types.path = "crates/apollo_signature_manager_types"
233-
<<<<<<< HEAD
234193
apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.17.0-rc.0" }
235194
apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.17.0-rc.0" }
236-
||||||| d8037b916e
237-
apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.16.0-rc.1" }
238-
apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.16.0-rc.1" }
239-
=======
240-
apollo_sizeof = { path = "crates/apollo_sizeof", version = "0.16.0-rc.2" }
241-
apollo_sizeof_macros = { path = "crates/apollo_sizeof_macros", version = "0.16.0-rc.2" }
242-
>>>>>>> origin/main-v0.14.1
243195
apollo_staking.path = "crates/apollo_staking"
244196
apollo_starknet_client.path = "crates/apollo_starknet_client"
245-
<<<<<<< HEAD
246197
apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.17.0-rc.0" }
247-
||||||| d8037b916e
248-
apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.16.0-rc.1" }
249-
=======
250-
apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.16.0-rc.2" }
251-
>>>>>>> origin/main-v0.14.1
252198
apollo_state_reader.path = "crates/apollo_state_reader"
253199
apollo_state_sync.path = "crates/apollo_state_sync"
254200
apollo_state_sync_config.path = "crates/apollo_state_sync_config"
@@ -277,21 +223,9 @@ bincode = "1.3.3"
277223
bisection = "0.1.0"
278224
bitvec = "1.0.1"
279225
blake2 = "0.10.6"
280-
<<<<<<< HEAD
281226
blockifier = { path = "crates/blockifier", version = "0.17.0-rc.0" }
282-
||||||| d8037b916e
283-
blockifier = { path = "crates/blockifier", version = "0.16.0-rc.1" }
284-
=======
285-
blockifier = { path = "crates/blockifier", version = "0.16.0-rc.2" }
286-
>>>>>>> origin/main-v0.14.1
287227
blockifier_reexecution.path = "crates/blockifier_reexecution"
288-
<<<<<<< HEAD
289228
blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.17.0-rc.0" }
290-
||||||| d8037b916e
291-
blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.16.0-rc.1" }
292-
=======
293-
blockifier_test_utils = { path = "crates/blockifier_test_utils", version = "0.16.0-rc.2" }
294-
>>>>>>> origin/main-v0.14.1
295229
byteorder = "1.4.3"
296230
bytes = "1"
297231
c-kzg = "2.1.5"
@@ -415,13 +349,7 @@ socket2 = "0.5.8"
415349
starknet-core = "0.16.0"
416350
starknet-crypto = "0.8.1"
417351
starknet-types-core = "0.2.4"
418-
<<<<<<< HEAD
419352
starknet_api = { path = "crates/starknet_api", version = "0.17.0-rc.0" }
420-
||||||| d8037b916e
421-
starknet_api = { path = "crates/starknet_api", version = "0.16.0-rc.1" }
422-
=======
423-
starknet_api = { path = "crates/starknet_api", version = "0.16.0-rc.2" }
424-
>>>>>>> origin/main-v0.14.1
425353
starknet_committer.path = "crates/starknet_committer"
426354
starknet_committer_and_os_cli.path = "crates/starknet_committer_and_os_cli"
427355
starknet_committer_cli.path = "crates/starknet_committer_cli"

crates/apollo_consensus/src/single_height_consensus_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ async fn writes_voted_height_to_storage() {
633633
]))
634634
);
635635

636-
let precommits = vec![
636+
let precommits = [
637637
precommit(Some(BLOCK.id.0), HEIGHT.0, 0, *PROPOSER_ID),
638638
precommit(Some(BLOCK.id.0), HEIGHT.0, 0, *VALIDATOR_ID_2),
639639
precommit(Some(BLOCK.id.0), HEIGHT.0, 0, *VALIDATOR_ID_1),

crates/apollo_consensus_manager/src/consensus_manager.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,8 @@ impl ConsensusManager {
271271
} else {
272272
QuorumType::Byzantine
273273
};
274-
<<<<<<< HEAD
275274
// TODO(Asmaa): refactor to pass entire consensus_manager_config instead of extracting
276275
// each field, and handle non-config params.
277-
||||||| d8037b916e
278-
=======
279-
280-
>>>>>>> origin/main-v0.14.1
281276
apollo_consensus::RunConsensusArguments {
282277
consensus_config: self.config.consensus_manager_config.clone(),
283278
start_active_height: observer_height,

crates/apollo_deployments/src/deployments/hybrid.rs

Lines changed: 12 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -262,111 +262,27 @@ impl ServiceNameInner for HybridNodeServiceName {
262262
fn get_resources(&self, environment: &Environment) -> Resources {
263263
match environment {
264264
Environment::CloudK8s(cloud_env) => match cloud_env {
265-
<<<<<<< HEAD
266-
CloudK8sEnvironment::PotcMock
267-
| CloudK8sEnvironment::SepoliaIntegration
268-
| CloudK8sEnvironment::UpgradeTest => match self {
269-
Self::Core => Resources::new(Resource::new(2, 4), Resource::new(7, 14)),
270-
Self::HttpServer => Resources::new(Resource::new(1, 2), Resource::new(4, 8)),
271-
Self::Gateway => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
272-
Self::L1 => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
273-
Self::Mempool => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
274-
Self::SierraCompiler => {
275-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
276-
}
277-
},
278-
CloudK8sEnvironment::Mainnet
279-
| CloudK8sEnvironment::SepoliaTestnet
280-
| CloudK8sEnvironment::StressTest => match self {
281-
Self::Core => Resources::new(Resource::new(50, 200), Resource::new(50, 220)),
282-
Self::HttpServer => Resources::new(Resource::new(1, 2), Resource::new(4, 8)),
283-
Self::Gateway => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
284-
Self::L1 => Resources::new(Resource::new(2, 4), Resource::new(3, 12)),
285-
Self::Mempool => Resources::new(Resource::new(2, 4), Resource::new(3, 12)),
286-
Self::SierraCompiler => {
287-
||||||| d8037b916e
288-
CloudK8sEnvironment::PotcMock
289-
| CloudK8sEnvironment::SepoliaIntegration
290-
| CloudK8sEnvironment::UpgradeTest => match self {
291-
HybridNodeServiceName::Core => {
292-
Resources::new(Resource::new(2, 4), Resource::new(7, 14))
293-
}
294-
HybridNodeServiceName::HttpServer => {
295-
Resources::new(Resource::new(1, 2), Resource::new(4, 8))
296-
}
297-
HybridNodeServiceName::Gateway => {
298-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
299-
}
300-
HybridNodeServiceName::L1 => {
301-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
302-
}
303-
HybridNodeServiceName::Mempool => {
304-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
305-
}
306-
HybridNodeServiceName::SierraCompiler => {
307-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
308-
}
309-
},
310-
CloudK8sEnvironment::Mainnet
311-
| CloudK8sEnvironment::SepoliaTestnet
312-
| CloudK8sEnvironment::StressTest => match self {
313-
HybridNodeServiceName::Core => {
314-
Resources::new(Resource::new(50, 200), Resource::new(50, 220))
315-
}
316-
HybridNodeServiceName::HttpServer => {
317-
Resources::new(Resource::new(1, 2), Resource::new(4, 8))
318-
}
319-
HybridNodeServiceName::Gateway => {
320-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
321-
}
322-
HybridNodeServiceName::L1 => {
323-
Resources::new(Resource::new(2, 4), Resource::new(3, 12))
324-
}
325-
HybridNodeServiceName::Mempool => {
326-
Resources::new(Resource::new(2, 4), Resource::new(3, 12))
327-
}
328-
HybridNodeServiceName::SierraCompiler => {
329-
=======
330265
CloudK8sEnvironment::SepoliaIntegration | CloudK8sEnvironment::UpgradeTest => {
331266
match self {
332-
HybridNodeServiceName::Core => {
333-
Resources::new(Resource::new(2, 4), Resource::new(7, 14))
334-
}
335-
HybridNodeServiceName::HttpServer => {
267+
Self::Core => Resources::new(Resource::new(2, 4), Resource::new(7, 14)),
268+
Self::HttpServer => {
336269
Resources::new(Resource::new(1, 2), Resource::new(4, 8))
337270
}
338-
HybridNodeServiceName::Gateway => {
339-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
340-
}
341-
HybridNodeServiceName::L1 => {
342-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
343-
}
344-
HybridNodeServiceName::Mempool => {
345-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
346-
}
347-
HybridNodeServiceName::SierraCompiler => {
271+
Self::Gateway => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
272+
Self::L1 => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
273+
Self::Mempool => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
274+
Self::SierraCompiler => {
348275
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
349276
}
350277
}
351278
}
352279
CloudK8sEnvironment::Mainnet | CloudK8sEnvironment::SepoliaTestnet => match self {
353-
HybridNodeServiceName::Core => {
354-
Resources::new(Resource::new(50, 200), Resource::new(50, 220))
355-
}
356-
HybridNodeServiceName::HttpServer => {
357-
Resources::new(Resource::new(1, 2), Resource::new(4, 8))
358-
}
359-
HybridNodeServiceName::Gateway => {
360-
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
361-
}
362-
HybridNodeServiceName::L1 => {
363-
Resources::new(Resource::new(2, 4), Resource::new(3, 12))
364-
}
365-
HybridNodeServiceName::Mempool => {
366-
Resources::new(Resource::new(2, 4), Resource::new(3, 12))
367-
}
368-
HybridNodeServiceName::SierraCompiler => {
369-
>>>>>>> origin/main-v0.14.1
280+
Self::Core => Resources::new(Resource::new(50, 200), Resource::new(50, 220)),
281+
Self::HttpServer => Resources::new(Resource::new(1, 2), Resource::new(4, 8)),
282+
Self::Gateway => Resources::new(Resource::new(1, 2), Resource::new(2, 4)),
283+
Self::L1 => Resources::new(Resource::new(2, 4), Resource::new(3, 12)),
284+
Self::Mempool => Resources::new(Resource::new(2, 4), Resource::new(3, 12)),
285+
Self::SierraCompiler => {
370286
Resources::new(Resource::new(1, 2), Resource::new(2, 4))
371287
}
372288
},

crates/apollo_gateway/src/state_reader_test.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ use starknet_api::block::{
3232
GasPriceVector,
3333
GasPrices,
3434
NonzeroGasPrice,
35+
StarknetVersion,
3536
};
3637
use starknet_api::contract_class::ContractClass;
3738
use starknet_api::core::{ClassHash, SequencerContractAddress};
@@ -262,6 +263,7 @@ async fn test_get_block_info() {
262263
GasPricePerToken { price_in_wei: 6_u8.into(), price_in_fri: 7_u8.into() };
263264
let l2_gas_price = GasPricePerToken { price_in_wei: 8_u8.into(), price_in_fri: 9_u8.into() };
264265
let l1_da_mode = L1DataAvailabilityMode::get_test_instance(&mut get_rng());
266+
let starknet_version = StarknetVersion::LATEST;
265267

266268
mock_state_sync_client.expect_get_block().times(1).with(predicate::eq(block_number)).returning(
267269
move |_| {
@@ -277,6 +279,7 @@ async fn test_get_block_info() {
277279
sequencer: SequencerContractAddress(sequencer_address),
278280
timestamp: block_timestamp,
279281
l1_da_mode,
282+
starknet_version,
280283
..Default::default()
281284
},
282285
})
@@ -298,6 +301,7 @@ async fn test_get_block_info() {
298301
block_number,
299302
block_timestamp,
300303
sequencer_address,
304+
starknet_version,
301305
gas_prices: GasPrices {
302306
eth_gas_prices: GasPriceVector {
303307
l1_gas_price: NonzeroGasPrice::new_unchecked(l1_gas_price.price_in_wei),

crates/apollo_gateway/src/sync_state_reader.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,7 @@ use blockifier::state::state_reader_and_contract_manager::FetchCompiledClasses;
2626
use starknet_api::block::{BlockHash, BlockInfo, BlockNumber, GasPriceVector, GasPrices};
2727
use starknet_api::contract_class::ContractClass;
2828
use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
29-
<<<<<<< HEAD
30-
use starknet_api::state::StorageKey;
31-
||||||| d8037b916e
32-
use starknet_api::data_availability::L1DataAvailabilityMode;
33-
use starknet_api::state::StorageKey;
34-
=======
35-
use starknet_api::data_availability::L1DataAvailabilityMode;
3629
use starknet_api::state::{SierraContractClass, StorageKey};
37-
>>>>>>> origin/main-v0.14.1
3830
use starknet_types_core::felt::Felt;
3931
use tracing::error;
4032

crates/blockifier/src/bouncer_test.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -777,23 +777,11 @@ fn class_hash_migration_data_from_state(
777777

778778
if should_migrate {
779779
expect![[r#"
780-
<<<<<<< HEAD
781-
110442016
782-
||||||| d8037b916e
783-
89883372
784-
=======
785-
80595392
786-
>>>>>>> origin/main-v0.14.1
780+
99026076
787781
"#]]
788782
.assert_debug_eq(&migration_sierra_gas.0);
789783
expect![[r#"
790-
<<<<<<< HEAD
791-
269014080
792-
||||||| d8037b916e
793-
218272460
794-
=======
795-
208984480
796-
>>>>>>> origin/main-v0.14.1
784+
257598140
797785
"#]]
798786
.assert_debug_eq(&migration_proving_gas.0);
799787
} else {

crates/blockifier_reexecution/src/state_reader/cli.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ pub fn get_block_numbers_for_reexecution(relative_path: Option<String>) -> Vec<B
166166
let file_path = relative_path.unwrap_or_default()
167167
+ &(FULL_RESOURCES_DIR.to_string() + "/../block_numbers_for_reexecution.json");
168168
let block_numbers_examples: HashMap<String, u64> =
169-
serde_json::from_str(&read_to_string(file_path.clone()).expect(
170-
&("Failed to read the block_numbers_for_reexecution file at ".to_string() + &file_path),
171-
))
169+
serde_json::from_str(&read_to_string(file_path.clone()).unwrap_or_else(|_| {
170+
panic!("Failed to read the block_numbers_for_reexecution file at {file_path}")
171+
}))
172172
.expect("Failed to deserialize block header");
173173
block_numbers_examples.values().cloned().map(BlockNumber).collect()
174174
}

0 commit comments

Comments
 (0)