matter-labs · kelemeno · Jan 19, 2026 · Jul 16, 2025 · Jul 16, 2025 · Jul 16, 2025
diff --git a/.github/actions/setup-env/action.yml b/.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'

diff --git a/contracts b/contracts
diff --git a/core/lib/basic_types/src/protocol_version.rs b/core/lib/basic_types/src/protocol_version.rs
@@ -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,

diff --git a/core/lib/types/src/api/mod.rs b/core/lib/types/src/api/mod.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 {

diff --git a/core/node/eth_sender/src/eth_tx_aggregator.rs b/core/node/eth_sender/src/eth_tx_aggregator.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.

diff --git a/core/node/state_keeper/src/io/mempool.rs b/core/node/state_keeper/src/io/mempool.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,

diff --git a/infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade-gateway.sh b/infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade-gateway.sh
@@ -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 \

diff --git a/infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade.sh b/infrastructure/local-upgrade-testing/era-cacher/do-no-server-upgrade.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 \

diff --git a/infrastructure/local-upgrade-testing/era-cacher/do-upgrade.sh b/infrastructure/local-upgrade-testing/era-cacher/do-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

diff --git a/infrastructure/scripts/interop.sh b/infrastructure/scripts/interop.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 \

diff --git a/proof-manager-contracts b/proof-manager-contracts
diff --git a/zkstack_cli/crates/config/src/forge_interface/deploy_gateway_tx_filterer/input.rs b/zkstack_cli/crates/config/src/forge_interface/deploy_gateway_tx_filterer/input.rs
diff --git a/zkstack_cli/crates/config/src/forge_interface/deploy_gateway_tx_filterer/mod.rs b/zkstack_cli/crates/config/src/forge_interface/deploy_gateway_tx_filterer/mod.rs
@@ -1,2 +1 @@
-pub mod input;
 pub mod output;
diff --git a/zkstack_cli/crates/config/src/forge_interface/deploy_l2_contracts/input.rs b/zkstack_cli/crates/config/src/forge_interface/deploy_l2_contracts/input.rs
diff --git a/zkstack_cli/crates/config/src/forge_interface/deploy_l2_contracts/mod.rs b/zkstack_cli/crates/config/src/forge_interface/deploy_l2_contracts/mod.rs
@@ -1,2 +1 @@
-pub mod input;
 pub mod output;
diff --git a/zkstack_cli/crates/config/src/forge_interface/mod.rs b/zkstack_cli/crates/config/src/forge_interface/mod.rs
@@ -11,7 +11,6 @@ pub mod gateway_vote_preparation;
 pub mod paymaster;
 pub mod register_chain;
 pub mod script_params;
-pub mod setup_legacy_bridge;
 pub mod upgrade_ecosystem;
 
 #[derive(Debug, Deserialize, Serialize, Clone)]

diff --git a/zkstack_cli/crates/config/src/forge_interface/paymaster/mod.rs b/zkstack_cli/crates/config/src/forge_interface/paymaster/mod.rs
@@ -1,28 +1,7 @@
 use ethers::types::Address;
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::L2ChainId;
 
-use crate::{traits::FileConfigTrait, ChainConfig};
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct DeployPaymasterInput {
-    pub chain_id: L2ChainId,
-    pub l1_shared_bridge: Address,
-    pub bridgehub: Address,
-}
-
-impl DeployPaymasterInput {
-    pub fn new(chain_config: &ChainConfig) -> anyhow::Result<Self> {
-        let contracts = chain_config.get_contracts_config()?;
-        Ok(Self {
-            chain_id: chain_config.chain_id,
-            l1_shared_bridge: contracts.bridges.shared.l1_address,
-            bridgehub: contracts.ecosystem_contracts.bridgehub_proxy_addr,
-        })
-    }
-}
-
-impl FileConfigTrait for DeployPaymasterInput {}
+use crate::traits::FileConfigTrait;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct DeployPaymasterOutput {

diff --git a/zkstack_cli/crates/config/src/forge_interface/script_params.rs b/zkstack_cli/crates/config/src/forge_interface/script_params.rs
@@ -125,6 +125,24 @@ pub const V29_UPGRADE_CHAIN_PARAMS: ForgeScriptParams = ForgeScriptParams {
     script_path: "deploy-scripts/upgrade/v29/ChainUpgrade_v29.s.sol",
 };
 
+pub const V31_UPGRADE_CORE_CONTRACTS_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/v31-upgrade-core.toml",
+    output: "script-out/v31-upgrade-core.toml",
+    script_path: "deploy-scripts/upgrade/v31/EcosystemUpgrade_v31.s.sol",
+};
+
+pub const V31_UPGRADE_CTM_CONTRACTS_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/v31-upgrade-ctm.toml",
+    output: "script-out/v31-upgrade-ctm.toml",
+    script_path: "deploy-scripts/upgrade/v31/EcosystemUpgrade_v31.s.sol",
+};
+
+pub const V31_UPGRADE_CHAIN_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/v31-upgrade-chain.toml",
+    output: "script-out/v31-upgrade-chain.toml",
+    script_path: "deploy-scripts/upgrade/v31/ChainUpgrade_v31.s.sol",
+};
+
 pub const FINALIZE_UPGRADE_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
     input: "script-config/gateway-finalize-upgrade.toml",
     output: "script-out/gateway-finalize-upgrade.toml",

diff --git a/zkstack_cli/crates/config/src/forge_interface/setup_legacy_bridge/mod.rs b/zkstack_cli/crates/config/src/forge_interface/setup_legacy_bridge/mod.rs
diff --git a/zkstack_cli/crates/config/src/forge_interface/upgrade_ecosystem/input.rs b/zkstack_cli/crates/config/src/forge_interface/upgrade_ecosystem/input.rs
@@ -14,10 +14,16 @@ pub struct V29UpgradeParams {
     pub encoded_old_gateway_validator_timelocks: String,
 }
 
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct V31UpgradeParams {
+    pub some_value_for_serialization: String,
+}
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub enum EcosystemUpgradeSpecificConfig {
     V28,
     V29(V29UpgradeParams),
+    V31(V31UpgradeParams),
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
+2 −2		.github/workflows/test.yml
+0 −1		.gitignore
+0 −3		.gitmodules
+1 −1		foundry.toml
+0 −1		lib/era-contracts
+5 −10		scripts/deployment/DeployProofManagerV1.s.sol
+10 −32		scripts/deployment/deploy.sh
+20 −68		src/ProofManagerV1.sol
+4 −10		src/interfaces/IProofManager.sol
+1 −1		src/store/ProofManagerStorage.sol
+7 −9		test/ProofManagerHarness.sol
+193 −170		test/ProofManagerV1.t.sol