@aztec/ethereum 1.2.1 → 2.0.0-nightly.20250813

package/dest/deploy_l1_contracts.js

@@ -1,147 +1,51 @@
 import { getActiveNetworkName } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { 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 { concatHex, encodeDeployData, encodeFunctionData, getAddress, getContract, getContractAddress, numberToHex, padHex } from 'viem';
 import { foundry } from 'viem/chains';
 import { isAnvilTestChain } from './chain.js';
 import { createExtendedL1Client } from './client.js';
-import { getEntryQueueConfig, getGovernanceConfiguration, getRewardBoostConfig, getRewardConfig } from './config.js';
+import { 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 { L1TxUtils, getL1TxUtilsConfigEnvVars } from './l1_tx_utils.js';
+import { formatViemError } from './utils.js';
 import { ZK_PASSPORT_DOMAIN, ZK_PASSPORT_SCOPE, ZK_PASSPORT_VERIFIER_ADDRESS } from './zkPassportVerifierAddress.js';
 export const DEPLOYER_ADDRESS = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
 const networkName = getActiveNetworkName();
-export const l1Artifacts = {
-    registry: {
-        contractAbi: RegistryAbi,
-        contractBytecode: RegistryBytecode
-    },
-    inbox: {
-        contractAbi: InboxAbi,
-        contractBytecode: InboxBytecode
-    },
-    outbox: {
-        contractAbi: OutboxAbi,
-        contractBytecode: OutboxBytecode
-    },
-    rollup: {
-        contractAbi: RollupAbi,
-        contractBytecode: RollupBytecode,
-        libraries: {
-            linkReferences: RollupLinkReferences,
-            libraryCode: {
-                ValidatorSelectionLib: {
-                    contractAbi: ValidatorSelectionLibAbi,
-                    contractBytecode: ValidatorSelectionLibBytecode
-                },
-                ExtRollupLib: {
-                    contractAbi: ExtRollupLibAbi,
-                    contractBytecode: ExtRollupLibBytecode
-                },
-                ExtRollupLib2: {
-                    contractAbi: ExtRollupLib2Abi,
-                    contractBytecode: ExtRollupLib2Bytecode
-                }
-            }
-        }
-    },
-    stakingAsset: {
-        contractAbi: TestERC20Abi,
-        contractBytecode: TestERC20Bytecode
-    },
-    feeAsset: {
-        contractAbi: TestERC20Abi,
-        contractBytecode: TestERC20Bytecode
-    },
-    feeJuicePortal: {
-        contractAbi: FeeJuicePortalAbi,
-        contractBytecode: FeeJuicePortalBytecode
-    },
-    rewardDistributor: {
-        contractAbi: RewardDistributorAbi,
-        contractBytecode: RewardDistributorBytecode
-    },
-    coinIssuer: {
-        contractAbi: CoinIssuerAbi,
-        contractBytecode: CoinIssuerBytecode
-    },
-    governanceProposer: {
-        contractAbi: GovernanceProposerAbi,
-        contractBytecode: GovernanceProposerBytecode
-    },
-    governance: {
-        contractAbi: GovernanceAbi,
-        contractBytecode: GovernanceBytecode
-    },
-    slashFactory: {
-        contractAbi: SlashFactoryAbi,
-        contractBytecode: SlashFactoryBytecode
-    },
-    registerNewRollupVersionPayload: {
-        contractAbi: RegisterNewRollupVersionPayloadAbi,
-        contractBytecode: RegisterNewRollupVersionPayloadBytecode
-    },
-    feeAssetHandler: {
-        contractAbi: FeeAssetHandlerAbi,
-        contractBytecode: FeeAssetHandlerBytecode
-    },
-    stakingAssetHandler: {
-        contractAbi: StakingAssetHandlerAbi,
-        contractBytecode: StakingAssetHandlerBytecode
-    },
-    multiAdder: {
-        contractAbi: MultiAdderAbi,
-        contractBytecode: MultiAdderBytecode
-    },
-    gse: {
-        contractAbi: GSEAbi,
-        contractBytecode: GSEBytecode
-    }
-};
-export const l1ArtifactsVerifiers = {
-    honkVerifier: {
-        contractAbi: HonkVerifierAbi,
-        contractBytecode: HonkVerifierBytecode
-    }
-};
-const mockVerifiers = {
-    mockVerifier: {
-        contractAbi: MockVerifierAbi,
-        contractBytecode: MockVerifierBytecode
-    },
-    mockZkPassportVerifier: {
-        contractAbi: MockZKPassportVerifierAbi,
-        contractBytecode: MockZKPassportVerifierBytecode
-    }
-};
 export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
-    logger.info(`Deploying shared contracts. Network configration: ${networkName}`);
+    logger.info(`Deploying shared contracts for network configration: ${networkName}`);
     const txHashes = [];
-    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()
+        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,
@@ -150,7 +54,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     logger.verbose(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
     // @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(),
@@ -166,7 +70,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     } else {
         const gseContract = getContract({
             address: getAddress(gseAddress.toString()),
-            abi: l1Artifacts.gse.contractAbi,
+            abi: GSEArtifact.contractAbi,
             client: l1Client
         });
         const existingGovernance = await gseContract.read.getGovernance();
@@ -178,7 +82,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         const { txHash } = await deployer.sendTransaction({
             to: gseAddress.toString(),
             data: encodeFunctionData({
-                abi: l1Artifacts.gse.contractAbi,
+                abi: GSEArtifact.contractAbi,
                 functionName: 'setGovernance',
                 args: [
                     governanceAddress.toString()
@@ -190,7 +94,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         logger.verbose(`Set governance on GSE in ${txHash}`);
         txHashes.push(txHash);
     }
-    const coinIssuerAddress = await deployer.deploy(l1Artifacts.coinIssuer, [
+    const coinIssuerAddress = await deployer.deploy(CoinIssuerArtifact, [
         feeAssetAddress.toString(),
         1n * 10n ** 18n,
         governanceAddress.toString()
@@ -198,7 +102,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     logger.verbose(`Deployed CoinIssuer at ${coinIssuerAddress}`);
     const feeAsset = getContract({
         address: feeAssetAddress.toString(),
-        abi: l1Artifacts.feeAsset.contractAbi,
+        abi: FeeAssetArtifact.contractAbi,
         client: l1Client
     });
     logger.verbose(`Waiting for deployments to complete`);
@@ -209,7 +113,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         const { txHash } = await deployer.sendTransaction({
             to: feeAssetAddress.toString(),
             data: encodeFunctionData({
-                abi: l1Artifacts.feeAsset.contractAbi,
+                abi: FeeAssetArtifact.contractAbi,
                 functionName: 'addMinter',
                 args: [
                     coinIssuerAddress.toString()
@@ -221,23 +125,13 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         logger.verbose(`Added coin issuer ${coinIssuerAddress} as minter on fee asset in ${txHash}`);
         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 = undefined;
     let stakingAssetHandlerAddress = undefined;
     let zkPassportVerifierAddress = undefined;
     // Only if not on mainnet will we deploy the handlers
     if (l1Client.chain.id !== 1) {
-        /* -------------------------------------------------------------------------- */ /*                          CHEAT CODES START HERE                            */ /* -------------------------------------------------------------------------- */ feeAssetHandlerAddress = await deployer.deploy(l1Artifacts.feeAssetHandler, [
+        /* -------------------------------------------------------------------------- */ /*                          CHEAT CODES START HERE                            */ /* -------------------------------------------------------------------------- */ feeAssetHandlerAddress = await deployer.deploy(FeeAssetHandlerArtifact, [
             l1Client.account.address,
             feeAssetAddress.toString(),
             BigInt(1e18)
@@ -246,7 +140,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         const { txHash } = await deployer.sendTransaction({
             to: feeAssetAddress.toString(),
             data: encodeFunctionData({
-                abi: l1Artifacts.feeAsset.contractAbi,
+                abi: FeeAssetArtifact.contractAbi,
                 functionName: 'addMinter',
                 args: [
                     feeAssetHandlerAddress.toString()
@@ -283,14 +177,14 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
                 skipBindCheck: args.zkPassportArgs?.mockZkPassportVerifier ?? false,
                 skipMerkleCheck: true
             };
-            stakingAssetHandlerAddress = await deployer.deploy(l1Artifacts.stakingAssetHandler, [
+            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()
@@ -309,17 +203,12 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     logger.verbose(`Deployed shared contracts`);
     const registry = new RegistryContract(l1Client, registryAddress);
     /* -------------------------------------------------------------------------- */ /*                      FUND REWARD DISTRIBUTOR START                         */ /* -------------------------------------------------------------------------- */ 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(),
@@ -368,7 +257,7 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
  * @param logger - The logger.
  * @param txUtilsConfig - The L1 tx utils config.
  */ export const deployRollupForUpgrade = async (extendedClient, args, registryAddress, logger, txUtilsConfig)=>{
-    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');
     const { rollup, slashFactoryAddress } = await deployRollup(extendedClient, deployer, args, addresses, logger);
     await deployer.waitForDeployments();
@@ -378,14 +267,14 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
     };
 };
 export const deploySlashFactory = async (deployer, rollupAddress, logger)=>{
-    const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [
+    const slashFactoryAddress = await deployer.deploy(SlashFactoryArtifact, [
         rollupAddress
     ]);
     logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
     return slashFactoryAddress;
 };
 export const deployUpgradePayload = async (deployer, addresses)=>{
-    const payloadAddress = await deployer.deploy(l1Artifacts.registerNewRollupVersionPayload, [
+    const payloadAddress = await deployer.deploy(RegisterNewRollupVersionPayloadArtifact, [
         addresses.registryAddress.toString(),
         addresses.rollupAddress.toString()
     ]);
@@ -418,6 +307,9 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
         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,
@@ -440,7 +332,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
         genesisStateArgs,
         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);
     await deployer.waitForDeployments();
@@ -451,7 +343,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
         const { txHash: mintTxHash } = await deployer.sendTransaction({
             to: addresses.feeJuiceAddress.toString(),
             data: encodeFunctionData({
-                abi: l1Artifacts.feeAsset.contractAbi,
+                abi: FeeAssetArtifact.contractAbi,
                 functionName: 'mint',
                 args: [
                     feeJuicePortalAddress.toString(),
@@ -462,14 +354,14 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
         logger.verbose(`Funding fee juice portal with ${args.feeJuicePortalInitialBalance} fee juice in ${mintTxHash} (accelerated test deployments)`);
         txHashes.push(mintTxHash);
     }
-    const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [
+    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
     });
     // Only if we are the owner will we be sending these transactions
@@ -484,7 +376,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
             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)
@@ -500,7 +392,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
     // 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)) {
@@ -510,7 +402,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
             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)
@@ -531,7 +423,7 @@ export const deployUpgradePayload = async (deployer, addresses)=>{
     if (args.initialValidators && await gseContract.read.isRollupRegistered([
         rollupContract.address
     ])) {
-        await addMultipleValidators(extendedClient, deployer, rollupAddress.toString(), addresses.stakingAssetAddress.toString(), args.initialValidators, args.acceleratedTestDeployments, logger);
+        await addMultipleValidators(extendedClient, deployer, addresses.gseAddress.toString(), rollupAddress.toString(), addresses.stakingAssetAddress.toString(), args.initialValidators, args.acceleratedTestDeployments, logger);
     }
     await deployer.waitForDeployments();
     await Promise.all(txHashes.map((txHash)=>extendedClient.waitForTransactionReceipt({
@@ -547,12 +439,12 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
     // 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
     });
     const txHashes = [];
@@ -562,7 +454,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
         const { txHash: transferOwnershipTxHash } = await deployer.sendTransaction({
             to: registryAddress.toString(),
             data: encodeFunctionData({
-                abi: l1Artifacts.registry.contractAbi,
+                abi: RegistryArtifact.contractAbi,
                 functionName: 'transferOwnership',
                 args: [
                     getAddress(governanceAddress.toString())
@@ -578,7 +470,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
         const { txHash: transferOwnershipTxHash } = await deployer.sendTransaction({
             to: gseContract.address,
             data: encodeFunctionData({
-                abi: l1Artifacts.gse.contractAbi,
+                abi: GSEArtifact.contractAbi,
                 functionName: 'transferOwnership',
                 args: [
                     getAddress(governanceAddress.toString())
@@ -604,9 +496,9 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
  * @param validators - The validators to initialize.
  * @param acceleratedTestDeployments - Whether to use accelerated test deployments.
  * @param logger - The logger.
- */ export const addMultipleValidators = async (extendedClient, deployer, rollupAddress, stakingAssetAddress, validators, acceleratedTestDeployments, logger)=>{
+ */ export const addMultipleValidators = async (extendedClient, deployer, gseAddress, rollupAddress, stakingAssetAddress, validators, acceleratedTestDeployments, 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) {
@@ -621,20 +513,26 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
             validators = enrichedValidators.filter((v)=>v.status === 0).map((v)=>v.operator);
         }
         if (validators.length > 0) {
-            const multiAdder = await deployer.deploy(l1Artifacts.multiAdder, [
+            const gseContract = new GSEContract(extendedClient, gseAddress);
+            const multiAdder = await deployer.deploy(MultiAdderArtifact, [
                 rollupAddress,
                 deployer.client.account.address
             ]);
-            const validatorsTuples = validators.map((v)=>({
-                    attester: getAddress(v.attester.toString()),
-                    withdrawer: getAddress(v.withdrawer.toString())
-                }));
+            const makeValidatorTuples = async (validator)=>{
+                const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey.getValue());
+                return {
+                    attester: getAddress(validator.attester.toString()),
+                    withdrawer: getAddress(validator.withdrawer.toString()),
+                    ...registrationTuple
+                };
+            };
+            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(),
@@ -650,7 +548,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
             }
             const addValidatorsTxHash = await deployer.client.writeContract({
                 address: multiAdder.toString(),
-                abi: l1Artifacts.multiAdder.contractAbi,
+                abi: MultiAdderArtifact.contractAbi,
                 functionName: 'addValidators',
                 args: [
                     validatorsTuples
@@ -676,7 +574,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
  * @param logger - The logger.
  */ // eslint-disable-next-line camelcase
 export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer, feeAssetAddress, logger)=>{
-    const feeAssetHandlerAddress = await deployer.deploy(l1Artifacts.feeAssetHandler, [
+    const feeAssetHandlerAddress = await deployer.deploy(FeeAssetHandlerArtifact, [
         extendedClient.account.address,
         feeAssetAddress.toString(),
         BigInt(1e18)
@@ -685,7 +583,7 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
     const { txHash } = await deployer.sendTransaction({
         to: feeAssetAddress.toString(),
         data: encodeFunctionData({
-            abi: l1Artifacts.feeAsset.contractAbi,
+            abi: FeeAssetArtifact.contractAbi,
             functionName: 'addMinter',
             args: [
                 feeAssetHandlerAddress.toString()
@@ -708,6 +606,8 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
  * @returns A list of ETH addresses of the deployed contracts.
  */ export const deployL1Contracts = async (rpcUrls, account, chain, logger, args, txUtilsConfig = getL1TxUtilsConfigEnvVars())=>{
     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
     const rpcCall = async (method, params)=>{
@@ -728,8 +628,9 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
         }
     }
     logger.verbose(`Deploying contracts from ${account.address.toString()}`);
-    const deployer = new L1Deployer(l1Client, args.salt, args.acceleratedTestDeployments, logger, txUtilsConfig);
-    const { feeAssetAddress, feeAssetHandlerAddress, stakingAssetAddress, stakingAssetHandlerAddress, registryAddress, gseAddress, rewardDistributorAddress, zkPassportVerifierAddress } = await deploySharedContracts(l1Client, deployer, args, logger);
+    const dateProvider = new DateProvider();
+    const deployer = new L1Deployer(l1Client, args.salt, dateProvider, args.acceleratedTestDeployments, logger, txUtilsConfig);
+    const { feeAssetAddress, feeAssetHandlerAddress, stakingAssetAddress, stakingAssetHandlerAddress, registryAddress, gseAddress, governanceAddress, rewardDistributorAddress, zkPassportVerifierAddress } = await deploySharedContracts(l1Client, deployer, args, logger);
     const { rollup, slashFactoryAddress } = await deployRollup(l1Client, deployer, args, {
         feeJuiceAddress: feeAssetAddress,
         registryAddress,
@@ -739,10 +640,12 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
     }, logger);
     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.
@@ -787,7 +690,7 @@ export class L1Deployer {
     salt;
     txHashes;
     l1TxUtils;
-    constructor(client, maybeSalt, acceleratedTestDeployments = false, logger = createLogger('L1Deployer'), txUtilsConfig){
+    constructor(client, maybeSalt, dateProvider = new DateProvider(), acceleratedTestDeployments = false, logger = createLogger('L1Deployer'), txUtilsConfig){
         this.client = client;
         this.acceleratedTestDeployments = acceleratedTestDeployments;
         this.logger = logger;
@@ -796,14 +699,26 @@ export class L1Deployer {
         this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), {
             size: 32
         }) : undefined;
-        this.l1TxUtils = new L1TxUtils(this.client, this.logger, this.txUtilsConfig, this.acceleratedTestDeployments);
+        this.l1TxUtils = new L1TxUtils(this.client, this.logger, dateProvider, this.txUtilsConfig, this.acceleratedTestDeployments);
     }
     async deploy(params, args = []) {
-        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(`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() {
         if (this.acceleratedTestDeployments) {
@@ -838,7 +753,7 @@ export class L1Deployer {
     let resultingAddress = undefined;
     if (!l1TxUtils) {
         const config = getL1TxUtilsConfigEnvVars();
-        l1TxUtils = new L1TxUtils(extendedClient, logger, config, acceleratedTestDeployments);
+        l1TxUtils = new L1TxUtils(extendedClient, logger, undefined, config, acceleratedTestDeployments);
     }
     if (libraries) {
         // Note that this does NOT work well for linked libraries having linked libraries.

package/dest/index.d.ts

@@ -1,7 +1,6 @@
 export * from './constants.js';
 export * from './deploy_l1_contracts.js';
 export * from './chain.js';
-export * from './eth_cheat_codes.js';
 export * from './l1_tx_utils.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
@@ -13,4 +12,5 @@ export * from './queries.js';
 export * from './client.js';
 export * from './account.js';
 export * from './l1_types.js';
+export * from './l1_artifacts.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC"}

package/dest/index.js

@@ -1,7 +1,6 @@
 export * from './constants.js';
 export * from './deploy_l1_contracts.js';
 export * from './chain.js';
-export * from './eth_cheat_codes.js';
 export * from './l1_tx_utils.js';
 export * from './l1_contract_addresses.js';
 export * from './l1_reader.js';
@@ -13,3 +12,4 @@ export * from './queries.js';
 export * from './client.js';
 export * from './account.js';
 export * from './l1_types.js';
+export * from './l1_artifacts.js';