feat: update upgrade script for v28 (#1423)

Co-authored-by: Raid Ateir <[email protected]>
Co-authored-by: Raid5594 <[email protected]>

Author: koloz193

AllContractsHashes.json

@@ -985,11 +985,11 @@
   },
   {
     "contractName": "l1-contracts/GatewayCTMDeployer",
-    "zkBytecodeHash": "0x010003c18fe906515df3edccfffd8c2c93591a8b45aa6ec73a71a3ff194a3959",
+    "zkBytecodeHash": "0x010003c16917108b4c68b889f841af139429fd2f226a89a33d1f68667fd11653",
     "zkBytecodePath": "/l1-contracts/zkout/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmBytecodeHash": "0xdfe9904e51738d8c47a991de1c0121ece7a000220421e89844458db3c8f3aba7",
+    "evmBytecodeHash": "0x7e25f86cb3b2538b7a34158bc855a15293a334545d41cc8dd9e633a1d6941a92",
     "evmBytecodePath": "/l1-contracts/out/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmDeployedBytecodeHash": "0x67c6917e9b2d58d877d193fb8591d030dd02796c4970536093459fddc9f92cb8"
+    "evmDeployedBytecodeHash": "0x1d44717c44de5bcb6e84380922619c9169c3983b3182c21f3f67da8d80bff05f"
   },
   {
     "contractName": "l1-contracts/GatewayTransactionFilterer",
@@ -1431,6 +1431,14 @@
     "evmBytecodePath": "/l1-contracts/out/UnsafeBytes.sol/UnsafeBytes.json",
     "evmDeployedBytecodeHash": "0x97b15b9cf3a912e69c3f08a5c2dbe0ec352ba2283f230b17e39c2eaa0a8244ca"
   },
