feat: add migration script

Author: LHerskind

l1-contracts/.gitignore

@@ -36,3 +36,5 @@ gas_benchmark.diff
 /bench-out
 
 /coverage
+
+/script/registration_data.json

l1-contracts/foundry.toml

@@ -55,6 +55,7 @@ fs_permissions = [
   {access = "read", path = "./test/staking_asset_handler/zkpassport/fixtures/valid_public_inputs.json"},
   {access = "read", path = "./test/fixtures/boosted_rewards/shares.json"},
   {access = "read", path = "./test/fixtures/boosted_rewards/activity_scores.json"},
+  {access = "read", path = "./script/registration_data.json"},
 ]
 
 no_match_contract="(ScreamAndShoutTest|UniswapPortalTest|MerkleCheck)"

l1-contracts/script/Migration.s.sol

@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Aztec Labs.
+pragma solidity >=0.8.27;
+
+import {Test} from "forge-std/Test.sol";
+
+import {IInstance} from "@aztec/core/interfaces/IInstance.sol";
+import {MultiAdder, CheatDepositArgs} from "@aztec/mock/MultiAdder.sol";
+import {G1Point, G2Point} from "@aztec/shared/libraries/BN254Lib.sol";
+import {RollupBuilder} from "@test/builder/RollupBuilder.sol";
+import {TestERC20} from "@aztec/mock/TestERC20.sol";
+
+struct RegistrationData {
+  address attester;
+  G1Point publicKeyInG1;
+  G2Point publicKeyInG2;
+  G1Point proofOfPossession;
+}
+
+contract MigrationScript is Test {
+  address internal constant ME = address(0xf8d7d601759CBcfB78044bA7cA9B0c0D6301A54f);
+
+  address public constant WITHDRAWER = address(0xdead);
+
+  // Update ME!
+  IInstance public INSTANCE;
+  TestERC20 public STAKING_ASSET;
+  // No more!
+
+  MultiAdder public ADDER;
+
+  RegistrationData[] public $registrations;
+
+  function setUp() public {
+    string memory root = vm.projectRoot();
+    string memory path = string.concat(root, "/script/registration_data.json");
+    string memory json = vm.readFile(path);
+    bytes memory jsonBytes = vm.parseJson(json);
+    RegistrationData[] memory registrations = abi.decode(jsonBytes, (RegistrationData[]));
+
+    for (uint256 i = 0; i < registrations.length; i++) {
+      $registrations.push(registrations[i]);
+    }
+  }
+
+  function emulate() public {
+    // If emulating we will deploy a rollup and other components ahead of time, otherwise
+    // you should provide them by updating the values above.
+    RollupBuilder builder = new RollupBuilder(ME).setUpdateOwnerships(false).deploy();
+
+    INSTANCE = IInstance(address(builder.getConfig().rollup));
+    STAKING_ASSET = builder.getConfig().testERC20;
+
+    vm.prank(STAKING_ASSET.owner());
+    STAKING_ASSET.addMinter(ME);
+
+    migrate();
+  }
+
+  function migrate() public {
+    uint256 activationThreshold = INSTANCE.getActivationThreshold();
+
+    vm.startBroadcast(ME);
+    ADDER = new MultiAdder(address(INSTANCE), ME);
+    STAKING_ASSET.mint(address(ADDER), activationThreshold * $registrations.length);
+    vm.stopBroadcast();
+
+    uint256 start = 0;
+    uint256 end = $registrations.length;
+    uint256 batchSize = 10;
+
+    while (start < end) {
+      uint256 batchEnd = start + batchSize;
+      if (batchEnd > end) {
+        batchEnd = end;
+      }
+
+      CheatDepositArgs[] memory args = new CheatDepositArgs[](batchEnd - start);
+
+      for (uint256 i = start; i < batchEnd; i++) {
+        emit log_named_address("Adding validator", $registrations[i].attester);
+        args[i - start] = CheatDepositArgs(
+          $registrations[i].attester,
+          WITHDRAWER,
+          $registrations[i].publicKeyInG1,
+          $registrations[i].publicKeyInG2,
+          $registrations[i].proofOfPossession
+        );
+      }
+
+      vm.startBroadcast(ME);
+      ADDER.addValidators(args);
+      vm.stopBroadcast();
+
+      start = batchEnd;
+    }
+  }
+}

