Merge remote-tracking branch 'origin/draft-v31' into sma/faster-tbm-script

Author: zkzoomer

.github/actions/setup-env/action.yml

@@ -71,7 +71,7 @@ runs:
       uses: actions/cache/restore@v4
       with:
         path: zkstack
-        key: zkstack-${{ runner.os }}-${{ hashFiles('zkstack_cli/**') }}
+        key: zkstack-${{ runner.os }}-${{ hashFiles('zkstack_cli/**', 'contracts/l1-contracts/zkstack-out/**/*.json') }}
 
     - name: Copy cached zkstack binary to inside docker (on cache hit)
       if: steps.zkstack_cache.outputs.cache-hit == 'true'

contracts

@@ -134,7 +134,8 @@ impl ProtocolVersionId {
             ProtocolVersionId::Version27 => VmVersion::VmEvmEmulator,
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
-            ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
+            // Note V30 is only present on zksync os
+            ProtocolVersionId::Version30 => VmVersion::VmInterop,
             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,
@@ -326,7 +327,7 @@ impl From<ProtocolVersionId> for VmVersion {
             ProtocolVersionId::Version27 => VmVersion::VmEvmEmulator,
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
-            ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
+            ProtocolVersionId::Version30 => VmVersion::VmInterop,
             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/basic_types/src/protocol_version.rs

@@ -205,7 +205,7 @@ pub enum InteropMode {
     // Proof-based interop on Gateway, meaning the Merkle proof hashes to Gateway's MessageRoot
     ProofBasedGateway,
     // Proof-based interop on L1, meaning the Merkle proof hashes to L1's MessageRoot
-    // ProofBasedL1, // todo: v30
+    // ProofBasedL1, // todo: v31
 }
 
 impl Serialize for InteropMode {

core/lib/types/src/api/mod.rs

@@ -855,7 +855,7 @@ impl EthTxAggregator {
             let reason = Some("Gateway migration started");
             op_restrictions.commit_restriction = reason;
             op_restrictions.precommit_restriction = reason;
-            // From V30 when migrating to or from gateway, we need to wait for all blocks to be executed,
+            // From V31 when migrating to or from gateway, we need to wait for all blocks to be executed,
             // so there is no restriction for prove and execute operations
             if let Some(SettlementLayer::Gateway(_)) = self.settlement_layer {
                 // For the migration from gateway to L1, we need we need to ensure all batches containing interop roots get committed and executed.

core/node/eth_sender/src/eth_tx_aggregator.rs

@@ -535,7 +535,7 @@ impl MempoolIO {
     }
 
     fn pubdata_params(&self, protocol_version: ProtocolVersionId) -> anyhow::Result<PubdataParams> {
-        // Starting from v30 we have to use commitment schema instead of address
+        // Starting from v31 we have to use commitment schema instead of address
         let pubdata_params = match (
             protocol_version.is_pre_medium_interop(),
             self.l2_da_validator_address,

core/node/state_keeper/src/io/mempool.rs

@@ -4,7 +4,7 @@
 
 upgrade_version="v28-1-vk"
 
-zkstackup  --local --cargo-features upgrades && zkstack dev clean containers && zkstack up --observability false
+zkstackup  --local && zkstack dev clean containers && zkstack up --observability false
 zkstack dev contracts
 
 zkstack ecosystem init --deploy-paymaster --deploy-erc20 \

infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade-gateway.sh

@@ -2,13 +2,13 @@
 
 # era-cacher/use-new-era.sh && cd zksync-working
 
-upgrade_version="v29-interop-a-ff"
+upgrade_version="v31-interop-b"
 # "v28-1-vk"
-upgrade_file_extension="v29"
+upgrade_file_extension="v31"
 # v28-1-zk-os
 
 
-zkstackup  --local --cargo-features upgrades && zkstack dev clean containers && zkstack up --observability false
+zkstackup  --local && zkstack dev clean containers && zkstack up --observability false
 zkstack dev contracts
 
 zkstack ecosystem init --deploy-paymaster --deploy-erc20 \

infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade.sh

@@ -53,7 +53,7 @@ cd .. && era-cacher/use-new-era.sh && cd zksync-working
 # `cd ..` and then `cd zksync-working`.
 # Sometimes, the console may not reflect the changes made to the codebase.
 
-zkstackup --local --cargo-features upgrades
+zkstackup --local
 zkstack dev contracts
 
 cd contracts

infrastructure/local-upgrade-testing/era-cacher/do-upgrade.sh

@@ -40,6 +40,8 @@ zkstack ecosystem init --deploy-paymaster --deploy-erc20 \
     --ignore-prerequisites --observability=false \
     --chain era \
     --update-submodules false
+    # --pause-deposits \
+
 
 zkstack chain create \
         --chain-name $SECOND_CHAIN_NAME \