Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: prover components versioning #1660

Merged
merged 22 commits into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ab4e2b4
initial change
Artemka374 Apr 11, 2024
f845fe9
fmt
Artemka374 Apr 11, 2024
a9cca95
Merge branch 'main' into afo/protocol-versions-checking
Artemka374 Apr 15, 2024
e919af7
update queries and other things
Artemka374 Apr 18, 2024
fbf226e
fix build
Artemka374 Apr 18, 2024
e386af3
Merge branch 'main' into afo/protocol-versions-checking
Artemka374 Apr 18, 2024
61b8c7a
add assert_vk_correctness function(unused for now)
Artemka374 Apr 18, 2024
2ad1b84
Merge remote-tracking branch 'origin/afo/protocol-versions-checking' …
Artemka374 Apr 18, 2024
bb4a166
use hardcoded versions everywhere, assert consistency in BWG
Artemka374 Apr 19, 2024
e81aa2e
fmt
Artemka374 Apr 19, 2024
d6c2d07
Merge branch 'main' into afo/protocol-versions-checking
Artemka374 Apr 19, 2024
1c67005
allow too many arguments
Artemka374 Apr 19, 2024
66ed0d7
Merge remote-tracking branch 'origin/afo/protocol-versions-checking' …
Artemka374 Apr 19, 2024
da1b1bd
address comments
Artemka374 Apr 23, 2024
f5cd052
remove todo
Artemka374 Apr 23, 2024
c72ed89
Merge branch 'main' into afo/protocol-versions-checking
Artemka374 Apr 23, 2024
4f99a10
Merge remote-tracking branch 'origin/afo/protocol-versions-checking' …
Artemka374 Apr 23, 2024
8f06038
fix tests
Artemka374 Apr 23, 2024
a64df6d
Merge branch 'main' into afo/protocol-versions-checking
Artemka374 Apr 24, 2024
af1bf96
Merge branch 'refs/heads/main' into afo/protocol-versions-checking
Artemka374 May 6, 2024
8b296aa
merge fixes
Artemka374 May 6, 2024
644ab97
Merge branch 'refs/heads/main' into afo/protocol-versions-checking
Artemka374 May 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/lib/basic_types/src/protocol_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ impl ProtocolVersionId {
Self::Version23
}

pub fn latest_prover() -> Self {
Artemka374 marked this conversation as resolved.
Show resolved Hide resolved
Self::Version23
}

pub fn next() -> Self {
Self::Version24
}
Expand Down
7 changes: 5 additions & 2 deletions prover/proof_fri_compressor/src/compressor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use zksync_prover_fri_types::{
};
use zksync_prover_interface::outputs::L1BatchProofForL1;
use zksync_queued_job_processor::JobProcessor;
use zksync_types::L1BatchNumber;
use zksync_types::{L1BatchNumber, ProtocolVersionId};
use zksync_vk_setup_data_server_fri::keystore::Keystore;

use crate::metrics::METRICS;
Expand All @@ -40,6 +40,7 @@ pub struct ProofCompressor {
compression_mode: u8,
verify_wrapper_proof: bool,
max_attempts: u32,
protocol_version: ProtocolVersionId,
}

impl ProofCompressor {
Expand All @@ -49,13 +50,15 @@ impl ProofCompressor {
compression_mode: u8,
verify_wrapper_proof: bool,
max_attempts: u32,
protocol_version: ProtocolVersionId,
) -> Self {
Self {
blob_store,
pool,
compression_mode,
verify_wrapper_proof,
max_attempts,
protocol_version,
}
}

Expand Down Expand Up @@ -135,7 +138,7 @@ impl JobProcessor for ProofCompressor {
let pod_name = get_current_pod_name();
let Some(l1_batch_number) = conn
.fri_proof_compressor_dal()
.get_next_proof_compression_job(&pod_name)
.get_next_proof_compression_job(&pod_name, &self.protocol_version)
.await
else {
return Ok(None);
Expand Down
5 changes: 5 additions & 0 deletions prover/proof_fri_compressor/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use zksync_config::configs::{FriProofCompressorConfig, ObservabilityConfig, Post
use zksync_env_config::{object_store::ProverObjectStoreConfig, FromEnv};
use zksync_object_store::ObjectStoreFactory;
use zksync_queued_job_processor::JobProcessor;
use zksync_types::ProtocolVersionId;
use zksync_utils::wait_for_tasks::ManagedTasks;

use crate::{
Expand Down Expand Up @@ -69,12 +70,16 @@ async fn main() -> anyhow::Result<()> {
let blob_store = ObjectStoreFactory::new(object_store_config.0)
.create_store()
.await;

let protocol_version = ProtocolVersionId::latest_prover();

let proof_compressor = ProofCompressor::new(
blob_store,
pool,
config.compression_mode,
config.verify_wrapper_proof,
config.max_attempts,
protocol_version,
);

let (stop_sender, stop_receiver) = watch::channel(false);
Expand Down

This file was deleted.

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

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

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

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

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

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

Loading
Loading