Skip to content

Commit b465e91

Browse files
einat-starkwareeinat-starkware
committed
apollo_proof_manager: enable proof manager and add to deployments
1 parent 9445ac5 commit b465e91

File tree

8 files changed

+67
-17
lines changed

8 files changed

+67
-17
lines changed

‎crates/apollo_deployments/resources/services/consolidated/node.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@
107107
"components.mempool_p2p.remote_server_config.#is_none": true,
108108
"components.mempool_p2p.url": "localhost",
109109
"components.monitoring_endpoint.execution_mode": "Enabled",
110-
"components.proof_manager.execution_mode": "Disabled",
111-
"components.proof_manager.local_server_config.#is_none": true,
110+
"components.proof_manager.execution_mode": "LocalExecutionWithRemoteDisabled",
111+
"components.proof_manager.local_server_config.#is_none": false,
112+
"components.proof_manager.local_server_config.high_priority_requests_channel_capacity": 1024,
113+
"components.proof_manager.local_server_config.inbound_requests_channel_capacity": 1024,
114+
"components.proof_manager.local_server_config.normal_priority_requests_channel_capacity": 1024,
115+
"components.proof_manager.local_server_config.processing_time_warning_threshold_ms": 3000,
112116
"components.proof_manager.max_concurrency": 128,
113117
"components.proof_manager.port": 0,
114118
"components.proof_manager.remote_client_config.#is_none": true,

‎crates/apollo_deployments/resources/services/consolidated/replacer_node.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@
107107
"components.mempool_p2p.remote_server_config.#is_none": true,
108108
"components.mempool_p2p.url": "localhost",
109109
"components.monitoring_endpoint.execution_mode": "Enabled",
110-
"components.proof_manager.execution_mode": "Disabled",
111-
"components.proof_manager.local_server_config.#is_none": true,
110+
"components.proof_manager.execution_mode": "LocalExecutionWithRemoteDisabled",
111+
"components.proof_manager.local_server_config.#is_none": false,
112+
"components.proof_manager.local_server_config.high_priority_requests_channel_capacity": 1024,
113+
"components.proof_manager.local_server_config.inbound_requests_channel_capacity": 1024,
114+
"components.proof_manager.local_server_config.normal_priority_requests_channel_capacity": 1024,
115+
"components.proof_manager.local_server_config.processing_time_warning_threshold_ms": 3000,
112116
"components.proof_manager.max_concurrency": 128,
113117
"components.proof_manager.port": 0,
114118
"components.proof_manager.remote_client_config.#is_none": true,

‎crates/apollo_deployments/resources/services/hybrid/core.json‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,20 @@
121121
"components.mempool_p2p.remote_server_config.#is_none": true,
122122
"components.mempool_p2p.url": "localhost",
123123
"components.monitoring_endpoint.execution_mode": "Enabled",
124-
"components.proof_manager.execution_mode": "Disabled",
125-
"components.proof_manager.local_server_config.#is_none": true,
124+
"components.proof_manager.execution_mode": "LocalExecutionWithRemoteEnabled",
125+
"components.proof_manager.local_server_config.#is_none": false,
126+
"components.proof_manager.local_server_config.high_priority_requests_channel_capacity": 1024,
127+
"components.proof_manager.local_server_config.inbound_requests_channel_capacity": 1024,
128+
"components.proof_manager.local_server_config.normal_priority_requests_channel_capacity": 1024,
129+
"components.proof_manager.local_server_config.processing_time_warning_threshold_ms": 3000,
126130
"components.proof_manager.max_concurrency": 128,
127-
"components.proof_manager.port": 0,
131+
"components.proof_manager.port": 55012,
128132
"components.proof_manager.remote_client_config.#is_none": true,
129-
"components.proof_manager.remote_server_config.#is_none": true,
130-
"components.proof_manager.url": "localhost",
133+
"components.proof_manager.remote_server_config.#is_none": false,
134+
"components.proof_manager.remote_server_config.bind_ip": "0.0.0.0",
135+
"components.proof_manager.remote_server_config.max_streams_per_connection": 8,
136+
"components.proof_manager.remote_server_config.set_tcp_nodelay": true,
137+
"components.proof_manager.url": "sequencer-core-service",
131138
"components.sierra_compiler.execution_mode": "Remote",
132139
"components.sierra_compiler.local_server_config.#is_none": true,
133140
"components.sierra_compiler.max_concurrency": 128,

