Merge remote-tracking branch 'origin/zksync-os-stable' into mmzk_0911_raid_script_merged

Author: mm-zk

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

@@ -6,6 +6,8 @@ bridgehub_create_new_chain_salt = 0
 validium_mode = false
 validator_sender_operator_commit_eth = "0x0000000000000000000000000000000000000000"
 validator_sender_operator_blobs_eth = "0x0000000000000000000000000000000000000001"
+validator_sender_operator_prove = "0x0000000000000000000000000000000000000002"
+validator_sender_operator_execute = "0x0000000000000000000000000000000000000003"
 base_token_gas_price_multiplier_nominator = 1
 base_token_gas_price_multiplier_denominator = 1
 governance_min_delay = 0

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

@@ -44,6 +44,10 @@ struct Config {
     uint256 bridgehubCreateNewChainSalt;
     address validatorSenderOperatorCommitEth;
     address validatorSenderOperatorBlobsEth;
+    // optional - if not set, then equal to 0
+    address validatorSenderOperatorProve;
+    // optional - if not set, then equal to 0
+    address validatorSenderOperatorExecute;
     address baseToken;
     bytes32 baseTokenAssetId;
     uint128 baseTokenGasPriceMultiplierNominator;
@@ -178,6 +182,20 @@ contract RegisterZKChainScript is Script {
         config.validiumMode = toml.readBool("$.chain.validium_mode");
         config.validatorSenderOperatorCommitEth = toml.readAddress("$.chain.validator_sender_operator_commit_eth");
         config.validatorSenderOperatorBlobsEth = toml.readAddress("$.chain.validator_sender_operator_blobs_eth");
+
+        // These were added to zkstack tool recently (9th Sept 2025).
+        // So doing this for backwards compatibility.
+        if (vm.keyExistsToml(toml, "$.chain.validator_sender_operator_prove")) {
+            config.validatorSenderOperatorProve = toml.readAddress("$.chain.validator_sender_operator_prove");
+        } else {
+            config.validatorSenderOperatorProve = address(0);
+        }
+        if (vm.keyExistsToml(toml, "$.chain.validator_sender_operator_execute")) {
+            config.validatorSenderOperatorExecute = toml.readAddress("$.chain.validator_sender_operator_execute");
+        } else {
+            config.validatorSenderOperatorExecute = address(0);
+        }
+
         config.initializeLegacyBridge = toml.readBool("$.initialize_legacy_bridge");
 
         config.governance = toml.readAddress("$.governance");
@@ -231,6 +249,10 @@ contract RegisterZKChainScript is Script {
         config.validiumMode = toml.readBool("$.chain.validium_mode");
         config.validatorSenderOperatorCommitEth = toml.readAddress("$.chain.validator_sender_operator_commit_eth");
         config.validatorSenderOperatorBlobsEth = toml.readAddress("$.chain.validator_sender_operator_blobs_eth");
+        // These were added to zkstack tool recently (9th Sept 2025).
+        config.validatorSenderOperatorProve = toml.readAddress("$.chain.validator_sender_operator_prove");
+        config.validatorSenderOperatorExecute = toml.readAddress("$.chain.validator_sender_operator_execute");
+
         config.baseTokenGasPriceMultiplierNominator = uint128(
             toml.readUint("$.chain.base_token_gas_price_multiplier_nominator")
         );
@@ -420,6 +442,14 @@ contract RegisterZKChainScript is Script {
         vm.startBroadcast(msg.sender);
         validatorTimelock.addValidatorForChainId(config.chainChainId, config.validatorSenderOperatorCommitEth);
         validatorTimelock.addValidatorForChainId(config.chainChainId, config.validatorSenderOperatorBlobsEth);
+        // Add them to validators, only if set.
+        if (config.validatorSenderOperatorProve != address(0)) {
+            validatorTimelock.addValidatorForChainId(config.chainChainId, config.validatorSenderOperatorProve);
+        }
+        if (config.validatorSenderOperatorExecute != address(0)) {
+            validatorTimelock.addValidatorForChainId(config.chainChainId, config.validatorSenderOperatorExecute);
+        }
+
         vm.stopBroadcast();
 
         console.log("Validators added");

l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol

@@ -25,6 +25,8 @@ contract ZKChainDeployer is L1ContractDeployer {
         bool validiumMode;
         address validatorSenderOperatorCommitEth;
         address validatorSenderOperatorBlobsEth;
+        address validatorSenderOperatorProve;
+        address validatorSenderOperatorExecute;
         uint128 baseTokenGasPriceMultiplierNominator;
         uint128 baseTokenGasPriceMultiplierDenominator;
         bool allowEvmEmulator;
@@ -88,6 +90,8 @@ contract ZKChainDeployer is L1ContractDeployer {
             validiumMode: false,
             validatorSenderOperatorCommitEth: address(0),
             validatorSenderOperatorBlobsEth: address(1),
+            validatorSenderOperatorProve: address(2),
+            validatorSenderOperatorExecute: address(3),
             baseTokenGasPriceMultiplierNominator: uint128(1),
             baseTokenGasPriceMultiplierDenominator: uint128(1),
             allowEvmEmulator: false
@@ -119,6 +123,8 @@ contract ZKChainDeployer is L1ContractDeployer {
             "validator_sender_operator_blobs_eth",
             description.validatorSenderOperatorBlobsEth
         );
+        vm.serializeAddress("chain", "validator_sender_operator_prove", description.validatorSenderOperatorProve);
+        vm.serializeAddress("chain", "validator_sender_operator_execute", description.validatorSenderOperatorExecute);
         vm.serializeUint(
             "chain",
             "base_token_gas_price_multiplier_nominator",