@aztec/stdlib 5.0.0-nightly.20260611 → 5.0.0-nightly.20260613

package/dest/timetable/proposer_timetable.js

@@ -10,13 +10,20 @@ import { ConsensusTimetable } from './consensus_timetable.js';
  *
  * The single hard deadline {@link getAttestationDeadline} is inherited from the composed
  * {@link ConsensusTimetable}, so the proposer uses one object.
+ *
+ * `maxBlocksPerCheckpoint` is computed from the local operational budgets and then clamped down to the optional
+ * network-provided value when that value is lower; a network value at or above the computed count leaves the
+ * computed count in effect. When clamping down occurs and a logger is supplied, a warning is emitted.
  */ export class ProposerTimetable extends ConsensusTimetable {
     /** Minimum block-building time (`min_block_duration`) in seconds. */ minBlockDuration;
     /** One-way proposal/attestation propagation budget (`p2p_propagation_time`) in seconds. */ p2pPropagationTime;
     /** Local checkpoint proposal preparation budget (`checkpoint_proposal_prepare_time`) in seconds. */ checkpointProposalPrepareTime;
     /** Proposer initialization budget (`checkpoint_proposal_init_time`) reserved before the first sub-slot, in seconds. */ checkpointProposalInitTime;
-    /** Whether the proposer enforces sub-slot/start deadlines (false keeps the single-mined-block test mode). */ enforce;
-    /** Maximum number of full-duration block sub-slots derivable from this timing config. */ maxBlocksPerCheckpoint;
+    /**
+   * Effective maximum number of block sub-slots per checkpoint: the value the local operational budgets compute,
+   * clamped down to the explicit network value when that value is lower. A network value above the computed
+   * count has no effect (the computed count is used) and is not logged.
+   */ maxBlocksPerCheckpoint;
     constructor(opts){
         super({
             l1Constants: opts.l1Constants,
@@ -34,21 +41,26 @@ import { ConsensusTimetable } from './consensus_timetable.js';
         this.p2pPropagationTime = budgets.p2pPropagationTime;
         this.checkpointProposalPrepareTime = budgets.checkpointProposalPrepareTime;
         this.checkpointProposalInitTime = budgets.checkpointProposalInitTime;
-        this.enforce = opts.enforce;
         // Clamp min block duration to the block duration so a single sub-slot is always startable.
-        this.minBlockDuration = this.blockDuration !== undefined ? Math.min(budgets.minBlockDuration, this.blockDuration) : budgets.minBlockDuration;
-        this.maxBlocksPerCheckpoint = this.computeMaxBlocksPerCheckpoint();
+        this.minBlockDuration = Math.min(budgets.minBlockDuration, this.blockDuration);
+        const computed = this.computeMaxBlocksPerCheckpoint();
+        this.maxBlocksPerCheckpoint = opts.maxBlocksPerCheckpoint !== undefined ? Math.min(computed, opts.maxBlocksPerCheckpoint) : computed;
+        if (opts.maxBlocksPerCheckpoint !== undefined && opts.maxBlocksPerCheckpoint < computed) {
+            opts.logger?.warn(`Locally computed max blocks per checkpoint clamped down to the network-provided value`, {
+                computed,
+                maxBlocksPerCheckpoint: opts.maxBlocksPerCheckpoint
+            });
+        }
+        if (this.maxBlocksPerCheckpoint < 1) {
+            throw new Error(`Invalid timing configuration: derived ${this.maxBlocksPerCheckpoint} blocks per checkpoint for ` + `slot duration ${this.aztecSlotDuration}s and block duration ${this.blockDuration}s.`);
+        }
     }
     /**
    * Computes the maximum number of full-duration block sub-slots in a checkpoint from the already-resolved
    * budgets. Derived from the spec's `max_blocks_per_checkpoint = floor((last_block_build_time -
    * first_subslot_start) / D)`, where the first sub-slot starts one `checkpoint_proposal_init_time` (`init`)
-   * after `build_frame_start`, so it simplifies to `floor((S - init - D - 2P - prepCp) / D)`. Single-block
-   * mode (`blockDuration` undefined) returns 1.
+   * after `build_frame_start`, so it simplifies to `floor((S - init - D - 2P - prepCp) / D)`.
    */ computeMaxBlocksPerCheckpoint() {
-        if (this.blockDuration === undefined) {
-            return 1;
-        }
         // last_block_build_time - (build_frame_start + init) = S - init - D - 2P - prepCp.
         const timeAvailableForBlocks = this.aztecSlotDuration - this.checkpointProposalInitTime - this.blockDuration - 2 * this.p2pPropagationTime - this.checkpointProposalPrepareTime;
         return Math.floor(timeAvailableForBlocks / this.blockDuration);
@@ -56,10 +68,9 @@ import { ConsensusTimetable } from './consensus_timetable.js';
     /**
    * Ideal time the last block must finish building by to make the ideal L1 publish path:
    * `target_slot_start - E - D - 2P - prepCp` (= `checkpoint_proposal_send_time - prepCp`). Single value;
-   * the proposer sizes block production around the ideal L1-publish path only. In single-block mode
-   * (`blockDuration` undefined) the `D` term drops out, since the single block is itself the final block.
+   * the proposer sizes block production around the ideal L1-publish path only.
    */ getLastBlockBuildTime(slot) {
-        return this.getTargetSlotStart(slot) - this.ethereumSlotDuration - (this.blockDuration ?? 0) - 2 * this.p2pPropagationTime - this.checkpointProposalPrepareTime;
+        return this.getTargetSlotStart(slot) - this.ethereumSlotDuration - this.blockDuration - 2 * this.p2pPropagationTime - this.checkpointProposalPrepareTime;
     }
     /**
    * Latest start at which the proposer can still squeeze in a minimum-duration block.
@@ -68,12 +79,8 @@ import { ConsensusTimetable } from './consensus_timetable.js';
    * intentionally earlier (by `P`) than the consensus receive gate would strictly allow, and
    * conservatively no later than the final sub-slot's start cutoff in {@link selectNextSubslot}.
    *
-   * Single-block mode (`blockDuration` undefined): `attestation_deadline - 2 * min_block_duration`,
-   * matching {@link selectNextSubslot}'s single-block branch (which needs `min_block_duration` for
-   * execution and another for re-execution before the attestation deadline). This keeps the build-entry
-   * start gate from abandoning a slot that {@link selectNextSubslot} would still allow to start.
    */ getBuildStartDeadline(slot) {
-        return this.blockDuration === undefined ? this.getAttestationDeadline(slot) - 2 * this.minBlockDuration : this.getLastBlockBuildTime(slot) - this.minBlockDuration;
+        return this.getLastBlockBuildTime(slot) - this.minBlockDuration;
     }
     /** Ideal L1 publish/send time: `target_slot_start - E`. Also the ideal attestation-receipt target. */ getL1PublishIdealTime(slot) {
         return this.getTargetSlotStart(slot) - this.ethereumSlotDuration;
@@ -85,7 +92,7 @@ import { ConsensusTimetable } from './consensus_timetable.js';
    * budget at the start of the build frame, so the first sub-slot still has its full duration once the
    * prologue finishes rather than being eaten by it.
    */ getBlockBuildDeadline(slot, blockIndex) {
-        return this.getBuildFrameStart(slot) + this.checkpointProposalInitTime + (blockIndex + 1) * this.requireBlockDurationForSchedule();
+        return this.getBuildFrameStart(slot) + this.checkpointProposalInitTime + (blockIndex + 1) * this.blockDuration;
     }
     /** Latest time to keep waiting for txs for sub-slot `k`: `block_build_deadline(k) - min_block_duration`. */ getWaitForTxsDeadline(slot, blockIndex) {
         return this.getBlockBuildDeadline(slot, blockIndex) - this.minBlockDuration;
@@ -99,39 +106,9 @@ import { ConsensusTimetable } from './consensus_timetable.js';
    * Scans sub-slots in order and picks the first whose build deadline is at least `min_block_duration`
    * in the future. Sub-slots with insufficient remaining headroom are skipped.
    *
-   * When enforcement is disabled, always allows building a single block with no deadline (test/sandbox
-   * mode). In single-block mode (`blockDuration === undefined`) enforced, splits the remaining time
-   * between execution and re-execution against the attestation deadline.
-   *
    * @param slot - Target slot the checkpoint commits to.
    * @param now - Current wall-clock time in seconds.
    */ selectNextSubslot(slot, now) {
-        if (!this.enforce) {
-            return {
-                canStart: true,
-                index: 0,
-                deadline: undefined,
-                isLastBlock: true
-            };
-        }
-        if (this.blockDuration === undefined) {
-            // Single-block enforced mode: execution and re-execution run sequentially, so split the time
-            // remaining until the attestation deadline in half.
-            const maxAllowed = this.getAttestationDeadline(slot);
-            const available = (maxAllowed - now) / 2;
-            const canStart = available >= this.minBlockDuration;
-            return canStart ? {
-                canStart: true,
-                index: 0,
-                deadline: now + available,
-                isLastBlock: true
-            } : {
-                canStart: false,
-                index: undefined,
-                deadline: undefined,
-                isLastBlock: false
-            };
-        }
         const maxBlocks = this.maxBlocksPerCheckpoint;
         for(let index = 0; index < maxBlocks; index++){
             const deadline = this.getBlockBuildDeadline(slot, index);
@@ -152,10 +129,4 @@ import { ConsensusTimetable } from './consensus_timetable.js';
             isLastBlock: false
         };
     }
-    requireBlockDurationForSchedule() {
-        if (this.blockDuration === undefined) {
-            throw new Error('blockDuration is required for sub-slot scheduling');
-        }
-        return this.blockDuration;
-    }
 }

package/dest/tx/fee_provider.d.ts

@@ -4,7 +4,7 @@ import type { GasFees } from '../gas/gas_fees.js';
 export interface FeeProvider {
     /** Returns the current minimum fees for inclusion in the next block. */
     getCurrentMinFees(): Promise<GasFees>;
-    /** Returns predicted min fees for each slot in the prediction window. */
+    /** Returns current min fees first, followed by predicted min fees for each slot in the prediction window. */
     getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsOEVBQThFO0FBQzlFLE1BQU0sV0FBVyxXQUFXO0lBQzFCLHdFQUF3RTtJQUN4RSxpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMseUVBQXlFO0lBQ3pFLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQ3hFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHgvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsOEVBQThFO0FBQzlFLE1BQU0sV0FBVyxXQUFXO0lBQzFCLHdFQUF3RTtJQUN4RSxpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEMsNkdBQTZHO0lBQzdHLG1CQUFtQixDQUFDLFNBQVMsQ0FBQyxFQUFFLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0NBQ3hFIn0=

package/dest/tx/fee_provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/tx/fee_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,yEAAyE;IACzE,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CACxE"}
+{"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/tx/fee_provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,8EAA8E;AAC9E,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,6GAA6G;IAC7G,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;CACxE"}

package/dest/tx/validator/error_texts.d.ts

@@ -1,7 +1,7 @@
 export declare const TX_ERROR_INSUFFICIENT_FEE_PER_GAS = "Insufficient fee per gas";
 export declare const TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE = "Insufficient fee payer balance";
 export declare const TX_ERROR_INSUFFICIENT_GAS_LIMIT = "Gas limit is below the minimum fixed cost";
-export declare const TX_ERROR_GAS_LIMIT_TOO_HIGH = "Gas limit is higher than the amount of gas that the AVM can process";
+export declare const TX_ERROR_GAS_LIMIT_TOO_HIGH = "Gas limit is higher than the maximum amount of gas this network allows per tx";
 export declare const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = "Setup function not on allow list";
 export declare const TX_ERROR_SETUP_FUNCTION_UNKNOWN_CONTRACT = "Setup function targets unknown contract";
 export declare const TX_ERROR_SETUP_ONLY_SELF_WRONG_SENDER = "Setup only_self function called with incorrect msg_sender";
@@ -30,4 +30,4 @@ export declare const TX_ERROR_MALFORMED_CONTRACT_INSTANCE_LOG = "Failed to parse
 export declare const TX_ERROR_INCORRECT_CONTRACT_CLASS_ID = "Incorrect contract class id";
 export declare const TX_ERROR_MALFORMED_CONTRACT_CLASS_LOG = "Failed to parse contract class registration log";
 export declare const TX_ERROR_DURING_VALIDATION = "Unexpected error during validation";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JfdGV4dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90eC92YWxpZGF0b3IvZXJyb3JfdGV4dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsZUFBTyxNQUFNLGlDQUFpQyw2QkFBNkIsQ0FBQztBQUM1RSxlQUFPLE1BQU0sdUNBQXVDLG1DQUFtQyxDQUFDO0FBQ3hGLGVBQU8sTUFBTSwrQkFBK0IsOENBQThDLENBQUM7QUFDM0YsZUFBTyxNQUFNLDJCQUEyQix3RUFBd0UsQ0FBQztBQUdqSCxlQUFPLE1BQU0sbUNBQW1DLHFDQUFxQyxDQUFDO0FBQ3RGLGVBQU8sTUFBTSx3Q0FBd0MsNENBQTRDLENBQUM7QUFDbEcsZUFBTyxNQUFNLHFDQUFxQyw4REFBOEQsQ0FBQztBQUNqSCxlQUFPLE1BQU0sOEJBQThCLCtDQUErQyxDQUFDO0FBQzNGLGVBQU8sTUFBTSxvQ0FBb0MscURBQXFELENBQUM7QUFHdkcsZUFBTyxNQUFNLGtDQUFrQyw4QkFBOEIsQ0FBQztBQUM5RSxlQUFPLE1BQU0sMkJBQTJCLHVCQUF1QixDQUFDO0FBR2hFLGVBQU8sTUFBTSxxQ0FBcUMsaUNBQWlDLENBQUM7QUFDcEYsZUFBTyxNQUFNLDhCQUE4QiwwQkFBMEIsQ0FBQztBQUN0RSxlQUFPLE1BQU0saUNBQWlDLDZCQUE2QixDQUFDO0FBQzVFLGVBQU8sTUFBTSwrQkFBK0IsMENBQTBDLENBQUM7QUFDdkYsZUFBTyxNQUFNLDBDQUEwQyxzQ0FBc0MsQ0FBQztBQUc5RixlQUFPLE1BQU0sc0JBQXNCLGtCQUFrQixDQUFDO0FBR3RELGVBQU8sTUFBTSwyQkFBMkIsdUNBQXVDLENBQUM7QUFDaEYsZUFBTyxNQUFNLGdDQUFnQyw4Q0FBOEMsQ0FBQztBQUM1RixlQUFPLE1BQU0saUNBQWlDLHVEQUF1RCxDQUFDO0FBQ3RHLGVBQU8sTUFBTSxpQ0FBaUMsNkNBQTZDLENBQUM7QUFDNUYsZUFBTyxNQUFNLGtDQUFrQyx5Q0FBeUMsQ0FBQztBQUN6RixlQUFPLE1BQU0sNEJBQTRCLG1DQUFtQyxDQUFDO0FBQzdFLGVBQU8sTUFBTSxtQ0FBbUMsMkNBQTJDLENBQUM7QUFDNUYsZUFBTyxNQUFNLHVCQUF1QixzQkFBc0IsQ0FBQztBQUczRCxlQUFPLE1BQU0seUJBQXlCLHNDQUFzQyxDQUFDO0FBRzdFLGVBQU8sTUFBTSxxQkFBcUIsMkJBQTJCLENBQUM7QUFHOUQsZUFBTyxNQUFNLG1DQUFtQyxtREFBbUQsQ0FBQztBQUNwRyxlQUFPLE1BQU0sd0NBQXdDLHFEQUFxRCxDQUFDO0FBRzNHLGVBQU8sTUFBTSxvQ0FBb0MsZ0NBQWdDLENBQUM7QUFDbEYsZUFBTyxNQUFNLHFDQUFxQyxvREFBb0QsQ0FBQztBQUd2RyxlQUFPLE1BQU0sMEJBQTBCLHVDQUF1QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JfdGV4dHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90eC92YWxpZGF0b3IvZXJyb3JfdGV4dHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsZUFBTyxNQUFNLGlDQUFpQyw2QkFBNkIsQ0FBQztBQUM1RSxlQUFPLE1BQU0sdUNBQXVDLG1DQUFtQyxDQUFDO0FBQ3hGLGVBQU8sTUFBTSwrQkFBK0IsOENBQThDLENBQUM7QUFDM0YsZUFBTyxNQUFNLDJCQUEyQixrRkFDeUMsQ0FBQztBQUdsRixlQUFPLE1BQU0sbUNBQW1DLHFDQUFxQyxDQUFDO0FBQ3RGLGVBQU8sTUFBTSx3Q0FBd0MsNENBQTRDLENBQUM7QUFDbEcsZUFBTyxNQUFNLHFDQUFxQyw4REFBOEQsQ0FBQztBQUNqSCxlQUFPLE1BQU0sOEJBQThCLCtDQUErQyxDQUFDO0FBQzNGLGVBQU8sTUFBTSxvQ0FBb0MscURBQXFELENBQUM7QUFHdkcsZUFBTyxNQUFNLGtDQUFrQyw4QkFBOEIsQ0FBQztBQUM5RSxlQUFPLE1BQU0sMkJBQTJCLHVCQUF1QixDQUFDO0FBR2hFLGVBQU8sTUFBTSxxQ0FBcUMsaUNBQWlDLENBQUM7QUFDcEYsZUFBTyxNQUFNLDhCQUE4QiwwQkFBMEIsQ0FBQztBQUN0RSxlQUFPLE1BQU0saUNBQWlDLDZCQUE2QixDQUFDO0FBQzVFLGVBQU8sTUFBTSwrQkFBK0IsMENBQTBDLENBQUM7QUFDdkYsZUFBTyxNQUFNLDBDQUEwQyxzQ0FBc0MsQ0FBQztBQUc5RixlQUFPLE1BQU0sc0JBQXNCLGtCQUFrQixDQUFDO0FBR3RELGVBQU8sTUFBTSwyQkFBMkIsdUNBQXVDLENBQUM7QUFDaEYsZUFBTyxNQUFNLGdDQUFnQyw4Q0FBOEMsQ0FBQztBQUM1RixlQUFPLE1BQU0saUNBQWlDLHVEQUF1RCxDQUFDO0FBQ3RHLGVBQU8sTUFBTSxpQ0FBaUMsNkNBQTZDLENBQUM7QUFDNUYsZUFBTyxNQUFNLGtDQUFrQyx5Q0FBeUMsQ0FBQztBQUN6RixlQUFPLE1BQU0sNEJBQTRCLG1DQUFtQyxDQUFDO0FBQzdFLGVBQU8sTUFBTSxtQ0FBbUMsMkNBQTJDLENBQUM7QUFDNUYsZUFBTyxNQUFNLHVCQUF1QixzQkFBc0IsQ0FBQztBQUczRCxlQUFPLE1BQU0seUJBQXlCLHNDQUFzQyxDQUFDO0FBRzdFLGVBQU8sTUFBTSxxQkFBcUIsMkJBQTJCLENBQUM7QUFHOUQsZUFBTyxNQUFNLG1DQUFtQyxtREFBbUQsQ0FBQztBQUNwRyxlQUFPLE1BQU0sd0NBQXdDLHFEQUFxRCxDQUFDO0FBRzNHLGVBQU8sTUFBTSxvQ0FBb0MsZ0NBQWdDLENBQUM7QUFDbEYsZUFBTyxNQUFNLHFDQUFxQyxvREFBb0QsQ0FBQztBQUd2RyxlQUFPLE1BQU0sMEJBQTBCLHVDQUF1QyxDQUFDIn0=

package/dest/tx/validator/error_texts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAC3F,eAAO,MAAM,2BAA2B,wEAAwE,CAAC;AAGjH,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AACtF,eAAO,MAAM,wCAAwC,4CAA4C,CAAC;AAClG,eAAO,MAAM,qCAAqC,8DAA8D,CAAC;AACjH,eAAO,MAAM,8BAA8B,+CAA+C,CAAC;AAC3F,eAAO,MAAM,oCAAoC,qDAAqD,CAAC;AAGvG,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,qCAAqC,iCAAiC,CAAC;AACpF,eAAO,MAAM,8BAA8B,0BAA0B,CAAC;AACtE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,+BAA+B,0CAA0C,CAAC;AACvF,eAAO,MAAM,0CAA0C,sCAAsC,CAAC;AAG9F,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,yCAAyC,CAAC;AACzF,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAC5F,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAG3D,eAAO,MAAM,yBAAyB,sCAAsC,CAAC;AAG7E,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,mCAAmC,mDAAmD,CAAC;AACpG,eAAO,MAAM,wCAAwC,qDAAqD,CAAC;AAG3G,eAAO,MAAM,oCAAoC,gCAAgC,CAAC;AAClF,eAAO,MAAM,qCAAqC,oDAAoD,CAAC;AAGvG,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}
+{"version":3,"file":"error_texts.d.ts","sourceRoot":"","sources":["../../../src/tx/validator/error_texts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,uCAAuC,mCAAmC,CAAC;AACxF,eAAO,MAAM,+BAA+B,8CAA8C,CAAC;AAC3F,eAAO,MAAM,2BAA2B,kFACyC,CAAC;AAGlF,eAAO,MAAM,mCAAmC,qCAAqC,CAAC;AACtF,eAAO,MAAM,wCAAwC,4CAA4C,CAAC;AAClG,eAAO,MAAM,qCAAqC,8DAA8D,CAAC;AACjH,eAAO,MAAM,8BAA8B,+CAA+C,CAAC;AAC3F,eAAO,MAAM,oCAAoC,qDAAqD,CAAC;AAGvG,eAAO,MAAM,kCAAkC,8BAA8B,CAAC;AAC9E,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAGhE,eAAO,MAAM,qCAAqC,iCAAiC,CAAC;AACpF,eAAO,MAAM,8BAA8B,0BAA0B,CAAC;AACtE,eAAO,MAAM,iCAAiC,6BAA6B,CAAC;AAC5E,eAAO,MAAM,+BAA+B,0CAA0C,CAAC;AACvF,eAAO,MAAM,0CAA0C,sCAAsC,CAAC;AAG9F,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAGtD,eAAO,MAAM,2BAA2B,uCAAuC,CAAC;AAChF,eAAO,MAAM,gCAAgC,8CAA8C,CAAC;AAC5F,eAAO,MAAM,iCAAiC,uDAAuD,CAAC;AACtG,eAAO,MAAM,iCAAiC,6CAA6C,CAAC;AAC5F,eAAO,MAAM,kCAAkC,yCAAyC,CAAC;AACzF,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,mCAAmC,2CAA2C,CAAC;AAC5F,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAG3D,eAAO,MAAM,yBAAyB,sCAAsC,CAAC;AAG7E,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAG9D,eAAO,MAAM,mCAAmC,mDAAmD,CAAC;AACpG,eAAO,MAAM,wCAAwC,qDAAqD,CAAC;AAG3G,eAAO,MAAM,oCAAoC,gCAAgC,CAAC;AAClF,eAAO,MAAM,qCAAqC,oDAAoD,CAAC;AAGvG,eAAO,MAAM,0BAA0B,uCAAuC,CAAC"}

package/dest/tx/validator/error_texts.js

@@ -2,7 +2,7 @@
 export const TX_ERROR_INSUFFICIENT_FEE_PER_GAS = 'Insufficient fee per gas';
 export const TX_ERROR_INSUFFICIENT_FEE_PAYER_BALANCE = 'Insufficient fee payer balance';
 export const TX_ERROR_INSUFFICIENT_GAS_LIMIT = 'Gas limit is below the minimum fixed cost';
-export const TX_ERROR_GAS_LIMIT_TOO_HIGH = 'Gas limit is higher than the amount of gas that the AVM can process';
+export const TX_ERROR_GAS_LIMIT_TOO_HIGH = 'Gas limit is higher than the maximum amount of gas this network allows per tx';
 // Phases
 export const TX_ERROR_SETUP_FUNCTION_NOT_ALLOWED = 'Setup function not on allow list';
 export const TX_ERROR_SETUP_FUNCTION_UNKNOWN_CONTRACT = 'Setup function targets unknown contract';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "5.0.0-nightly.20260611",
+  "version": "5.0.0-nightly.20260613",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -92,13 +92,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "5.0.0-nightly.20260611",
-    "@aztec/blob-lib": "5.0.0-nightly.20260611",
-    "@aztec/constants": "5.0.0-nightly.20260611",
-    "@aztec/ethereum": "5.0.0-nightly.20260611",
-    "@aztec/foundation": "5.0.0-nightly.20260611",
-    "@aztec/l1-artifacts": "5.0.0-nightly.20260611",
-    "@aztec/noir-noirc_abi": "5.0.0-nightly.20260611",
+    "@aztec/bb.js": "5.0.0-nightly.20260613",
+    "@aztec/blob-lib": "5.0.0-nightly.20260613",
+    "@aztec/constants": "5.0.0-nightly.20260613",
+    "@aztec/ethereum": "5.0.0-nightly.20260613",
+    "@aztec/foundation": "5.0.0-nightly.20260613",
+    "@aztec/l1-artifacts": "5.0.0-nightly.20260613",
+    "@aztec/noir-noirc_abi": "5.0.0-nightly.20260613",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.15.1",
     "json-stringify-deterministic": "1.0.12",

package/src/block/l2_block_source.ts

@@ -351,6 +351,13 @@ export type L2Tips = {
   finalized: L2TipId;
 };
 
+/**
+ * Tips of the L2 chain as tracked by a local provider (world-state, l2-tips-store). Omits
+ * `proposedCheckpoint`, which is degenerate in local stores (always equal to `checkpointed`) and
+ * is only meaningful on the archiver side via {@link L2BlockSource}.
+ */
+export type LocalL2Tips = Omit<L2Tips, 'proposedCheckpoint'>;
+
 export const GENESIS_CHECKPOINT_HEADER_HASH = CheckpointHeader.empty().hash();
 
 /** Identifies a block by number and hash. */

package/src/block/l2_block_stream/interfaces.ts

@@ -1,14 +1,38 @@
+import type { BlockNumber } from '@aztec/foundation/branded-types';
+
 import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
 import type { L2Block } from '../l2_block.js';
-import type { CheckpointId, L2BlockId, L2Tips } from '../l2_block_source.js';
+import type { CheckpointId, L2BlockId, L2TipId, LocalL2Tips } from '../l2_block_source.js';
 
 /** Provides the current chain tips. Implemented by world-state, l2-tips-store, and AztecNode. */
 export interface L2TipsProvider {
-  getL2Tips(): Promise<L2Tips>;
+  getL2Tips(): Promise<LocalL2Tips>;
 }
 
-/** Interface to the local view of the chain. Implemented by world-state and l2-tips-store. */
-export interface L2BlockStreamLocalDataProvider extends L2TipsProvider {
+/**
+ * A block id reported by a local data provider, whose hash may be unknown when the provider cannot resolve it (e.g.
+ * world-state cannot resolve the hash of a proven tip ahead of its synced range).
+ */
+export type LocalL2BlockId = { number: BlockNumber; hash?: string };
+
+/**
+ * Minimal local view of the chain the block stream needs to drive sync. `checkpointed` is only required when the
+ * stream emits checkpoint events (i.e. `ignoreCheckpoints` is off).
+ */
+export type LocalChainTips = {
+  proposed: LocalL2BlockId;
+  checkpointed?: { checkpoint: CheckpointId };
+  proven: { block: LocalL2BlockId };
+  finalized: { block: LocalL2BlockId };
+};
+
+/**
+ * Interface to the local view of the chain. Implemented by world-state and l2-tips-store. Anything implementing
+ * {@link L2TipsProvider} also satisfies this contract structurally, since {@link LocalL2Tips} is assignable to
+ * {@link LocalChainTips}.
+ */
+export interface L2BlockStreamLocalDataProvider {
+  getL2Tips(): Promise<LocalChainTips>;
   getL2BlockHash(number: number): Promise<string | undefined>;
 }
 
@@ -30,19 +54,27 @@ export type L2BlockStreamEvent =
   | /**
    * Reports last correct block (new tip of the proposed chain). Note that this is not necessarily the anchor block
    * that will be used in the transaction - if the chain has already moved past the reorg, we'll also see blocks-added
-   * events that will push the anchor block forward.
+   * events that will push the anchor block forward. `block` is the prune target (the new proposed tip); `checkpointed`
+   * and `proven` are the source's confirmed checkpointed and proven tips (each a block and checkpoint id). Each is used
+   * to clamp the corresponding local cursor when it leads the source tip, so a cursor never overshoots its own source
+   * frontier during a prune (the source guarantees proven <= checkpointed).
    */ {
       type: 'chain-pruned';
       block: L2BlockId;
-      checkpoint: CheckpointId;
+      checkpointed: L2TipId;
+      proven: L2TipId;
     }
   | /** Reports new proven block. */ {
       type: 'chain-proven';
       block: L2BlockId;
+      checkpoint: CheckpointId;
     }
   | /** Reports new finalized block (proven and finalized on L1). */ {
       type: 'chain-finalized';
       block: L2BlockId;
+      checkpoint: CheckpointId;
     };
 
-export type L2TipsStore = L2BlockStreamEventHandler & L2BlockStreamLocalDataProvider;
+export type L2TipsStore = L2BlockStreamEventHandler &
+  L2TipsProvider &
+  Pick<L2BlockStreamLocalDataProvider, 'getL2BlockHash'>;

package/src/block/l2_block_stream/l2_block_stream.ts

@@ -70,6 +70,13 @@ export class L2BlockStream {
       const localTips = await this.localData.getL2Tips();
       this.log.trace(`Running L2 block stream`, { sourceTips, localTips });
 
+      if (!this.opts.ignoreCheckpoints && localTips.checkpointed === undefined) {
+        throw new Error(
+          'Local data provider does not expose a checkpointed tip; checkpoint events require one ' +
+            '(set ignoreCheckpoints or provide checkpointed tips).',
+        );
+      }
+
       // Check if there was a reorg and emit a chain-pruned event if so.
       let latestBlockNumber = localTips.proposed.number;
       const sourceCache = new BlockHashCache([sourceTips.proposed]);
@@ -105,7 +112,8 @@ export class L2BlockStream {
         await this.emitEvent({
           type: 'chain-pruned',
           block: makeL2BlockId(latestBlockNumber, hash),
-          checkpoint: sourceTips.checkpointed.checkpoint,
+          checkpointed: sourceTips.checkpointed,
+          proven: sourceTips.proven,
         });
       }
 
@@ -122,7 +130,12 @@ export class L2BlockStream {
       }
 
       let nextBlockNumber = latestBlockNumber + 1;
-      let nextCheckpointToEmit = CheckpointNumber(localTips.checkpointed.checkpoint.number + 1);
+      // When checkpoints are ignored the local provider may omit `checkpointed`; in that case the fallback to
+      // CheckpointNumber.ZERO is harmless because `nextCheckpointToEmit` is never consumed for emission (Loop 1 and
+      // the startingBlock/skipFinalized adjustments below only feed checkpoint emission, which is gated off).
+      let nextCheckpointToEmit = CheckpointNumber(
+        (localTips.checkpointed?.checkpoint.number ?? CheckpointNumber.ZERO) + 1,
+      );
 
       // When startingBlock is set, also skip ahead for checkpoints.
       if (
@@ -261,10 +274,15 @@ export class L2BlockStream {
         await this.emitEvent({
           type: 'chain-proven',
           block: sourceTips.proven.block,
+          checkpoint: sourceTips.proven.checkpoint,
         });
       }
       if (localTips.finalized !== undefined && sourceTips.finalized.block.number !== localTips.finalized.block.number) {
-        await this.emitEvent({ type: 'chain-finalized', block: sourceTips.finalized.block });
+        await this.emitEvent({
+          type: 'chain-finalized',
+          block: sourceTips.finalized.block,
+          checkpoint: sourceTips.finalized.checkpoint,
+        });
       }
     } catch (err: any) {
       if (err.name === 'AbortError') {

package/src/block/l2_block_stream/l2_tips_memory_store.ts

@@ -1,8 +1,7 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 
-import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
 import type { BlockHash } from '../block_hash.js';
-import type { L2BlockTag } from '../l2_block_source.js';
+import type { CheckpointId, L2BlockTag } from '../l2_block_source.js';
 import { L2TipsStoreBase } from './l2_tips_store_base.js';
 
 /**
@@ -15,9 +14,8 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
   }
 
   private readonly tips = new Map<L2BlockTag, BlockNumber>();
+  private readonly tipCheckpoints = new Map<L2BlockTag, CheckpointId>();
   private readonly blockHashes = new Map<number, string>();
-  private readonly blockToCheckpoint = new Map<number, CheckpointNumber>();
-  private readonly checkpoints = new Map<number, PublishedCheckpoint>();
 
   protected getTip(tag: L2BlockTag): Promise<BlockNumber | undefined> {
     return Promise.resolve(this.tips.get(tag));
@@ -28,6 +26,15 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
     return Promise.resolve();
   }
 
+  protected getTipCheckpoint(tag: L2BlockTag): Promise<CheckpointId | undefined> {
+    return Promise.resolve(this.tipCheckpoints.get(tag));
+  }
+
+  protected setTipCheckpoint(tag: L2BlockTag, checkpoint: CheckpointId): Promise<void> {
+    this.tipCheckpoints.set(tag, checkpoint);
+    return Promise.resolve();
+  }
+
   protected getStoredBlockHash(blockNumber: BlockNumber): Promise<string | undefined> {
     return Promise.resolve(this.blockHashes.get(blockNumber));
   }
@@ -46,42 +53,6 @@ export class L2TipsMemoryStore extends L2TipsStoreBase {
     return Promise.resolve();
   }
 
-  protected getCheckpointNumberForBlock(blockNumber: BlockNumber): Promise<CheckpointNumber | undefined> {
-    return Promise.resolve(this.blockToCheckpoint.get(blockNumber));
-  }
-
-  protected setCheckpointNumberForBlock(blockNumber: BlockNumber, checkpointNumber: CheckpointNumber): Promise<void> {
-    this.blockToCheckpoint.set(blockNumber, checkpointNumber);
-    return Promise.resolve();
-  }
-
-  protected deleteBlockToCheckpointBefore(blockNumber: BlockNumber): Promise<void> {
-    for (const key of this.blockToCheckpoint.keys()) {
-      if (key < blockNumber) {
-        this.blockToCheckpoint.delete(key);
-      }
-    }
-    return Promise.resolve();
-  }
-
-  protected getCheckpoint(checkpointNumber: CheckpointNumber): Promise<PublishedCheckpoint | undefined> {
-    return Promise.resolve(this.checkpoints.get(checkpointNumber));
-  }
-
-  protected saveCheckpointData(checkpoint: PublishedCheckpoint): Promise<void> {
-    this.checkpoints.set(checkpoint.checkpoint.number, checkpoint);
-    return Promise.resolve();
-  }
-
-  protected deleteCheckpointsBefore(checkpointNumber: CheckpointNumber): Promise<void> {
-    for (const key of this.checkpoints.keys()) {
-      if (key < checkpointNumber) {
-        this.checkpoints.delete(key);
-      }
-    }
-    return Promise.resolve();
-  }
-
   protected runInTransaction<T>(fn: () => Promise<T>): Promise<T> {
     // Memory store doesn't need transactions - just execute immediately
     return fn();