Fix default upgrade v28 (#1436)

Author: StanislavBreadless

AllContractsHashes.json

@@ -873,11 +873,11 @@
   },
   {
     "contractName": "l1-contracts/DefaultUpgrade",
-    "zkBytecodeHash": "0x010002c1b3042819252c95f9ab5f46e517fe289252fe8b50e56723eba61d4177",
+    "zkBytecodeHash": "0x010002c78f44229569124cd4f8fd0285a6795b0c33b05f381a949488bcb64003",
     "zkBytecodePath": "/l1-contracts/zkout/DefaultUpgrade.sol/DefaultUpgrade.json",
-    "evmBytecodeHash": "0xff710fc102e0fba52026517db3463f8900a76e217cdb263d9c4eafe2718158ad",
+    "evmBytecodeHash": "0x324e4c5eadce51161b86cac68145112b4d5d4d1d08ac380b81752f2761d5a244",
     "evmBytecodePath": "/l1-contracts/out/DefaultUpgrade.sol/DefaultUpgrade.json",
-    "evmDeployedBytecodeHash": "0x65a5916935cc49d65810e2e4d584dc4e8d26164972a5a0eb42cb870c48d7ffda"
+    "evmDeployedBytecodeHash": "0xa21ee18a561100fd760f7c3a0974149bc86638da3358f5eaadecac706729a218"
   },
   {
     "contractName": "l1-contracts/Diamond",
@@ -985,11 +985,11 @@
   },
   {
     "contractName": "l1-contracts/GatewayCTMDeployer",
-    "zkBytecodeHash": "0x010003c188a3d77697a3eb00d92b04ca871bfb40564a70949eb662b56546dc9b",
+    "zkBytecodeHash": "0x010003c18fe906515df3edccfffd8c2c93591a8b45aa6ec73a71a3ff194a3959",
     "zkBytecodePath": "/l1-contracts/zkout/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmBytecodeHash": "0xd22197a6f68f4088e6b82ff4b4bf558245a960a426658d83029de6d7ff17006d",
+    "evmBytecodeHash": "0xdfe9904e51738d8c47a991de1c0121ece7a000220421e89844458db3c8f3aba7",
     "evmBytecodePath": "/l1-contracts/out/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmDeployedBytecodeHash": "0xf26576e2640c73f8ba633df3b2cf56f8187d74920082bc99c86903c4ac4feb64"
+    "evmDeployedBytecodeHash": "0x67c6917e9b2d58d877d193fb8591d030dd02796c4970536093459fddc9f92cb8"
   },
   {
     "contractName": "l1-contracts/GatewayTransactionFilterer",
@@ -1001,11 +1001,11 @@
   },
   {
     "contractName": "l1-contracts/GatewayUpgrade",
-    "zkBytecodeHash": "0x0100057d557e2106afce1091922539b224629ea74561705eb4cdfc5e6dceb0dd",
+    "zkBytecodeHash": "0x010005817a46e8cfa63c9938a0eb135443b152714d42a345786ca97dbc0cc1d7",
     "zkBytecodePath": "/l1-contracts/zkout/GatewayUpgrade.sol/GatewayUpgrade.json",
-    "evmBytecodeHash": "0x35f4e0b31357cd37d216acb6a5b0c0b5dbcabcae2893ebe4e50ad9f760b0a373",
+    "evmBytecodeHash": "0x33e937a9e0251664775649d0136e6fd2c24b98783b8cb689f3a991abfbbe2d9b",
     "evmBytecodePath": "/l1-contracts/out/GatewayUpgrade.sol/GatewayUpgrade.json",
-    "evmDeployedBytecodeHash": "0x5ecfc2a8085929fce231c1a878ce58e5f1cac77b37a0f812146e01a790f278cc"
+    "evmDeployedBytecodeHash": "0x2e958e2fbc662cb62a6ea2c7668d538057087b051273bd10c3a94b2c29bbf8e8"
   },
   {
     "contractName": "l1-contracts/GettersFacet",
@@ -1049,11 +1049,11 @@
   },
   {
     "contractName": "l1-contracts/L1GenesisUpgrade",
-    "zkBytecodeHash": "0x010006c730a40df01dcbd82c1cd60082b97f65d57425eaad9c9b79b8278044b8",
+    "zkBytecodeHash": "0x010006c5c012346761c4bf8378a1a31ea0d04db69a37f369781fabcd612d9329",
     "zkBytecodePath": "/l1-contracts/zkout/L1GenesisUpgrade.sol/L1GenesisUpgrade.json",
-    "evmBytecodeHash": "0x50f0bc005dc9069984e00d1b908bd43a1502c13877c87c39ea76909e4d597595",
+    "evmBytecodeHash": "0x9d4ad5ce116afcb9e7378d64bcd71087b113e34d82df42fb1a52bdb9b077a6ed",
     "evmBytecodePath": "/l1-contracts/out/L1GenesisUpgrade.sol/L1GenesisUpgrade.json",
-    "evmDeployedBytecodeHash": "0x071205d074506ef8f14ea32bcc39534ed9bd2fc3fa4eb30a9586a4235a0169e6"
+    "evmDeployedBytecodeHash": "0x72230a977e3b0380374a4db9bc7973129d4fab56cbc1042596aac42476966aaf"
   },
   {
     "contractName": "l1-contracts/L1NativeTokenVault",

l1-contracts/contracts/dev-contracts/test/CustomUpgradeTest.sol

@@ -28,7 +28,7 @@ contract CustomUpgradeTest is BaseZkSyncUpgrade {
     /// @notice The main function that will be delegate-called by the chain.
     /// @param _proposedUpgrade The upgrade to be executed.
     function upgrade(ProposedUpgrade calldata _proposedUpgrade) public override returns (bytes32) {
-        (uint32 newMinorVersion, bool isPatchOnly) = _setNewProtocolVersion(_proposedUpgrade.newProtocolVersion);
+        (uint32 newMinorVersion, bool isPatchOnly) = _setNewProtocolVersion(_proposedUpgrade.newProtocolVersion, true);
         _upgradeL1Contract(_proposedUpgrade.l1ContractsUpgradeCalldata);
         _upgradeVerifier(_proposedUpgrade.verifier, _proposedUpgrade.verifierParams);
         _setBaseSystemContracts(

l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol

@@ -71,6 +71,11 @@ abstract contract BaseZkSyncUpgrade is ZKChainBase {
     /// @dev This is a virtual function and should be overridden by custom upgrade implementations.
     /// @param _proposedUpgrade The upgrade to be executed.
     /// @return txHash The hash of the L2 system contract upgrade transaction.
+    /// @dev Note, that the logic of the upgrade differs depending on whether the upgrade happens on the settlement layer
+    /// or not. If the upgrade happens on the instance of the diamond proxy that is not on the settlement layer, we
+    /// do not validate any variants about the upgrade transaction or generally don't do anything related to the upgrade transaction.
+    /// Updates on diamond proxy located not on settlement layer are needed to ensure that the logic of the contracts remains compatible with
+    /// the diamond proxy on the settlement layer and so are still needed to update facets, verifiers and so on.
     function upgrade(ProposedUpgrade calldata _proposedUpgrade) public virtual returns (bytes32 txHash) {
         // Note that due to commitment delay, the timestamp of the L2 upgrade batch may be earlier than the timestamp
         // of the L1 block at which the upgrade occurred. This means that using timestamp as a signifier of "upgraded"
@@ -79,8 +84,13 @@ abstract contract BaseZkSyncUpgrade is ZKChainBase {
         if (block.timestamp < _proposedUpgrade.upgradeTimestamp) {
             revert TimeNotReached(_proposedUpgrade.upgradeTimestamp, block.timestamp);
         }
+        // If settlement layer is 0, it means that this diamond proxy is located on the settlement layer.
+        bool isOnSettlementLayer = s.settlementLayer == address(0);
 
-        (uint32 newMinorVersion, bool isPatchOnly) = _setNewProtocolVersion(_proposedUpgrade.newProtocolVersion);
+        (uint32 newMinorVersion, bool isPatchOnly) = _setNewProtocolVersion(
+            _proposedUpgrade.newProtocolVersion,
+            isOnSettlementLayer
+        );
         _upgradeL1Contract(_proposedUpgrade.l1ContractsUpgradeCalldata);
         _upgradeVerifier(_proposedUpgrade.verifier, _proposedUpgrade.verifierParams);
         _setBaseSystemContracts(
@@ -90,7 +100,11 @@ abstract contract BaseZkSyncUpgrade is ZKChainBase {
             isPatchOnly
         );
 
-        txHash = _setL2SystemContractUpgrade(_proposedUpgrade.l2ProtocolUpgradeTx, newMinorVersion, isPatchOnly);
+        // The upgrades that happen not on settlement layers are to update the logic of the facets
+        // only and do not include the upgrade transaction.
+        if (isOnSettlementLayer) {
+            txHash = _setL2SystemContractUpgrade(_proposedUpgrade.l2ProtocolUpgradeTx, newMinorVersion, isPatchOnly);
+        }
 
         _postUpgrade(_proposedUpgrade.postUpgradeCalldata);
 
@@ -286,8 +300,10 @@ abstract contract BaseZkSyncUpgrade is ZKChainBase {
 
     /// @notice Changes the protocol version
     /// @param _newProtocolVersion The new protocol version
+    /// @param _isOnSettlementLayer Whether the chain settles on the current settlement layer.
     function _setNewProtocolVersion(
-        uint256 _newProtocolVersion
+        uint256 _newProtocolVersion,
+        bool _isOnSettlementLayer
     ) internal virtual returns (uint32 newMinorVersion, bool patchOnly) {
         uint256 previousProtocolVersion = s.protocolVersion;
         if (_newProtocolVersion <= previousProtocolVersion) {
@@ -324,7 +340,9 @@ abstract contract BaseZkSyncUpgrade is ZKChainBase {
         // If the minor version changes also, we need to ensure that the previous upgrade has been finalized.
         // In case the minor version does not change, we permit to keep the old upgrade transaction in the system, but it
         // must be ensured in the other parts of the upgrade that the upgrade transaction is not overridden.
-        if (!patchOnly) {
+        // Note, that we check for the presence of the protocol upgrade transaction only when the current diamond proxy
+        // belongs to the settlement layer.
+        if (!patchOnly && _isOnSettlementLayer) {
             // If the previous upgrade had an L2 system upgrade transaction, we require that it is finalized.
             // Note it is important to keep this check, as otherwise ZK chains might skip upgrades by overwriting
             if (s.l2SystemContractsUpgradeTxHash != bytes32(0)) {

l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.28;
 import {SafeCast} from "@openzeppelin/contracts-v4/utils/math/SafeCast.sol";
 
 import {BaseZkSyncUpgrade} from "./BaseZkSyncUpgrade.sol";
-import {ProtocolVersionTooSmall, ProtocolVersionDeltaTooLarge, PreviousUpgradeNotFinalized, PreviousUpgradeBatchNotCleared, ProtocolMajorVersionNotZero} from "./ZkSyncUpgradeErrors.sol";
+import {ProtocolVersionTooSmall, ProtocolVersionDeltaTooLarge, PreviousUpgradeNotFinalized, PreviousUpgradeBatchNotCleared, ProtocolMajorVersionNotZero, GenesisUpgradeExpectedOnSettlementLayer} from "./ZkSyncUpgradeErrors.sol";
 import {MAX_ALLOWED_MINOR_VERSION_DELTA} from "../common/Config.sol";
 import {SemVer} from "../common/libraries/SemVer.sol";
 
@@ -16,7 +16,8 @@ abstract contract BaseZkSyncUpgradeGenesis is BaseZkSyncUpgrade {
     /// @notice Changes the protocol version
     /// @param _newProtocolVersion The new protocol version
     function _setNewProtocolVersion(
-        uint256 _newProtocolVersion
+        uint256 _newProtocolVersion,
+        bool _isOnSettlementLayer
     ) internal override returns (uint32 newMinorVersion, bool patchOnly) {
         uint256 previousProtocolVersion = s.protocolVersion;
         if (
@@ -53,6 +54,10 @@ abstract contract BaseZkSyncUpgradeGenesis is BaseZkSyncUpgrade {
             revert ProtocolVersionDeltaTooLarge(minorDelta, MAX_ALLOWED_MINOR_VERSION_DELTA);
         }
 
+        if (!_isOnSettlementLayer) {
+            revert GenesisUpgradeExpectedOnSettlementLayer();
+        }
+
         // If the minor version changes also, we need to ensure that the previous upgrade has been finalized.
         // In case the minor version does not change, we permit to keep the old upgrade transaction in the system, but it
         // must be ensured in the other parts of the upgrade that the upgrade transaction is not overridden.

l1-contracts/contracts/upgrades/ZkSyncUpgradeErrors.sol

@@ -32,6 +32,7 @@ error PreviousUpgradeNotFinalized(bytes32 txHash);
 error PreviousUpgradeNotCleaned();
 // 0x5cb29523
 error InvalidTxType(uint256 txType);
-
+// 0xb334f781
+error GenesisUpgradeExpectedOnSettlementLayer();
 // 0x388b6f68
 error GatewayUpgradeFailed();