+  {
+    "contractName": "l1-contracts/UpgradeStageValidator",
+    "zkBytecodeHash": "0x010000a3e8b9be8fcea224da8557ac4f61717f0b68e01f4b1ad1f7844ac57e8f",
+    "zkBytecodePath": "/l1-contracts/zkout/UpgradeStageValidator.sol/UpgradeStageValidator.json",
+    "evmBytecodeHash": "0x0ddd2d6d39b37506a20617e093464c3c4ac3b9cabde47defe9e0e987cc4cc33c",
+    "evmBytecodePath": "/l1-contracts/out/UpgradeStageValidator.sol/UpgradeStageValidator.json",
+    "evmDeployedBytecodeHash": "0x06e43ee2956a2a8425fe9512a7440bba4fd5b2341ffd2b632f6f254f4c082743"
+  },
   {
     "contractName": "l1-contracts/UpgradeableBeacon",
     "zkBytecodeHash": "0x010000674dd9c2b44a5c02408bda04df734b258d1c6ee9e07f5a6904a13d27fc",

l1-contracts/contracts/state-transition/chain-deps/GatewayCTMDeployer.sol

@@ -13,8 +13,8 @@ import {RelayedSLDAValidator} from "../data-availability/RelayedSLDAValidator.so
 import {ValidiumL1DAValidator} from "../data-availability/ValidiumL1DAValidator.sol";
 
 import {DualVerifier} from "../verifiers/DualVerifier.sol";
-import {L2VerifierFflonk} from "../verifiers/L2VerifierFflonk.sol";
-import {L2VerifierPlonk} from "../verifiers/L2VerifierPlonk.sol";
+import {L1VerifierFflonk} from "../verifiers/L1VerifierFflonk.sol";
+import {L1VerifierPlonk} from "../verifiers/L1VerifierPlonk.sol";
 
 import {VerifierParams, IVerifier} from "../chain-interfaces/IVerifier.sol";
 import {TestnetVerifier} from "../verifiers/TestnetVerifier.sol";
@@ -286,9 +286,9 @@ contract GatewayCTMDeployer {
         bool _testnetVerifier,
         DeployedContracts memory _deployedContracts
     ) internal {
-        L2VerifierFflonk fflonkVerifier = new L2VerifierFflonk{salt: _salt}();
+        L1VerifierFflonk fflonkVerifier = new L1VerifierFflonk{salt: _salt}();
         _deployedContracts.stateTransition.verifierFflonk = address(fflonkVerifier);
-        L2VerifierPlonk verifierPlonk = new L2VerifierPlonk{salt: _salt}();
+        L1VerifierPlonk verifierPlonk = new L1VerifierPlonk{salt: _salt}();
         _deployedContracts.stateTransition.verifierPlonk = address(verifierPlonk);
         if (_testnetVerifier) {
             _deployedContracts.stateTransition.verifier = address(

l1-contracts/contracts/upgrades/UpgradeStageValidator.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.18;
+
+import {IBridgehub} from "../bridgehub/IBridgehub.sol";
+import {IChainTypeManager} from "../state-transition/IChainTypeManager.sol";
+import {ZeroAddress, MigrationPaused, MigrationsNotPaused, ProtocolIdMismatch} from "../common/L1ContractErrors.sol";
+
+/// @title Rules to validate that different upgrade stages have passed.
+/// @author Matter Labs
+/// @custom:security-contact [email protected]
+/// @notice This contract will be used by the governance to ensure that certain criteria are met before proceeding to the
+/// next upgrade stage.
+contract UpgradeStageValidator {
+    /// @notice Address of bridgehub.
+    IBridgehub public immutable BRIDGEHUB;
+
+    /// @notice Address of chain type manager.
+    IChainTypeManager public immutable CHAIN_TYPE_MANAGER;
+
+    /// @notice Protocol Version of chain after the upgrade
+    uint256 public immutable NEW_PROTOCOL_VERSION;
+
+    /// @dev Initializes the contract with immutable values for `BRIDGEHUB`, `CHAIN_TYPE_MANAGER`,
+    /// and `NEW_PROTOCOL_VERSION`.
+    /// @param chainTypeManager The address of the ChainTypeManager for the chain.
+    /// @param newProtocolVersion The protocol version of the chain post upgrade.
+    constructor(address chainTypeManager, uint256 newProtocolVersion) {
+        if (chainTypeManager == address(0)) {
+            revert ZeroAddress();
+        }
+
+        CHAIN_TYPE_MANAGER = IChainTypeManager(chainTypeManager);
+        BRIDGEHUB = IBridgehub(CHAIN_TYPE_MANAGER.BRIDGE_HUB());
+        NEW_PROTOCOL_VERSION = newProtocolVersion;
+    }
+
+    /// @notice Check if migrations are paused
+    function checkMigrationsPaused() external {
+        if (!BRIDGEHUB.migrationPaused()) {
+            revert MigrationsNotPaused();
+        }
+    }
+
+    /// @notice Check if migrations are unpaused
+    function checkMigrationsUnpaused() external {
+        if (BRIDGEHUB.migrationPaused()) {
+            revert MigrationPaused();
+        }
+    }
+
+    /// @notice Check if the upgrade data was sent to the CTM.
+    function checkProtocolUpgradePresence() external {
+        uint256 protocolVersion = CHAIN_TYPE_MANAGER.protocolVersion();
+
+        if (protocolVersion != NEW_PROTOCOL_VERSION) {
+            revert ProtocolIdMismatch(NEW_PROTOCOL_VERSION, protocolVersion);
+        }
+    }
+}

l1-contracts/deploy-script-config-template/config-deploy-l1.toml

@@ -3,6 +3,9 @@ owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
 testnet_verifier = true
 support_l2_legacy_shared_bridge_test = false
 
+[gateway]
+chain_id = 123
+
 [contracts]
 governance_security_council_address = "0x0000000000000000000000000000000000000000"
 governance_min_delay = 0

l1-contracts/deploy-scripts/AdminFunctions.s.sol

@@ -305,6 +305,67 @@ contract AdminFunctions is Script {
         saveAndSendAdminTx(chainInfo.admin, calls, _shouldSend);
     }
 
+    struct UpgradeZKChainOnGatewayParams {
+        uint256 l1GasPrice;
+        uint256 oldProtocolVersion;
+        bytes upgradeCutData;
+        address chainDiamondProxyOnGateway;
+        uint256 gatewayChainId;
+        uint256 chainId;
+        address bridgehub;
+        address l1AssetRouterProxy;
+        address refundRecipient;
+        bool shouldSend;
+    }
+
+    function _prepareUpgradeZKChainOnGatewayInner(UpgradeZKChainOnGatewayParams memory data) private {
+        ChainInfoFromBridgehub memory chainInfo = Utils.chainInfoFromBridgehubAndChainId(data.bridgehub, data.chainId);
+        Diamond.DiamondCutData memory upgradeCutData = abi.decode(data.upgradeCutData, (Diamond.DiamondCutData));
+
+        Call[] memory calls = Utils.prepareAdminL1L2DirectTransaction(
+            data.l1GasPrice,
+            abi.encodeCall(IAdmin.upgradeChainFromVersion, (data.oldProtocolVersion, upgradeCutData)),
+            Utils.MAX_PRIORITY_TX_GAS,
+            new bytes[](0),
+            data.chainDiamondProxyOnGateway,
+            0,
+            data.gatewayChainId,
+            data.bridgehub,
+            data.l1AssetRouterProxy,
+            data.refundRecipient
+        );
+
+        saveAndSendAdminTx(chainInfo.admin, calls, data.shouldSend);
+    }
+
+    function prepareUpgradeZKChainOnGateway(
+        uint256 l1GasPrice,
+        uint256 oldProtocolVersion,
+        bytes memory upgradeCutData,
+        address chainDiamondProxyOnGateway,
+        uint256 gatewayChainId,
+        uint256 chainId,
+        address bridgehub,
+        address l1AssetRouterProxy,
+        address refundRecipient,
+        bool shouldSend
+    ) public {
+        _prepareUpgradeZKChainOnGatewayInner(
+            UpgradeZKChainOnGatewayParams({
+                l1GasPrice: l1GasPrice,
+                oldProtocolVersion: oldProtocolVersion,
+                upgradeCutData: upgradeCutData,
+                chainDiamondProxyOnGateway: chainDiamondProxyOnGateway,
+                gatewayChainId: gatewayChainId,
+                chainId: chainId,
+                bridgehub: bridgehub,
+                l1AssetRouterProxy: l1AssetRouterProxy,
+                refundRecipient: refundRecipient,
+                shouldSend: shouldSend
+            })
+        );
+    }
+
     function grantGatewayWhitelist(
         address _bridgehub,
         uint256 _chainId,

l1-contracts/deploy-scripts/Create2FactoryUtils.s.sol

@@ -103,9 +103,16 @@ abstract contract Create2FactoryUtils is Script {
     function deployViaCreate2AndNotify(
         bytes memory creationCode,
         bytes memory constructorParams,
-        string memory contractName
+        string memory contractName,
+        bool isZKBytecode
     ) internal returns (address deployedAddress) {
-        deployedAddress = deployViaCreate2AndNotify(creationCode, constructorParams, contractName, contractName);
+        deployedAddress = deployViaCreate2AndNotify(
+            creationCode,
+            constructorParams,
+            contractName,
+            contractName,
+            isZKBytecode
+        );
     }
 
     /// @notice Deploys a contract via Create2 and notifies via console logs.
@@ -118,11 +125,12 @@ abstract contract Create2FactoryUtils is Script {
         bytes memory creationCode,
         bytes memory constructorParams,
         string memory contractName,
-        string memory displayName
+        string memory displayName,
+        bool isZKBytecode
     ) internal returns (address deployedAddress) {
         bytes memory bytecode = abi.encodePacked(creationCode, constructorParams);
         deployedAddress = deployViaCreate2(bytecode);
-        notifyAboutDeployment(deployedAddress, contractName, constructorParams, displayName);
+        notifyAboutDeployment(deployedAddress, contractName, constructorParams, displayName, isZKBytecode);
     }
 
     /// @notice Deploys a contract via Create2 with a deterministic owner.
@@ -150,10 +158,11 @@ abstract contract Create2FactoryUtils is Script {
         bytes memory constructorParams,
         address owner,
         string memory contractName,
-        string memory displayName
+        string memory displayName,
+        bool isZKBytecode
     ) internal returns (address contractAddress) {
         contractAddress = create2WithDeterministicOwner(abi.encodePacked(initCode, constructorParams), owner);
-        notifyAboutDeployment(contractAddress, contractName, constructorParams, displayName);
+        notifyAboutDeployment(contractAddress, contractName, constructorParams, displayName, isZKBytecode);
     }
 
     /// @notice Overload for notifyAboutDeployment that takes three arguments.
@@ -163,9 +172,10 @@ abstract contract Create2FactoryUtils is Script {
     function notifyAboutDeployment(
         address contractAddr,
         string memory contractName,
-        bytes memory constructorParams
+        bytes memory constructorParams,
+        bool isZKBytecode
     ) internal {
-        notifyAboutDeployment(contractAddr, contractName, constructorParams, contractName);
+        notifyAboutDeployment(contractAddr, contractName, constructorParams, contractName, isZKBytecode);
     }
 
     /// @notice Notifies about a deployment by printing messages to the console.
@@ -178,7 +188,8 @@ abstract contract Create2FactoryUtils is Script {
         address contractAddr,
         string memory contractName,
         bytes memory constructorParams,
-        string memory displayName
+        string memory displayName,
+        bool isZKBytecode
     ) internal {
         string memory basicMessage = string.concat(displayName, " has been deployed at ", vm.toString(contractAddr));
         console.log(basicMessage);
@@ -202,6 +213,10 @@ abstract contract Create2FactoryUtils is Script {
                 vm.toString(constructorParams)
             );
         }
+
+        if (isZKBytecode) {
+            forgeMessage = string.concat(forgeMessage, " --verifier zksync");
+        }
         console.log(forgeMessage);
     }
 

l1-contracts/deploy-scripts/DeployGatewayTransactionFilterer.s.sol

@@ -39,7 +39,8 @@ contract DeployGatewayTransactionFilterer is Script, Create2FactoryUtils {
             type(GatewayTransactionFilterer).creationCode,
             abi.encode(bridgehub, l1AssetRouter),
             "GatewayTransactionFilterer",
-            "GatewayTransactionFilterer"
+            "GatewayTransactionFilterer",
+            false
         );
 
         // Prepare the initialization calldata.
@@ -56,7 +57,8 @@ contract DeployGatewayTransactionFilterer is Script, Create2FactoryUtils {
                 initData // initialization calldata to set chainAdmin as owner
             ),
             "TransparentUpgradeableProxy",
-            "GatewayTxFiltererProxy"
+            "GatewayTxFiltererProxy",
+            false
         );
     }