@aztec/validator-client 3.0.0-nightly.20250921 → 3.0.0-nightly.20250923

package/dest/validator.d.ts

@@ -12,7 +12,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { CommitteeAttestationsAndSigners, L2BlockSource } from '@aztec/stdlib/block';
 import type { IFullNodeBlockBuilder, Validator, ValidatorClientFullConfig } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
+import { type BlockAttestation, type BlockProposal, type BlockProposalOptions } from '@aztec/stdlib/p2p';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { type StateReference, type Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
@@ -37,6 +37,7 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
     readonly tracer: Tracer;
     private validationService;
     private metrics;
+    private hasRegisteredHandlers;
     private previousProposal?;
     private lastEpochForCommitteeUpdateLoop;
     private epochCacheUpdateLoop;
@@ -54,7 +55,8 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
     updateConfig(config: Partial<ValidatorClientFullConfig>): void;
     start(): Promise<void>;
     stop(): Promise<void>;
-    registerBlockProposalHandler(): void;
+    /** Register handlers on the p2p client */
+    registerHandlers(): Promise<void>;
     attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined>;
     private getReexecutionDeadline;
     /**

package/dest/validator.d.ts.map

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

package/dest/validator.js

@@ -10,6 +10,7 @@ import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
 import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
 import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { ConsensusPayload } from '@aztec/stdlib/p2p';
 import { GlobalVariables } from '@aztec/stdlib/tx';
 import { AttestationTimeoutError, ReExFailedTxsError, ReExStateMismatchError, ReExTimeoutError, TransactionsNotAvailableError } from '@aztec/stdlib/validators';
 import { getTelemetryClient } from '@aztec/telemetry-client';
@@ -36,6 +37,8 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     tracer;
     validationService;
     metrics;
+    // Whether it has already registered handlers on the p2p client
+    hasRegisteredHandlers;
     // Used to check if we are sending the same proposal twice
     previousProposal;
     lastEpochForCommitteeUpdateLoop;
@@ -43,7 +46,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     blockProposalValidator;
     proposersOfInvalidBlocks;
     constructor(blockBuilder, keyStore, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
-        super(), this.blockBuilder = blockBuilder, this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockSource = blockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.txProvider = txProvider, this.config = config, this.dateProvider = dateProvider, this.log = log, this.proposersOfInvalidBlocks = new Set();
+        super(), this.blockBuilder = blockBuilder, this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockSource = blockSource, this.l1ToL2MessageSource = l1ToL2MessageSource, this.txProvider = txProvider, this.config = config, this.dateProvider = dateProvider, this.log = log, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set();
         this.tracer = telemetry.getTracer('Validator');
         this.metrics = new ValidatorMetrics(telemetry);
         this.validationService = new ValidationService(keyStore);
@@ -126,9 +129,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             this.log.warn(`Validator client already started`);
             return;
         }
-        this.registerBlockProposalHandler();
-        // Sync the committee from the smart contract
-        // https://github.com/AztecProtocol/aztec-packages/issues/7962
+        await this.registerHandlers();
         const myAddresses = this.getValidatorAddresses();
         const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
         if (inCommittee.length > 0) {
@@ -137,16 +138,20 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             this.log.info(`Started validator with addresses: ${myAddresses.map((a)=>a.toString()).join(', ')}`);
         }
         this.epochCacheUpdateLoop.start();
-        this.p2pClient.registerThisValidatorAddresses(myAddresses);
-        await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
         return Promise.resolve();
     }
     async stop() {
         await this.epochCacheUpdateLoop.stop();
     }
-    registerBlockProposalHandler() {
-        const handler = (block, proposalSender)=>this.attestToProposal(block, proposalSender);
-        this.p2pClient.registerBlockProposalHandler(handler);
+    /** Register handlers on the p2p client */ async registerHandlers() {
+        if (!this.hasRegisteredHandlers) {
+            this.hasRegisteredHandlers = true;
+            const handler = (block, proposalSender)=>this.attestToProposal(block, proposalSender);
+            this.p2pClient.registerBlockProposalHandler(handler);
+            const myAddresses = this.getValidatorAddresses();
+            this.p2pClient.registerThisValidatorAddresses(myAddresses);
+            await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
+        }
     }
     async attestToProposal(proposal, proposalSender) {
         const slotNumber = proposal.slotNumber.toBigInt();
@@ -155,19 +160,21 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         // Check that I have any address in current committee before attesting
         const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
         const partOfCommittee = inCommittee.length > 0;
+        const incFailedAttestation = partOfCommittee ? (reason)=>this.metrics.incFailedAttestations(1, reason) : ()=>{};
         const proposalInfo = {
             ...proposal.toBlockInfo(),
             proposer: proposer.toString()
         };
         this.log.info(`Received proposal for slot ${slotNumber}`, {
             ...proposalInfo,
-            txHashes: proposal.txHashes.map((txHash)=>txHash.toString())
+            txHashes: proposal.txHashes.map((t)=>t.toString())
         });
         // Collect txs from the proposal. Note that we do this before checking if we have an address in the
         // current committee, since we want to collect txs anyway to facilitate propagation.
+        const config = this.blockBuilder.getConfig();
         const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, {
             pinnedPeer: proposalSender,
-            deadline: this.getReexecutionDeadline(proposal, this.blockBuilder.getConfig())
+            deadline: this.getReexecutionDeadline(proposal, config)
         });
         // Check that I have any address in current committee before attesting
         if (!partOfCommittee) {
@@ -179,9 +186,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         const invalidProposal = await this.blockProposalValidator.validate(proposal);
         if (invalidProposal) {
             this.log.warn(`Proposal is not valid, skipping attestation`, proposalInfo);
-            if (partOfCommittee) {
-                this.metrics.incFailedAttestations(1, 'invalid_proposal');
-            }
+            incFailedAttestation('invalid_proposal');
             return undefined;
         }
         // Check that the parent proposal is a block we know, otherwise reexecution would fail.
@@ -190,7 +195,6 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         // would not be rebroadcasted. But it also means that nodes that have not fully synced would
         // not rebroadcast the proposal.
         if (blockNumber > INITIAL_L2_BLOCK_NUM) {
-            const config = this.blockBuilder.getConfig();
             const deadline = this.getReexecutionDeadline(proposal, config);
             const currentTime = this.dateProvider.now();
             const timeoutDurationMs = deadline.getTime() - currentTime;
@@ -204,9 +208,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             }, 'Force Archiver Sync', timeoutDurationMs / 1000, 0.5);
             if (parentBlock === undefined) {
                 this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`, proposalInfo);
-                if (partOfCommittee) {
-                    this.metrics.incFailedAttestations(1, 'parent_block_not_found');
-                }
+                incFailedAttestation('parent_block_not_found');
                 return undefined;
             }
             if (!proposal.payload.header.lastArchiveRoot.equals(parentBlock.archive.root)) {
@@ -215,9 +217,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                     parentBlockArchiveRoot: parentBlock.archive.root.toString(),
                     ...proposalInfo
                 });
-                if (partOfCommittee) {
-                    this.metrics.incFailedAttestations(1, 'parent_block_does_not_match');
-                }
+                incFailedAttestation('parent_block_does_not_match');
                 return undefined;
             }
         }
@@ -232,9 +232,15 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 computedInHash: computedInHash.toString(),
                 ...proposalInfo
             });
-            if (partOfCommittee) {
-                this.metrics.incFailedAttestations(1, 'in_hash_mismatch');
-            }
+            incFailedAttestation('in_hash_mismatch');
+            return undefined;
+        }
+        // Check that this block number does not exist already, otherwise the proposer could signal
+        // an arbitrary block number in the past, though this would most likely fail on the rollup contract.
+        const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
+        if (existingBlock) {
+            this.log.warn(`Block number ${blockNumber} already exists, skipping attestation`, proposalInfo);
+            incFailedAttestation('block_number_already_exists');
             return undefined;
         }
         // Check that all of the transactions in the proposal are available in the tx pool before attesting
@@ -243,9 +249,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 ...proposalInfo,
                 missingTxs
             });
-            if (partOfCommittee) {
-                this.metrics.incFailedAttestations(1, 'TransactionsNotAvailableError');
-            }
+            incFailedAttestation('TransactionsNotAvailableError');
             return undefined;
         }
         // Try re-executing the transactions in the proposal
@@ -256,7 +260,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 await this.reExecuteTransactions(proposal, txs, l1ToL2Messages);
             }
         } catch (error) {
-            this.metrics.incFailedAttestations(1, error instanceof Error ? error.name : 'unknown');
+            incFailedAttestation(error instanceof Error ? error.name : 'unknown');
             this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
             if (error instanceof ReExStateMismatchError && this.config.slashBroadcastedInvalidBlockPenalty > 0n) {
                 this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
@@ -290,8 +294,12 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         // 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({
-            ...proposal.payload.header,
+            slotNumber: proposal.payload.header.slotNumber,
+            coinbase: proposal.payload.header.coinbase,
+            feeRecipient: proposal.payload.header.feeRecipient,
+            gasFees: proposal.payload.header.gasFees,
             blockNumber: proposal.blockNumber,
             timestamp: header.timestamp,
             chainId: new Fr(config.l1ChainId),
@@ -310,8 +318,14 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             this.metrics.recordFailedReexecution(proposal);
             throw new ReExTimeoutError();
         }
-        // This function will throw an error if state updates do not match
-        if (!block.archive.root.equals(proposal.archive)) {
+        // Throw a ReExStateMismatchError error if state updates do not match.
+        // Note that we check the entire proposal payload here, since it could be inconsistent within itself,
+        // as in the archive root not being actually derived by its other tree roots.
+        if (!ConsensusPayload.fromBlock(block).equals(proposal.payload)) {
+            this.log.warn(`Re-execution state mismatch for slot ${proposal.slotNumber.toBigInt()}`, {
+                expected: ConsensusPayload.fromBlock(block).toInspect(),
+                actual: proposal.payload.toInspect()
+            });
             this.metrics.recordFailedReexecution(proposal);
             throw new ReExStateMismatchError(proposal.archive, block.archive.root, proposal.payload.stateReference, block.header.state);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "3.0.0-nightly.20250921",
+  "version": "3.0.0-nightly.20250923",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -64,16 +64,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20250921",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250921",
-    "@aztec/ethereum": "3.0.0-nightly.20250921",
-    "@aztec/foundation": "3.0.0-nightly.20250921",
-    "@aztec/node-keystore": "3.0.0-nightly.20250921",
-    "@aztec/p2p": "3.0.0-nightly.20250921",
-    "@aztec/prover-client": "3.0.0-nightly.20250921",
-    "@aztec/slasher": "3.0.0-nightly.20250921",
-    "@aztec/stdlib": "3.0.0-nightly.20250921",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250921",
+    "@aztec/constants": "3.0.0-nightly.20250923",
+    "@aztec/epoch-cache": "3.0.0-nightly.20250923",
+    "@aztec/ethereum": "3.0.0-nightly.20250923",
+    "@aztec/foundation": "3.0.0-nightly.20250923",
+    "@aztec/node-keystore": "3.0.0-nightly.20250923",
+    "@aztec/p2p": "3.0.0-nightly.20250923",
+    "@aztec/prover-client": "3.0.0-nightly.20250923",
+    "@aztec/slasher": "3.0.0-nightly.20250923",
+    "@aztec/stdlib": "3.0.0-nightly.20250923",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250923",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",

package/src/validator.ts

@@ -25,7 +25,12 @@ import type { CommitteeAttestationsAndSigners, L2BlockSource } from '@aztec/stdl
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import type { IFullNodeBlockBuilder, Validator, ValidatorClientFullConfig } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
+import {
+  type BlockAttestation,
+  type BlockProposal,
+  type BlockProposalOptions,
+  ConsensusPayload,
+} from '@aztec/stdlib/p2p';
 import type { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { GlobalVariables, type StateReference, type Tx } from '@aztec/stdlib/tx';
 import {
@@ -57,6 +62,9 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   private validationService: ValidationService;
   private metrics: ValidatorMetrics;
 
+  // Whether it has already registered handlers on the p2p client
+  private hasRegisteredHandlers = false;
+
   // Used to check if we are sending the same proposal twice
   private previousProposal?: BlockProposal;
 
@@ -207,12 +215,9 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       return;
     }
 
-    this.registerBlockProposalHandler();
+    await this.registerHandlers();
 
-    // Sync the committee from the smart contract
-    // https://github.com/AztecProtocol/aztec-packages/issues/7962
     const myAddresses = this.getValidatorAddresses();
-
     const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
     if (inCommittee.length > 0) {
       this.log.info(
@@ -225,9 +230,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     }
     this.epochCacheUpdateLoop.start();
 
-    this.p2pClient.registerThisValidatorAddresses(myAddresses);
-    await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
-
     return Promise.resolve();
   }
 
@@ -235,10 +237,20 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     await this.epochCacheUpdateLoop.stop();
   }
 
-  public registerBlockProposalHandler() {
-    const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> =>
-      this.attestToProposal(block, proposalSender);
-    this.p2pClient.registerBlockProposalHandler(handler);
+  /** Register handlers on the p2p client */
+  public async registerHandlers() {
+    if (!this.hasRegisteredHandlers) {
+      this.hasRegisteredHandlers = true;
+
+      const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> =>
+        this.attestToProposal(block, proposalSender);
+      this.p2pClient.registerBlockProposalHandler(handler);
+
+      const myAddresses = this.getValidatorAddresses();
+      this.p2pClient.registerThisValidatorAddresses(myAddresses);
+
+      await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
+    }
   }
 
   async attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> {
@@ -249,22 +261,22 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     // Check that I have any address in current committee before attesting
     const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
     const partOfCommittee = inCommittee.length > 0;
+    const incFailedAttestation = partOfCommittee
+      ? (reason: string) => this.metrics.incFailedAttestations(1, reason)
+      : () => {};
 
-    const proposalInfo = {
-      ...proposal.toBlockInfo(),
-      proposer: proposer.toString(),
-    };
-
+    const proposalInfo = { ...proposal.toBlockInfo(), proposer: proposer.toString() };
     this.log.info(`Received proposal for slot ${slotNumber}`, {
       ...proposalInfo,
-      txHashes: proposal.txHashes.map(txHash => txHash.toString()),
+      txHashes: proposal.txHashes.map(t => t.toString()),
     });
 
     // Collect txs from the proposal. Note that we do this before checking if we have an address in the
     // current committee, since we want to collect txs anyway to facilitate propagation.
+    const config = this.blockBuilder.getConfig();
     const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, {
       pinnedPeer: proposalSender,
-      deadline: this.getReexecutionDeadline(proposal, this.blockBuilder.getConfig()),
+      deadline: this.getReexecutionDeadline(proposal, config),
     });
 
     // Check that I have any address in current committee before attesting
@@ -278,9 +290,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     const invalidProposal = await this.blockProposalValidator.validate(proposal);
     if (invalidProposal) {
       this.log.warn(`Proposal is not valid, skipping attestation`, proposalInfo);
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'invalid_proposal');
-      }
+      incFailedAttestation('invalid_proposal');
       return undefined;
     }
 
@@ -290,7 +300,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     // would not be rebroadcasted. But it also means that nodes that have not fully synced would
     // not rebroadcast the proposal.
     if (blockNumber > INITIAL_L2_BLOCK_NUM) {
-      const config = this.blockBuilder.getConfig();
       const deadline = this.getReexecutionDeadline(proposal, config);
       const currentTime = this.dateProvider.now();
       const timeoutDurationMs = deadline.getTime() - currentTime;
@@ -313,9 +322,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
       if (parentBlock === undefined) {
         this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`, proposalInfo);
-        if (partOfCommittee) {
-          this.metrics.incFailedAttestations(1, 'parent_block_not_found');
-        }
+        incFailedAttestation('parent_block_not_found');
         return undefined;
       }
 
