@aztec/ethereum 3.0.0-nightly.20251123 → 3.0.0-nightly.20251125

package/dest/config.d.ts

@@ -101,7 +101,7 @@ export declare const getRewardConfig: (networkName: NetworkNames) => {
     sequencerBps: number;
     rewardDistributor: `0x${string}`;
     booster: `0x${string}`;
-    blockReward: bigint;
+    checkpointReward: bigint;
 };
 export declare const getRewardBoostConfig: () => {
     increment: number;

package/dest/config.js

@@ -19,7 +19,7 @@ export const DefaultL1ContractsConfig = {
     slashingExecutionDelayInRounds: 0,
     slashingVetoer: EthAddress.ZERO,
     governanceProposerRoundSize: 300,
-    manaTarget: BigInt(1e10),
+    manaTarget: BigInt(100e6),
     provingCostPerMana: BigInt(100),
     exitDelaySeconds: 2 * 24 * 60 * 60,
     slasherFlavor: 'tally',
@@ -118,13 +118,13 @@ const DefaultRewardConfig = {
     sequencerBps: 8000,
     rewardDistributor: EthAddress.ZERO.toString(),
     booster: EthAddress.ZERO.toString(),
-    blockReward: 500n * 10n ** 18n
+    checkpointReward: 500n * 10n ** 18n
 };
 const MainnetRewardConfig = {
     sequencerBps: 7_000,
     rewardDistributor: EthAddress.ZERO.toString(),
     booster: EthAddress.ZERO.toString(),
-    blockReward: 400n * 10n ** 18n
+    checkpointReward: 400n * 10n ** 18n
 };
 export const getRewardConfig = (networkName)=>{
     switch(networkName){

package/dest/contracts/rollup.d.ts

@@ -112,9 +112,9 @@ export declare class RollupContract {
     getOwner(): Promise<`0x${string}`>;
     getActiveAttesterCount(): Promise<bigint>;
     getSlashingProposerAddress(): Promise<EthAddress>;
-    getBlockReward(): Promise<bigint>;
-    getBlockNumber(): Promise<bigint>;
-    getProvenBlockNumber(): Promise<bigint>;
+    getCheckpointReward(): Promise<bigint>;
+    getCheckpointNumber(): Promise<bigint>;
+    getProvenCheckpointNumber(): Promise<bigint>;
     getSlotNumber(): Promise<bigint>;
     getL1FeesAt(timestamp: bigint): Promise<{
         baseFee: bigint;
@@ -128,7 +128,7 @@ export declare class RollupContract {
     getCurrentEpochCommittee(): Promise<readonly `0x${string}`[] | undefined>;
     getCurrentProposer(): Promise<`0x${string}`>;
     getProposerAt(timestamp: bigint): Promise<`0x${string}`>;
-    getBlock(blockNumber: bigint | number): Promise<{
+    getCheckpoint(checkpointNumber: bigint | number): Promise<{
         archive: `0x${string}`;
         headerHash: `0x${string}`;
         blobCommitmentsHash: `0x${string}`;
@@ -144,15 +144,15 @@ export declare class RollupContract {
         };
     }>;
     getTips(): Promise<{
-        pendingBlockNumber: bigint;
-        provenBlockNumber: bigint;
+        pending: bigint;
+        proven: bigint;
     }>;
     getTimestampForSlot(slot: bigint): Promise<bigint>;
     getEntryQueueLength(): Promise<bigint>;
     getAvailableValidatorFlushes(): Promise<bigint>;
     getNextFlushableEpoch(): Promise<bigint>;
     getCurrentEpochNumber(): Promise<bigint>;
-    getEpochNumberForBlock(blockNumber: bigint): Promise<bigint>;
+    getEpochNumberForCheckpoint(checkpointNumber: bigint): Promise<bigint>;
     getRollupAddresses(): Promise<L1RollupContractAddresses>;
     getFeeJuicePortal(): Promise<EthAddress>;
     getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
@@ -175,38 +175,39 @@ export declare class RollupContract {
      * @dev     Throws if unable to propose
      *
      * @param archive - The archive that we expect to be current state
-     * @return [slot, blockNumber] - If you can propose, the L2 slot number and L2 block number of the next Ethereum block,
+     * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
+     * timestamp of the next L1 block
      * @throws otherwise
      */
     canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: bigint | number, opts?: {
-        forcePendingBlockNumber?: number;
+        forcePendingCheckpointNumber?: number;
     }): Promise<{
         slot: bigint;
-        blockNumber: bigint;
+        checkpointNumber: bigint;
         timeOfNextL1Slot: bigint;
     }>;
     /**
-     * Returns a state override that sets the pending block number to the specified value. Useful for simulations.
-     * Requires querying the current state of the contract to get the current proven block number, as they are both
+     * Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
+     * Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
      * stored in the same slot. If the argument is undefined, it returns an empty override.
      */
-    makePendingBlockNumberOverride(forcePendingBlockNumber: number | undefined): Promise<StateOverride>;
+    makePendingCheckpointNumberOverride(forcePendingCheckpointNumber: number | undefined): Promise<StateOverride>;
     /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
-    buildInvalidateBadAttestationRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
+    buildInvalidateBadAttestationRequest(checkpointNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
     /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
-    buildInvalidateInsufficientAttestationsRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
+    buildInvalidateInsufficientAttestationsRequest(checkpointNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
     /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
-    getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
+    getHasSubmittedProof(epochNumber: number, numberOfCheckpointsInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
     getManaBaseFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint>;
     getSlotAt(timestamp: bigint): Promise<bigint>;
-    status(blockNumber: bigint, options?: {
+    status(checkpointNumber: bigint, options?: {
         blockNumber?: bigint;
     }): Promise<readonly [bigint, `0x${string}`, bigint, `0x${string}`, `0x${string}`, bigint]>;
     canPruneAtTime(timestamp: bigint, options?: {
         blockNumber?: bigint;
     }): Promise<boolean>;
     archive(): Promise<`0x${string}`>;
-    archiveAt(blockNumber: bigint): Promise<`0x${string}`>;
+    archiveAt(checkpointNumber: bigint): Promise<`0x${string}`>;
     getSequencerRewards(address: Hex | EthAddress): Promise<bigint>;
     getSpecificProverRewardsForEpoch(epoch: bigint, prover: Hex | EthAddress): Promise<bigint>;
     getAttesters(): Promise<`0x${string}`[]>;
@@ -230,14 +231,14 @@ export declare class RollupContract {
         };
     }>;
     getStatus(address: Hex | EthAddress): Promise<number>;
-    getBlobCommitmentsHash(blockNumber: bigint): Promise<`0x${string}`>;
+    getBlobCommitmentsHash(checkpointNumber: bigint): Promise<`0x${string}`>;
     getCurrentBlobCommitmentsHash(): Promise<`0x${string}`>;
     getStakingAsset(): Promise<`0x${string}`>;
     getRewardConfig(): Promise<{
         rewardDistributor: `0x${string}`;
         sequencerBps: number;
         booster: `0x${string}`;
-        blockReward: bigint;
+        checkpointReward: bigint;
     }>;
     setupEpoch(l1TxUtils: L1TxUtils): Promise<{
         receipt: import("viem").TransactionReceipt;
@@ -251,8 +252,8 @@ export declare class RollupContract {
         oldSlasher: `0x${string}`;
         newSlasher: `0x${string}`;
     }) => unknown): WatchContractEventReturnType;
-    listenToBlockInvalidated(callback: (args: {
-        blockNumber: bigint;
+    listenToCheckpointInvalidated(callback: (args: {
+        checkpointNumber: bigint;
     }) => unknown): WatchContractEventReturnType;
     getSlashEvents(l1BlockHash: Hex): Promise<{
         amount: bigint;

package/dest/contracts/rollup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}

package/dest/contracts/rollup.js

@@ -199,14 +199,14 @@ export class RollupContract {
         }
         return await slasher.getProposer();
     }
-    getBlockReward() {
-        return this.rollup.read.getBlockReward();
+    getCheckpointReward() {
+        return this.rollup.read.getCheckpointReward();
     }
-    getBlockNumber() {
-        return this.rollup.read.getPendingBlockNumber();
+    getCheckpointNumber() {
+        return this.rollup.read.getPendingCheckpointNumber();
     }
-    getProvenBlockNumber() {
-        return this.rollup.read.getProvenBlockNumber();
+    getProvenCheckpointNumber() {
+        return this.rollup.read.getProvenCheckpointNumber();
     }
     getSlotNumber() {
         return this.rollup.read.getCurrentSlot();
@@ -284,9 +284,9 @@ export class RollupContract {
         });
         return result;
     }
-    getBlock(blockNumber) {
-        return this.rollup.read.getBlock([
-            BigInt(blockNumber)
+    getCheckpoint(checkpointNumber) {
+        return this.rollup.read.getCheckpoint([
+            BigInt(checkpointNumber)
         ]);
     }
     getTips() {
@@ -309,9 +309,9 @@ export class RollupContract {
     getCurrentEpochNumber() {
         return this.rollup.read.getCurrentEpoch();
     }
-    getEpochNumberForBlock(blockNumber) {
-        return this.rollup.read.getEpochForBlock([
-            BigInt(blockNumber)
+    getEpochNumberForCheckpoint(checkpointNumber) {
+        return this.rollup.read.getEpochForCheckpoint([
+            BigInt(checkpointNumber)
         ]);
     }
     async getRollupAddresses() {
@@ -365,7 +365,8 @@ export class RollupContract {
    * @dev     Throws if unable to propose
    *
    * @param archive - The archive that we expect to be current state
-   * @return [slot, blockNumber] - If you can propose, the L2 slot number and L2 block number of the next Ethereum block,
+   * @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
+   * timestamp of the next L1 block
    * @throws otherwise
    */ async canProposeAtNextEthBlock(archive, account, slotDuration, opts = {}) {
         if (typeof slotDuration === 'number') {
@@ -375,7 +376,7 @@ export class RollupContract {
         const timeOfNextL1Slot = latestBlock.timestamp + slotDuration;
         const who = typeof account === 'string' ? account : account.address;
         try {
-            const { result: [slot, blockNumber] } = await this.client.simulateContract({
+            const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
                 address: this.address,
                 abi: RollupAbi,
                 functionName: 'canProposeAtTime',
@@ -385,11 +386,11 @@ export class RollupContract {
                     who
                 ],
                 account,
-                stateOverride: await this.makePendingBlockNumberOverride(opts.forcePendingBlockNumber)
+                stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber)
             });
             return {
                 slot,
-                blockNumber,
+                checkpointNumber,
                 timeOfNextL1Slot
             };
         } catch (err) {
@@ -397,11 +398,11 @@ export class RollupContract {
         }
     }
     /**
-   * Returns a state override that sets the pending block number to the specified value. Useful for simulations.
-   * Requires querying the current state of the contract to get the current proven block number, as they are both
+   * Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
+   * Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
    * stored in the same slot. If the argument is undefined, it returns an empty override.
-   */ async makePendingBlockNumberOverride(forcePendingBlockNumber) {
-        if (forcePendingBlockNumber === undefined) {
+   */ async makePendingCheckpointNumberOverride(forcePendingCheckpointNumber) {
+        if (forcePendingCheckpointNumber === undefined) {
             return [];
         }
         const slot = RollupContract.stfStorageSlot;
@@ -409,8 +410,8 @@ export class RollupContract {
             address: this.address,
             slot
         });
-        const currentProvenBlockNumber = currentValue ? hexToBigInt(currentValue) & (1n << 128n) - 1n : 0n;
-        const newValue = BigInt(forcePendingBlockNumber) << 128n | currentProvenBlockNumber;
+        const currentProvenCheckpointNumber = currentValue ? hexToBigInt(currentValue) & (1n << 128n) - 1n : 0n;
+        const newValue = BigInt(forcePendingCheckpointNumber) << 128n | currentProvenCheckpointNumber;
         return [
             {
                 address: this.address,
@@ -423,14 +424,14 @@ export class RollupContract {
             }
         ];
     }
-    /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(blockNumber, attestationsAndSigners, committee, invalidIndex) {
+    /** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
         return {
             to: this.address,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'invalidateBadAttestation',
                 args: [
-                    BigInt(blockNumber),
+                    BigInt(checkpointNumber),
                     attestationsAndSigners,
                     committee.map((addr)=>addr.toString()),
                     BigInt(invalidIndex)
@@ -438,27 +439,27 @@ export class RollupContract {
             })
         };
     }
-    /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(blockNumber, attestationsAndSigners, committee) {
+    /** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(checkpointNumber, attestationsAndSigners, committee) {
         return {
             to: this.address,
             data: encodeFunctionData({
                 abi: RollupAbi,
                 functionName: 'invalidateInsufficientAttestations',
                 args: [
-                    BigInt(blockNumber),
+                    BigInt(checkpointNumber),
                     attestationsAndSigners,
                     committee.map((addr)=>addr.toString())
                 ]
             })
         };
     }
-    /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */ getHasSubmittedProof(epochNumber, numberOfBlocksInEpoch, prover) {
+    /** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */ getHasSubmittedProof(epochNumber, numberOfCheckpointsInEpoch, prover) {
         if (prover instanceof EthAddress) {
             prover = prover.toString();
         }
         return this.rollup.read.getHasSubmitted([
             BigInt(epochNumber),
-            BigInt(numberOfBlocksInEpoch),
+            BigInt(numberOfCheckpointsInEpoch),
             prover
         ]);
     }
@@ -473,10 +474,10 @@ export class RollupContract {
             timestamp
         ]);
     }
-    async status(blockNumber, options) {
+    async status(checkpointNumber, options) {
         await checkBlockTag(options?.blockNumber, this.client);
         return this.rollup.read.status([
-            blockNumber
+            checkpointNumber
         ], options);
     }
     async canPruneAtTime(timestamp, options) {
@@ -488,9 +489,9 @@ export class RollupContract {
     archive() {
         return this.rollup.read.archive();
     }
-    archiveAt(blockNumber) {
+    archiveAt(checkpointNumber) {
         return this.rollup.read.archiveAt([
-            blockNumber
+            checkpointNumber
         ]);
     }
     getSequencerRewards(address) {
@@ -536,9 +537,9 @@ export class RollupContract {
             address
         ]);
     }
-    getBlobCommitmentsHash(blockNumber) {
+    getBlobCommitmentsHash(checkpointNumber) {
         return this.rollup.read.getBlobCommitmentsHash([
-            blockNumber
+            checkpointNumber
         ]);
     }
     getCurrentBlobCommitmentsHash() {
@@ -584,14 +585,14 @@ export class RollupContract {
             }
         });
     }
-    listenToBlockInvalidated(callback) {
-        return this.rollup.watchEvent.BlockInvalidated({}, {
+    listenToCheckpointInvalidated(callback) {
+        return this.rollup.watchEvent.CheckpointInvalidated({}, {
             onLogs: (logs)=>{
                 for (const log of logs){
                     const args = log.args;
-                    if (args.blockNumber !== undefined) {
+                    if (args.checkpointNumber !== undefined) {
                         callback({
-                            blockNumber: args.blockNumber
+                            checkpointNumber: args.checkpointNumber
                         });
                     }
                 }

package/dest/deploy_l1_contracts.js

@@ -310,8 +310,8 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
     const registry = new RegistryContract(l1Client, registryAddress);
     /* -------------------------------------------------------------------------- */ /*                      FUND REWARD DISTRIBUTOR START                         */ /* -------------------------------------------------------------------------- */ const rewardDistributorAddress = await registry.getRewardDistributor();
     if (!args.existingTokenAddress) {
-        const blockReward = getRewardConfig(networkName).blockReward;
-        const funding = blockReward * 200000n;
+        const checkpointReward = getRewardConfig(networkName).checkpointReward;
+        const funding = checkpointReward * 200000n;
         const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
             to: feeAssetAddress.toString(),
             data: encodeFunctionData({