‎crates/apollo_deployments/resources/services/hybrid/replacer_core.json‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,20 @@
121121
"components.mempool_p2p.remote_server_config.#is_none": true,
122122
"components.mempool_p2p.url": "localhost",
123123
"components.monitoring_endpoint.execution_mode": "Enabled",
124-
"components.proof_manager.execution_mode": "Disabled",
125-
"components.proof_manager.local_server_config.#is_none": true,
124+
"components.proof_manager.execution_mode": "LocalExecutionWithRemoteEnabled",
125+
"components.proof_manager.local_server_config.#is_none": false,
126+
"components.proof_manager.local_server_config.high_priority_requests_channel_capacity": 1024,
127+
"components.proof_manager.local_server_config.inbound_requests_channel_capacity": 1024,
128+
"components.proof_manager.local_server_config.normal_priority_requests_channel_capacity": 1024,
129+
"components.proof_manager.local_server_config.processing_time_warning_threshold_ms": 3000,
126130
"components.proof_manager.max_concurrency": 128,
127-
"components.proof_manager.port": 0,
131+
"components.proof_manager.port": "$$$_COMPONENTS-PROOF_MANAGER-PORT_$$$",
128132
"components.proof_manager.remote_client_config.#is_none": true,
129-
"components.proof_manager.remote_server_config.#is_none": true,
130-
"components.proof_manager.url": "localhost",
133+
"components.proof_manager.remote_server_config.#is_none": false,
134+
"components.proof_manager.remote_server_config.bind_ip": "0.0.0.0",
135+
"components.proof_manager.remote_server_config.max_streams_per_connection": 8,
136+
"components.proof_manager.remote_server_config.set_tcp_nodelay": true,
137+
"components.proof_manager.url": "$$$_COMPONENTS-PROOF_MANAGER-URL_$$$",
131138
"components.sierra_compiler.execution_mode": "Remote",
132139
"components.sierra_compiler.local_server_config.#is_none": true,
133140
"components.sierra_compiler.max_concurrency": 128,