@@ -325,9 +332,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
           parentBlockArchiveRoot: parentBlock.archive.root.toString(),
           ...proposalInfo,
         });
-        if (partOfCommittee) {
-          this.metrics.incFailedAttestations(1, 'parent_block_does_not_match');
-        }
+        incFailedAttestation('parent_block_does_not_match');
         return undefined;
       }
     }
@@ -343,18 +348,23 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
         computedInHash: computedInHash.toString(),
         ...proposalInfo,
       });
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'in_hash_mismatch');
-      }
+      incFailedAttestation('in_hash_mismatch');
+      return undefined;
+    }
+
+    // Check that this block number does not exist already, otherwise the proposer could signal
+    // an arbitrary block number in the past, though this would most likely fail on the rollup contract.
+    const existingBlock = await this.blockSource.getBlockHeader(blockNumber);
+    if (existingBlock) {
+      this.log.warn(`Block number ${blockNumber} already exists, skipping attestation`, proposalInfo);
+      incFailedAttestation('block_number_already_exists');
       return undefined;
     }
 
     // Check that all of the transactions in the proposal are available in the tx pool before attesting
     if (missingTxs.length > 0) {
       this.log.warn(`Missing ${missingTxs.length} txs to attest to proposal`, { ...proposalInfo, missingTxs });
-      if (partOfCommittee) {
-        this.metrics.incFailedAttestations(1, 'TransactionsNotAvailableError');
-      }
+      incFailedAttestation('TransactionsNotAvailableError');
       return undefined;
     }
 
