@aztec/ethereum 2.1.0-rc.9 → 2.1.1-rc.1

package/dest/deploy_l1_contracts.js

@@ -123,6 +123,19 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         ]);
         feeAssetAddress = deployedFee.address;
         logger.verbose(`Deployed Fee Asset at ${feeAssetAddress}`);
+        // Mint a tiny bit of tokens to satisfy coin-issuer constraints
+        const { txHash } = await deployer.sendTransaction({
+            to: feeAssetAddress.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetArtifact.contractAbi,
+                functionName: 'mint',
+                args: [
+                    l1Client.account.address,
+                    1n * 10n ** 18n
+                ]
+            })
+        });
+        logger.verbose(`Minted tiny bit of tokens to satisfy coin-issuer constraints in ${txHash}`);
         const deployedStaking = await deployer.deploy(StakingAssetArtifact, [
             'Staking',
             'STK',
@@ -130,6 +143,7 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
         ]);
         stakingAssetAddress = deployedStaking.address;
         logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
+        await deployer.waitForDeployments();
     }
     const gseAddress = (await deployer.deploy(GSEArtifact, [
         l1Client.account.address,
@@ -194,9 +208,11 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     }
     const coinIssuerAddress = (await deployer.deploy(CoinIssuerArtifact, [
         feeAssetAddress.toString(),
-        25_000_000_000n * 10n ** 18n / (60n * 60n * 24n * 365n),
+        2n * 10n ** 17n,
         l1Client.account.address
-    ])).address;
+    ], {
+        gasLimit: 1_000_000n
+    })).address;
     logger.verbose(`Deployed CoinIssuer at ${coinIssuerAddress}`);
     logger.verbose(`Waiting for deployments to complete`);
     await deployer.waitForDeployments();
@@ -332,6 +348,224 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
         scope
     ];
 };