‎crates/apollo_deployments/src/deployment_definitions.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const L1_GAS_PRICE_PROVIDER_PORT: u16 = 55003;
2020
const L1_PROVIDER_PORT: u16 = 55004;
2121
const MEMPOOL_PORT: u16 = 55006;
2222
pub(crate) const MEMPOOL_P2P_PORT: u16 = 53200;
23+
const PROOF_MANAGER_PORT: u16 = 55012;
2324
const SIERRA_COMPILER_PORT: u16 = 55007;
2425
const SIGNATURE_MANAGER_PORT: u16 = 55008;
2526
const STATE_SYNC_PORT: u16 = 55009;
@@ -116,6 +117,7 @@ pub enum InfraServicePort {
116117
L1GasPriceProvider,
117118
L1Provider,
118119
Mempool,
120+
ProofManager,
119121
SierraCompiler,
120122
SignatureManager,
121123
StateSync,
@@ -131,6 +133,7 @@ impl InfraServicePort {
131133
InfraServicePort::L1GasPriceProvider => L1_GAS_PRICE_PROVIDER_PORT,
132134
InfraServicePort::L1Provider => L1_PROVIDER_PORT,
133135
InfraServicePort::Mempool => MEMPOOL_PORT,
136+
InfraServicePort::ProofManager => PROOF_MANAGER_PORT,
134137
InfraServicePort::SierraCompiler => SIERRA_COMPILER_PORT,
135138
InfraServicePort::SignatureManager => SIGNATURE_MANAGER_PORT,
136139
InfraServicePort::StateSync => STATE_SYNC_PORT,

‎crates/apollo_deployments/src/deployments/consolidated.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ impl ServiceNameInner for ConsolidatedNodeServiceName {
116116
| InfraServicePort::Gateway
117117
| InfraServicePort::L1GasPriceProvider
118118
| InfraServicePort::L1Provider
119+
| InfraServicePort::ProofManager
119120
| InfraServicePort::SierraCompiler
120121
| InfraServicePort::StateSync
121122
| InfraServicePort::SignatureManager => {}
@@ -157,7 +158,7 @@ fn get_consolidated_config() -> ComponentConfig {
157158
mempool: base.clone(),
158159
mempool_p2p: base.clone(),
159160
monitoring_endpoint: ActiveComponentExecutionConfig::enabled(),
160-
proof_manager: ReactiveComponentExecutionConfig::disabled(),
161+
proof_manager: base.clone(),
161162
sierra_compiler: base.clone(),
162163
signature_manager: base.clone(),
163164
state_sync: base.clone(),

‎crates/apollo_deployments/src/deployments/distributed.rs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
270270
| InfraServicePort::L1GasPriceProvider
271271
| InfraServicePort::L1Provider
272272
| InfraServicePort::Mempool
273+
| InfraServicePort::ProofManager
273274
| InfraServicePort::SignatureManager
274275
| InfraServicePort::StateSync
275276
| InfraServicePort::SierraCompiler => {}
@@ -298,6 +299,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
298299
| InfraServicePort::L1GasPriceProvider
299300
| InfraServicePort::L1Provider
300301
| InfraServicePort::Mempool
302+
| InfraServicePort::ProofManager
301303
| InfraServicePort::SignatureManager
302304
| InfraServicePort::StateSync
303305
| InfraServicePort::SierraCompiler => {}
@@ -326,6 +328,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
326328
| InfraServicePort::L1GasPriceProvider
327329
| InfraServicePort::L1Provider
328330
| InfraServicePort::Mempool
331+
| InfraServicePort::ProofManager
329332
| InfraServicePort::SignatureManager
330333
| InfraServicePort::StateSync
331334
| InfraServicePort::SierraCompiler => {}
@@ -352,6 +355,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
352355
| InfraServicePort::L1GasPriceProvider
353356
| InfraServicePort::L1Provider
354357
| InfraServicePort::Mempool
358+
| InfraServicePort::ProofManager
355359
| InfraServicePort::SignatureManager
356360
| InfraServicePort::StateSync
357361
| InfraServicePort::SierraCompiler => {}
@@ -378,6 +382,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
378382
| InfraServicePort::L1GasPriceProvider
379383
| InfraServicePort::L1Provider
380384
| InfraServicePort::Mempool
385+
| InfraServicePort::ProofManager
381386
| InfraServicePort::SignatureManager
382387
| InfraServicePort::StateSync
383388
| InfraServicePort::SierraCompiler => {}
@@ -407,6 +412,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
407412
| InfraServicePort::L1GasPriceProvider
408413
| InfraServicePort::L1Provider
409414
| InfraServicePort::Mempool
415+
| InfraServicePort::ProofManager
410416
| InfraServicePort::SignatureManager
411417
| InfraServicePort::StateSync
412418
| InfraServicePort::SierraCompiler => {}
@@ -434,6 +440,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
434440
| InfraServicePort::Committer
435441
| InfraServicePort::Gateway
436442
| InfraServicePort::Mempool
443+
| InfraServicePort::ProofManager
437444
| InfraServicePort::SignatureManager
438445
| InfraServicePort::StateSync
439446
| InfraServicePort::SierraCompiler => {}
@@ -462,6 +469,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
462469
| InfraServicePort::Gateway
463470
| InfraServicePort::L1GasPriceProvider
464471
| InfraServicePort::L1Provider
472+
| InfraServicePort::ProofManager
465473
| InfraServicePort::SignatureManager
466474
| InfraServicePort::StateSync
467475
| InfraServicePort::SierraCompiler => {}
@@ -491,6 +499,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
491499
| InfraServicePort::L1GasPriceProvider
492500
| InfraServicePort::L1Provider
493501
| InfraServicePort::Mempool
502+
| InfraServicePort::ProofManager
494503
| InfraServicePort::SignatureManager
495504
| InfraServicePort::StateSync => {}
496505
},
@@ -519,6 +528,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
519528
| InfraServicePort::L1GasPriceProvider
520529
| InfraServicePort::L1Provider
521530
| InfraServicePort::Mempool
531+
| InfraServicePort::ProofManager
522532
| InfraServicePort::StateSync
523533
| InfraServicePort::SierraCompiler => {}
524534
},
@@ -547,6 +557,7 @@ impl ServiceNameInner for DistributedNodeServiceName {
547557
| InfraServicePort::L1GasPriceProvider
548558
| InfraServicePort::L1Provider
549559
| InfraServicePort::Mempool
560+
| InfraServicePort::ProofManager
550561
| InfraServicePort::SignatureManager
551562
| InfraServicePort::SierraCompiler => {}
552563
},

‎crates/apollo_deployments/src/deployments/hybrid.rs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@ use crate::service::{GetComponentConfigs, NodeService, ServiceNameInner};
2424
use crate::update_strategy::UpdateStrategy;
2525
use crate::utils::validate_ports;
2626

27-
pub const HYBRID_NODE_REQUIRED_PORTS_NUM: usize = 10;
27+
pub const HYBRID_NODE_REQUIRED_PORTS_NUM: usize = 11;
2828

2929
const TEST_CORE_STORAGE: usize = 1;
3030

3131
#[derive(Clone, Copy, Debug, Display, PartialEq, Eq, Hash, Serialize, AsRefStr, EnumIter)]
3232
#[strum(serialize_all = "snake_case")]
3333
pub enum HybridNodeServiceName {
3434
Committer,
35-
Core, // Comprises the batcher, class manager, consensus manager, and state sync.
35+
Core, /* Comprises the batcher, class manager, proof manager, consensus manager, and state
36+
* sync. */
3637
HttpServer,
3738
Gateway,
3839
L1, // Comprises the various l1 components.
@@ -83,6 +84,8 @@ impl GetComponentConfigs for HybridNodeServiceName {
8384
Self::L1.component_config_pair(service_ports[&InfraServicePort::L1Provider]);
8485
let mempool =
8586
Self::Mempool.component_config_pair(service_ports[&InfraServicePort::Mempool]);
87+
let proof_manager =
88+
Self::Core.component_config_pair(service_ports[&InfraServicePort::ProofManager]);
8689
let sierra_compiler = Self::SierraCompiler
8790
.component_config_pair(service_ports[&InfraServicePort::SierraCompiler]);
8891
let signature_manager =
@@ -103,6 +106,7 @@ impl GetComponentConfigs for HybridNodeServiceName {
103106
l1_provider.remote(),
104107
state_sync.local(),
105108
mempool.remote(),
109+
proof_manager.local(),
106110
sierra_compiler.remote(),
107111
signature_manager.local(),
108112
),
@@ -240,6 +244,7 @@ impl ServiceNameInner for HybridNodeServiceName {
240244
| InfraServicePort::L1GasPriceProvider
241245
| InfraServicePort::L1Provider
242246
| InfraServicePort::Mempool
247+
| InfraServicePort::ProofManager
243248
| InfraServicePort::SierraCompiler
244249
| InfraServicePort::SignatureManager
245250
| InfraServicePort::StateSync => {}
@@ -261,6 +266,7 @@ impl ServiceNameInner for HybridNodeServiceName {
261266
ServicePort::Infra(infra_port) => match infra_port {
262267
InfraServicePort::Batcher
263268
| InfraServicePort::ClassManager
269+
| InfraServicePort::ProofManager
264270
| InfraServicePort::StateSync
265271
| InfraServicePort::SignatureManager => {
266272
service_ports.insert(service_port);
@@ -292,6 +298,7 @@ impl ServiceNameInner for HybridNodeServiceName {
292298
| InfraServicePort::Committer
293299
| InfraServicePort::L1GasPriceProvider
294300
| InfraServicePort::L1Provider
301+
| InfraServicePort::ProofManager
295302
| InfraServicePort::StateSync
296303
| InfraServicePort::Mempool
297304
| InfraServicePort::Gateway
@@ -321,6 +328,7 @@ impl ServiceNameInner for HybridNodeServiceName {
321328
| InfraServicePort::Committer
322329
| InfraServicePort::L1GasPriceProvider
323330
| InfraServicePort::L1Provider
331+
| InfraServicePort::ProofManager
324332
| InfraServicePort::StateSync
325333
| InfraServicePort::Mempool
326334
| InfraServicePort::SignatureManager
@@ -347,6 +355,7 @@ impl ServiceNameInner for HybridNodeServiceName {
347355
InfraServicePort::Batcher
348356
| InfraServicePort::ClassManager
349357
| InfraServicePort::Committer
358+
| InfraServicePort::ProofManager
350359
| InfraServicePort::StateSync
351360
| InfraServicePort::Mempool
352361
| InfraServicePort::Gateway
@@ -376,6 +385,7 @@ impl ServiceNameInner for HybridNodeServiceName {
376385
| InfraServicePort::Committer
377386
| InfraServicePort::L1GasPriceProvider
378387
| InfraServicePort::L1Provider
388+
| InfraServicePort::ProofManager
379389
| InfraServicePort::StateSync
380390
| InfraServicePort::Gateway
381391
| InfraServicePort::SignatureManager
@@ -404,6 +414,7 @@ impl ServiceNameInner for HybridNodeServiceName {
404414
| InfraServicePort::Committer
405415
| InfraServicePort::L1GasPriceProvider
406416
| InfraServicePort::L1Provider
417+
| InfraServicePort::ProofManager
407418
| InfraServicePort::StateSync
408419
| InfraServicePort::Mempool
409420
| InfraServicePort::Gateway
@@ -646,6 +657,7 @@ fn get_core_component_config(
646657
l1_provider_remote_config: ReactiveComponentExecutionConfig,
647658
state_sync_local_config: ReactiveComponentExecutionConfig,
648659
mempool_remote_config: ReactiveComponentExecutionConfig,
660+
proof_manager_local_config: ReactiveComponentExecutionConfig,
649661
sierra_compiler_remote_config: ReactiveComponentExecutionConfig,
650662
signature_manager_remote_config: ReactiveComponentExecutionConfig,
651663
) -> ComponentConfig {
@@ -657,6 +669,7 @@ fn get_core_component_config(
657669
config.consensus_manager = ActiveComponentExecutionConfig::enabled();
658670
config.l1_gas_price_provider = l1_gas_price_provider_remote_config;
659671
config.l1_provider = l1_provider_remote_config;
672+
config.proof_manager = proof_manager_local_config;
660673
config.sierra_compiler = sierra_compiler_remote_config;
661674
config.signature_manager = signature_manager_remote_config;
662675
config.state_sync = state_sync_local_config;

0 commit comments

Comments
 (0)