@@ -366,7 +376,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
         await this.reExecuteTransactions(proposal, txs, l1ToL2Messages);
       }
     } catch (error: any) {
-      this.metrics.incFailedAttestations(1, error instanceof Error ? error.name : 'unknown');
+      incFailedAttestation(error instanceof Error ? error.name : 'unknown');
       this.log.error(`Error reexecuting txs while processing block proposal`, error, proposalInfo);
       if (error instanceof ReExStateMismatchError && this.config.slashBroadcastedInvalidBlockPenalty > 0n) {
         this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
@@ -410,10 +420,15 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     // 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({
-      ...proposal.payload.header,
-      blockNumber: proposal.blockNumber,
-      timestamp: header.timestamp,
+      slotNumber: proposal.payload.header.slotNumber, // checked in the block proposal validator
+      coinbase: proposal.payload.header.coinbase, // set arbitrarily by the proposer
+      feeRecipient: proposal.payload.header.feeRecipient, // set arbitrarily by the proposer
+      gasFees: proposal.payload.header.gasFees, // validated by the rollup contract
+      blockNumber: proposal.blockNumber, // checked blockNumber-1 exists in archiver but blockNumber doesnt
+      timestamp: header.timestamp, // checked in the rollup contract against the slot number
       chainId: new Fr(config.l1ChainId),
       version: new Fr(config.rollupVersion),
     });
@@ -435,8 +450,14 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       throw new ReExTimeoutError();
     }
 
-    // This function will throw an error if state updates do not match
-    if (!block.archive.root.equals(proposal.archive)) {
+    // Throw a ReExStateMismatchError error if state updates do not match.
+    // Note that we check the entire proposal payload here, since it could be inconsistent within itself,
+    // as in the archive root not being actually derived by its other tree roots.
+    if (!ConsensusPayload.fromBlock(block).equals(proposal.payload)) {
+      this.log.warn(`Re-execution state mismatch for slot ${proposal.slotNumber.toBigInt()}`, {
+        expected: ConsensusPayload.fromBlock(block).toInspect(),
+        actual: proposal.payload.toInspect(),
+      });
       this.metrics.recordFailedReexecution(proposal);
       throw new ReExStateMismatchError(
         proposal.archive,