fix protocol version

Author: zkzoomer

core/lib/basic_types/src/protocol_version.rs

@@ -73,17 +73,19 @@ pub enum ProtocolVersionId {
     Version27,
     Version28,
     Version29,
+    // Version `30` was skipped as an Era upgrade due to version clash with ZKsync OS.
     Version30,
     Version31,
+    Version32,
 }
 
 impl ProtocolVersionId {
     pub const fn latest() -> Self {
-        Self::Version30
+        Self::Version31
     }
 
     pub const fn next() -> Self {
-        Self::Version31
+        Self::Version32
     }
 
     pub fn try_from_packed_semver(packed_semver: U256) -> Result<Self, String> {
@@ -132,8 +134,9 @@ impl ProtocolVersionId {
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
             ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
-            // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
             ProtocolVersionId::Version31 => VmVersion::VmMediumInterop,
+            // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
+            ProtocolVersionId::Version32 => VmVersion::VmMediumInterop,
         }
     }
 
@@ -172,7 +175,7 @@ impl ProtocolVersionId {
     }
 
     pub fn is_pre_medium_interop(&self) -> bool {
-        self < &Self::Version30
+        self < &Self::Version31
     }
 
     pub fn is_1_4_0(&self) -> bool {
@@ -323,8 +326,9 @@ impl From<ProtocolVersionId> for VmVersion {
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
             ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
-            // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
             ProtocolVersionId::Version31 => VmVersion::VmMediumInterop,
+            // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
+            ProtocolVersionId::Version32 => VmVersion::VmMediumInterop,
         }
     }
 }

core/lib/multivm/src/pubdata_builders/tests.rs

@@ -103,7 +103,7 @@ fn test_full_pubdata_building() {
     ));
 
     let actual =
-        full_pubdata_builder.settlement_layer_pubdata(&input, ProtocolVersionId::Version30);
+        full_pubdata_builder.settlement_layer_pubdata(&input, ProtocolVersionId::Version31);
     let expected = "00000001000000000000000000000000000000000000000000008001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000100000004deadbeef0000000100000060bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0100002a040001000000000000000000000000000000000000000000000000000000000000007e090e0000000c0901";
     assert_eq!(
         &hex::encode(actual),
@@ -141,7 +141,7 @@ fn test_hashed_pubdata_building() {
         L2DACommitmentScheme::BlobsAndPubdataKeccak256,
     ));
     let actual =
-        hashed_pubdata_builder.settlement_layer_pubdata(&input, ProtocolVersionId::Version30);
+        hashed_pubdata_builder.settlement_layer_pubdata(&input, ProtocolVersionId::Version31);
     let expected = "fa96e2436e6fb4d668f5a06681a7c53fcb199b2747ee624ee52a13e85aac5f1e";
     assert_eq!(
         &hex::encode(actual),

core/lib/vm_executor/src/oneshot/contracts.rs

@@ -115,9 +115,9 @@ impl<C: ContractsKind> MultiVmBaseSystemContracts<C> {
             ProtocolVersionId::Version27 => &self.vm_evm_emulator,
             ProtocolVersionId::Version28 => &self.vm_precompiles,
             ProtocolVersionId::Version29 => &self.interop,
-            ProtocolVersionId::Version30 => &self.medium_interop,
+            ProtocolVersionId::Version30 | ProtocolVersionId::Version31 => &self.medium_interop,
             // Speculative base system contracts for the next protocol version to be used in the upgrade integration test etc.
-            ProtocolVersionId::Version31 => &self.medium_interop,
+            ProtocolVersionId::Version32 => &self.medium_interop,
         };
         base.clone()
     }

etc/env/file_based/genesis.yaml

@@ -1,4 +1,4 @@
-genesis_protocol_semantic_version: 0.30.0
+genesis_protocol_semantic_version: 0.31.0
 genesis_protocol_version: null
 genesis_root: 0xaa7eaa4388da7ec71007aeac9c7af0fbde8ed0621b8f64c43894737f7a0b4ace
 genesis_rollup_leaf_index: 104

prover/crates/lib/prover_fri_types/src/lib.rs

@@ -23,7 +23,7 @@ pub mod keys;
 pub const MAX_COMPRESSION_CIRCUITS: u8 = 5;
 
 // THESE VALUES SHOULD BE UPDATED ON ANY PROTOCOL UPGRADE OF PROVERS
-pub const PROVER_PROTOCOL_VERSION: ProtocolVersionId = ProtocolVersionId::Version30;
+pub const PROVER_PROTOCOL_VERSION: ProtocolVersionId = ProtocolVersionId::Version31;
 pub const PROVER_PROTOCOL_PATCH: VersionPatch = VersionPatch(0);
 pub const PROVER_PROTOCOL_SEMANTIC_VERSION: ProtocolSemanticVersion = ProtocolSemanticVersion {
     minor: PROVER_PROTOCOL_VERSION,