@aztec/ethereum 2.0.3 → 2.1.0-rc.2

package/dest/deploy_l1_contracts.js

@@ -6,50 +6,144 @@ import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import { mkdir, writeFile } from 'fs/promises';
+import chunk from 'lodash.chunk';
 import { concatHex, encodeAbiParameters, 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, getGSEConfiguration, getGovernanceConfiguration, getRewardBoostConfig, getRewardConfig, validateConfig } from './config.js';
+import { getEntryQueueConfig, getGovernanceConfiguration, getRewardBoostConfig, getRewardConfig, validateConfig } from './config.js';
 import { GSEContract } from './contracts/gse.js';
 import { deployMulticall3 } from './contracts/multicall.js';
 import { RegistryContract } from './contracts/registry.js';
 import { RollupContract, SlashingProposerType } 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 { createL1TxUtilsFromViemWallet, getL1TxUtilsConfigEnvVars } from './l1_tx_utils.js';
+import { CoinIssuerArtifact, DateGatedRelayerArtifact, FeeAssetArtifact, FeeAssetHandlerArtifact, GSEArtifact, GovernanceArtifact, GovernanceProposerArtifact, MultiAdderArtifact, RegisterNewRollupVersionPayloadArtifact, RegistryArtifact, RollupArtifact, SlashFactoryArtifact, StakingAssetArtifact, StakingAssetHandlerArtifact, l1ArtifactsVerifiers, mockVerifiers } from './l1_artifacts.js';
+import { createL1TxUtilsFromViemWallet, getL1TxUtilsConfigEnvVars } from './l1_tx_utils/index.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();
+// Minimal ERC20 ABI for validation purposes. We only read view methods.
+const ERC20_VALIDATION_ABI = [
+    {
+        type: 'function',
+        name: 'totalSupply',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [
+            {
+                name: '',
+                type: 'uint256'
+            }
+        ]
+    },
+    {
+        type: 'function',
+        name: 'name',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [
+            {
+                name: '',
+                type: 'string'
+            }
+        ]
+    },
+    {
+        type: 'function',
+        name: 'symbol',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [
+            {
+                name: '',
+                type: 'string'
+            }
+        ]
+    },
+    {
+        type: 'function',
+        name: 'decimals',
+        stateMutability: 'view',
+        inputs: [],
+        outputs: [
+            {
+                name: '',
+                type: 'uint8'
+            }
+        ]
+    }
+];
+/**
+ * Validates that the provided address points to a contract that resembles an ERC20 token.
+ * Checks for contract code and attempts common ERC20 view calls.
+ * Throws an error if validation fails.
+ */ export async function validateExistingErc20TokenAddress(l1Client, tokenAddress, logger) {
+    const addressString = tokenAddress.toString();
+    // Ensure there is contract code at the address
+    const code = await l1Client.getCode({
+        address: addressString
+    });
+    if (!code || code === '0x') {
+        throw new Error(`No contract code found at provided token address ${addressString}`);
+    }
+    const contract = getContract({
+        address: getAddress(addressString),
+        abi: ERC20_VALIDATION_ABI,
+        client: l1Client
+    });
+    // Validate all required ERC20 methods in parallel
+    const checks = [
+        contract.read.totalSupply().then((total)=>typeof total === 'bigint'),
+        contract.read.name().then(()=>true),
+        contract.read.symbol().then(()=>true),
+        contract.read.decimals().then((dec)=>typeof dec === 'number' || typeof dec === 'bigint')
+    ];
+    const results = await Promise.allSettled(checks);
+    const failedChecks = results.filter((result)=>result.status === 'rejected' || result.value !== true);
+    if (failedChecks.length > 0) {
+        throw new Error(`Address ${addressString} does not appear to implement ERC20 view methods`);
+    }
+    logger.verbose(`Validated existing token at ${addressString} appears to be ERC20-compatible`);
+}
 export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
+    const networkName = getActiveNetworkName();
     logger.info(`Deploying shared contracts for network configuration: ${networkName}`);
     const txHashes = [];
