chore: add zkstack-out CI check (#1977)

# What ❔

Adds a CI check to ensure that `l1-contracts/zkstack-out` is kept up to
date, plus some other cosmetic fixes
This is a sister PR to
matter-labs/zksync-era#4616

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.

Author: zkzoomer

.github/workflows/l1-contracts-ci.yaml

@@ -43,8 +43,17 @@ jobs:
       - name: Build l1 contracts
         working-directory: l1-contracts
         run: |
+          rm -rf zkstack-out
           yarn build:foundry
 
+          # Fail if regenerated zkstack-out differs from what was committed
+          if [ -n "$(git status --porcelain -- zkstack-out)" ]; then
+            echo "::error::l1-contracts/zkstack-out is out of date. Run 'cd l1-contracts && yarn build:foundry' and commit the changes."
+            git --no-pager status --porcelain -- zkstack-out
+            git --no-pager diff -- zkstack-out || true
+            exit 1
+          fi
+
       - name: Build l2 contracts
         working-directory: l2-contracts
         run: |

l1-contracts/contracts/script-interfaces/IGatewayVotePreparation.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.21;
+
+/// @title IGatewayVotePreparation
+/// @notice Interface for GatewayVotePreparation.s.sol script
+/// @dev This interface ensures selector visibility for GatewayVotePreparation functions
+interface IGatewayVotePreparation {
+    function run(address bridgehubProxy, uint256 ctmRepresentativeChainId) external;
+}

l1-contracts/contracts/script-interfaces/IValidatorTimelockForZKStack.sol

@@ -125,6 +125,8 @@ interface IChainTypeManager {
 
     function validatorTimelock() external view returns (address);
 
+    function validatorTimelockPostV29() external view returns (address);
+
     function initialize(ChainTypeManagerInitializeData calldata _initializeData) external;
 
     function setLegacyValidatorTimelock(address _validatorTimelock) external;

l1-contracts/contracts/state-transition/IChainTypeManager.sol

@@ -12,19 +12,16 @@ const REQUIRED_CONTRACTS = [
   "L1Bridgehub.sol",
   "MessageRootBase.sol",
   "IZKChain.sol",
-  "IChainTypeManagerForZKStack.sol",
-  "IValidatorTimelockForZKStack.sol",
+  "IValidatorTimelock.sol",
   "IChainAssetHandler.sol",
   "IChainTypeManager.sol",
   "IAdmin.sol",
   "IChainAdminOwnable.sol",
   "IRegisterZKChain.sol",
   "IDeployL2Contracts.sol",
-  "DeployPaymaster.s.sol",
   "IDeployPaymaster.sol",
-  "GatewayVotePreparation.s.sol",
+  "IGatewayVotePreparation.sol",
   "AdminFunctions.s.sol",
-  "EnableEvmEmulator.s.sol",
   "DeployGatewayTransactionFilterer.s.sol",
   "IAdminFunctions.sol",
   "IEnableEvmEmulator.sol",

l1-contracts/scripts/copy-to-zkstack-out.ts

@@ -4562,6 +4562,8 @@ IChainTypeManager
 |----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
 | Function | validatorTimelock()                                                                                                                                            | 0xe66c8c44                                                         |
 |----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
+| Function | validatorTimelockPostV29()                                                                                                                                     | 0xef9955bc                                                         |
+|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
 | Event    | GenesisUpgrade(address,(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256[4],bytes,bytes,uint256[],bytes,bytes),uint256) | 0x778b7f95aad9610955002f243aabbbf9546bb6e792f7b3b89dab86b4f210e30f |
 |----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
 | Event    | NewAdmin(address,address)                                                                                                                                      | 0xf9ffabca9c8276e99321725bcb43fb076a6c66a54b7f21c4e8146d8519b417dc |
@@ -4841,6 +4843,14 @@ IGatewayUtils
 | Function | finishMigrateChainToGateway(address,bytes,uint256,uint256,bytes32,uint256,uint256,uint16,bytes32[],uint8) | 0x59067261 |
 ╰----------+-----------------------------------------------------------------------------------------------------------+------------╯
 
+IGatewayVotePreparation
+
+╭----------+----------------------+------------╮
+| Type     | Signature            | Selector   |
++==============================================+
+| Function | run(address,uint256) | 0x381fd190 |
+╰----------+----------------------+------------╯
+
 IGetters
 
 ╭----------+-------------------------------------------+------------╮
@@ -6319,26 +6329,6 @@ IValidatorTimelock
 | Event    | ReportCommittedBatchRangeZKsyncOS(uint64,uint64,uint64)          | 0xa2ac105688fc09c2584d6b2e79dd0fc14e6003a20c62ac45aa858e8ed12bb7bb |
 ╰----------+------------------------------------------------------------------+--------------------------------------------------------------------╯
 
-IValidatorTimelockForZKStack
-
-╭----------+--------------------------------------------+------------╮
-| Type     | Signature                                  | Selector   |
-+====================================================================+
-| Function | COMMITTER_ROLE()                           | 0x1a7c3f73 |
-|----------+--------------------------------------------+------------|
-| Function | EXECUTOR_ROLE()                            | 0x07bd0265 |
-|----------+--------------------------------------------+------------|
-| Function | PRECOMMITTER_ROLE()                        | 0xa86d67c5 |
-|----------+--------------------------------------------+------------|
-| Function | PROVER_ROLE()                              | 0xdc9a4ef6 |
-|----------+--------------------------------------------+------------|
-| Function | hasRole(uint256,bytes32,address)           | 0x119345aa |
-|----------+--------------------------------------------+------------|
-| Function | hasRoleForChainId(uint256,bytes32,address) | 0x8e80aaf6 |
-|----------+--------------------------------------------+------------|
-| Function | validators(uint256,address)                | 0x91b19874 |
-╰----------+--------------------------------------------+------------╯
-
 IVerifier
 
 ╭----------+-----------------------------+------------╮