@aztec/validator-client 0.0.1-commit.b655e406 → 0.0.1-commit.b6e433891

package/dest/block_proposal_handler.js

@@ -1,67 +1,149 @@
+function _ts_add_disposable_resource(env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() {
+            try {
+                inner.call(this);
+            } catch (e) {
+                return Promise.reject(e);
+            }
+        };
+        env.stack.push({
+            value: value,
+            dispose: dispose,
+            async: async
+        });
+    } else if (async) {
+        env.stack.push({
+            async: true
+        });
+    }
+    return value;
+}
+function _ts_dispose_resources(env) {
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+    return (_ts_dispose_resources = function _ts_dispose_resources(env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while(r = env.stack.pop()){
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+                            fail(e);
+                            return next();
+                        });
+                    } else s |= 1;
+                } catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    })(env);
+}
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { pick } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { TimeoutError } from '@aztec/foundation/error';
-import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
-import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
-import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import { ConsensusPayload } from '@aztec/stdlib/p2p';
-import { GlobalVariables } from '@aztec/stdlib/tx';
-import { ReExFailedTxsError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
+import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { Gas } from '@aztec/stdlib/gas';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { ReExFailedTxsError, ReExInitialStateMismatchError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 export class BlockProposalHandler {
-    blockBuilder;
+    checkpointsBuilder;
+    worldState;
     blockSource;
     l1ToL2MessageSource;
     txProvider;
     blockProposalValidator;
+    epochCache;
     config;
     metrics;
     dateProvider;
     log;
     tracer;
-    constructor(blockBuilder, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, config, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:block-proposal-handler')){
-        this.blockBuilder = blockBuilder;
+    constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:block-proposal-handler')){
+        this.checkpointsBuilder = checkpointsBuilder;
+        this.worldState = worldState;
         this.blockSource = blockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
         this.txProvider = txProvider;
         this.blockProposalValidator = blockProposalValidator;
+        this.epochCache = epochCache;
         this.config = config;
         this.metrics = metrics;
         this.dateProvider = dateProvider;
         this.log = log;
+        if (config.fishermanMode) {
+            this.log = this.log.createChild('[FISHERMAN]');
+        }
         this.tracer = telemetry.getTracer('BlockProposalHandler');
     }
-    registerForReexecution(p2pClient) {
+    register(p2pClient, shouldReexecute) {
+        // Non-validator handler that processes or re-executes for monitoring but does not attest.
+        // Returns boolean indicating whether the proposal was valid.
         const handler = async (proposal, proposalSender)=>{
             try {
-                const result = await this.handleBlockProposal(proposal, proposalSender, true);
+                const { slotNumber, blockNumber } = proposal;
+                const result = await this.handleBlockProposal(proposal, proposalSender, shouldReexecute);
                 if (result.isValid) {
-                    this.log.info(`Non-validator reexecution completed for slot ${proposal.slotNumber.toBigInt()}`, {
+                    this.log.info(`Non-validator block proposal ${blockNumber} at slot ${slotNumber} handled`, {
                         blockNumber: result.blockNumber,
+                        slotNumber,
                         reexecutionTimeMs: result.reexecutionResult?.reexecutionTimeMs,
                         totalManaUsed: result.reexecutionResult?.totalManaUsed,
-                        numTxs: result.reexecutionResult?.block?.body?.txEffects?.length ?? 0
+                        numTxs: result.reexecutionResult?.block?.body?.txEffects?.length ?? 0,
+                        reexecuted: shouldReexecute
                     });
+                    return true;
                 } else {
-                    this.log.warn(`Non-validator reexecution failed for slot ${proposal.slotNumber.toBigInt()}`, {
+                    this.log.warn(`Non-validator block proposal ${blockNumber} at slot ${slotNumber} failed processing with ${result.reason}`, {
                         blockNumber: result.blockNumber,
+                        slotNumber,
                         reason: result.reason
                     });
+                    return false;
                 }
             } catch (error) {
                 this.log.error('Error processing block proposal in non-validator handler', error);
+                return false;
             }
-            return undefined; // Non-validator nodes don't return attestations
         };
         p2pClient.registerBlockProposalHandler(handler);
         return this;
     }
     async handleBlockProposal(proposal, proposalSender, shouldReexecute) {
-        const slotNumber = proposal.slotNumber.toBigInt();
+        const slotNumber = proposal.slotNumber;
         const proposer = proposal.getSender();
-        const config = this.blockBuilder.getConfig();
+        const config = this.checkpointsBuilder.getConfig();
         // Reject proposals with invalid signatures
         if (!proposer) {
             this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
@@ -72,7 +154,9 @@ export class BlockProposalHandler {
         }
         const proposalInfo = {
             ...proposal.toBlockInfo(),
-            proposer: proposer.toString()
+            proposer: proposer.toString(),
+            blockNumber: undefined,
+            checkpointNumber: undefined
         };
         this.log.info(`Processing proposal for slot ${slotNumber}`, {
             ...proposalInfo,
@@ -80,27 +164,46 @@ export class BlockProposalHandler {
         });
         // Check that the proposal is from the current proposer, or the next proposer
         // This should have been handled by the p2p layer, but we double check here out of caution
-        const invalidProposal = await this.blockProposalValidator.validate(proposal);
-        if (invalidProposal) {
+        const validationResult = await this.blockProposalValidator.validate(proposal);
+        if (validationResult.result !== 'accept') {
             this.log.warn(`Proposal is not valid, skipping processing`, proposalInfo);
             return {
                 isValid: false,
                 reason: 'invalid_proposal'
             };
         }
-        // Check that the parent proposal is a block we know, otherwise reexecution would fail
-        const parentBlockHeader = await this.getParentBlock(proposal);
-        if (parentBlockHeader === undefined) {
+        // Ensure the block source is synced before checking for existing blocks,
+        // since a pending checkpoint prune may remove blocks we'd otherwise find.
+        // This affects mostly the block_number_already_exists check, since a pending
+        // checkpoint prune could remove a block that would conflict with this proposal.
+        // When pipelining is enabled, the proposer builds ahead of L1 submission, so the
+        // block source won't have synced to the proposed slot yet. Skip the sync wait to
+        // avoid eating into the attestation window.
+        if (!this.epochCache.isProposerPipeliningEnabled()) {
+            const blockSourceSync = await this.waitForBlockSourceSync(slotNumber);
+            if (!blockSourceSync) {
+                this.log.warn(`Block source is not synced, skipping processing`, proposalInfo);
+                return {
+                    isValid: false,
+                    reason: 'block_source_not_synced'
+                };
+            }
+        }
+        // Check that the parent proposal is a block we know, otherwise reexecution would fail.
+        // If we don't find it immediately, we keep retrying for a while; it may be we still
+        // need to process other block proposals to get to it.
+        const parentBlock = await this.getParentBlock(proposal);
+        if (parentBlock === undefined) {
             this.log.warn(`Parent block for proposal not found, skipping processing`, proposalInfo);
             return {
                 isValid: false,
                 reason: 'parent_block_not_found'
             };
         }
-        // Check that the parent block's slot is less than the proposal's slot (should not happen, but we check anyway)
-        if (parentBlockHeader !== 'genesis' && parentBlockHeader.getSlot() >= slotNumber) {
-            this.log.warn(`Parent block slot is greater than or equal to proposal slot, skipping processing`, {
-                parentBlockSlot: parentBlockHeader.getSlot().toString(),
+        // Check that the parent block's slot is not greater than the proposal's slot.
+        if (parentBlock !== 'genesis' && parentBlock.header.getSlot() > slotNumber) {
+            this.log.warn(`Parent block slot is greater than proposal slot, skipping processing`, {
+                parentBlockSlot: parentBlock.header.getSlot().toString(),
                 proposalSlot: slotNumber.toString(),
                 ...proposalInfo
             });
@@ -110,7 +213,8 @@ export class BlockProposalHandler {
             };
         }
         // Compute the block number based on the parent block
-        const blockNumber = parentBlockHeader === 'genesis' ? INITIAL_L2_BLOCK_NUM : parentBlockHeader.getBlockNumber() + 1;
+        const blockNumber = parentBlock === 'genesis' ? BlockNumber(INITIAL_L2_BLOCK_NUM) : BlockNumber(parentBlock.header.getBlockNumber() + 1);
+        proposalInfo.blockNumber = blockNumber;
         // Check that this block number does not exist already
         const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
         if (existingBlock) {
@@ -127,10 +231,29 @@ export class BlockProposalHandler {
             pinnedPeer: proposalSender,
             deadline: this.getReexecutionDeadline(slotNumber, config)
         });
+        // If reexecution is disabled, bail. We were just interested in triggering tx collection.
+        if (!shouldReexecute) {
+            this.log.info(`Received valid block ${blockNumber} proposal at index ${proposal.indexWithinCheckpoint} on slot ${slotNumber}`, proposalInfo);
+            return {
+                isValid: true,
+                blockNumber
+            };
+        }
+        // Compute the checkpoint number for this block and validate checkpoint consistency
+        const checkpointResult = this.computeCheckpointNumber(proposal, parentBlock, proposalInfo);
+        if (checkpointResult.reason) {
+            return {
+                isValid: false,
+                blockNumber,
+                reason: checkpointResult.reason
+            };
+        }
+        const checkpointNumber = checkpointResult.checkpointNumber;
+        proposalInfo.checkpointNumber = checkpointNumber;
         // Check that I have the same set of l1ToL2Messages as the proposal
-        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
-        const computedInHash = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
-        const proposalInHash = proposal.payload.header.contentCommitment.inHash;
+        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
+        const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
+        const proposalInHash = proposal.inHash;
         if (!computedInHash.equals(proposalInHash)) {
             this.log.warn(`L1 to L2 messages in hash mismatch, skipping processing`, {
                 proposalInHash: proposalInHash.toString(),
@@ -155,24 +278,32 @@ export class BlockProposalHandler {
                 reason: 'txs_not_available'
             };
         }
+        // Collect the out hashes of all the checkpoints before this one in the same epoch
+        const epoch = getEpochAtSlot(slotNumber, this.epochCache.getL1Constants());
+        const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
         // Try re-executing the transactions in the proposal if needed
         let reexecutionResult;
-        if (shouldReexecute) {
-            try {
-                this.log.verbose(`Re-executing transactions in the proposal`, proposalInfo);
-                reexecutionResult = await this.reexecuteTransactions(proposal, blockNumber, txs, l1ToL2Messages);
-            } catch (error) {
-                this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
-                const reason = this.getReexecuteFailureReason(error);
-                return {
-                    isValid: false,
-                    blockNumber,
-                    reason,
-                    reexecutionResult
-                };
-            }
+        try {
+            this.log.verbose(`Re-executing transactions in the proposal`, proposalInfo);
+            reexecutionResult = await this.reexecuteTransactions(proposal, blockNumber, checkpointNumber, txs, l1ToL2Messages, previousCheckpointOutHashes);
+        } catch (error) {
+            this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
+            const reason = this.getReexecuteFailureReason(error);
+            return {
+                isValid: false,
+                blockNumber,
+                reason,
+                reexecutionResult
+            };
         }
-        this.log.info(`Successfully processed proposal for slot ${slotNumber}`, proposalInfo);
+        // If we succeeded, push this block into the archiver (unless disabled)
+        if (reexecutionResult?.block && this.config.skipPushProposedBlocksToArchiver === false) {
+            await this.blockSource.addBlock(reexecutionResult?.block);
+        }
+        this.log.info(`Successfully re-executed block ${blockNumber} proposal at index ${proposal.indexWithinCheckpoint} on slot ${slotNumber}`, {
+            ...proposalInfo,
+            ...pick(reexecutionResult, 'reexecutionTimeMs', 'totalManaUsed')
+        });
         return {
             isValid: true,
             blockNumber,
@@ -180,9 +311,9 @@ export class BlockProposalHandler {
         };
     }
     async getParentBlock(proposal) {
-        const parentArchive = proposal.payload.header.lastArchiveRoot;
-        const slot = proposal.slotNumber.toBigInt();
-        const config = this.blockBuilder.getConfig();
+        const parentArchive = proposal.blockHeader.lastArchive.root;
+        const slot = proposal.slotNumber;
+        const config = this.checkpointsBuilder.getConfig();
         const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
         if (parentArchive.equals(genesisArchiveRoot)) {
             return 'genesis';
@@ -191,7 +322,7 @@ export class BlockProposalHandler {
         const currentTime = this.dateProvider.now();
         const timeoutDurationMs = deadline.getTime() - currentTime;
         try {
-            return await this.blockSource.getBlockHeaderByArchive(parentArchive) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockHeaderByArchive(parentArchive)), 'force archiver sync', timeoutDurationMs / 1000, 0.5));
+            return await this.blockSource.getBlockDataByArchive(parentArchive) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockDataByArchive(parentArchive)), 'force archiver sync', timeoutDurationMs / 1000, 0.5));
         } catch (err) {
             if (err instanceof TimeoutError) {
                 this.log.debug(`Timed out getting parent block by archive root`, {
@@ -205,13 +336,171 @@ export class BlockProposalHandler {
             return undefined;
         }
     }
+    computeCheckpointNumber(proposal, parentBlock, proposalInfo) {
+        if (parentBlock === 'genesis') {
+            // First block is in checkpoint 1
+            if (proposal.indexWithinCheckpoint !== 0) {
+                this.log.warn(`First block proposal has non-zero indexWithinCheckpoint`, proposalInfo);
+                return {
+                    reason: 'invalid_proposal'
+                };
+            }
+            return {
+                checkpointNumber: CheckpointNumber.INITIAL
+            };
+        }
+        if (proposal.indexWithinCheckpoint === 0) {
+            // If this is the first block in a new checkpoint, increment the checkpoint number
+            if (!(proposal.blockHeader.getSlot() > parentBlock.header.getSlot())) {
+                this.log.warn(`Slot should be greater than parent block slot for first block in checkpoint`, proposalInfo);
+                return {
+                    reason: 'invalid_proposal'
+                };
+            }
+            return {
+                checkpointNumber: CheckpointNumber(parentBlock.checkpointNumber + 1)
+            };
+        }
+        // Otherwise it should follow the previous block in the same checkpoint
+        if (proposal.indexWithinCheckpoint !== parentBlock.indexWithinCheckpoint + 1) {
+            this.log.warn(`Non-sequential indexWithinCheckpoint`, proposalInfo);
+            return {
+                reason: 'invalid_proposal'
+            };
+        }
+        if (proposal.blockHeader.getSlot() !== parentBlock.header.getSlot()) {
+            this.log.warn(`Slot should be equal to parent block slot for non-first block in checkpoint`, proposalInfo);
+            return {
+                reason: 'invalid_proposal'
+            };
+        }
+        // For non-first blocks in a checkpoint, validate global variables match parent (except blockNumber)
+        const validationResult = this.validateNonFirstBlockInCheckpoint(proposal, parentBlock, proposalInfo);
+        if (validationResult) {
+            return validationResult;
+        }
+        return {
+            checkpointNumber: parentBlock.checkpointNumber
+        };
+    }
+    /**
+   * Validates that a non-first block in a checkpoint has consistent global variables with its parent.
+   * For blocks with indexWithinCheckpoint > 0, all global variables except blockNumber must match the parent.
+   * @returns A failure result if validation fails, undefined if validation passes
+   */ validateNonFirstBlockInCheckpoint(proposal, parentBlock, proposalInfo) {
+        const proposalGlobals = proposal.blockHeader.globalVariables;
+        const parentGlobals = parentBlock.header.globalVariables;
+        // All global variables except blockNumber should match the parent
+        // blockNumber naturally increments between blocks
+        if (!proposalGlobals.chainId.equals(parentGlobals.chainId)) {
+            this.log.warn(`Non-first block in checkpoint has mismatched chainId`, {
+                ...proposalInfo,
+                proposalChainId: proposalGlobals.chainId.toString(),
+                parentChainId: parentGlobals.chainId.toString()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (!proposalGlobals.version.equals(parentGlobals.version)) {
+            this.log.warn(`Non-first block in checkpoint has mismatched version`, {
+                ...proposalInfo,
+                proposalVersion: proposalGlobals.version.toString(),
+                parentVersion: parentGlobals.version.toString()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (proposalGlobals.slotNumber !== parentGlobals.slotNumber) {
+            this.log.warn(`Non-first block in checkpoint has mismatched slotNumber`, {
+                ...proposalInfo,
+                proposalSlotNumber: proposalGlobals.slotNumber,
+                parentSlotNumber: parentGlobals.slotNumber
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (proposalGlobals.timestamp !== parentGlobals.timestamp) {
+            this.log.warn(`Non-first block in checkpoint has mismatched timestamp`, {
+                ...proposalInfo,
+                proposalTimestamp: proposalGlobals.timestamp.toString(),
+                parentTimestamp: parentGlobals.timestamp.toString()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (!proposalGlobals.coinbase.equals(parentGlobals.coinbase)) {
+            this.log.warn(`Non-first block in checkpoint has mismatched coinbase`, {
+                ...proposalInfo,
+                proposalCoinbase: proposalGlobals.coinbase.toString(),
+                parentCoinbase: parentGlobals.coinbase.toString()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (!proposalGlobals.feeRecipient.equals(parentGlobals.feeRecipient)) {
+            this.log.warn(`Non-first block in checkpoint has mismatched feeRecipient`, {
+                ...proposalInfo,
+                proposalFeeRecipient: proposalGlobals.feeRecipient.toString(),
+                parentFeeRecipient: parentGlobals.feeRecipient.toString()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        if (!proposalGlobals.gasFees.equals(parentGlobals.gasFees)) {
+            this.log.warn(`Non-first block in checkpoint has mismatched gasFees`, {
+                ...proposalInfo,
+                proposalGasFees: proposalGlobals.gasFees.toInspect(),
+                parentGasFees: parentGlobals.gasFees.toInspect()
+            });
+            return {
+                reason: 'global_variables_mismatch'
+            };
+        }
+        return undefined;
+    }
     getReexecutionDeadline(slot, config) {
-        const nextSlotTimestampSeconds = Number(getTimestampForSlot(slot + 1n, config));
-        const msNeededForPropagationAndPublishing = this.config.validatorReexecuteDeadlineMs;
-        return new Date(nextSlotTimestampSeconds * 1000 - msNeededForPropagationAndPublishing);
+        const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
+        return new Date(nextSlotTimestampSeconds * 1000);
+    }
+    /** Waits for the block source to sync L1 data up to at least the slot before the given one. */ async waitForBlockSourceSync(slot) {
+        const deadline = this.getReexecutionDeadline(slot, this.checkpointsBuilder.getConfig());
+        const timeoutMs = deadline.getTime() - this.dateProvider.now();
+        if (slot === 0) {
+            return true;
+        }
+        // Make a quick check before triggering an archiver sync
+        const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
+        if (syncedSlot !== undefined && syncedSlot + 1 >= slot) {
+            return true;
+        }
+        try {
+            // Trigger an immediate sync of the block source, and wait until it reports being synced to the required slot
+            return await retryUntil(async ()=>{
+                await this.blockSource.syncImmediate();
+                const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
+                return syncedSlot !== undefined && syncedSlot + 1 >= slot;
+            }, 'wait for block source sync', timeoutMs / 1000, 0.5);
+        } catch (err) {
+            if (err instanceof TimeoutError) {
+                this.log.warn(`Timed out waiting for block source to sync to slot ${slot}`);
+                return false;
+            } else {
+                throw err;
+            }
+        }
     }
     getReexecuteFailureReason(err) {
-        if (err instanceof ReExStateMismatchError) {
+        if (err instanceof TransactionsNotAvailableError) {
+            return 'txs_not_available';
+        } else if (err instanceof ReExInitialStateMismatchError) {
+            return 'initial_state_mismatch';
+        } else if (err instanceof ReExStateMismatchError) {
             return 'state_mismatch';
         } else if (err instanceof ReExFailedTxsError) {
             return 'failed_txs';
@@ -221,66 +510,105 @@ export class BlockProposalHandler {
             return 'unknown_error';
         }
     }
-    async reexecuteTransactions(proposal, blockNumber, txs, l1ToL2Messages) {
-        const { header } = proposal.payload;
-        const { txHashes } = proposal;
-        // If we do not have all of the transactions, then we should fail
-        if (txs.length !== txHashes.length) {
-            const foundTxHashes = txs.map((tx)=>tx.getTxHash());
-            const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.includes(txHash));
-            throw new TransactionsNotAvailableError(missingTxHashes);
-        }
-        // Use the sequencer's block building logic to re-execute the transactions
-        const timer = new Timer();
-        const config = this.blockBuilder.getConfig();
-        // We source most global variables from the proposal
-        const globalVariables = GlobalVariables.from({
-            slotNumber: proposal.payload.header.slotNumber,
-            coinbase: proposal.payload.header.coinbase,
-            feeRecipient: proposal.payload.header.feeRecipient,
-            gasFees: proposal.payload.header.gasFees,
-            blockNumber,
-            timestamp: header.timestamp,
-            chainId: new Fr(config.l1ChainId),
-            version: new Fr(config.rollupVersion)
-        });
-        const { block, failedTxs } = await this.blockBuilder.buildBlock(txs, l1ToL2Messages, globalVariables, {
-            deadline: this.getReexecutionDeadline(proposal.payload.header.slotNumber.toBigInt(), config)
-        });
-        const numFailedTxs = failedTxs.length;
-        const slot = proposal.slotNumber.toBigInt();
-        this.log.verbose(`Transaction re-execution complete for slot ${slot}`, {
-            numFailedTxs,
-            numProposalTxs: txHashes.length,
-            numProcessedTxs: block.body.txEffects.length,
-            slot
-        });
-        if (numFailedTxs > 0) {
-            this.metrics?.recordFailedReexecution(proposal);
-            throw new ReExFailedTxsError(numFailedTxs);
-        }
-        if (block.body.txEffects.length !== txHashes.length) {
-            this.metrics?.recordFailedReexecution(proposal);
-            throw new ReExTimeoutError();
-        }
-        // Throw a ReExStateMismatchError error if state updates do not match
-        const blockPayload = ConsensusPayload.fromBlock(block);
-        if (!blockPayload.equals(proposal.payload)) {
-            this.log.warn(`Re-execution state mismatch for slot ${slot}`, {
-                expected: blockPayload.toInspect(),
-                actual: proposal.payload.toInspect()
+    async reexecuteTransactions(proposal, blockNumber, checkpointNumber, txs, l1ToL2Messages, previousCheckpointOutHashes) {
+        const env = {
+            stack: [],
+            error: void 0,
+            hasError: false
+        };
+        try {
+            const { blockHeader, txHashes } = proposal;
+            // If we do not have all of the transactions, then we should fail
+            if (txs.length !== txHashes.length) {
+                const foundTxHashes = txs.map((tx)=>tx.getTxHash());
+                const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.includes(txHash));
+                throw new TransactionsNotAvailableError(missingTxHashes);
+            }
+            const timer = new Timer();
+            const slot = proposal.slotNumber;
+            const config = this.checkpointsBuilder.getConfig();
+            // Get prior blocks in this checkpoint (same slot before current block)
+            const allBlocksInSlot = await this.blockSource.getBlocksForSlot(slot);
+            const priorBlocks = allBlocksInSlot.filter((b)=>b.number < blockNumber && b.header.getSlot() === slot);
+            // Fork before the block to be built
+            const parentBlockNumber = BlockNumber(blockNumber - 1);
+            await this.worldState.syncImmediate(parentBlockNumber);
+            const fork = _ts_add_disposable_resource(env, await this.worldState.fork(parentBlockNumber), true);
+            // Verify the fork's archive root matches the proposal's expected last archive.
+            // If they don't match, our world state synced to a different chain and reexecution would fail.
+            const forkArchiveRoot = new Fr((await fork.getTreeInfo(MerkleTreeId.ARCHIVE)).root);
+            if (!forkArchiveRoot.equals(proposal.blockHeader.lastArchive.root)) {
+                throw new ReExInitialStateMismatchError(proposal.blockHeader.lastArchive.root, forkArchiveRoot);
+            }
+            // Build checkpoint constants from proposal (excludes blockNumber which is per-block)
+            const constants = {
+                chainId: new Fr(config.l1ChainId),
+                version: new Fr(config.rollupVersion),
+                slotNumber: slot,
+                timestamp: blockHeader.globalVariables.timestamp,
+                coinbase: blockHeader.globalVariables.coinbase,
+                feeRecipient: blockHeader.globalVariables.feeRecipient,
+                gasFees: blockHeader.globalVariables.gasFees
+            };
+            // Create checkpoint builder with prior blocks
+            const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, 0n, l1ToL2Messages, previousCheckpointOutHashes, fork, priorBlocks, this.log.getBindings());
+            // Build the new block
+            const deadline = this.getReexecutionDeadline(slot, config);
+            const maxBlockGas = this.config.validateMaxL2BlockGas !== undefined || this.config.validateMaxDABlockGas !== undefined ? new Gas(this.config.validateMaxDABlockGas ?? Infinity, this.config.validateMaxL2BlockGas ?? Infinity) : undefined;
+            const result = await checkpointBuilder.buildBlock(txs, blockNumber, blockHeader.globalVariables.timestamp, {
+                isBuildingProposal: false,
+                minValidTxs: 0,
+                deadline,
+                expectedEndState: blockHeader.state,
+                maxTransactions: this.config.validateMaxTxsPerBlock,
+                maxBlockGas
+            });
+            const { block, failedTxs } = result;
+            const numFailedTxs = failedTxs.length;
+            this.log.verbose(`Block proposal ${blockNumber} at slot ${slot} transaction re-execution complete`, {
+                numFailedTxs,
+                numProposalTxs: txHashes.length,
+                numProcessedTxs: block.body.txEffects.length,
+                blockNumber,
+                slot
             });
-            this.metrics?.recordFailedReexecution(proposal);
-            throw new ReExStateMismatchError(proposal.archive, block.archive.root, proposal.payload.stateReference, block.header.state);
+            if (numFailedTxs > 0) {
+                this.metrics?.recordFailedReexecution(proposal);
+                throw new ReExFailedTxsError(numFailedTxs);
+            }
+            if (block.body.txEffects.length !== txHashes.length) {
+                this.metrics?.recordFailedReexecution(proposal);
+                throw new ReExTimeoutError();
+            }
+            // Throw a ReExStateMismatchError error if state updates do not match
+            // Compare the full block structure (archive and header) from the built block with the proposal
+            const archiveMatches = proposal.archive.equals(block.archive.root);
+            const headerMatches = proposal.blockHeader.equals(block.header);
+            if (!archiveMatches || !headerMatches) {
+                this.log.warn(`Re-execution state mismatch for slot ${slot}`, {
+                    expectedArchive: block.archive.root.toString(),
+                    actualArchive: proposal.archive.toString(),
+                    expectedHeader: block.header.toInspect(),
+                    actualHeader: proposal.blockHeader.toInspect()
+                });
+                this.metrics?.recordFailedReexecution(proposal);
+                throw new ReExStateMismatchError(proposal.archive, block.archive.root);
+            }
+            const reexecutionTimeMs = timer.ms();
+            const totalManaUsed = block.header.totalManaUsed.toNumber() / 1e6;
+            this.metrics?.recordReex(reexecutionTimeMs, txs.length, totalManaUsed);
+            return {
+                block,
+                failedTxs,
+                reexecutionTimeMs,
+                totalManaUsed
+            };
+        } catch (e) {
+            env.error = e;
+            env.hasError = true;
+        } finally{
+            const result = _ts_dispose_resources(env);
+            if (result) await result;
         }
-        const reexecutionTimeMs = timer.ms();
-        const totalManaUsed = block.header.totalManaUsed.toNumber() / 1e6;
-        this.metrics?.recordReex(reexecutionTimeMs, txs.length, totalManaUsed);
-        return {
-            block,
-            failedTxs,
-            reexecutionTimeMs,
-            totalManaUsed
-        };
     }
 }