-    const feeAssetAddress = await deployer.deploy(FeeAssetArtifact, [
-        'FeeJuice',
-        'FEE',
-        l1Client.account.address
-    ]);
-    logger.verbose(`Deployed Fee Asset at ${feeAssetAddress}`);
-    const stakingAssetAddress = await deployer.deploy(StakingAssetArtifact, [
-        'Staking',
-        'STK',
-        l1Client.account.address
-    ]);
-    logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
-    const gseConfiguration = getGSEConfiguration(networkName);
-    const gseAddress = await deployer.deploy(GSEArtifact, [
+    let feeAssetAddress;
+    let stakingAssetAddress;
+    if (args.existingTokenAddress) {
+        await validateExistingErc20TokenAddress(l1Client, args.existingTokenAddress, logger);
+        feeAssetAddress = args.existingTokenAddress;
+        stakingAssetAddress = args.existingTokenAddress;
+        logger.verbose(`Using existing token for fee and staking assets at ${args.existingTokenAddress}`);
+    } else {
+        const deployedFee = await deployer.deploy(FeeAssetArtifact, [
+            'FeeJuice',
+            'FEE',
+            l1Client.account.address
+        ]);
+        feeAssetAddress = deployedFee.address;
+        logger.verbose(`Deployed Fee Asset at ${feeAssetAddress}`);
+        const deployedStaking = await deployer.deploy(StakingAssetArtifact, [
+            'Staking',
+            'STK',
+            l1Client.account.address
+        ]);
+        stakingAssetAddress = deployedStaking.address;
+        logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
+    }
+    const gseAddress = (await deployer.deploy(GSEArtifact, [
         l1Client.account.address,
         stakingAssetAddress.toString(),
-        gseConfiguration.activationThreshold,
-        gseConfiguration.ejectionThreshold
-    ]);
+        args.activationThreshold,
+        args.ejectionThreshold
+    ])).address;
     logger.verbose(`Deployed GSE at ${gseAddress}`);
