@aztec/ethereum 1.2.1 → 2.0.0-nightly.20250813

package/src/deploy_l1_contracts.ts

@@ -1,54 +1,8 @@
-import { getActiveNetworkName } from '@aztec/foundation/config';
+import { SecretValue, getActiveNetworkName } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import {
-  CoinIssuerAbi,
-  CoinIssuerBytecode,
-  ExtRollupLib2Abi,
-  ExtRollupLib2Bytecode,
-  ExtRollupLibAbi,
-  ExtRollupLibBytecode,
-  FeeAssetHandlerAbi,
-  FeeAssetHandlerBytecode,
-  FeeJuicePortalAbi,
-  FeeJuicePortalBytecode,
-  GSEAbi,
-  GSEBytecode,
-  GovernanceAbi,
-  GovernanceBytecode,
-  GovernanceProposerAbi,
-  GovernanceProposerBytecode,
-  HonkVerifierAbi,
-  HonkVerifierBytecode,
-  InboxAbi,
-  InboxBytecode,
-  MockVerifierAbi,
-  MockVerifierBytecode,
-  MockZKPassportVerifierAbi,
-  MockZKPassportVerifierBytecode,
-  MultiAdderAbi,
-  MultiAdderBytecode,
-  OutboxAbi,
-  OutboxBytecode,
-  RegisterNewRollupVersionPayloadAbi,
-  RegisterNewRollupVersionPayloadBytecode,
-  RegistryAbi,
-  RegistryBytecode,
-  RewardDistributorAbi,
-  RewardDistributorBytecode,
-  RollupAbi,
-  RollupBytecode,
-  RollupLinkReferences,
-  SlashFactoryAbi,
-  SlashFactoryBytecode,
-  StakingAssetHandlerAbi,
-  StakingAssetHandlerBytecode,
-  TestERC20Abi,
-  TestERC20Bytecode,
-  ValidatorSelectionLibAbi,
-  ValidatorSelectionLibBytecode,
-} from '@aztec/l1-artifacts';
+import { DateProvider } from '@aztec/foundation/timer';
 
 import type { Abi, Narrow } from 'abitype';
 import {
@@ -72,12 +26,32 @@ import { createExtendedL1Client } from './client.js';
 import {
   type L1ContractsConfig,
   getEntryQueueConfig,
+  getGSEConfiguration,
   getGovernanceConfiguration,
   getRewardBoostConfig,
   getRewardConfig,
 } from './config.js';
+import { GSEContract } from './contracts/gse.js';
+import { deployMulticall3 } from './contracts/multicall.js';
 import { RegistryContract } from './contracts/registry.js';
 import { RollupContract } from './contracts/rollup.js';
+import {
+  CoinIssuerArtifact,
+  FeeAssetArtifact,
+  FeeAssetHandlerArtifact,
+  GSEArtifact,
+  GovernanceArtifact,
+  GovernanceProposerArtifact,
+  MultiAdderArtifact,
+  RegisterNewRollupVersionPayloadArtifact,
+  RegistryArtifact,
+  RollupArtifact,
+  SlashFactoryArtifact,
+  StakingAssetArtifact,
+  StakingAssetHandlerArtifact,
+  l1ArtifactsVerifiers,
+  mockVerifiers,
+} from './l1_artifacts.js';
 import type { L1ContractAddresses } from './l1_contract_addresses.js';
 import {
   type GasPrice,
@@ -88,6 +62,7 @@ import {
   getL1TxUtilsConfigEnvVars,
 } from './l1_tx_utils.js';
 import type { ExtendedViemWalletClient } from './types.js';
+import { formatViemError } from './utils.js';
 import { ZK_PASSPORT_DOMAIN, ZK_PASSPORT_SCOPE, ZK_PASSPORT_VERIFIER_ADDRESS } from './zkPassportVerifierAddress.js';
 
 export const DEPLOYER_ADDRESS: Hex = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
@@ -97,6 +72,7 @@ const networkName = getActiveNetworkName();
 export type Operator = {
   attester: EthAddress;
   withdrawer: EthAddress;
+  bn254SecretKey: SecretValue<bigint>;
 };
 
 /**
@@ -129,6 +105,10 @@ export interface Libraries {
  * Contract artifacts
  */
 export interface ContractArtifacts {
+  /**
+   * The contract name.
+   */
+  name: string;
   /**
    * The contract abi.
    */
@@ -143,112 +123,6 @@ export interface ContractArtifacts {
   libraries?: Libraries;
 }
 
-export const l1Artifacts = {
-  registry: {
-    contractAbi: RegistryAbi,
-    contractBytecode: RegistryBytecode as Hex,
-  },
-  inbox: {
-    contractAbi: InboxAbi,
-    contractBytecode: InboxBytecode as Hex,
-  },
-  outbox: {
-    contractAbi: OutboxAbi,
-    contractBytecode: OutboxBytecode as Hex,
-  },
-  rollup: {
-    contractAbi: RollupAbi,
-    contractBytecode: RollupBytecode as Hex,
-    libraries: {
-      linkReferences: RollupLinkReferences,
-      libraryCode: {
-        ValidatorSelectionLib: {
-          contractAbi: ValidatorSelectionLibAbi,
-          contractBytecode: ValidatorSelectionLibBytecode as Hex,
-        },
-        ExtRollupLib: {
-          contractAbi: ExtRollupLibAbi,
-          contractBytecode: ExtRollupLibBytecode as Hex,
-        },
-        ExtRollupLib2: {
-          contractAbi: ExtRollupLib2Abi,
-          contractBytecode: ExtRollupLib2Bytecode as Hex,
-        },
-      },
-    },
-  },
-  stakingAsset: {
-    contractAbi: TestERC20Abi,
-    contractBytecode: TestERC20Bytecode as Hex,
-  },
-  feeAsset: {
-    contractAbi: TestERC20Abi,
-    contractBytecode: TestERC20Bytecode as Hex,
-  },
-  feeJuicePortal: {
-    contractAbi: FeeJuicePortalAbi,
-    contractBytecode: FeeJuicePortalBytecode as Hex,
-  },
-  rewardDistributor: {
-    contractAbi: RewardDistributorAbi,
-    contractBytecode: RewardDistributorBytecode as Hex,
-  },
-  coinIssuer: {
-    contractAbi: CoinIssuerAbi,
-    contractBytecode: CoinIssuerBytecode as Hex,
-  },
-  governanceProposer: {
-    contractAbi: GovernanceProposerAbi,
-    contractBytecode: GovernanceProposerBytecode as Hex,
-  },
-  governance: {
-    contractAbi: GovernanceAbi,
-    contractBytecode: GovernanceBytecode as Hex,
-  },
-  slashFactory: {
-    contractAbi: SlashFactoryAbi,
-    contractBytecode: SlashFactoryBytecode as Hex,
-  },
-  registerNewRollupVersionPayload: {
-    contractAbi: RegisterNewRollupVersionPayloadAbi,
-    contractBytecode: RegisterNewRollupVersionPayloadBytecode as Hex,
-  },
-  feeAssetHandler: {
-    contractAbi: FeeAssetHandlerAbi,
-    contractBytecode: FeeAssetHandlerBytecode as Hex,
-  },
-  stakingAssetHandler: {
-    contractAbi: StakingAssetHandlerAbi,
-    contractBytecode: StakingAssetHandlerBytecode as Hex,
-  },
-  multiAdder: {
-    contractAbi: MultiAdderAbi,
-    contractBytecode: MultiAdderBytecode as Hex,
-  },
-  gse: {
-    contractAbi: GSEAbi,
-    contractBytecode: GSEBytecode as Hex,
-  },
-};
-
-export const l1ArtifactsVerifiers = {
-  honkVerifier: {
-    contractAbi: HonkVerifierAbi,
-    contractBytecode: HonkVerifierBytecode as Hex,
-  },
-};
-
-const mockVerifiers = {
-  mockVerifier: {
-    contractAbi: MockVerifierAbi,
-    contractBytecode: MockVerifierBytecode as Hex,
-  },
-  mockZkPassportVerifier: {
-    contractAbi: MockZKPassportVerifierAbi,
-    contractBytecode: MockZKPassportVerifierBytecode as Hex,
-  },
-};
-
 export interface DeployL1ContractsArgs extends L1ContractsConfig {
   /** The vk tree root. */
   vkTreeRoot: Fr;
@@ -287,37 +161,41 @@ export const deploySharedContracts = async (
   args: DeployL1ContractsArgs,
   logger: Logger,
 ) => {
-  logger.info(`Deploying shared contracts. Network configration: ${networkName}`);
+  logger.info(`Deploying shared contracts for network configration: ${networkName}`);
 
   const txHashes: Hex[] = [];
 
-  const feeAssetAddress = await deployer.deploy(l1Artifacts.feeAsset, [
+  const feeAssetAddress = await deployer.deploy(FeeAssetArtifact, [
     'FeeJuice',
     'FEE',
     l1Client.account.address.toString(),
   ]);
   logger.verbose(`Deployed Fee Asset at ${feeAssetAddress}`);
 
-  const stakingAssetAddress = await deployer.deploy(l1Artifacts.stakingAsset, [
+  const stakingAssetAddress = await deployer.deploy(StakingAssetArtifact, [
     'Staking',
     'STK',
     l1Client.account.address.toString(),
   ]);
   logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
 
-  const gseAddress = await deployer.deploy(l1Artifacts.gse, [
+  const gseConfiguration = getGSEConfiguration(networkName);
+
+  const gseAddress = await deployer.deploy(GSEArtifact, [
     l1Client.account.address.toString(),
     stakingAssetAddress.toString(),
+    gseConfiguration.activationThreshold,
+    gseConfiguration.ejectionThreshold,
   ]);
   logger.verbose(`Deployed GSE at ${gseAddress}`);
 
-  const registryAddress = await deployer.deploy(l1Artifacts.registry, [
+  const registryAddress = await deployer.deploy(RegistryArtifact, [
     l1Client.account.address.toString(),
     feeAssetAddress.toString(),
   ]);
   logger.verbose(`Deployed Registry at ${registryAddress}`);
 
-  const governanceProposerAddress = await deployer.deploy(l1Artifacts.governanceProposer, [
+  const governanceProposerAddress = await deployer.deploy(GovernanceProposerArtifact, [
     registryAddress.toString(),
     gseAddress.toString(),
     args.governanceProposerQuorum,
@@ -327,7 +205,7 @@ export const deploySharedContracts = async (
 
   // @note @LHerskind the assets are expected to be the same at some point, but for better
   // configurability they are different for now.
-  const governanceAddress = await deployer.deploy(l1Artifacts.governance, [
+  const governanceAddress = await deployer.deploy(GovernanceArtifact, [
     stakingAssetAddress.toString(),
     governanceProposerAddress.toString(),
     gseAddress.toString(),
@@ -343,7 +221,7 @@ export const deploySharedContracts = async (
   } else {
     const gseContract = getContract({
       address: getAddress(gseAddress.toString()),
-      abi: l1Artifacts.gse.contractAbi,
+      abi: GSEArtifact.contractAbi,
       client: l1Client,
     });
     const existingGovernance = await gseContract.read.getGovernance();
@@ -357,7 +235,7 @@ export const deploySharedContracts = async (
       {
         to: gseAddress.toString(),
         data: encodeFunctionData({
-          abi: l1Artifacts.gse.contractAbi,
+          abi: GSEArtifact.contractAbi,
           functionName: 'setGovernance',
           args: [governanceAddress.toString()],
         }),
@@ -369,7 +247,7 @@ export const deploySharedContracts = async (
     txHashes.push(txHash);
   }
 
-  const coinIssuerAddress = await deployer.deploy(l1Artifacts.coinIssuer, [
+  const coinIssuerAddress = await deployer.deploy(CoinIssuerArtifact, [
     feeAssetAddress.toString(),
     1n * 10n ** 18n, // @todo  #8084
     governanceAddress.toString(),
@@ -378,7 +256,7 @@ export const deploySharedContracts = async (
 
   const feeAsset = getContract({
     address: feeAssetAddress.toString(),
-    abi: l1Artifacts.feeAsset.contractAbi,
+    abi: FeeAssetArtifact.contractAbi,
     client: l1Client,
   });
 
@@ -390,7 +268,7 @@ export const deploySharedContracts = async (
       {
         to: feeAssetAddress.toString(),
         data: encodeFunctionData({
-          abi: l1Artifacts.feeAsset.contractAbi,
+          abi: FeeAssetArtifact.contractAbi,
           functionName: 'addMinter',
           args: [coinIssuerAddress.toString()],
         }),
@@ -401,16 +279,7 @@ export const deploySharedContracts = async (
     txHashes.push(txHash);
   }
 
-  const { txHash: setGovernanceTxHash } = await deployer.sendTransaction({
-    to: registryAddress.toString(),
-    data: encodeFunctionData({
-      abi: l1Artifacts.registry.contractAbi,
-      functionName: 'updateGovernance',
-      args: [governanceAddress.toString()],
-    }),
-  });
-
-  txHashes.push(setGovernanceTxHash);
+  // Registry ownership will be transferred to governance later, after rollup is added
 
   let feeAssetHandlerAddress: EthAddress | undefined = undefined;
   let stakingAssetHandlerAddress: EthAddress | undefined = undefined;
@@ -422,7 +291,7 @@ export const deploySharedContracts = async (
     /*                          CHEAT CODES START HERE                            */
     /* -------------------------------------------------------------------------- */
 
-    feeAssetHandlerAddress = await deployer.deploy(l1Artifacts.feeAssetHandler, [
+    feeAssetHandlerAddress = await deployer.deploy(FeeAssetHandlerArtifact, [
       l1Client.account.address,
       feeAssetAddress.toString(),
       BigInt(1e18),
@@ -432,7 +301,7 @@ export const deploySharedContracts = async (
     const { txHash } = await deployer.sendTransaction({
       to: feeAssetAddress.toString(),
       data: encodeFunctionData({
-        abi: l1Artifacts.feeAsset.contractAbi,
+        abi: FeeAssetArtifact.contractAbi,
         functionName: 'addMinter',
         args: [feeAssetHandlerAddress.toString()],
       }),
@@ -465,15 +334,13 @@ export const deploySharedContracts = async (
         skipMerkleCheck: true, // skip merkle check - needed for testing without generating proofs
       };
 
-      stakingAssetHandlerAddress = await deployer.deploy(l1Artifacts.stakingAssetHandler, [
-        stakingAssetHandlerDeployArgs,
-      ]);
+      stakingAssetHandlerAddress = await deployer.deploy(StakingAssetHandlerArtifact, [stakingAssetHandlerDeployArgs]);
       logger.verbose(`Deployed StakingAssetHandler at ${stakingAssetHandlerAddress}`);
 
       const { txHash: stakingMinterTxHash } = await deployer.sendTransaction({
         to: stakingAssetAddress.toString(),
         data: encodeFunctionData({
-          abi: l1Artifacts.stakingAsset.contractAbi,
+          abi: StakingAssetArtifact.contractAbi,
           functionName: 'addMinter',
           args: [stakingAssetHandlerAddress.toString()],
         }),
@@ -503,19 +370,13 @@ export const deploySharedContracts = async (
 
   const rewardDistributorAddress = await registry.getRewardDistributor();
 
-  const rewardDistributor = getContract({
-    address: rewardDistributorAddress.toString(),
-    abi: l1Artifacts.rewardDistributor.contractAbi,
-    client: l1Client,
-  });
-
-  const blockReward = await rewardDistributor.read.BLOCK_REWARD();
+  const blockReward = getRewardConfig(networkName).blockReward;
 
   const funding = blockReward * 200000n;
   const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
     to: feeAssetAddress.toString(),
     data: encodeFunctionData({
-      abi: l1Artifacts.feeAsset.contractAbi,
+      abi: FeeAssetArtifact.contractAbi,
       functionName: 'mint',
       args: [rewardDistributorAddress.toString(), funding],
     }),
@@ -572,13 +433,20 @@ export const deployRollupForUpgrade = async (
   extendedClient: ExtendedViemWalletClient,
   args: Omit<
     DeployL1ContractsArgs,
-    'governanceProposerQuorum' | 'governanceProposerRoundSize' | 'minimumStake' | 'depositAmount'
+    'governanceProposerQuorum' | 'governanceProposerRoundSize' | 'ejectionThreshold' | 'activationThreshold'
   >,
   registryAddress: EthAddress,
   logger: Logger,
   txUtilsConfig: L1TxUtilsConfig,
 ) => {
-  const deployer = new L1Deployer(extendedClient, args.salt, args.acceleratedTestDeployments, logger, txUtilsConfig);
+  const deployer = new L1Deployer(
+    extendedClient,
+    args.salt,
+    undefined,
+    args.acceleratedTestDeployments,
+    logger,
+    txUtilsConfig,
+  );
 
   const addresses = await RegistryContract.collectAddresses(extendedClient, registryAddress, 'canonical');
 
@@ -590,7 +458,7 @@ export const deployRollupForUpgrade = async (
 };
 
 export const deploySlashFactory = async (deployer: L1Deployer, rollupAddress: Hex, logger: Logger) => {
-  const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [rollupAddress]);
+  const slashFactoryAddress = await deployer.deploy(SlashFactoryArtifact, [rollupAddress]);
   logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
   return slashFactoryAddress;
 };
@@ -599,7 +467,7 @@ export const deployUpgradePayload = async (
   deployer: L1Deployer,
   addresses: Pick<L1ContractAddresses, 'registryAddress' | 'rollupAddress'>,
 ) => {
-  const payloadAddress = await deployer.deploy(l1Artifacts.registerNewRollupVersionPayload, [
+  const payloadAddress = await deployer.deploy(RegisterNewRollupVersionPayloadArtifact, [
     addresses.registryAddress.toString(),
     addresses.rollupAddress.toString(),
   ]);
@@ -615,7 +483,7 @@ export const deployRollup = async (
   deployer: L1Deployer,
   args: Omit<
     DeployL1ContractsArgs,
-    'governanceProposerQuorum' | 'governanceProposerRoundSize' | 'minimumStake' | 'depositAmount'
+    'governanceProposerQuorum' | 'governanceProposerRoundSize' | 'ejectionThreshold' | 'activationThreshold'
   >,
   addresses: Pick<
     L1ContractAddresses,
@@ -653,6 +521,9 @@ export const deployRollup = async (
     aztecProofSubmissionEpochs: args.aztecProofSubmissionEpochs,
     slashingQuorum: args.slashingQuorum,
     slashingRoundSize: args.slashingRoundSize,
+    slashingLifetimeInRounds: args.slashingLifetimeInRounds,
+    slashingExecutionDelayInRounds: args.slashingExecutionDelayInRounds,
+    slashingVetoer: args.slashingVetoer.toString(),
     manaTarget: args.manaTarget,
     provingCostPerMana: args.provingCostPerMana,
     rewardConfig: rewardConfig,
@@ -677,7 +548,7 @@ export const deployRollup = async (
     rollupConfigArgs,
   ];
 
-  const rollupAddress = await deployer.deploy(l1Artifacts.rollup, rollupArgs);
+  const rollupAddress = await deployer.deploy(RollupArtifact, rollupArgs);
   logger.verbose(`Deployed Rollup at ${rollupAddress}`, rollupConfigArgs);
 
   const rollupContract = new RollupContract(extendedClient, rollupAddress);
@@ -692,7 +563,7 @@ export const deployRollup = async (
     const { txHash: mintTxHash } = await deployer.sendTransaction({
       to: addresses.feeJuiceAddress.toString(),
       data: encodeFunctionData({
-        abi: l1Artifacts.feeAsset.contractAbi,
+        abi: FeeAssetArtifact.contractAbi,
         functionName: 'mint',
         args: [feeJuicePortalAddress.toString(), args.feeJuicePortalInitialBalance],
       }),
@@ -703,13 +574,13 @@ export const deployRollup = async (
     txHashes.push(mintTxHash);
   }
 
-  const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [rollupAddress.toString()]);
+  const slashFactoryAddress = await deployer.deploy(SlashFactoryArtifact, [rollupAddress.toString()]);
   logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
 
   // We need to call a function on the registry to set the various contract addresses.
   const registryContract = getContract({
     address: getAddress(addresses.registryAddress.toString()),
-    abi: l1Artifacts.registry.contractAbi,
+    abi: RegistryArtifact.contractAbi,
     client: extendedClient,
   });
 
@@ -723,7 +594,7 @@ export const deployRollup = async (
       const { txHash: addRollupTxHash } = await deployer.sendTransaction({
         to: addresses.registryAddress.toString(),
         data: encodeFunctionData({
-          abi: l1Artifacts.registry.contractAbi,
+          abi: RegistryArtifact.contractAbi,
           functionName: 'addRollup',
           args: [getAddress(rollupContract.address)],
         }),
@@ -741,7 +612,7 @@ export const deployRollup = async (
   // We need to call a function on the registry to set the various contract addresses.
   const gseContract = getContract({
     address: getAddress(addresses.gseAddress.toString()),
-    abi: l1Artifacts.gse.contractAbi,
+    abi: GSEArtifact.contractAbi,
     client: extendedClient,
   });
   if ((await gseContract.read.owner()) === getAddress(extendedClient.account.address)) {
@@ -749,7 +620,7 @@ export const deployRollup = async (
       const { txHash: addRollupTxHash } = await deployer.sendTransaction({
         to: addresses.gseAddress.toString(),
         data: encodeFunctionData({
-          abi: l1Artifacts.gse.contractAbi,
+          abi: GSEArtifact.contractAbi,
           functionName: 'addRollup',
           args: [getAddress(rollupContract.address)],
         }),
@@ -769,6 +640,7 @@ export const deployRollup = async (
     await addMultipleValidators(
       extendedClient,
       deployer,
+      addresses.gseAddress.toString(),
       rollupAddress.toString(),
       addresses.stakingAssetAddress.toString(),
       args.initialValidators,
@@ -796,13 +668,13 @@ export const handoverToGovernance = async (
   // We need to call a function on the registry to set the various contract addresses.
   const registryContract = getContract({
     address: getAddress(registryAddress.toString()),
-    abi: l1Artifacts.registry.contractAbi,
+    abi: RegistryArtifact.contractAbi,
     client: extendedClient,
   });
 
   const gseContract = getContract({
     address: getAddress(gseAddress.toString()),
-    abi: l1Artifacts.gse.contractAbi,
+    abi: GSEArtifact.contractAbi,
     client: extendedClient,
   });
 
@@ -817,7 +689,7 @@ export const handoverToGovernance = async (
     const { txHash: transferOwnershipTxHash } = await deployer.sendTransaction({
       to: registryAddress.toString(),
       data: encodeFunctionData({
-        abi: l1Artifacts.registry.contractAbi,
+        abi: RegistryArtifact.contractAbi,
         functionName: 'transferOwnership',
         args: [getAddress(governanceAddress.toString())],
       }),
@@ -834,7 +706,7 @@ export const handoverToGovernance = async (
     const { txHash: transferOwnershipTxHash } = await deployer.sendTransaction({
       to: gseContract.address,
       data: encodeFunctionData({
-        abi: l1Artifacts.gse.contractAbi,
+        abi: GSEArtifact.contractAbi,
         functionName: 'transferOwnership',
         args: [getAddress(governanceAddress.toString())],
       }),
@@ -864,6 +736,7 @@ export const handoverToGovernance = async (
 export const addMultipleValidators = async (
   extendedClient: ExtendedViemWalletClient,
   deployer: L1Deployer,
+  gseAddress: Hex,
   rollupAddress: Hex,
   stakingAssetAddress: Hex,
   validators: Operator[],
@@ -871,7 +744,7 @@ export const addMultipleValidators = async (
   logger: Logger,
 ) => {
   const rollup = new RollupContract(extendedClient, rollupAddress);
-  const depositAmount = await rollup.getDepositAmount();
+  const activationThreshold = await rollup.getActivationThreshold();
   if (validators && validators.length > 0) {
     // Check if some of the initial validators are already registered, so we support idempotent deployments
     if (!acceleratedTestDeployments) {
@@ -894,22 +767,26 @@ export const addMultipleValidators = async (
     }
 
     if (validators.length > 0) {
-      const multiAdder = await deployer.deploy(l1Artifacts.multiAdder, [
-        rollupAddress,
-        deployer.client.account.address,
-      ]);
+      const gseContract = new GSEContract(extendedClient, gseAddress);
+      const multiAdder = await deployer.deploy(MultiAdderArtifact, [rollupAddress, deployer.client.account.address]);
+
+      const makeValidatorTuples = async (validator: Operator) => {
+        const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey.getValue());
+        return {
+          attester: getAddress(validator.attester.toString()),
+          withdrawer: getAddress(validator.withdrawer.toString()),
+          ...registrationTuple,
+        };
+      };
 
-      const validatorsTuples = validators.map(v => ({
-        attester: getAddress(v.attester.toString()),
-        withdrawer: getAddress(v.withdrawer.toString()),
-      }));
+      const validatorsTuples = await Promise.all(validators.map(makeValidatorTuples));
 
       // Mint tokens, approve them, use cheat code to initialise validator set without setting up the epoch.
-      const stakeNeeded = depositAmount * BigInt(validators.length);
+      const stakeNeeded = activationThreshold * BigInt(validators.length);
       const { txHash } = await deployer.sendTransaction({
         to: stakingAssetAddress,
         data: encodeFunctionData({
-          abi: l1Artifacts.stakingAsset.contractAbi,
+          abi: StakingAssetArtifact.contractAbi,
           functionName: 'mint',
           args: [multiAdder.toString(), stakeNeeded],
         }),
@@ -922,7 +799,7 @@ export const addMultipleValidators = async (
 
       const addValidatorsTxHash = await deployer.client.writeContract({
         address: multiAdder.toString(),
-        abi: l1Artifacts.multiAdder.contractAbi,
+        abi: MultiAdderArtifact.contractAbi,
         functionName: 'addValidators',
         args: [validatorsTuples],
       });
@@ -954,7 +831,7 @@ export const cheat_initializeFeeAssetHandler = async (
   feeAssetHandlerAddress: EthAddress;
   txHash: Hex;
 }> => {
-  const feeAssetHandlerAddress = await deployer.deploy(l1Artifacts.feeAssetHandler, [
+  const feeAssetHandlerAddress = await deployer.deploy(FeeAssetHandlerArtifact, [
     extendedClient.account.address,
     feeAssetAddress.toString(),
     BigInt(1e18),
@@ -964,7 +841,7 @@ export const cheat_initializeFeeAssetHandler = async (
   const { txHash } = await deployer.sendTransaction({
     to: feeAssetAddress.toString(),
     data: encodeFunctionData({
-      abi: l1Artifacts.feeAsset.contractAbi,
+      abi: FeeAssetArtifact.contractAbi,
       functionName: 'addMinter',
       args: [feeAssetHandlerAddress.toString()],
     }),
@@ -992,6 +869,9 @@ export const deployL1Contracts = async (
 ): Promise<DeployL1ContractsReturnType> => {
   const l1Client = createExtendedL1Client(rpcUrls, account, chain);
 
+  // Deploy multicall3 if it does not exist in this network
+  await deployMulticall3(l1Client, logger);
+
   // We are assuming that you are running this on a local anvil node which have 1s block times
   // To align better with actual deployment, we update the block interval to 12s
 
@@ -1014,7 +894,15 @@ export const deployL1Contracts = async (
 
   logger.verbose(`Deploying contracts from ${account.address.toString()}`);
 
-  const deployer = new L1Deployer(l1Client, args.salt, args.acceleratedTestDeployments, logger, txUtilsConfig);
+  const dateProvider = new DateProvider();
+  const deployer = new L1Deployer(
+    l1Client,
+    args.salt,
+    dateProvider,
+    args.acceleratedTestDeployments,
+    logger,
+    txUtilsConfig,
+  );
 
   const {
     feeAssetAddress,
@@ -1023,6 +911,7 @@ export const deployL1Contracts = async (
     stakingAssetHandlerAddress,
     registryAddress,
     gseAddress,
+    governanceAddress,
     rewardDistributorAddress,
     zkPassportVerifierAddress,
   } = await deploySharedContracts(l1Client, deployer, args, logger);
@@ -1043,13 +932,24 @@ export const deployL1Contracts = async (
   logger.verbose('Waiting for rollup and slash factory to be deployed');
   await deployer.waitForDeployments();
 
+  // Now that the rollup has been deployed and added to the registry, transfer ownership to governance
+  await handoverToGovernance(
+    l1Client,
+    deployer,
+    registryAddress,
+    gseAddress,
+    governanceAddress,
+    logger,
+    args.acceleratedTestDeployments,
+  );
+
+  logger.info(`Handing over to governance complete`);
+
   logger.verbose(`All transactions for L1 deployment have been mined`);
   const l1Contracts = await RegistryContract.collectAddresses(l1Client, registryAddress, 'canonical');
 
   logger.info(`Aztec L1 contracts initialized`, l1Contracts);
 
-  logger.info(`Handing over to governance`);
-
   if (isAnvilTestChain(chain.id)) {
     // @note  We make a time jump PAST the very first slot to not have to deal with the edge case of the first slot.
     //        The edge case being that the genesis block is already occupying slot 0, so we cannot have another block.
@@ -1094,30 +994,43 @@ export class L1Deployer {
   constructor(
     public readonly client: ExtendedViemWalletClient,
     maybeSalt: number | undefined,
+    dateProvider: DateProvider = new DateProvider(),
     private acceleratedTestDeployments: boolean = false,
     private logger: Logger = createLogger('L1Deployer'),
     private txUtilsConfig?: L1TxUtilsConfig,
   ) {
     this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), { size: 32 }) : undefined;
-    this.l1TxUtils = new L1TxUtils(this.client, this.logger, this.txUtilsConfig, this.acceleratedTestDeployments);
-  }
-
-  async deploy(params: ContractArtifacts, args: readonly unknown[] = []): Promise<EthAddress> {
-    const { txHash, address } = await deployL1Contract(
+    this.l1TxUtils = new L1TxUtils(
       this.client,
-      params.contractAbi,
-      params.contractBytecode,
-      args,
-      this.salt,
-      params.libraries,
       this.logger,
-      this.l1TxUtils,
+      dateProvider,
+      this.txUtilsConfig,
       this.acceleratedTestDeployments,
     );
-    if (txHash) {
-      this.txHashes.push(txHash);
+  }
+
+  async deploy(params: ContractArtifacts, args: readonly unknown[] = []): Promise<EthAddress> {
+    this.logger.debug(`Deploying ${params.name} contract`, { args });
+    try {
+      const { txHash, address } = await deployL1Contract(
+        this.client,
+        params.contractAbi,
+        params.contractBytecode,
+        args,
+        this.salt,
+        params.libraries,
+        this.logger,
+        this.l1TxUtils,
+        this.acceleratedTestDeployments,
+      );
+      if (txHash) {
+        this.txHashes.push(txHash);
+      }
+      this.logger.debug(`Deployed ${params.name} at ${address}`, { args });
+      return address;
+    } catch (error) {
+      throw new Error(`Failed to deploy ${params.name}`, { cause: formatViemError(error) });
     }
-    return address;
   }
 
   async waitForDeployments(): Promise<void> {
@@ -1169,7 +1082,7 @@ export async function deployL1Contract(
 
   if (!l1TxUtils) {
     const config = getL1TxUtilsConfigEnvVars();
-    l1TxUtils = new L1TxUtils(extendedClient, logger, config, acceleratedTestDeployments);
+    l1TxUtils = new L1TxUtils(extendedClient, logger, undefined, config, acceleratedTestDeployments);
   }
 
   if (libraries) {