l1-contracts/src/mock/MultiAdder.sol

@@ -2,7 +2,7 @@
 // Copyright 2024 Aztec Labs.
 pragma solidity >=0.8.27;
 
-import {IStaking} from "@aztec/core/interfaces/IStaking.sol";
+import {IInstance} from "@aztec/core/interfaces/IInstance.sol";
 import {G1Point, G2Point} from "@aztec/shared/libraries/BN254Lib.sol";
 import {IERC20} from "@oz/token/ERC20/IERC20.sol";
 
@@ -20,13 +20,13 @@ interface IMultiAdder {
 
 contract MultiAdder is IMultiAdder {
   address public immutable OWNER;
-  IStaking public immutable STAKING;
+  IInstance public immutable STAKING;
 
   error NotOwner();
 
   constructor(address _staking, address _owner) {
     OWNER = _owner;
-    STAKING = IStaking(_staking);
+    STAKING = IInstance(_staking);
 
     IERC20 stakingAsset = STAKING.getStakingAsset();
     stakingAsset.approve(address(STAKING), type(uint256).max);
@@ -44,6 +44,9 @@ contract MultiAdder is IMultiAdder {
         true
       );
     }
-    STAKING.flushEntryQueue();
+
+    if (STAKING.getCurrentEpoch() >= STAKING.getNextFlushableEpoch()) {
+      STAKING.flushEntryQueue();
+    }
   }
 }

yarn-project/end-to-end/src/e2e_sequencer/gov_proposal.test.ts

@@ -25,7 +25,7 @@ const TXS_PER_BLOCK = 1;
 const ROUND_SIZE = 2;
 const QUORUM_SIZE = 2;
 // Can't use 48 without chunking the addValidators call.
-const COMMITTEE_SIZE = 36;
+const COMMITTEE_SIZE = 16;
 
 describe('e2e_gov_proposal', () => {
   let logger: Logger;

yarn-project/ethereum/src/deploy_l1_contracts.ts

@@ -795,31 +795,33 @@ export const addMultipleValidators = async (
 
       // Mint tokens, approve them, use cheat code to initialize validator set without setting up the epoch.
       const stakeNeeded = activationThreshold * BigInt(validators.length);
-      const { txHash } = await deployer.sendTransaction({
+
+      await deployer.l1TxUtils.sendAndMonitorTransaction({
         to: stakingAssetAddress,
         data: encodeFunctionData({
           abi: StakingAssetArtifact.contractAbi,
           functionName: 'mint',
           args: [multiAdder.toString(), stakeNeeded],
         }),
       });
-      const receipt = await extendedClient.waitForTransactionReceipt({ hash: txHash });
 
-      if (receipt.status !== 'success') {
-        throw new Error(`Failed to mint staking assets for validators: ${receipt.status}`);
-      }
+      const validatorCount = await rollup.getActiveAttesterCount();
 
-      const addValidatorsTxHash = await deployer.client.writeContract({
-        address: multiAdder.toString(),
-        abi: MultiAdderArtifact.contractAbi,
-        functionName: 'addValidators',
-        args: [validatorsTuples],
-      });
-      await extendedClient.waitForTransactionReceipt({ hash: addValidatorsTxHash });
-      logger.info(`Initialized validator set`, {
-        validators,
-        txHash: addValidatorsTxHash,
+      logger.info(`Adding ${validators.length} validators to the rollup`);
+
+      await deployer.l1TxUtils.sendAndMonitorTransaction({
+        to: multiAdder.toString(),
+        data: encodeFunctionData({
+          abi: MultiAdderArtifact.contractAbi,
+          functionName: 'addValidators',
+          args: [validatorsTuples],
+        }),
       });
+
+      const validatorCountAfter = await rollup.getActiveAttesterCount();
+      if (validatorCountAfter < validatorCount + BigInt(validators.length)) {
+        throw new Error(`Failed to add ${validators.length} validators. ${validatorCount} -> ${validatorCountAfter} `);
+      }
     }
   }
 };