-    const registryAddress = await deployer.deploy(RegistryArtifact, [
+    const { address: registryAddress } = await deployer.deploy(RegistryArtifact, [
         l1Client.account.address,
         feeAssetAddress.toString()
     ]);
     logger.verbose(`Deployed Registry at ${registryAddress}`);
-    const governanceProposerAddress = await deployer.deploy(GovernanceProposerArtifact, [
+    const { address: governanceProposerAddress } = await deployer.deploy(GovernanceProposerArtifact, [
         registryAddress.toString(),
         gseAddress.toString(),
         BigInt(args.governanceProposerQuorum ?? args.governanceProposerRoundSize / 2 + 1),
@@ -58,7 +152,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(GovernanceArtifact, [
+    const { address: governanceAddress } = await deployer.deploy(GovernanceArtifact, [
         stakingAssetAddress.toString(),
         governanceProposerAddress.toString(),
         gseAddress.toString(),
@@ -98,11 +192,11 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         logger.verbose(`Set governance on GSE in ${txHash}`);
         txHashes.push(txHash);
     }
-    const coinIssuerAddress = await deployer.deploy(CoinIssuerArtifact, [
+    const coinIssuerAddress = (await deployer.deploy(CoinIssuerArtifact, [
         feeAssetAddress.toString(),
-        1_000_000n * 10n ** 18n,
+        25_000_000_000n * 10n ** 18n / (60n * 60n * 24n * 365n),
         l1Client.account.address
-    ]);
+    ])).address;
     logger.verbose(`Deployed CoinIssuer at ${coinIssuerAddress}`);
     logger.verbose(`Waiting for deployments to complete`);
     await deployer.waitForDeployments();
@@ -110,13 +204,13 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     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(FeeAssetHandlerArtifact, [
+    // Only if not on mainnet will we deploy the handlers, and only when we control the token
+    if (l1Client.chain.id !== 1 && !args.existingTokenAddress) {
+        /* -------------------------------------------------------------------------- */ /*                          CHEAT CODES START HERE                            */ /* -------------------------------------------------------------------------- */ feeAssetHandlerAddress = (await deployer.deploy(FeeAssetHandlerArtifact, [
             l1Client.account.address,
             feeAssetAddress.toString(),
             BigInt(1000n * 10n ** 18n)
-        ]);
+        ])).address;
         logger.verbose(`Deployed FeeAssetHandler at ${feeAssetHandlerAddress}`);
         // Only if we are "fresh" will we be adding as a minter, otherwise above will simply get same address
         if (needToSetGovernance) {
@@ -147,6 +241,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
                 stakingAsset: stakingAssetAddress.toString(),
                 registry: registryAddress.toString(),
                 withdrawer: AMIN.toString(),
+                validatorsToFlush: 16n,
                 mintInterval: BigInt(60 * 60 * 24),
                 depositsPerMint: BigInt(10),
                 depositMerkleRoot: '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -161,9 +256,9 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
                 skipBindCheck: args.zkPassportArgs?.mockZkPassportVerifier ?? false,
                 skipMerkleCheck: true
             };
-            stakingAssetHandlerAddress = await deployer.deploy(StakingAssetHandlerArtifact, [
+            stakingAssetHandlerAddress = (await deployer.deploy(StakingAssetHandlerArtifact, [
                 stakingAssetHandlerDeployArgs
-            ]);
+            ])).address;
             logger.verbose(`Deployed StakingAssetHandler at ${stakingAssetHandlerAddress}`);
             const { txHash: stakingMinterTxHash } = await deployer.sendTransaction({
                 to: stakingAssetAddress.toString(),
@@ -187,20 +282,24 @@ 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 blockReward = getRewardConfig(networkName).blockReward;
-    const funding = blockReward * 200000n;
-    const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
-        to: feeAssetAddress.toString(),
-        data: encodeFunctionData({
-            abi: FeeAssetArtifact.contractAbi,
-            functionName: 'mint',
-            args: [
-                rewardDistributorAddress.toString(),
-                funding
-            ]
-        })
-    });
-    logger.verbose(`Funded reward distributor with ${funding} fee asset in ${fundRewardDistributorTxHash}`);
+    if (!args.existingTokenAddress) {
+        const blockReward = getRewardConfig(networkName).blockReward;
+        const funding = blockReward * 200000n;
+        const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
+            to: feeAssetAddress.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetArtifact.contractAbi,
+                functionName: 'mint',
+                args: [
+                    rewardDistributorAddress.toString(),
+                    funding
+                ]
+            })
+        });
+        logger.verbose(`Funded reward distributor with ${funding} fee asset in ${fundRewardDistributorTxHash}`);
+    } else {
+        logger.verbose(`Skipping reward distributor funding as existing token is provided`);
+    }
     /* -------------------------------------------------------------------------- */ /*                      FUND REWARD DISTRIBUTOR STOP                          */ /* -------------------------------------------------------------------------- */ return {
         feeAssetAddress,
         feeAssetHandlerAddress,
@@ -217,7 +316,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
 };
 const getZkPassportVerifierAddress = async (deployer, args)=>{
     if (args.zkPassportArgs?.mockZkPassportVerifier) {
-        return await deployer.deploy(mockVerifiers.mockZkPassportVerifier);
+        return (await deployer.deploy(mockVerifiers.mockZkPassportVerifier)).address;
     }
     return ZK_PASSPORT_VERIFIER_ADDRESS;
 };
@@ -251,17 +350,17 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
     };
 };
 export const deploySlashFactory = async (deployer, rollupAddress, logger)=>{
-    const slashFactoryAddress = await deployer.deploy(SlashFactoryArtifact, [
+    const slashFactoryAddress = (await deployer.deploy(SlashFactoryArtifact, [
         rollupAddress
-    ]);
+    ])).address;
     logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
     return slashFactoryAddress;
 };
 export const deployUpgradePayload = async (deployer, addresses)=>{
-    const payloadAddress = await deployer.deploy(RegisterNewRollupVersionPayloadArtifact, [
+    const payloadAddress = (await deployer.deploy(RegisterNewRollupVersionPayloadArtifact, [
         addresses.registryAddress.toString(),
         addresses.rollupAddress.toString()
-    ]);
+    ])).address;
     return payloadAddress;
 };
 function slasherFlavorToSolidityEnum(flavor) {
@@ -285,14 +384,15 @@ function slasherFlavorToSolidityEnum(flavor) {
     if (!addresses.gseAddress) {
         throw new Error('GSE address is required when deploying');
     }
+    const networkName = getActiveNetworkName();
     logger.info(`Deploying rollup using network configuration: ${networkName}`);
     const txHashes = [];
     let epochProofVerifier = EthAddress.ZERO;
     if (args.realVerifier) {
-        epochProofVerifier = await deployer.deploy(l1ArtifactsVerifiers.honkVerifier);
+        epochProofVerifier = (await deployer.deploy(l1ArtifactsVerifiers.honkVerifier)).address;
         logger.verbose(`Rollup will use the real verifier at ${epochProofVerifier}`);
     } else {
-        epochProofVerifier = await deployer.deploy(mockVerifiers.mockVerifier);
+        epochProofVerifier = (await deployer.deploy(mockVerifiers.mockVerifier)).address;
         logger.verbose(`Rollup will use the mock verifier at ${epochProofVerifier}`);
     }
     const rewardConfig = {
@@ -303,6 +403,7 @@ function slasherFlavorToSolidityEnum(flavor) {
         aztecSlotDuration: BigInt(args.aztecSlotDuration),
         aztecEpochDuration: BigInt(args.aztecEpochDuration),
         targetCommitteeSize: BigInt(args.aztecTargetCommitteeSize),
+        lagInEpochs: BigInt(args.lagInEpochs),
         aztecProofSubmissionEpochs: BigInt(args.aztecProofSubmissionEpochs),
         slashingQuorum: BigInt(args.slashingQuorum ?? args.slashingRoundSizeInEpochs * args.aztecEpochDuration / 2 + 1),
         slashingRoundSize: BigInt(args.slashingRoundSizeInEpochs * args.aztecEpochDuration),
@@ -322,7 +423,9 @@ function slasherFlavorToSolidityEnum(flavor) {
             args.slashAmountSmall,
             args.slashAmountMedium,
             args.slashAmountLarge
-        ]
+        ],
+        localEjectionThreshold: args.localEjectionThreshold,
+        slashingDisableDuration: BigInt(args.slashingDisableDuration ?? 0n)
     };
     const genesisStateArgs = {
         vkTreeRoot: args.vkTreeRoot.toString(),
@@ -345,33 +448,38 @@ function slasherFlavorToSolidityEnum(flavor) {
         genesisStateArgs,
         rollupConfigArgs
     ];
-    const rollupAddress = await deployer.deploy(RollupArtifact, rollupArgs, {
+    const { address: rollupAddress, existed: rollupExisted } = await deployer.deploy(RollupArtifact, rollupArgs, {
         gasLimit: 15_000_000n
     });
-    logger.verbose(`Deployed Rollup at ${rollupAddress}`, rollupConfigArgs);
+    logger.verbose(`Deployed Rollup at ${rollupAddress}, already existed: ${rollupExisted}`, rollupConfigArgs);
     const rollupContract = new RollupContract(extendedClient, rollupAddress);
     await deployer.waitForDeployments();
     logger.verbose(`All core contracts have been deployed`);
     if (args.feeJuicePortalInitialBalance && args.feeJuicePortalInitialBalance > 0n) {
-        const feeJuicePortalAddress = await rollupContract.getFeeJuicePortal();
-        // In fast mode, use the L1TxUtils to send transactions with nonce management
-        const { txHash: mintTxHash } = await deployer.sendTransaction({
-            to: addresses.feeJuiceAddress.toString(),
-            data: encodeFunctionData({
-                abi: FeeAssetArtifact.contractAbi,
-                functionName: 'mint',
-                args: [
-                    feeJuicePortalAddress.toString(),
-                    args.feeJuicePortalInitialBalance
-                ]
-            })
-        });
-        logger.verbose(`Funding fee juice portal with ${args.feeJuicePortalInitialBalance} fee juice in ${mintTxHash} (accelerated test deployments)`);
-        txHashes.push(mintTxHash);
+        // Skip funding when using an external token, as we likely don't have mint permissions
+        if (!('existingTokenAddress' in args) || !args.existingTokenAddress) {
+            const feeJuicePortalAddress = await rollupContract.getFeeJuicePortal();
+            // In fast mode, use the L1TxUtils to send transactions with nonce management
+            const { txHash: mintTxHash } = await deployer.sendTransaction({
+                to: addresses.feeJuiceAddress.toString(),
+                data: encodeFunctionData({
+                    abi: FeeAssetArtifact.contractAbi,
+                    functionName: 'mint',
+                    args: [
+                        feeJuicePortalAddress.toString(),
+                        args.feeJuicePortalInitialBalance
+                    ]
+                })
+            });
+            logger.verbose(`Funding fee juice portal with ${args.feeJuicePortalInitialBalance} fee juice in ${mintTxHash} (accelerated test deployments)`);
+            txHashes.push(mintTxHash);
+        } else {
+            logger.verbose('Skipping fee juice portal funding due to external token usage');
+        }
     }
-    const slashFactoryAddress = await deployer.deploy(SlashFactoryArtifact, [
+    const slashFactoryAddress = (await deployer.deploy(SlashFactoryArtifact, [
         rollupAddress.toString()
-    ]);
+    ])).address;
     logger.verbose(`Deployed SlashFactory at ${slashFactoryAddress}`);
     // We need to call a function on the registry to set the various contract addresses.
     const registryContract = getContract({
@@ -435,7 +543,11 @@ function slasherFlavorToSolidityEnum(flavor) {
     } else {
         logger.verbose(`Not the owner of the gse, skipping rollup addition`);
     }
-    if (args.initialValidators && await gseContract.read.isRollupRegistered([
+    const activeAttestorCount = await rollupContract.getActiveAttesterCount();
+    const queuedAttestorCount = await rollupContract.getEntryQueueLength();
+    logger.info(`Rollup has ${activeAttestorCount} active attestors and ${queuedAttestorCount} queued attestors`);
+    const shouldAddValidators = activeAttestorCount === 0n && queuedAttestorCount === 0n;
+    if (args.initialValidators && shouldAddValidators && await gseContract.read.isRollupRegistered([
         rollupContract.address
     ])) {
         await addMultipleValidators(extendedClient, deployer, addresses.gseAddress.toString(), rollupAddress.toString(), addresses.stakingAssetAddress.toString(), args.initialValidators, args.acceleratedTestDeployments, logger);
@@ -467,7 +579,7 @@ function slasherFlavorToSolidityEnum(flavor) {
         slashFactoryAddress
     };
 };
-export const handoverToGovernance = async (extendedClient, deployer, registryAddress, gseAddress, coinIssuerAddress, feeAssetAddress, governanceAddress, logger, acceleratedTestDeployments)=>{
+export const handoverToGovernance = async (extendedClient, deployer, registryAddress, gseAddress, coinIssuerAddress, feeAssetAddress, governanceAddress, logger, acceleratedTestDeployments, useExternalToken = false)=>{
     // We need to call a function on the registry to set the various contract addresses.
     const registryContract = getContract({
         address: getAddress(registryAddress.toString()),
@@ -522,7 +634,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
         logger.verbose(`Transferring the ownership of the gse contract at ${gseAddress} to the Governance ${governanceAddress} in tx ${transferOwnershipTxHash}`);
         txHashes.push(transferOwnershipTxHash);
     }
-    if (acceleratedTestDeployments || await feeAsset.read.owner() !== coinIssuerAddress.toString()) {
+    if (!useExternalToken && (acceleratedTestDeployments || await feeAsset.read.owner() !== coinIssuerAddress.toString())) {
         const { txHash } = await deployer.sendTransaction({
             to: feeAssetAddress.toString(),
             data: encodeFunctionData({
@@ -548,20 +660,27 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
         });
         logger.verbose(`Accept ownership of fee asset in ${acceptTokenOwnershipTxHash}`);
         txHashes.push(acceptTokenOwnershipTxHash);
+    } else if (useExternalToken) {
+        logger.verbose('Skipping fee asset ownership transfer due to external token usage');
     }
+    // Either deploy or at least predict the address of the date gated relayer
+    const dateGatedRelayer = await deployer.deploy(DateGatedRelayerArtifact, [
+        governanceAddress.toString(),
+        1798761600n
+    ]);
     // If the owner is not the Governance contract, transfer ownership to the Governance contract
-    if (acceleratedTestDeployments || await coinIssuerContract.read.owner() !== getAddress(governanceAddress.toString())) {
+    if (acceleratedTestDeployments || await coinIssuerContract.read.owner() === deployer.client.account.address) {
         const { txHash: transferOwnershipTxHash } = await deployer.sendTransaction({
             to: coinIssuerContract.address,
             data: encodeFunctionData({
                 abi: CoinIssuerArtifact.contractAbi,
                 functionName: 'transferOwnership',
                 args: [
-                    getAddress(governanceAddress.toString())
+                    getAddress(dateGatedRelayer.address.toString())
                 ]
             })
         });
-        logger.verbose(`Transferring the ownership of the coin issuer contract at ${coinIssuerAddress} to the Governance ${governanceAddress} in tx ${transferOwnershipTxHash}`);
+        logger.verbose(`Transferring the ownership of the coin issuer contract at ${coinIssuerAddress} to the DateGatedRelayer ${dateGatedRelayer.address} in tx ${transferOwnershipTxHash}`);
         txHashes.push(transferOwnershipTxHash);
     }
     // Wait for all actions to be mined
@@ -569,6 +688,9 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
     await Promise.all(txHashes.map((txHash)=>extendedClient.waitForTransactionReceipt({
             hash: txHash
         })));
+    return {
+        dateGatedRelayerAddress: dateGatedRelayer.address
+    };
 };
 /*
  * Adds multiple validators to the rollup
@@ -596,85 +718,94 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
             }
             validators = enrichedValidators.filter((v)=>v.status === 0).map((v)=>v.operator);
         }
-        if (validators.length > 0) {
-            const gseContract = new GSEContract(extendedClient, gseAddress);
-            const multiAdder = await deployer.deploy(MultiAdderArtifact, [
-                rollupAddress,
-                deployer.client.account.address
-            ]);
-            const makeValidatorTuples = async (validator)=>{
-                const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey.getValue());
-                return {
-                    attester: getAddress(validator.attester.toString()),
-                    withdrawer: getAddress(validator.withdrawer.toString()),
-                    ...registrationTuple
-                };
+        if (validators.length === 0) {
+            logger.warn('No validators to add. Skipping.');
+            return;
+        }
+        const gseContract = new GSEContract(extendedClient, gseAddress);
+        const multiAdder = (await deployer.deploy(MultiAdderArtifact, [
+            rollupAddress,
+            deployer.client.account.address
+        ])).address;
+        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 initialize validator set without setting up the epoch.
-            const stakeNeeded = activationThreshold * BigInt(validators.length);
+        };
+        const validatorsTuples = await Promise.all(validators.map(makeValidatorTuples));
+        // Mint tokens, approve them, use cheat code to initialize validator set without setting up the epoch.
+        const stakeNeeded = activationThreshold * BigInt(validators.length);
+        await deployer.l1TxUtils.sendAndMonitorTransaction({
+            to: stakingAssetAddress,
+            data: encodeFunctionData({
+                abi: StakingAssetArtifact.contractAbi,
+                functionName: 'mint',
+                args: [
+                    multiAdder.toString(),
+                    stakeNeeded
+                ]
+            })
+        });
+        const entryQueueLengthBefore = await rollup.getEntryQueueLength();
+        const validatorCountBefore = await rollup.getActiveAttesterCount();
+        logger.info(`Adding ${validators.length} validators to the rollup`);
+        const chunkSize = 16;
+        // We will add `chunkSize` validators to the queue until we have covered all of our validators.
+        // The `chunkSize` needs to be small enough to fit inside a single tx, therefore 16.
+        for (const c of chunk(validatorsTuples, chunkSize)){
             await deployer.l1TxUtils.sendAndMonitorTransaction({
-                to: stakingAssetAddress,
+                to: multiAdder.toString(),
                 data: encodeFunctionData({
-                    abi: StakingAssetArtifact.contractAbi,
-                    functionName: 'mint',
+                    abi: MultiAdderArtifact.contractAbi,
+                    functionName: 'addValidators',
                     args: [
-                        multiAdder.toString(),
-                        stakeNeeded
+                        c,
+                        BigInt(chunkSize)
                     ]
                 })
+            }, {
+                gasLimit: 16_000_000n
             });
-            const entryQueueLengthBefore = await rollup.getEntryQueueLength();
-            const validatorCountBefore = await rollup.getActiveAttesterCount();
-            logger.info(`Adding ${validators.length} validators to the rollup`);
-            // Adding to the queue and flushing need to be done in two transactions
-            // if we are adding many validators.
-            if (validatorsTuples.length > 10) {
-                await deployer.l1TxUtils.sendAndMonitorTransaction({
-                    to: multiAdder.toString(),
-                    data: encodeFunctionData({
-                        abi: MultiAdderArtifact.contractAbi,
-                        functionName: 'addValidators',
-                        args: [
-                            validatorsTuples,
-                            true
-                        ]
-                    })
-                }, {
-                    gasLimit: 40_000_000n
-                });
-                await deployer.l1TxUtils.sendAndMonitorTransaction({
-                    to: rollupAddress,
-                    data: encodeFunctionData({
-                        abi: RollupArtifact.contractAbi,
-                        functionName: 'flushEntryQueue',
-                        args: []
-                    })
-                }, {
-                    gasLimit: 40_000_000n
-                });
-            } else {
-                await deployer.l1TxUtils.sendAndMonitorTransaction({
-                    to: multiAdder.toString(),
-                    data: encodeFunctionData({
-                        abi: MultiAdderArtifact.contractAbi,
-                        functionName: 'addValidators',
-                        args: [
-                            validatorsTuples,
-                            false
-                        ]
-                    })
-                }, {
-                    gasLimit: 45_000_000n
-                });
+        }
+        // After adding to the queue, we will now try to flush from it.
+        // We are explicitly doing this as a second step instead of as part of adding to benefit
+        // from the accounting used to speed the process up.
+        // As the queue computes the amount of possible flushes in an epoch when told to flush,
+        // waiting until we have added all we want allows us to benefit in the case were we added
+        // enough to pass the bootstrap set size without needing to wait another epoch.
+        // This is useful when we are testing as it speeds up the tests slightly.
+        while(true){
+            // If the queue is empty, we can break
+            if (await rollup.getEntryQueueLength() == 0n) {
+                break;
             }
-            const entryQueueLengthAfter = await rollup.getEntryQueueLength();
-            const validatorCountAfter = await rollup.getActiveAttesterCount();
-            if (entryQueueLengthAfter + validatorCountAfter < entryQueueLengthBefore + validatorCountBefore + BigInt(validators.length)) {
-                throw new Error(`Failed to add ${validators.length} validators. Active validators: ${validatorCountBefore} -> ${validatorCountAfter}. Queue: ${entryQueueLengthBefore} -> ${entryQueueLengthAfter}`);
+            // If there are no available validator flushes, no need to even try
+            if (await rollup.getAvailableValidatorFlushes() == 0n) {
+                break;
             }
-            logger.info(`Added ${validators.length} validators. Active validators: ${validatorCountBefore} -> ${validatorCountAfter}. Queue: ${entryQueueLengthBefore} -> ${entryQueueLengthAfter}`);
+            // Note that we are flushing at most `chunkSize` at each call
+            await deployer.l1TxUtils.sendAndMonitorTransaction({
+                to: rollup.address,
+                data: encodeFunctionData({
+                    abi: RollupArtifact.contractAbi,
+                    functionName: 'flushEntryQueue',
+                    args: [
+                        BigInt(chunkSize)
+                    ]
+                })
+            }, {
+                gasLimit: 16_000_000n
+            });
+        }
+        const entryQueueLengthAfter = await rollup.getEntryQueueLength();
+        const validatorCountAfter = await rollup.getActiveAttesterCount();
+        if (entryQueueLengthAfter + validatorCountAfter < entryQueueLengthBefore + validatorCountBefore + BigInt(validators.length)) {
+            throw new Error(`Failed to add ${validators.length} validators. Active validators: ${validatorCountBefore} -> ${validatorCountAfter}. Queue: ${entryQueueLengthBefore} -> ${entryQueueLengthAfter}. A likely issue is the bootstrap size.`);
         }
+        logger.info(`Added ${validators.length} validators. Active validators: ${validatorCountBefore} -> ${validatorCountAfter}. Queue: ${entryQueueLengthBefore} -> ${entryQueueLengthAfter}`);
     }
 };
 /**
@@ -687,11 +818,11 @@ 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(FeeAssetHandlerArtifact, [
+    const feeAssetHandlerAddress = (await deployer.deploy(FeeAssetHandlerArtifact, [
         extendedClient.account.address,
         feeAssetAddress.toString(),
         BigInt(1e18)
-    ]);
+    ])).address;
     logger.verbose(`Deployed FeeAssetHandler at ${feeAssetHandlerAddress}`);
     const { txHash } = await deployer.sendTransaction({
         to: feeAssetAddress.toString(),
@@ -720,6 +851,9 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
  */ export const deployL1Contracts = async (rpcUrls, account, chain, logger, args, txUtilsConfig = getL1TxUtilsConfigEnvVars(), createVerificationJson = false)=>{
     logger.info(`Deploying L1 contracts with config: ${jsonStringify(args)}`);
     validateConfig(args);
+    if (args.initialValidators && args.initialValidators.length > 0 && args.existingTokenAddress) {
+        throw new Error('Cannot deploy with both initialValidators and existingTokenAddress. ' + 'Initial validator funding requires minting tokens, which is not possible with an external token.');
+    }
     const l1Client = createExtendedL1Client(rpcUrls, account, chain);
     // Deploy multicall3 if it does not exist in this network
     await deployMulticall3(l1Client, logger);
@@ -757,7 +891,7 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
     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, coinIssuerAddress, feeAssetAddress, governanceAddress, logger, args.acceleratedTestDeployments);
+    const { dateGatedRelayerAddress } = await handoverToGovernance(l1Client, deployer, registryAddress, gseAddress, coinIssuerAddress, feeAssetAddress, governanceAddress, logger, args.acceleratedTestDeployments, !!args.existingTokenAddress);
     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');
@@ -946,6 +1080,7 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
                 recursive: true
             });
             const verificationOutputPath = `${createVerificationJson}/l1-verify-${chain.id}-${formattedDate.slice(0, 6)}-${formattedDate.slice(6)}.json`;
+            const networkName = getActiveNetworkName();
             const verificationData = {
                 chainId: chain.id,
                 network: networkName,
@@ -990,7 +1125,8 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
             feeAssetHandlerAddress,
             stakingAssetHandlerAddress,
             zkPassportVerifierAddress,
-            coinIssuerAddress
+            coinIssuerAddress,
+            dateGatedRelayerAddress
         }
     };
 };
@@ -1015,14 +1151,20 @@ export class L1Deployer {
         this.salt = maybeSalt ? padHex(numberToHex(maybeSalt), {
             size: 32
         }) : undefined;
-        this.l1TxUtils = createL1TxUtilsFromViemWallet(this.client, this.logger, dateProvider, this.txUtilsConfig, this.acceleratedTestDeployments);
+        this.l1TxUtils = createL1TxUtilsFromViemWallet(this.client, {
+            logger: this.logger,
+            dateProvider
+        }, {
+            ...this.txUtilsConfig,
+            debugMaxGasLimit: acceleratedTestDeployments
+        });
     }
     async deploy(params, args, opts = {}) {
         this.logger.debug(`Deploying ${params.name} contract`, {
             args
         });
         try {
-            const { txHash, address, deployedLibraries } = await deployL1Contract(this.client, params.contractAbi, params.contractBytecode, args ?? [], {
+            const { txHash, address, deployedLibraries, existed } = await deployL1Contract(this.client, params.contractAbi, params.contractBytecode, args ?? [], {
                 salt: this.salt,
                 libraries: params.libraries,
                 logger: this.logger,
@@ -1053,7 +1195,10 @@ export class L1Deployer {
                     libraries: deployedLibraries ?? []
                 });
             }
-            return address;
+            return {
+                address,
+                existed
+            };
         } catch (error) {
             throw new Error(`Failed to deploy ${params.name}`, {
                 cause: formatViemError(error)
@@ -1083,7 +1228,11 @@ export class L1Deployer {
         });
     }
     sendTransaction(tx, options) {
-        return this.l1TxUtils.sendTransaction(tx, options);
+        return this.l1TxUtils.sendTransaction(tx, options).then(({ txHash, state })=>({
+                txHash,
+                gasLimit: state.gasLimit,
+                gasPrice: state.gasPrice
+            }));
     }
 }
 // docs:start:deployL1Contract
@@ -1104,7 +1253,12 @@ export class L1Deployer {
     let { l1TxUtils } = opts;
     if (!l1TxUtils) {
         const config = getL1TxUtilsConfigEnvVars();
-        l1TxUtils = createL1TxUtilsFromViemWallet(extendedClient, logger, undefined, config, acceleratedTestDeployments);
+        l1TxUtils = createL1TxUtilsFromViemWallet(extendedClient, {
+            logger
+        }, {
+            ...config,
+            debugMaxGasLimit: acceleratedTestDeployments
+        });
     }
     if (libraries) {
         // Note that this does NOT work well for linked libraries having linked libraries.
@@ -1179,6 +1333,7 @@ export class L1Deployer {
             logger?.verbose(`Skipping waiting for linked libraries to be deployed ${acceleratedTestDeployments ? '(accelerated test deployments)' : ''}`);
         }
     }
+    let existed = false;
     if (saltFromOpts) {
         logger?.info(`Deploying contract with salt ${saltFromOpts}`);
         const { address, paddedSalt: salt, calldata } = getExpectedAddress(abi, bytecode, args, saltFromOpts);
@@ -1221,6 +1376,7 @@ export class L1Deployer {
             logger?.verbose(`Deployed contract with salt ${salt} to address ${resultingAddress} in tx ${txHash}.`);
         } else {
             logger?.verbose(`Skipping existing deployment of contract with salt ${salt} to address ${resultingAddress}`);
+            existed = true;
         }
     } else {
         const deployData = encodeDeployData({
@@ -1241,7 +1397,8 @@ export class L1Deployer {
     return {
         address: EthAddress.fromString(resultingAddress),
         txHash,
-        deployedLibraries
+        deployedLibraries,
+        existed
     };
 }
 export function getExpectedAddress(abi, bytecode, args, salt) {