+/**
+ * Generates verification records for a deployed rollup and its associated contracts (Inbox, Outbox, Slasher, etc).
+ * @param rollup - The deployed rollup contract.
+ * @param deployer - The L1 deployer instance.
+ * @param args - The deployment arguments used for the rollup.
+ * @param addresses - The L1 contract addresses.
+ * @param extendedClient - The extended viem wallet client.
+ * @param logger - The logger.
+ */ async function generateRollupVerificationRecords(rollup, deployer, args, addresses, extendedClient, logger) {
+    try {
+        // Add Inbox / Outbox verification records (constructor args are created inside RollupCore)
+        const rollupAddr = rollup.address;
+        const rollupAddresses = await rollup.getRollupAddresses();
+        const inboxAddr = rollupAddresses.inboxAddress.toString();
+        const outboxAddr = rollupAddresses.outboxAddress.toString();
+        const feeAsset = rollupAddresses.feeJuiceAddress.toString();
+        const version = await rollup.getVersion();
+        const inboxCtor = encodeAbiParameters([
+            {
+                type: 'address'
+            },
+            {
+                type: 'address'
+            },
+            {
+                type: 'uint256'
+            },
+            {
+                type: 'uint256'
+            }
+        ], [
+            rollupAddr,
+            feeAsset,
+            version,
+            BigInt(L1_TO_L2_MSG_SUBTREE_HEIGHT)
+        ]);
+        const outboxCtor = encodeAbiParameters([
+            {
+                type: 'address'
+            },
+            {
+                type: 'uint256'
+            }
+        ], [
+            rollupAddr,
+            version
+        ]);
+        deployer.verificationRecords.push({
+            name: 'Inbox',
+            address: inboxAddr,
+            constructorArgsHex: inboxCtor,
+            libraries: []
+        }, {
+            name: 'Outbox',
+            address: outboxAddr,
+            constructorArgsHex: outboxCtor,
+            libraries: []
+        });
+        // Include Slasher and SlashingProposer (if deployed) in verification data
+        try {
+            const slasherAddrHex = await rollup.getSlasherAddress();
+            const slasherAddr = EthAddress.fromString(slasherAddrHex);
+            if (!slasherAddr.isZero()) {
+                // Slasher constructor: (address _vetoer, address _governance)
+                const slasherCtor = encodeAbiParameters([
+                    {
+                        type: 'address'
+                    },
+                    {
+                        type: 'address'
+                    }
+                ], [
+                    args.slashingVetoer.toString(),
+                    extendedClient.account.address
+                ]);
+                deployer.verificationRecords.push({
+                    name: 'Slasher',
+                    address: slasherAddr.toString(),
+                    constructorArgsHex: slasherCtor,
+                    libraries: []
+                });
+                // Proposer address is stored in Slasher.PROPOSER()
+                const proposerAddr = (await rollup.getSlashingProposerAddress()).toString();
+                // Compute constructor args matching deployment path in RollupCore
+                const computedRoundSize = BigInt(args.slashingRoundSizeInEpochs * args.aztecEpochDuration);
+                const computedQuorum = BigInt(args.slashingQuorum ?? args.slashingRoundSizeInEpochs * args.aztecEpochDuration / 2 + 1);
+                const lifetimeInRounds = BigInt(args.slashingLifetimeInRounds);
+                const executionDelayInRounds = BigInt(args.slashingExecutionDelayInRounds);
+                if (args.slasherFlavor === 'tally') {
+                    const slashAmounts = [
+                        args.slashAmountSmall,
+                        args.slashAmountMedium,
+                        args.slashAmountLarge
+                    ];
+                    const committeeSize = BigInt(args.aztecTargetCommitteeSize);
+                    const epochDuration = BigInt(args.aztecEpochDuration);
+                    const slashOffsetInRounds = BigInt(args.slashingOffsetInRounds);
+                    const proposerCtor = encodeAbiParameters([
+                        {
+                            type: 'address'
+                        },
+                        {
+                            type: 'address'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256[3]'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        }
+                    ], [
+                        rollup.address,
+                        slasherAddr.toString(),
+                        computedQuorum,
+                        computedRoundSize,
+                        lifetimeInRounds,
+                        executionDelayInRounds,
+                        slashAmounts,
+                        committeeSize,
+                        epochDuration,
+                        slashOffsetInRounds
+                    ]);
+                    deployer.verificationRecords.push({
+                        name: 'TallySlashingProposer',
+                        address: proposerAddr,
+                        constructorArgsHex: proposerCtor,
+                        libraries: []
+                    });
+                } else if (args.slasherFlavor === 'empire') {
+                    const proposerCtor = encodeAbiParameters([
+                        {
+                            type: 'address'
+                        },
+                        {
+                            type: 'address'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        },
+                        {
+                            type: 'uint256'
+                        }
+                    ], [
+                        rollup.address,
+                        slasherAddr.toString(),
+                        computedQuorum,
+                        computedRoundSize,
+                        lifetimeInRounds,
+                        executionDelayInRounds
+                    ]);
+                    deployer.verificationRecords.push({
+                        name: 'EmpireSlashingProposer',
+                        address: proposerAddr,
+                        constructorArgsHex: proposerCtor,
+                        libraries: []
+                    });
+                }
+            }
+        } catch (e) {
+            logger.warn(`Failed to add Slasher/Proposer verification records: ${String(e)}`);
+        }
+    } catch (e) {
+        throw new Error(`Failed to generate rollup verification records: ${String(e)}`);
+    }
+}
+/**
+ * Writes verification records to a JSON file for later forge verify.
+ * @param deployer - The L1 deployer containing verification records.
+ * @param outputDirectory - The directory to write the verification file to.
+ * @param chainId - The chain ID.
+ * @param filenameSuffix - Optional suffix for the filename (e.g., 'upgrade').
+ * @param logger - The logger.
+ */ async function writeVerificationJson(deployer, outputDirectory, chainId, filenameSuffix = '', logger) {
+    try {
+        const date = new Date();
+        const formattedDate = date.toISOString().slice(2, 19).replace(/[-T:]/g, '');
+        // Ensure the verification output directory exists
+        await mkdir(outputDirectory, {
+            recursive: true
+        });
+        const suffix = filenameSuffix ? `-${filenameSuffix}` : '';
+        const verificationOutputPath = `${outputDirectory}/l1-verify${suffix}-${chainId}-${formattedDate.slice(0, 6)}-${formattedDate.slice(6)}.json`;
+        const networkName = getActiveNetworkName();
+        const verificationData = {
+            chainId: chainId,
+            network: networkName,
+            records: deployer.verificationRecords
+        };
+        await writeFile(verificationOutputPath, JSON.stringify(verificationData, null, 2));
+        logger.info(`Wrote L1 verification data to ${verificationOutputPath}`);
+    } catch (e) {
+        logger.warn(`Failed to write L1 verification data file: ${String(e)}`);
+    }
+}
 /**
  * Deploys a new rollup, using the existing canonical version to derive certain values (addresses of assets etc).
  * @param clients - The L1 clients.
@@ -339,11 +573,17 @@ const getZkPassportVerifierAddress = async (deployer, args)=>{
  * @param registryAddress - The address of the registry.
  * @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, undefined, args.acceleratedTestDeployments, logger, txUtilsConfig);
+ * @param createVerificationJson - Optional path to write verification data for forge verify.
+ */ export const deployRollupForUpgrade = async (extendedClient, args, registryAddress, logger, txUtilsConfig, createVerificationJson = false)=>{
+    const deployer = new L1Deployer(extendedClient, args.salt, undefined, args.acceleratedTestDeployments, logger, txUtilsConfig, !!createVerificationJson);
     const addresses = await RegistryContract.collectAddresses(extendedClient, registryAddress, 'canonical');
     const { rollup, slashFactoryAddress } = await deployRollup(extendedClient, deployer, args, addresses, logger);
     await deployer.waitForDeployments();
+    // Write verification data (constructor args + linked libraries) to file for later forge verify
+    if (createVerificationJson) {
+        await generateRollupVerificationRecords(rollup, deployer, args, addresses, extendedClient, logger);
+        await writeVerificationJson(deployer, createVerificationJson, extendedClient.chain.id, 'upgrade', logger);
+    }
     return {
         rollup,
         slashFactoryAddress
@@ -425,7 +665,8 @@ function slasherFlavorToSolidityEnum(flavor) {
             args.slashAmountLarge
         ],
         localEjectionThreshold: args.localEjectionThreshold,
-        slashingDisableDuration: BigInt(args.slashingDisableDuration ?? 0n)
+        slashingDisableDuration: BigInt(args.slashingDisableDuration ?? 0n),
+        earliestRewardsClaimableTimestamp: 0n
     };
     const genesisStateArgs = {
         vkTreeRoot: args.vkTreeRoot.toString(),
@@ -763,7 +1004,7 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
                     functionName: 'addValidators',
                     args: [
                         c,
-                        BigInt(chunkSize)
+                        BigInt(0)
                     ]
                 })
             }, {
@@ -780,13 +1021,16 @@ export const handoverToGovernance = async (extendedClient, deployer, registryAdd
         while(true){
             // If the queue is empty, we can break
             if (await rollup.getEntryQueueLength() == 0n) {
+                logger.debug('Entry queue is empty, stopping flush attempts');
                 break;
             }
             // If there are no available validator flushes, no need to even try
             if (await rollup.getAvailableValidatorFlushes() == 0n) {
+                logger.debug('No available validator flushes, stopping flush attempts');
                 break;
             }
             // Note that we are flushing at most `chunkSize` at each call
+            logger.debug(`Flushing entry queue for ${chunkSize} validators`);
             await deployer.l1TxUtils.sendAndMonitorTransaction({
                 to: rollup.address,
                 data: encodeFunctionData({
@@ -898,199 +1142,8 @@ export const cheat_initializeFeeAssetHandler = async (extendedClient, deployer,
     logger.info(`Aztec L1 contracts initialized`, l1Contracts);
     // Write verification data (constructor args + linked libraries) to file for later forge verify
     if (createVerificationJson) {
-        try {
-            // Add Inbox / Outbox verification records (constructor args are created inside RollupCore)
-            const rollupAddr = l1Contracts.rollupAddress.toString();
-            const inboxAddr = l1Contracts.inboxAddress.toString();
-            const outboxAddr = l1Contracts.outboxAddress.toString();
-            const feeAsset = l1Contracts.feeJuiceAddress.toString();
-            const version = await rollup.getVersion();
-            const inboxCtor = encodeAbiParameters([
-                {
-                    type: 'address'
-                },
-                {
-                    type: 'address'
-                },
-                {
-                    type: 'uint256'
-                },
-                {
-                    type: 'uint256'
-                }
-            ], [
-                rollupAddr,
-                feeAsset,
-                version,
-                BigInt(L1_TO_L2_MSG_SUBTREE_HEIGHT)
-            ]);
-            const outboxCtor = encodeAbiParameters([
-                {
-                    type: 'address'
-                },
-                {
-                    type: 'uint256'
-                }
-            ], [
-                rollupAddr,
-                version
-            ]);
-            deployer.verificationRecords.push({
-                name: 'Inbox',
-                address: inboxAddr,
-                constructorArgsHex: inboxCtor,
-                libraries: []
-            }, {
-                name: 'Outbox',
-                address: outboxAddr,
-                constructorArgsHex: outboxCtor,
-                libraries: []
-            });
-            // Include Slasher and SlashingProposer (if deployed) in verification data
-            try {
-                const slasherAddrHex = await rollup.getSlasherAddress();
-                const slasherAddr = EthAddress.fromString(slasherAddrHex);
-                if (!slasherAddr.isZero()) {
-                    // Slasher constructor: (address _vetoer, address _governance)
-                    const slasherCtor = encodeAbiParameters([
-                        {
-                            type: 'address'
-                        },
-                        {
-                            type: 'address'
-                        }
-                    ], [
-                        args.slashingVetoer.toString(),
-                        l1Client.account.address
-                    ]);
-                    deployer.verificationRecords.push({
-                        name: 'Slasher',
-                        address: slasherAddr.toString(),
-                        constructorArgsHex: slasherCtor,
-                        libraries: []
-                    });
-                    // Proposer address is stored in Slasher.PROPOSER()
-                    const proposerAddr = (await rollup.getSlashingProposerAddress()).toString();
-                    // Compute constructor args matching deployment path in RollupCore
-                    const computedRoundSize = BigInt(args.slashingRoundSizeInEpochs * args.aztecEpochDuration);
-                    const computedQuorum = BigInt(args.slashingQuorum ?? args.slashingRoundSizeInEpochs * args.aztecEpochDuration / 2 + 1);
-                    const lifetimeInRounds = BigInt(args.slashingLifetimeInRounds);
-                    const executionDelayInRounds = BigInt(args.slashingExecutionDelayInRounds);
-                    if (args.slasherFlavor === 'tally') {
-                        const slashAmounts = [
-                            args.slashAmountSmall,
-                            args.slashAmountMedium,
-                            args.slashAmountLarge
-                        ];
-                        const committeeSize = BigInt(args.aztecTargetCommitteeSize);
-                        const epochDuration = BigInt(args.aztecEpochDuration);
-                        const slashOffsetInRounds = BigInt(args.slashingOffsetInRounds);
-                        const proposerCtor = encodeAbiParameters([
-                            {
-                                type: 'address'
-                            },
-                            {
-                                type: 'address'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256[3]'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            }
-                        ], [
-                            rollup.address,
-                            slasherAddr.toString(),
-                            computedQuorum,
-                            computedRoundSize,
-                            lifetimeInRounds,
-                            executionDelayInRounds,
-                            slashAmounts,
-                            committeeSize,
-                            epochDuration,
-                            slashOffsetInRounds
-                        ]);
-                        deployer.verificationRecords.push({
-                            name: 'TallySlashingProposer',
-                            address: proposerAddr,
-                            constructorArgsHex: proposerCtor,
-                            libraries: []
-                        });
-                    } else if (args.slasherFlavor === 'empire') {
-                        const proposerCtor = encodeAbiParameters([
-                            {
-                                type: 'address'
-                            },
-                            {
-                                type: 'address'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            },
-                            {
-                                type: 'uint256'
-                            }
-                        ], [
-                            rollup.address,
-                            slasherAddr.toString(),
-                            computedQuorum,
-                            computedRoundSize,
-                            lifetimeInRounds,
-                            executionDelayInRounds
-                        ]);
-                        deployer.verificationRecords.push({
-                            name: 'EmpireSlashingProposer',
-                            address: proposerAddr,
-                            constructorArgsHex: proposerCtor,
-                            libraries: []
-                        });
-                    }
-                }
-            } catch (e) {
-                logger.warn(`Failed to add Slasher/Proposer verification records: ${String(e)}`);
-            }
-            const date = new Date();
-            const formattedDate = date.toISOString().slice(2, 19).replace(/[-T:]/g, '');
-            // Ensure the verification output directory exists
-            await mkdir(createVerificationJson, {
-                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,
-                records: deployer.verificationRecords
-            };
-            await writeFile(verificationOutputPath, JSON.stringify(verificationData, null, 2));
-            logger.info(`Wrote L1 verification data to ${verificationOutputPath}`);
-        } catch (e) {
-            logger.warn(`Failed to write L1 verification data file: ${String(e)}`);
-        }
+        await generateRollupVerificationRecords(rollup, deployer, args, l1Contracts, l1Client, logger);
+        await writeVerificationJson(deployer, createVerificationJson, chain.id, '', logger);
     }
     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.