feat: Update provers to use SemVer

core/lib/basic_types/src/protocol_version.rs

@@ -20,6 +20,16 @@ use crate::{
 pub const PACKED_SEMVER_MINOR_OFFSET: u32 = 32;
 pub const PACKED_SEMVER_MINOR_MASK: u32 = 0xFFFF;
 
+// These values should be manually updated for every protocol upgrade
+// Otherwise, the prover will not be able to work with new versions.
+// TODO(PLA-954): Move to prover workspace
+pub const PROVER_PROTOCOL_VERSION: ProtocolVersionId = ProtocolVersionId::Version24;
+pub const PROVER_PROTOCOL_PATCH: VersionPatch = VersionPatch(0);
+pub const PROVER_PROTOCOL_SEMANTIC_VERSION: ProtocolSemanticVersion = ProtocolSemanticVersion {
+    minor: PROVER_PROTOCOL_VERSION,
+    patch: PROVER_PROTOCOL_PATCH,
+};
+
 /// `ProtocolVersionId` is a unique identifier of the protocol version.
 /// Note, that it is an identifier of the `minor` semver version of the protocol, with
 /// the `major` version being `0`. Also, the protocol version on the contracts may contain
@@ -76,7 +86,7 @@ impl ProtocolVersionId {
     }
 
     pub fn current_prover_version() -> Self {
-        Self::Version24
+        PROVER_PROTOCOL_VERSION
     }
 
     pub fn next() -> Self {
@@ -297,6 +307,14 @@ pub struct ProtocolSemanticVersion {
 impl ProtocolSemanticVersion {
     const MAJOR_VERSION: u8 = 0;
 
+    pub fn new(minor: ProtocolVersionId, patch: VersionPatch) -> Self {
+        Self { minor, patch }
+    }
+
+    pub fn current_prover_version() -> Self {
+        PROVER_PROTOCOL_SEMANTIC_VERSION
+    }
+
     pub fn try_from_packed(packed: U256) -> Result<Self, String> {
         let minor = ((packed >> U256::from(PACKED_SEMVER_MINOR_OFFSET))
             & U256::from(PACKED_SEMVER_MINOR_MASK))

prover/proof_fri_compressor/src/compressor.rs

@@ -35,7 +35,7 @@ use zksync_prover_fri_types::{
 };
 use zksync_prover_interface::outputs::L1BatchProofForL1;
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::{L1BatchNumber, ProtocolVersionId};
+use zksync_types::{protocol_version::ProtocolSemanticVersion, L1BatchNumber};
 use zksync_vk_setup_data_server_fri::keystore::Keystore;
 
 use crate::metrics::METRICS;
@@ -46,7 +46,7 @@ pub struct ProofCompressor {
     compression_mode: u8,
     verify_wrapper_proof: bool,
     max_attempts: u32,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl ProofCompressor {
@@ -56,7 +56,7 @@ impl ProofCompressor {
         compression_mode: u8,
         verify_wrapper_proof: bool,
         max_attempts: u32,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             blob_store,
@@ -166,7 +166,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, &self.protocol_version)
+            .get_next_proof_compression_job(&pod_name, self.protocol_version)
             .await
         else {
             return Ok(None);
@@ -243,11 +243,12 @@ impl JobProcessor for ProofCompressor {
         let l1_batch_proof = L1BatchProofForL1 {
             aggregation_result_coords,
             scheduler_proof: artifacts,
+            protocol_version: self.protocol_version,
         };
         let blob_save_started_at = Instant::now();
         let blob_url = self
             .blob_store
-            .put(job_id, &l1_batch_proof)
+            .put((job_id, self.protocol_version), &l1_batch_proof)
             .await
             .context("Failed to save converted l1_batch_proof")?;
         METRICS

prover/proof_fri_compressor/src/main.rs

@@ -11,7 +11,7 @@ use zksync_config::configs::{DatabaseSecrets, FriProofCompressorConfig, Observab
 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_types::protocol_version::ProtocolSemanticVersion;
 use zksync_utils::wait_for_tasks::ManagedTasks;
 
 use crate::{
@@ -73,7 +73,7 @@ async fn main() -> anyhow::Result<()> {
         .create_store()
         .await;
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = ProtocolSemanticVersion::current_prover_version();
 
     let proof_compressor = ProofCompressor::new(
         blob_store,