@aztec/validator-client 0.86.0 → 0.87.0

package/dest/duties/validation_service.d.ts

@@ -1,6 +1,6 @@
 import type { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import { BlockAttestation, BlockProposal, type BlockProposalOptions } from '@aztec/stdlib/p2p';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 import type { ValidatorKeyStore } from '../key_store/interface.js';
 export declare class ValidationService {
     private keyStore;
@@ -8,13 +8,14 @@ export declare class ValidationService {
     /**
      * Create a block proposal with the given header, archive, and transactions
      *
+     * @param blockNumber - The block number this proposal is for
      * @param header - The block header
      * @param archive - The archive of the current block
      * @param txs - TxHash[] ordered list of transactions
      *
      * @returns A block proposal signing the above information (not the current implementation!!!)
      */
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal>;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal>;
     /**
      * Attest to the given block proposal constructed by the current sequencer
      *

package/dest/duties/validation_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAA8C,MAAM,mBAAmB,CAAC;AAChH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;OAQG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAM5F;;;;;;;;OAQG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAS3E"}
+{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,KAAK,oBAAoB,EAG1B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;;OASG;IACG,mBAAmB,CACvB,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;OAQG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAS3E"}

package/dest/duties/validation_service.js

@@ -9,14 +9,17 @@ export class ValidationService {
     /**
    * Create a block proposal with the given header, archive, and transactions
    *
+   * @param blockNumber - The block number this proposal is for
    * @param header - The block header
    * @param archive - The archive of the current block
    * @param txs - TxHash[] ordered list of transactions
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
-   */ createBlockProposal(header, archive, txs) {
+   */ async createBlockProposal(blockNumber, header, archive, stateReference, txs, options) {
         const payloadSigner = (payload)=>this.keyStore.signMessage(payload);
-        return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txs), payloadSigner);
+        // TODO: check if this is calculated earlier / can not be recomputed
+        const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+        return BlockProposal.createProposalFromSigner(blockNumber, new ConsensusPayload(header, archive, stateReference, txHashes), options.publishFullTxs ? txs : undefined, payloadSigner);
     }
     /**
    * Attest to the given block proposal constructed by the current sequencer
@@ -30,6 +33,6 @@ export class ValidationService {
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7961): check that the current validator is correct
         const buf = Buffer32.fromBuffer(keccak256(proposal.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation)));
         const sig = await this.keyStore.signMessage(buf);
-        return new BlockAttestation(proposal.payload, sig);
+        return new BlockAttestation(proposal.blockNumber, proposal.payload, sig);
     }
 }

package/dest/factory.d.ts

@@ -1,11 +1,13 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
+import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 import type { ValidatorClientConfig } from './config.js';
 import { ValidatorClient } from './validator.js';
 export declare function createValidatorClient(config: ValidatorClientConfig, deps: {
     p2pClient: P2P;
+    blockSource: L2BlockSource;
     telemetry: TelemetryClient;
     dateProvider: DateProvider;
     epochCache: EpochCache;

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;IACJ,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAUF"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;IACJ,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,CAAC;IAC3B,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAiBF"}

package/dest/factory.js

@@ -7,5 +7,5 @@ export function createValidatorClient(config, deps) {
     if (config.validatorPrivateKey === undefined || config.validatorPrivateKey === '') {
         config.validatorPrivateKey = generatePrivateKey();
     }
-    return ValidatorClient.new(config, deps.epochCache, deps.p2pClient, deps.dateProvider, deps.telemetry);
+    return ValidatorClient.new(config, deps.epochCache, deps.p2pClient, deps.blockSource, deps.dateProvider, deps.telemetry);
 }

package/dest/validator.d.ts

@@ -1,11 +1,11 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { DateProvider, type Timer } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
-import type { L2Block } from '@aztec/stdlib/block';
-import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import type { BlockHeader, GlobalVariables, Tx, TxHash } from '@aztec/stdlib/tx';
+import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
 import type { ValidatorClientConfig } from './config.js';
 import type { ValidatorKeyStore } from './key_store/interface.js';
@@ -14,7 +14,7 @@ import type { ValidatorKeyStore } from './key_store/interface.js';
  *
  * We reuse the sequencer's block building functionality for re-execution
  */
-type BlockBuilderCallback = (txs: Iterable<Tx> | AsyncIterableIterator<Tx>, globalVariables: GlobalVariables, opts?: {
+type BlockBuilderCallback = (blockNumber: Fr, header: ProposedBlockHeader, txs: Iterable<Tx> | AsyncIterableIterator<Tx>, opts?: {
     validateOnly?: boolean;
 }) => Promise<{
     block: L2Block;
@@ -27,9 +27,9 @@ export interface Validator {
     start(): Promise<void>;
     registerBlockProposalHandler(): void;
     registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
-    attestToProposal(proposal: BlockProposal): void;
-    broadcastBlockProposal(proposal: BlockProposal): void;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined>;
+    broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
 }
 /**
@@ -39,6 +39,7 @@ export declare class ValidatorClient extends WithTracer implements Validator {
     private keyStore;
     private epochCache;
     private p2pClient;
+    private blockSource;
     private config;
     private dateProvider;
     private log;
@@ -50,9 +51,9 @@ export declare class ValidatorClient extends WithTracer implements Validator {
     private lastEpoch;
     private epochCacheUpdateLoop;
     private blockProposalValidator;
-    constructor(keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, config: ValidatorClientConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
-    private handleEpochCommiteeUpdate;
-    static new(config: ValidatorClientConfig, epochCache: EpochCache, p2pClient: P2P, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
+    constructor(keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, config: ValidatorClientConfig, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    private handleEpochCommitteeUpdate;
+    static new(config: ValidatorClientConfig, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
     getValidatorAddress(): EthAddress;
     start(): Promise<void>;
     stop(): Promise<void>;
@@ -68,7 +69,7 @@ export declare class ValidatorClient extends WithTracer implements Validator {
      * Re-execute the transactions in the proposal and check that the state updates match the header state
      * @param proposal - The proposal to re-execute
      */
-    reExecuteTransactions(proposal: BlockProposal): Promise<void>;
+    reExecuteTransactions(proposal: BlockProposal, txs: Tx[]): Promise<void>;
     /**
      * Ensure that all of the transactions in the proposal are available in the tx pool before attesting
      *
@@ -77,9 +78,9 @@ export declare class ValidatorClient extends WithTracer implements Validator {
      * 3. If we cannot retrieve them from the network, throw an error
      * @param proposal - The proposal to attest to
      */
-    ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<void>;
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
-    broadcastBlockProposal(proposal: BlockProposal): void;
+    ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]>;
+    createBlockProposal(blockNumber: Fr, header: ProposedBlockHeader, archive: Fr, stateReference: StateReference, txs: Tx[], options: BlockProposalOptions): Promise<BlockProposal | undefined>;
+    broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
     private doAttestToProposal;
 }

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

@@ -1,3 +1,4 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -15,6 +16,7 @@ import { ValidatorMetrics } from './metrics.js';
     keyStore;
     epochCache;
     p2pClient;
+    blockSource;
     config;
     dateProvider;
     log;
@@ -28,18 +30,18 @@ import { ValidatorMetrics } from './metrics.js';
     lastEpoch;
     epochCacheUpdateLoop;
     blockProposalValidator;
-    constructor(keyStore, epochCache, p2pClient, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
+    constructor(keyStore, epochCache, p2pClient, blockSource, config, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
         // Instantiate tracer
-        super(telemetry, 'Validator'), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.config = config, this.dateProvider = dateProvider, this.log = log, this.blockBuilder = undefined;
+        super(telemetry, 'Validator'), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockSource = blockSource, this.config = config, this.dateProvider = dateProvider, this.log = log, this.blockBuilder = undefined;
         this.metrics = new ValidatorMetrics(telemetry);
         this.validationService = new ValidationService(keyStore);
         this.blockProposalValidator = new BlockProposalValidator(epochCache);
-        // Refresh epoch cache every second to trigger alert if participation in commitee changes
+        // Refresh epoch cache every second to trigger alert if participation in committee changes
         this.myAddress = this.keyStore.getAddress();
-        this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommiteeUpdate.bind(this), log, 1000);
+        this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
         this.log.verbose(`Initialized validator with address ${this.keyStore.getAddress().toString()}`);
     }
-    async handleEpochCommiteeUpdate() {
+    async handleEpochCommitteeUpdate() {
         try {
             const { committee, epoch } = await this.epochCache.getCommittee('now');
             if (epoch !== this.lastEpoch) {
@@ -55,13 +57,13 @@ import { ValidatorMetrics } from './metrics.js';
             this.log.error(`Error updating epoch committee`, err);
         }
     }
-    static new(config, epochCache, p2pClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
+    static new(config, epochCache, p2pClient, blockSource, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
         if (!config.validatorPrivateKey) {
             throw new InvalidValidatorPrivateKeyError();
         }
         const privateKey = validatePrivateKey(config.validatorPrivateKey);
         const localKeyStore = new LocalKeyStore(privateKey);
-        const validator = new ValidatorClient(localKeyStore, epochCache, p2pClient, config, dateProvider, telemetry);
+        const validator = new ValidatorClient(localKeyStore, epochCache, p2pClient, blockSource, config, dateProvider, telemetry);
         validator.registerBlockProposalHandler();
         return validator;
     }
@@ -99,9 +101,10 @@ import { ValidatorMetrics } from './metrics.js';
     }
     async attestToProposal(proposal) {
         const slotNumber = proposal.slotNumber.toNumber();
+        const blockNumber = proposal.blockNumber.toNumber();
         const proposalInfo = {
             slotNumber,
-            blockNumber: proposal.payload.header.globalVariables.blockNumber.toNumber(),
+            blockNumber,
             archive: proposal.payload.archive.toString(),
             txCount: proposal.payload.txHashes.length,
             txHashes: proposal.payload.txHashes.map((txHash)=>txHash.toString())
@@ -119,20 +122,38 @@ import { ValidatorMetrics } from './metrics.js';
             this.metrics.incFailedAttestations('invalid_proposal');
             return undefined;
         }
+        // Check that the parent proposal is a block we know, otherwise reexecution would fail.
+        // Q: Should we move this to the block proposal validator? If there, then p2p would check it
+        // before re-broadcasting it. This means that proposals built on top of an L1-reorgd-out block
+        // 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 parentBlock = await this.blockSource.getBlock(blockNumber - 1);
+            if (parentBlock === undefined) {
+                this.log.verbose(`Parent block for ${blockNumber} not found, skipping attestation`);
+                this.metrics.incFailedAttestations('parent_block_not_found');
+                return undefined;
+            }
+            if (!proposal.payload.header.lastArchiveRoot.equals(parentBlock.archive.root)) {
+                this.log.verbose(`Parent block archive root for proposal does not match, skipping attestation`, {
+                    proposalLastArchiveRoot: proposal.payload.header.lastArchiveRoot.toString(),
+                    parentBlockArchiveRoot: parentBlock.archive.root.toString(),
+                    ...proposalInfo
+                });
+                this.metrics.incFailedAttestations('parent_block_does_not_match');
+                return undefined;
+            }
+        }
         // Check that all of the transactions in the proposal are available in the tx pool before attesting
         this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
         try {
-            await this.ensureTransactionsAreAvailable(proposal);
+            const txs = await this.ensureTransactionsAreAvailable(proposal);
             if (this.config.validatorReexecute) {
                 this.log.verbose(`Re-executing transactions in the proposal before attesting`);
-                await this.reExecuteTransactions(proposal);
+                await this.reExecuteTransactions(proposal, txs);
             }
         } catch (error) {
-            if (error instanceof Error) {
-                this.metrics.incFailedAttestations(error.name);
-            } else {
-                this.metrics.incFailedAttestations('unknown');
-            }
+            this.metrics.incFailedAttestations(error instanceof Error ? error.name : 'unknown');
             // If the transactions are not available, then we should not attempt to attest
             if (error instanceof TransactionsNotAvailableError) {
                 this.log.error(`Transactions not available, skipping attestation`, error, proposalInfo);
@@ -152,12 +173,13 @@ import { ValidatorMetrics } from './metrics.js';
     /**
    * Re-execute the transactions in the proposal and check that the state updates match the header state
    * @param proposal - The proposal to re-execute
-   */ async reExecuteTransactions(proposal) {
+   */ async reExecuteTransactions(proposal, txs) {
         const { header, txHashes } = proposal.payload;
-        const txs = (await Promise.all(txHashes.map((tx)=>this.p2pClient.getTxByHash(tx)))).filter((tx)=>tx !== undefined);
-        // If we cannot request all of the transactions, then we should fail
+        // If we do not have all of the transactions, then we should fail
         if (txs.length !== txHashes.length) {
-            throw new TransactionsNotAvailableError(txHashes);
+            const foundTxHashes = await Promise.all(txs.map(async (tx)=>await tx.getTxHash()));
+            const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.includes(txHash));
+            throw new TransactionsNotAvailableError(missingTxHashes);
         }
         // Assertion: This check will fail if re-execution is not enabled
         if (this.blockBuilder === undefined) {
@@ -165,7 +187,7 @@ import { ValidatorMetrics } from './metrics.js';
         }
         // Use the sequencer's block building logic to re-execute the transactions
         const stopTimer = this.metrics.reExecutionTimer();
-        const { block, numFailedTxs } = await this.blockBuilder(txs, header.globalVariables, {
+        const { block, numFailedTxs } = await this.blockBuilder(proposal.blockNumber, header, txs, {
             validateOnly: true
         });
         stopTimer();
@@ -192,37 +214,87 @@ import { ValidatorMetrics } from './metrics.js';
    * 3. If we cannot retrieve them from the network, throw an error
    * @param proposal - The proposal to attest to
    */ async ensureTransactionsAreAvailable(proposal) {
+        if (proposal.payload.txHashes.length === 0) {
+            this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
+            return [];
+        }
+        // Is this a new style proposal?
+        if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
+            // Yes, any txs that we already have we should use
+            this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
+            // Request from the pool based on the signed hashes in the payload
+            const hashesFromPayload = proposal.payload.txHashes;
+            const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
+            const missingTxs = txsToUse.filter((tx)=>tx === undefined).length;
+            if (missingTxs > 0) {
+                this.log.verbose(`Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`);
+            }
+            let usedFromProposal = 0;
+            // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
+            for(let i = 0; i < txsToUse.length; i++){
+                if (txsToUse[i] === undefined) {
+                    // We don't have the transaction, take from the proposal, provided the hash is the same
+                    const hashOfTxInProposal = await proposal.txs[i].getTxHash();
+                    if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
+                        // Hash is equal, we can use the tx from the proposal
+                        txsToUse[i] = proposal.txs[i];
+                        usedFromProposal++;
+                    } else {
+                        this.log.warn(`Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[i].toString()}`);
+                    }
+                }
+            }
+            // See if we still have any holes, if there are then we were not successful and will try the old method
+            if (txsToUse.some((tx)=>tx === undefined)) {
+                this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
+            } else {
+                this.log.info(`Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`);
+                await this.p2pClient.validate(txsToUse);
+                return txsToUse;
+            }
+        }
+        this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
+        // Old style proposal, we will perform a request by hash from pool
+        // This will request from network any txs that are missing
         const txHashes = proposal.payload.txHashes;
-        const transactionStatuses = await Promise.all(txHashes.map((txHash)=>this.p2pClient.getTxStatus(txHash)));
-        const missingTxs = txHashes.filter((_, index)=>![
-                'pending',
-                'mined'
-            ].includes(transactionStatuses[index] ?? ''));
-        if (missingTxs.length === 0) {
-            return; // All transactions are available
+        // This part is just for logging that we are requesting from the network
+        const availability = await this.p2pClient.hasTxsInPool(txHashes);
+        const notAvailable = availability.filter((availability)=>availability === false);
+        if (notAvailable.length) {
+            this.log.verbose(`Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`);
         }
-        this.log.verbose(`Missing ${missingTxs.length} transactions in the tx pool, requesting from the network`);
-        const requestedTxs = await this.p2pClient.requestTxs(missingTxs);
-        if (requestedTxs.some((tx)=>tx === undefined)) {
+        // This will request from the network any txs that are missing
+        const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
+        const missingTxs = retrievedTxs.map((tx, index)=>{
+            // Return the hash of any that we did not get
+            if (tx === undefined) {
+                return txHashes[index];
+            } else {
+                return undefined;
+            }
+        }).filter((hash)=>hash !== undefined);
+        if (missingTxs.length > 0) {
             throw new TransactionsNotAvailableError(missingTxs);
         }
+        await this.p2pClient.validate(retrievedTxs);
+        return retrievedTxs;
     }
-    async createBlockProposal(header, archive, txs) {
-        if (this.previousProposal?.slotNumber.equals(header.globalVariables.slotNumber)) {
+    async createBlockProposal(blockNumber, header, archive, stateReference, txs, options) {
+        if (this.previousProposal?.slotNumber.equals(header.slotNumber)) {
             this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);
             return Promise.resolve(undefined);
         }
-        const newProposal = await this.validationService.createBlockProposal(header, archive, txs);
+        const newProposal = await this.validationService.createBlockProposal(blockNumber, header, archive, stateReference, txs, options);
         this.previousProposal = newProposal;
         return newProposal;
     }
-    broadcastBlockProposal(proposal) {
-        this.p2pClient.broadcastProposal(proposal);
+    async broadcastBlockProposal(proposal) {
+        await this.p2pClient.broadcastProposal(proposal);
     }
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7962)
     async collectAttestations(proposal, required, deadline) {
         // Wait and poll the p2pClient's attestation pool for this block until we have enough attestations
-        const slot = proposal.payload.header.globalVariables.slotNumber.toBigInt();
+        const slot = proposal.payload.header.slotNumber.toBigInt();
         this.log.debug(`Collecting ${required} attestations for slot ${slot} with deadline ${deadline.toISOString()}`);
         if (+deadline < this.dateProvider.now()) {
             this.log.error(`Deadline ${deadline.toISOString()} for collecting ${required} attestations for slot ${slot} is in the past`);
@@ -263,7 +335,7 @@ import { ValidatorMetrics } from './metrics.js';
 function validatePrivateKey(privateKey) {
     try {
         return Buffer32.fromString(privateKey);
-    } catch (error) {
+    } catch  {
         throw new InvalidValidatorPrivateKeyError();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -60,12 +60,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/epoch-cache": "0.86.0",
-    "@aztec/ethereum": "0.86.0",
-    "@aztec/foundation": "0.86.0",
-    "@aztec/p2p": "0.86.0",
-    "@aztec/stdlib": "0.86.0",
-    "@aztec/telemetry-client": "0.86.0",
+    "@aztec/constants": "0.87.0",
+    "@aztec/epoch-cache": "0.87.0",
+    "@aztec/ethereum": "0.87.0",
+    "@aztec/foundation": "0.87.0",
+    "@aztec/p2p": "0.87.0",
+    "@aztec/stdlib": "0.87.0",
+    "@aztec/telemetry-client": "0.87.0",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",
@@ -74,11 +75,11 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "jest": "^29.5.0",
     "jest-mock-extended": "^3.0.7",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -87,6 +88,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/duties/validation_service.ts

@@ -1,8 +1,14 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256 } from '@aztec/foundation/crypto';
 import type { Fr } from '@aztec/foundation/fields';
-import { BlockAttestation, BlockProposal, ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import {
+  BlockAttestation,
+  BlockProposal,
+  type BlockProposalOptions,
+  ConsensusPayload,
+  SignatureDomainSeparator,
+} from '@aztec/stdlib/p2p';
+import type { ProposedBlockHeader, StateReference, Tx } from '@aztec/stdlib/tx';
 
 import type { ValidatorKeyStore } from '../key_store/interface.js';
 
@@ -12,16 +18,31 @@ export class ValidationService {
   /**
    * Create a block proposal with the given header, archive, and transactions
    *
+   * @param blockNumber - The block number this proposal is for
    * @param header - The block header
    * @param archive - The archive of the current block
    * @param txs - TxHash[] ordered list of transactions
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
    */
-  createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal> {
+  async createBlockProposal(
+    blockNumber: Fr,
+    header: ProposedBlockHeader,
+    archive: Fr,
+    stateReference: StateReference,
+    txs: Tx[],
+    options: BlockProposalOptions,
+  ): Promise<BlockProposal> {
     const payloadSigner = (payload: Buffer32) => this.keyStore.signMessage(payload);
+    // TODO: check if this is calculated earlier / can not be recomputed
+    const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
 
-    return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txs), payloadSigner);
+    return BlockProposal.createProposalFromSigner(
+      blockNumber,
+      new ConsensusPayload(header, archive, stateReference, txHashes),
+      options.publishFullTxs ? txs : undefined,
+      payloadSigner,
+    );
   }
 
   /**
@@ -40,6 +61,6 @@ export class ValidationService {
       keccak256(proposal.payload.getPayloadToSign(SignatureDomainSeparator.blockAttestation)),
     );
     const sig = await this.keyStore.signMessage(buf);
-    return new BlockAttestation(proposal.payload, sig);
+    return new BlockAttestation(proposal.blockNumber, proposal.payload, sig);
   }
 }

package/src/factory.ts

@@ -1,6 +1,7 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
+import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { TelemetryClient } from '@aztec/telemetry-client';
 
 import { generatePrivateKey } from 'viem/accounts';
@@ -12,6 +13,7 @@ export function createValidatorClient(
   config: ValidatorClientConfig,
   deps: {
     p2pClient: P2P;
+    blockSource: L2BlockSource;
     telemetry: TelemetryClient;
     dateProvider: DateProvider;
     epochCache: EpochCache;
@@ -24,5 +26,12 @@ export function createValidatorClient(
     config.validatorPrivateKey = generatePrivateKey();
   }
 
-  return ValidatorClient.new(config, deps.epochCache, deps.p2pClient, deps.dateProvider, deps.telemetry);
+  return ValidatorClient.new(
+    config,
+    deps.epochCache,
+    deps.p2pClient,
+    deps.blockSource,
+    deps.dateProvider,
+    deps.telemetry,
+  );
 }

package/src/validator.ts

@@ -1,16 +1,17 @@
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import type { EpochCache } from '@aztec/epoch-cache';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, type Timer } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
 import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
-import type { L2Block } from '@aztec/stdlib/block';
-import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import type { BlockHeader, GlobalVariables, Tx, TxHash } from '@aztec/stdlib/tx';
+import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
+import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
+import type { ProposedBlockHeader, StateReference, Tx, TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient, WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
 
 import type { ValidatorClientConfig } from './config.js';
@@ -34,8 +35,9 @@ import { ValidatorMetrics } from './metrics.js';
  * We reuse the sequencer's block building functionality for re-execution
  */
 type BlockBuilderCallback = (
+  blockNumber: Fr,
+  header: ProposedBlockHeader,
   txs: Iterable<Tx> | AsyncIterableIterator<Tx>,
-  globalVariables: GlobalVariables,
   opts?: { validateOnly?: boolean },
 ) => Promise<{
   block: L2Block;
@@ -51,10 +53,17 @@ export interface Validator {
   registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
 
   // Block validation responsibilities
-  createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
-  attestToProposal(proposal: BlockProposal): void;
-
-  broadcastBlockProposal(proposal: BlockProposal): void;
+  createBlockProposal(
+    blockNumber: Fr,
+    header: ProposedBlockHeader,
+    archive: Fr,
+    stateReference: StateReference,
+    txs: Tx[],
+    options: BlockProposalOptions,
+  ): Promise<BlockProposal | undefined>;
+  attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined>;
+
+  broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
   collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
 }
 
@@ -81,6 +90,7 @@ export class ValidatorClient extends WithTracer implements Validator {
     private keyStore: ValidatorKeyStore,
     private epochCache: EpochCache,
     private p2pClient: P2P,
+    private blockSource: L2BlockSource,
     private config: ValidatorClientConfig,
     private dateProvider: DateProvider = new DateProvider(),
     telemetry: TelemetryClient = getTelemetryClient(),
@@ -94,14 +104,14 @@ export class ValidatorClient extends WithTracer implements Validator {
 
     this.blockProposalValidator = new BlockProposalValidator(epochCache);
 
-    // Refresh epoch cache every second to trigger alert if participation in commitee changes
+    // Refresh epoch cache every second to trigger alert if participation in committee changes
     this.myAddress = this.keyStore.getAddress();
-    this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommiteeUpdate.bind(this), log, 1000);
+    this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
 
     this.log.verbose(`Initialized validator with address ${this.keyStore.getAddress().toString()}`);
   }
 
-  private async handleEpochCommiteeUpdate() {
+  private async handleEpochCommitteeUpdate() {
     try {
       const { committee, epoch } = await this.epochCache.getCommittee('now');
       if (epoch !== this.lastEpoch) {
@@ -122,6 +132,7 @@ export class ValidatorClient extends WithTracer implements Validator {
     config: ValidatorClientConfig,
     epochCache: EpochCache,
     p2pClient: P2P,
+    blockSource: L2BlockSource,
     dateProvider: DateProvider = new DateProvider(),
     telemetry: TelemetryClient = getTelemetryClient(),
   ) {
@@ -132,7 +143,15 @@ export class ValidatorClient extends WithTracer implements Validator {
     const privateKey = validatePrivateKey(config.validatorPrivateKey);
     const localKeyStore = new LocalKeyStore(privateKey);
 
-    const validator = new ValidatorClient(localKeyStore, epochCache, p2pClient, config, dateProvider, telemetry);
+    const validator = new ValidatorClient(
+      localKeyStore,
+      epochCache,
+      p2pClient,
+      blockSource,
+      config,
+      dateProvider,
+      telemetry,
+    );
     validator.registerBlockProposalHandler();
     return validator;
   }
@@ -178,9 +197,10 @@ export class ValidatorClient extends WithTracer implements Validator {
 
   async attestToProposal(proposal: BlockProposal): Promise<BlockAttestation | undefined> {
     const slotNumber = proposal.slotNumber.toNumber();
+    const blockNumber = proposal.blockNumber.toNumber();
     const proposalInfo = {
       slotNumber,
-      blockNumber: proposal.payload.header.globalVariables.blockNumber.toNumber(),
+      blockNumber,
       archive: proposal.payload.archive.toString(),
       txCount: proposal.payload.txHashes.length,
       txHashes: proposal.payload.txHashes.map(txHash => txHash.toString()),
@@ -201,21 +221,40 @@ export class ValidatorClient extends WithTracer implements Validator {
       return undefined;
     }
 
+    // Check that the parent proposal is a block we know, otherwise reexecution would fail.
+    // Q: Should we move this to the block proposal validator? If there, then p2p would check it
+    // before re-broadcasting it. This means that proposals built on top of an L1-reorgd-out block
+    // 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 parentBlock = await this.blockSource.getBlock(blockNumber - 1);
+      if (parentBlock === undefined) {
+        this.log.verbose(`Parent block for ${blockNumber} not found, skipping attestation`);
+        this.metrics.incFailedAttestations('parent_block_not_found');
+        return undefined;
+      }
+      if (!proposal.payload.header.lastArchiveRoot.equals(parentBlock.archive.root)) {
+        this.log.verbose(`Parent block archive root for proposal does not match, skipping attestation`, {
+          proposalLastArchiveRoot: proposal.payload.header.lastArchiveRoot.toString(),
+          parentBlockArchiveRoot: parentBlock.archive.root.toString(),
+          ...proposalInfo,
+        });
+        this.metrics.incFailedAttestations('parent_block_does_not_match');
+        return undefined;
+      }
+    }
+
     // Check that all of the transactions in the proposal are available in the tx pool before attesting
     this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
     try {
-      await this.ensureTransactionsAreAvailable(proposal);
+      const txs = await this.ensureTransactionsAreAvailable(proposal);
 
       if (this.config.validatorReexecute) {
         this.log.verbose(`Re-executing transactions in the proposal before attesting`);
-        await this.reExecuteTransactions(proposal);
+        await this.reExecuteTransactions(proposal, txs);
       }
     } catch (error: any) {
-      if (error instanceof Error) {
-        this.metrics.incFailedAttestations(error.name);
-      } else {
-        this.metrics.incFailedAttestations('unknown');
-      }
+      this.metrics.incFailedAttestations(error instanceof Error ? error.name : 'unknown');
 
       // If the transactions are not available, then we should not attempt to attest
       if (error instanceof TransactionsNotAvailableError) {
@@ -240,16 +279,14 @@ export class ValidatorClient extends WithTracer implements Validator {
    * Re-execute the transactions in the proposal and check that the state updates match the header state
    * @param proposal - The proposal to re-execute
    */
-  async reExecuteTransactions(proposal: BlockProposal) {
+  async reExecuteTransactions(proposal: BlockProposal, txs: Tx[]) {
     const { header, txHashes } = proposal.payload;
 
-    const txs = (await Promise.all(txHashes.map(tx => this.p2pClient.getTxByHash(tx)))).filter(
-      tx => tx !== undefined,
-    ) as Tx[];
-
-    // If we cannot request all of the transactions, then we should fail
+    // If we do not have all of the transactions, then we should fail
     if (txs.length !== txHashes.length) {
-      throw new TransactionsNotAvailableError(txHashes);
+      const foundTxHashes = await Promise.all(txs.map(async tx => await tx.getTxHash()));
+      const missingTxHashes = txHashes.filter(txHash => !foundTxHashes.includes(txHash));
+      throw new TransactionsNotAvailableError(missingTxHashes);
     }
 
     // Assertion: This check will fail if re-execution is not enabled
@@ -259,7 +296,7 @@ export class ValidatorClient extends WithTracer implements Validator {
 
     // Use the sequencer's block building logic to re-execute the transactions
     const stopTimer = this.metrics.reExecutionTimer();
-    const { block, numFailedTxs } = await this.blockBuilder(txs, header.globalVariables, {
+    const { block, numFailedTxs } = await this.blockBuilder(proposal.blockNumber, header, txs, {
       validateOnly: true,
     });
     stopTimer();
@@ -291,43 +328,130 @@ export class ValidatorClient extends WithTracer implements Validator {
    * 3. If we cannot retrieve them from the network, throw an error
    * @param proposal - The proposal to attest to
    */
-  async ensureTransactionsAreAvailable(proposal: BlockProposal) {
-    const txHashes: TxHash[] = proposal.payload.txHashes;
-    const transactionStatuses = await Promise.all(txHashes.map(txHash => this.p2pClient.getTxStatus(txHash)));
+  async ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]> {
+    if (proposal.payload.txHashes.length === 0) {
+      this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
+      return [];
+    }
+    // Is this a new style proposal?
+    if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
+      // Yes, any txs that we already have we should use
+      this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
+
+      // Request from the pool based on the signed hashes in the payload
+      const hashesFromPayload = proposal.payload.txHashes;
+      const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
+
+      const missingTxs = txsToUse.filter(tx => tx === undefined).length;
+      if (missingTxs > 0) {
+        this.log.verbose(
+          `Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`,
+        );
+      }
 
-    const missingTxs = txHashes.filter((_, index) => !['pending', 'mined'].includes(transactionStatuses[index] ?? ''));
+      let usedFromProposal = 0;
+
+      // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
+      for (let i = 0; i < txsToUse.length; i++) {
+        if (txsToUse[i] === undefined) {
+          // We don't have the transaction, take from the proposal, provided the hash is the same
+          const hashOfTxInProposal = await proposal.txs[i].getTxHash();
+          if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
+            // Hash is equal, we can use the tx from the proposal
+            txsToUse[i] = proposal.txs[i];
+            usedFromProposal++;
+          } else {
+            this.log.warn(
+              `Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[
+                i
+              ].toString()}`,
+            );
+          }
+        }
+      }
 
-    if (missingTxs.length === 0) {
-      return; // All transactions are available
+      // See if we still have any holes, if there are then we were not successful and will try the old method
+      if (txsToUse.some(tx => tx === undefined)) {
+        this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
+      } else {
+        this.log.info(
+          `Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`,
+        );
+
+        await this.p2pClient.validate(txsToUse as Tx[]);
+        return txsToUse as Tx[];
+      }
     }
 
-    this.log.verbose(`Missing ${missingTxs.length} transactions in the tx pool, requesting from the network`);
+    this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
+
+    // Old style proposal, we will perform a request by hash from pool
+    // This will request from network any txs that are missing
+    const txHashes: TxHash[] = proposal.payload.txHashes;
+
+    // This part is just for logging that we are requesting from the network
+    const availability = await this.p2pClient.hasTxsInPool(txHashes);
+    const notAvailable = availability.filter(availability => availability === false);
+    if (notAvailable.length) {
+      this.log.verbose(
+        `Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`,
+      );
+    }
 
-    const requestedTxs = await this.p2pClient.requestTxs(missingTxs);
-    if (requestedTxs.some(tx => tx === undefined)) {
-      throw new TransactionsNotAvailableError(missingTxs);
+    // This will request from the network any txs that are missing
+    const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
+    const missingTxs = retrievedTxs
+      .map((tx, index) => {
+        // Return the hash of any that we did not get
+        if (tx === undefined) {
+          return txHashes[index];
+        } else {
+          return undefined;
+        }
+      })
+      .filter(hash => hash !== undefined);
+    if (missingTxs.length > 0) {
+      throw new TransactionsNotAvailableError(missingTxs as TxHash[]);
     }
+
+    await this.p2pClient.validate(retrievedTxs as Tx[]);
+
+    return retrievedTxs as Tx[];
   }
 
-  async createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined> {
-    if (this.previousProposal?.slotNumber.equals(header.globalVariables.slotNumber)) {
+  async createBlockProposal(
+    blockNumber: Fr,
+    header: ProposedBlockHeader,
+    archive: Fr,
+    stateReference: StateReference,
+    txs: Tx[],
+    options: BlockProposalOptions,
+  ): Promise<BlockProposal | undefined> {
+    if (this.previousProposal?.slotNumber.equals(header.slotNumber)) {
       this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);
       return Promise.resolve(undefined);
     }
 
-    const newProposal = await this.validationService.createBlockProposal(header, archive, txs);
+    const newProposal = await this.validationService.createBlockProposal(
+      blockNumber,
+      header,
+      archive,
+      stateReference,
+      txs,
+      options,
+    );
     this.previousProposal = newProposal;
     return newProposal;
   }
 
-  broadcastBlockProposal(proposal: BlockProposal): void {
-    this.p2pClient.broadcastProposal(proposal);
+  async broadcastBlockProposal(proposal: BlockProposal): Promise<void> {
+    await this.p2pClient.broadcastProposal(proposal);
   }
 
   // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7962)
   async collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]> {
     // Wait and poll the p2pClient's attestation pool for this block until we have enough attestations
-    const slot = proposal.payload.header.globalVariables.slotNumber.toBigInt();
+    const slot = proposal.payload.header.slotNumber.toBigInt();
     this.log.debug(`Collecting ${required} attestations for slot ${slot} with deadline ${deadline.toISOString()}`);
 
     if (+deadline < this.dateProvider.now()) {
@@ -378,7 +502,7 @@ export class ValidatorClient extends WithTracer implements Validator {
 function validatePrivateKey(privateKey: string): Buffer32 {
   try {
     return Buffer32.fromString(privateKey);
-  } catch (error) {
+  } catch {
     throw new InvalidValidatorPrivateKeyError();
   }
 }