@aztec/validator-client 1.0.0-nightly.20250708 → 1.0.0-staging.1

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAKjB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6EAA6E;IAC7E,oBAAoB,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC,CAAC;IAEnD,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,+CAA+C;IAC/C,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;CACtC;AAED,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CA6BnF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAKjB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6EAA6E;IAC7E,oBAAoB,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,EAAE,CAAC,CAAC;IAEnD,+BAA+B;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAE1B,+DAA+D;IAC/D,4BAA4B,EAAE,MAAM,CAAC;IAErC,+CAA+C;IAC/C,kBAAkB,EAAE,OAAO,CAAC;IAE5B,wEAAwE;IACxE,4BAA4B,EAAE,MAAM,CAAC;CACtC;AAED,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CA4BnF,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}

package/dest/config.js

@@ -3,10 +3,7 @@ export const validatorClientConfigMappings = {
     validatorPrivateKeys: {
         env: 'VALIDATOR_PRIVATE_KEYS',
         description: 'List of private keys of the validators participating in attestation duties',
-        ...secretValueConfigHelper((val)=>val ? val.split(',').map((key)=>`0x${key.replace('0x', '')}`) : []),
-        fallback: [
-            'VALIDATOR_PRIVATE_KEY'
-        ]
+        ...secretValueConfigHelper((val)=>val ? val.split(',').map((key)=>`0x${key.replace('0x', '')}`) : [])
     },
     disableValidator: {
         env: 'VALIDATOR_DISABLED',

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,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,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,MAAM,EACnB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,uBAAuB,EAAE,UAAU,GAAG,SAAS,EAC/C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC;IAqBzB;;;;;;;;;OASG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAUtG"}
+{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,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,MAAM,EACnB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,EAAE,EACX,cAAc,EAAE,cAAc,EAC9B,GAAG,EAAE,EAAE,EAAE,EACT,uBAAuB,EAAE,UAAU,GAAG,SAAS,EAC/C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,aAAa,CAAC;IAoBzB;;;;;;;;;OASG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAUtG"}

package/dest/duties/validation_service.js

@@ -26,7 +26,7 @@ export class ValidationService {
         }
         // 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);
+        return BlockProposal.createProposalFromSigner(blockNumber, new ConsensusPayload(header, archive, stateReference, txHashes), options.publishFullTxs ? txs : undefined, payloadSigner);
     }
     /**
    * Attest with selection of validators to the given block proposal, constructed by the current sequencer

package/dest/factory.d.ts

@@ -1,6 +1,6 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { P2PClient } from '@aztec/p2p';
+import type { P2P } from '@aztec/p2p';
 import type { SlasherConfig } from '@aztec/slasher/config';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { IFullNodeBlockBuilder } from '@aztec/stdlib/interfaces/server';
@@ -10,7 +10,7 @@ import type { ValidatorClientConfig } from './config.js';
 import { ValidatorClient } from './validator.js';
 export declare function createValidatorClient(config: ValidatorClientConfig & Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>, deps: {
     blockBuilder: IFullNodeBlockBuilder;
-    p2pClient: P2PClient;
+    p2pClient: P2P;
     blockSource: L2BlockSource;
     l1ToL2MessageSource: L1ToL2MessageSource;
     telemetry: TelemetryClient;

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;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,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,GAC3B,IAAI,CAAC,aAAa,EAAE,0BAA0B,GAAG,0BAA0B,GAAG,6BAA6B,CAAC,EAC9G,IAAI,EAAE;IACJ,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,aAAa,CAAC;IAC3B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAqBF"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,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,GAC3B,IAAI,CAAC,aAAa,EAAE,0BAA0B,GAAG,0BAA0B,GAAG,6BAA6B,CAAC,EAC9G,IAAI,EAAE;IACJ,YAAY,EAAE,qBAAqB,CAAC;IACpC,SAAS,EAAE,GAAG,CAAC;IACf,WAAW,EAAE,aAAa,CAAC;IAC3B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;CACxB,+BAmBF"}

package/dest/factory.js

@@ -10,6 +10,5 @@ export function createValidatorClient(config, deps) {
             generatePrivateKey()
         ]);
     }
-    const txProvider = deps.p2pClient.getTxProvider();
-    return ValidatorClient.new(config, deps.blockBuilder, deps.epochCache, deps.p2pClient, deps.blockSource, deps.l1ToL2MessageSource, txProvider, deps.dateProvider, deps.telemetry);
+    return ValidatorClient.new(config, deps.blockBuilder, deps.epochCache, deps.p2pClient, deps.blockSource, deps.l1ToL2MessageSource, deps.dateProvider, deps.telemetry);
 }

package/dest/validator.d.ts

@@ -3,7 +3,6 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { P2P, PeerId } from '@aztec/p2p';
-import { TxProvider } from '@aztec/p2p';
 import { type SlasherConfig, type WantToSlashArgs, type Watcher, type WatcherEmitter } from '@aztec/slasher/config';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { IFullNodeBlockBuilder, SequencerConfig } from '@aztec/stdlib/interfaces/server';
@@ -32,7 +31,6 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
     private p2pClient;
     private blockSource;
     private l1ToL2MessageSource;
-    private txProvider;
     private config;
     private dateProvider;
     private log;
@@ -41,13 +39,14 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
     private metrics;
     private previousProposal?;
     private myAddresses;
-    private lastEpochForCommitteeUpdateLoop;
+    private lastEpoch;
     private epochCacheUpdateLoop;
     private blockProposalValidator;
+    private txCollector;
     private proposersOfInvalidBlocks;
-    protected constructor(blockBuilder: IFullNodeBlockBuilder, keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: TxProvider, config: ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList'> & Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
+    constructor(blockBuilder: IFullNodeBlockBuilder, keyStore: ValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, config: ValidatorClientConfig & Pick<SequencerConfig, 'txPublicSetupAllowList'> & Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private handleEpochCommitteeUpdate;
-    static new(config: ValidatorClientConfig & Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>, blockBuilder: IFullNodeBlockBuilder, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: TxProvider, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
+    static new(config: ValidatorClientConfig & Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>, blockBuilder: IFullNodeBlockBuilder, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, dateProvider?: DateProvider, telemetry?: TelemetryClient): ValidatorClient;
     getValidatorAddresses(): EthAddress[];
     configureSlashing(config: Partial<Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>>): void;
     start(): Promise<void>;

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

@@ -6,6 +6,7 @@ import { retryUntil } from '@aztec/foundation/retry';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
+import { TxCollector } from '@aztec/p2p';
 import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
 import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
 import { Offense, WANT_TO_SLASH_EVENT } from '@aztec/slasher/config';
@@ -29,7 +30,6 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     p2pClient;
     blockSource;
     l1ToL2MessageSource;
-    txProvider;
     config;
     dateProvider;
     log;
@@ -39,16 +39,18 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     // Used to check if we are sending the same proposal twice
     previousProposal;
     myAddresses;
-    lastEpochForCommitteeUpdateLoop;
+    lastEpoch;
     epochCacheUpdateLoop;
     blockProposalValidator;
+    txCollector;
     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();
+    constructor(blockBuilder, keyStore, epochCache, p2pClient, blockSource, l1ToL2MessageSource, 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.config = config, this.dateProvider = dateProvider, this.log = log, this.proposersOfInvalidBlocks = new Set();
         this.tracer = telemetry.getTracer('Validator');
         this.metrics = new ValidatorMetrics(telemetry);
         this.validationService = new ValidationService(keyStore);
         this.blockProposalValidator = new BlockProposalValidator(epochCache);
+        this.txCollector = new TxCollector(p2pClient, this.log);
         // Refresh epoch cache every second to trigger alert if participation in committee changes
         this.myAddresses = this.keyStore.getAddresses();
         this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
@@ -56,12 +58,12 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
     }
     async handleEpochCommitteeUpdate() {
         try {
-            const { committee, epoch } = await this.epochCache.getCommittee('next');
+            const { committee, epoch } = await this.epochCache.getCommittee('now');
             if (!committee) {
                 this.log.trace(`No committee found for slot`);
                 return;
             }
-            if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
+            if (epoch !== this.lastEpoch) {
                 const me = this.myAddresses;
                 const committeeSet = new Set(committee.map((v)=>v.toString()));
                 const inCommittee = me.filter((a)=>committeeSet.has(a.toString()));
@@ -70,19 +72,19 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 } else {
                     this.log.verbose(`Validators ${me.map((a)=>a.toString()).join(', ')} are not on the validator committee for epoch ${epoch}`);
                 }
-                this.lastEpochForCommitteeUpdateLoop = epoch;
+                this.lastEpoch = epoch;
             }
         } catch (err) {
             this.log.error(`Error updating epoch committee`, err);
         }
     }
-    static new(config, blockBuilder, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
+    static new(config, blockBuilder, epochCache, p2pClient, blockSource, l1ToL2MessageSource, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
         if (!config.validatorPrivateKeys.getValue().length) {
             throw new InvalidValidatorPrivateKeyError();
         }
         const privateKeys = config.validatorPrivateKeys.getValue().map(validatePrivateKey);
         const localKeyStore = new LocalKeyStore(privateKeys);
-        const validator = new ValidatorClient(blockBuilder, localKeyStore, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, config, dateProvider, telemetry);
+        const validator = new ValidatorClient(blockBuilder, localKeyStore, epochCache, p2pClient, blockSource, l1ToL2MessageSource, config, dateProvider, telemetry);
         validator.registerBlockProposalHandler();
         return validator;
     }
@@ -98,7 +100,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         // Sync the committee from the smart contract
         // https://github.com/AztecProtocol/aztec-packages/issues/7962
         const myAddresses = this.keyStore.getAddresses();
-        const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
+        const inCommittee = await this.epochCache.filterInCommittee(myAddresses);
         if (inCommittee.length > 0) {
             this.log.info(`Started validator with addresses in current validator committee: ${inCommittee.map((a)=>a.toString()).join(', ')}`);
         } else {
@@ -111,40 +113,32 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         await this.epochCacheUpdateLoop.stop();
     }
     registerBlockProposalHandler() {
-        const handler = (block, proposalSender)=>this.attestToProposal(block, proposalSender);
+        const handler = (block, proposalSender)=>{
+            return this.attestToProposal(block, proposalSender);
+        };
         this.p2pClient.registerBlockProposalHandler(handler);
     }
     async attestToProposal(proposal, proposalSender) {
-        const slotNumber = proposal.slotNumber.toBigInt();
+        const slotNumber = proposal.slotNumber.toNumber();
         const blockNumber = proposal.blockNumber;
         const proposer = proposal.getSender();
         // Check that I have any address in current committee before attesting
-        const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.keyStore.getAddresses());
+        const inCommittee = await this.epochCache.filterInCommittee(this.keyStore.getAddresses());
         const partOfCommittee = inCommittee.length > 0;
         const proposalInfo = {
-            ...proposal.toBlockInfo(),
-            proposer: proposer.toString()
+            slotNumber,
+            blockNumber,
+            proposer: proposer.toString(),
+            archive: proposal.payload.archive.toString(),
+            txCount: proposal.payload.txHashes.length,
+            txHashes: proposal.payload.txHashes.map((txHash)=>txHash.toString())
         };
-        this.log.info(`Received proposal for slot ${slotNumber}`, {
-            ...proposalInfo,
-            txHashes: proposal.txHashes.map((txHash)=>txHash.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 { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, {
-            pinnedPeer: proposalSender,
-            deadline: this.getReexecutionDeadline(proposal, this.blockBuilder.getConfig())
-        });
-        // Check that I have any address in current committee before attesting
-        if (!partOfCommittee) {
-            this.log.verbose(`No validator in the current committee, skipping attestation`, proposalInfo);
-            return undefined;
-        }
+        this.log.info(`Received request to attest for slot ${slotNumber}`, proposalInfo);
         // Check that the proposal is from the current proposer, or the next proposer.
         // Q: Should this be moved to the block proposal validator, so we disregard proposals from anyone?
         const invalidProposal = await this.blockProposalValidator.validate(proposal);
         if (invalidProposal) {
-            this.log.warn(`Proposal is not valid, skipping attestation`, proposalInfo);
+            this.log.warn(`Proposal is not valid, skipping attestation`);
             if (partOfCommittee) {
                 this.metrics.incFailedAttestations(1, 'invalid_proposal');
             }
@@ -169,7 +163,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 return await this.blockSource.getBlock(blockNumber - 1);
             }, 'Force Archiver Sync', timeoutDurationMs / 1000, 0.5);
             if (parentBlock === undefined) {
-                this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`, proposalInfo);
+                this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`);
                 if (partOfCommittee) {
                     this.metrics.incFailedAttestations(1, 'parent_block_not_found');
                 }
@@ -187,8 +181,20 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
                 return undefined;
             }
         }
+        // Collect txs from the proposal
+        const { missing, txs } = await this.txCollector.collectForBlockProposal(proposal, proposalSender);
+        // Check that all of the transactions in the proposal are available in the tx pool before attesting
+        if (missing && missing.length > 0) {
+            this.log.warn(`Missing ${missing.length}/${proposal.payload.txHashes.length} txs to attest to proposal`, {
+                ...proposalInfo,
+                missing
+            });
+            if (partOfCommittee) {
+                this.metrics.incFailedAttestations(1, 'tx_not_available');
+            }
+            return undefined;
+        }
         // Check that I have the same set of l1ToL2Messages as the proposal
-        // Q: Same as above, should this be part of p2p validation?
         const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
         const computedInHash = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
         const proposalInHash = proposal.payload.header.contentCommitment.inHash;
@@ -203,15 +209,8 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
             }
             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');
-            }
+        if (!partOfCommittee) {
+            this.log.verbose(`No validator in the committee, skipping attestation`);
             return undefined;
         }
         // Try re-executing the transactions in the proposal
@@ -245,8 +244,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
    * 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, txs, l1ToL2Messages) {
-        const { header } = proposal.payload;
-        const { txHashes } = proposal;
+        const { header, txHashes } = proposal.payload;
         // If we do not have all of the transactions, then we should fail
         if (txs.length !== txHashes.length) {
             const foundTxHashes = await Promise.all(txs.map(async (tx)=>await tx.getTxHash()));
@@ -336,7 +334,7 @@ const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
         }
         const proposalId = proposal.archive.toString();
         // adds attestations for all of my addresses locally
-        const inCommittee = await this.epochCache.filterInCommittee(slot, this.keyStore.getAddresses());
+        const inCommittee = await this.epochCache.filterInCommittee(this.keyStore.getAddresses());
         await this.doAttestToProposal(proposal, inCommittee);
         const myAddresses = this.keyStore.getAddresses();
         let attestations = [];

package/package.json

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

package/src/config.ts

@@ -34,7 +34,6 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
     ...secretValueConfigHelper<`0x${string}`[]>(val =>
       val ? val.split(',').map<`0x${string}`>(key => `0x${key.replace('0x', '')}`) : [],
     ),
-    fallback: ['VALIDATOR_PRIVATE_KEY'],
   },
   disableValidator: {
     env: 'VALIDATOR_DISABLED',

package/src/duties/validation_service.ts

@@ -49,8 +49,7 @@ export class ValidationService {
 
     return BlockProposal.createProposalFromSigner(
       blockNumber,
-      new ConsensusPayload(header, archive, stateReference),
-      txHashes,
+      new ConsensusPayload(header, archive, stateReference, txHashes),
       options.publishFullTxs ? txs : undefined,
       payloadSigner,
     );

package/src/factory.ts

@@ -1,7 +1,7 @@
 import type { EpochCache } from '@aztec/epoch-cache';
 import { SecretValue } from '@aztec/foundation/config';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { P2PClient } from '@aztec/p2p';
+import type { P2P } from '@aztec/p2p';
 import type { SlasherConfig } from '@aztec/slasher/config';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { IFullNodeBlockBuilder } from '@aztec/stdlib/interfaces/server';
@@ -18,7 +18,7 @@ export function createValidatorClient(
     Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>,
   deps: {
     blockBuilder: IFullNodeBlockBuilder;
-    p2pClient: P2PClient;
+    p2pClient: P2P;
     blockSource: L2BlockSource;
     l1ToL2MessageSource: L1ToL2MessageSource;
     telemetry: TelemetryClient;
@@ -33,7 +33,6 @@ export function createValidatorClient(
     config.validatorPrivateKeys = new SecretValue([generatePrivateKey()]);
   }
 
-  const txProvider = deps.p2pClient.getTxProvider();
   return ValidatorClient.new(
     config,
     deps.blockBuilder,
@@ -41,7 +40,6 @@ export function createValidatorClient(
     deps.p2pClient,
     deps.blockSource,
     deps.l1ToL2MessageSource,
-    txProvider,
     deps.dateProvider,
     deps.telemetry,
   );

package/src/validator.ts

@@ -9,7 +9,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
 import type { P2P, PeerId } from '@aztec/p2p';
-import { TxProvider } from '@aztec/p2p';
+import { TxCollector } from '@aztec/p2p';
 import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
 import { computeInHashFromL1ToL2Messages } from '@aztec/prover-client/helpers';
 import {
@@ -22,7 +22,7 @@ import {
 } from '@aztec/slasher/config';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
-import type { IFullNodeBlockBuilder, SequencerConfig } from '@aztec/stdlib/interfaces/server';
+import type { IFullNodeBlockBuilder, ITxCollector, SequencerConfig } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import type { BlockAttestation, BlockProposal, BlockProposalOptions } from '@aztec/stdlib/p2p';
 import { GlobalVariables, type ProposedBlockHeader, type StateReference, type Tx } from '@aztec/stdlib/tx';
@@ -80,21 +80,20 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   private previousProposal?: BlockProposal;
 
   private myAddresses: EthAddress[];
-  private lastEpochForCommitteeUpdateLoop: bigint | undefined;
+  private lastEpoch: bigint | undefined;
   private epochCacheUpdateLoop: RunningPromise;
 
   private blockProposalValidator: BlockProposalValidator;
-
+  private txCollector: ITxCollector;
   private proposersOfInvalidBlocks: Set<EthAddress> = new Set();
 
-  protected constructor(
+  constructor(
     private blockBuilder: IFullNodeBlockBuilder,
     private keyStore: ValidatorKeyStore,
     private epochCache: EpochCache,
     private p2pClient: P2P,
     private blockSource: L2BlockSource,
     private l1ToL2MessageSource: L1ToL2MessageSource,
-    private txProvider: TxProvider,
     private config: ValidatorClientConfig &
       Pick<SequencerConfig, 'txPublicSetupAllowList'> &
       Pick<SlasherConfig, 'slashInvalidBlockEnabled' | 'slashInvalidBlockPenalty' | 'slashInvalidBlockMaxPenalty'>,
@@ -110,6 +109,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     this.blockProposalValidator = new BlockProposalValidator(epochCache);
 
+    this.txCollector = new TxCollector(p2pClient, this.log);
+
     // Refresh epoch cache every second to trigger alert if participation in committee changes
     this.myAddresses = this.keyStore.getAddresses();
     this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), log, 1000);
@@ -119,12 +120,12 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
   private async handleEpochCommitteeUpdate() {
     try {
-      const { committee, epoch } = await this.epochCache.getCommittee('next');
+      const { committee, epoch } = await this.epochCache.getCommittee('now');
       if (!committee) {
         this.log.trace(`No committee found for slot`);
         return;
       }
-      if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
+      if (epoch !== this.lastEpoch) {
         const me = this.myAddresses;
         const committeeSet = new Set(committee.map(v => v.toString()));
         const inCommittee = me.filter(a => committeeSet.has(a.toString()));
@@ -137,7 +138,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
             `Validators ${me.map(a => a.toString()).join(', ')} are not on the validator committee for epoch ${epoch}`,
           );
         }
-        this.lastEpochForCommitteeUpdateLoop = epoch;
+        this.lastEpoch = epoch;
       }
     } catch (err) {
       this.log.error(`Error updating epoch committee`, err);
@@ -152,7 +153,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     p2pClient: P2P,
     blockSource: L2BlockSource,
     l1ToL2MessageSource: L1ToL2MessageSource,
-    txProvider: TxProvider,
     dateProvider: DateProvider = new DateProvider(),
     telemetry: TelemetryClient = getTelemetryClient(),
   ) {
@@ -170,7 +170,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       p2pClient,
       blockSource,
       l1ToL2MessageSource,
-      txProvider,
       config,
       dateProvider,
       telemetry,
@@ -200,7 +199,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     const myAddresses = this.keyStore.getAddresses();
 
-    const inCommittee = await this.epochCache.filterInCommittee('now', myAddresses);
+    const inCommittee = await this.epochCache.filterInCommittee(myAddresses);
     if (inCommittee.length > 0) {
       this.log.info(
         `Started validator with addresses in current validator committee: ${inCommittee.map(a => a.toString()).join(', ')}`,
@@ -217,48 +216,36 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
   }
 
   public registerBlockProposalHandler() {
-    const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> =>
-      this.attestToProposal(block, proposalSender);
+    const handler = (block: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> => {
+      return this.attestToProposal(block, proposalSender);
+    };
     this.p2pClient.registerBlockProposalHandler(handler);
   }
 
   async attestToProposal(proposal: BlockProposal, proposalSender: PeerId): Promise<BlockAttestation[] | undefined> {
-    const slotNumber = proposal.slotNumber.toBigInt();
+    const slotNumber = proposal.slotNumber.toNumber();
     const blockNumber = proposal.blockNumber;
     const proposer = proposal.getSender();
 
     // Check that I have any address in current committee before attesting
-    const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.keyStore.getAddresses());
+    const inCommittee = await this.epochCache.filterInCommittee(this.keyStore.getAddresses());
     const partOfCommittee = inCommittee.length > 0;
 
     const proposalInfo = {
-      ...proposal.toBlockInfo(),
+      slotNumber,
+      blockNumber,
       proposer: proposer.toString(),
+      archive: proposal.payload.archive.toString(),
+      txCount: proposal.payload.txHashes.length,
+      txHashes: proposal.payload.txHashes.map(txHash => txHash.toString()),
     };
-
-    this.log.info(`Received proposal for slot ${slotNumber}`, {
-      ...proposalInfo,
-      txHashes: proposal.txHashes.map(txHash => txHash.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 { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, {
-      pinnedPeer: proposalSender,
-      deadline: this.getReexecutionDeadline(proposal, this.blockBuilder.getConfig()),
-    });
-
-    // Check that I have any address in current committee before attesting
-    if (!partOfCommittee) {
-      this.log.verbose(`No validator in the current committee, skipping attestation`, proposalInfo);
-      return undefined;
-    }
+    this.log.info(`Received request to attest for slot ${slotNumber}`, proposalInfo);
 
     // Check that the proposal is from the current proposer, or the next proposer.
     // Q: Should this be moved to the block proposal validator, so we disregard proposals from anyone?
     const invalidProposal = await this.blockProposalValidator.validate(proposal);
     if (invalidProposal) {
-      this.log.warn(`Proposal is not valid, skipping attestation`, proposalInfo);
+      this.log.warn(`Proposal is not valid, skipping attestation`);
       if (partOfCommittee) {
         this.metrics.incFailedAttestations(1, 'invalid_proposal');
       }
@@ -293,13 +280,14 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
             );
 
       if (parentBlock === undefined) {
-        this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`, proposalInfo);
+        this.log.warn(`Parent block for ${blockNumber} not found, skipping attestation`);
+
         if (partOfCommittee) {
           this.metrics.incFailedAttestations(1, 'parent_block_not_found');
         }
+
         return undefined;
       }
-
       if (!proposal.payload.header.lastArchiveRoot.equals(parentBlock.archive.root)) {
         this.log.warn(`Parent block archive root for proposal does not match, skipping attestation`, {
           proposalLastArchiveRoot: proposal.payload.header.lastArchiveRoot.toString(),
@@ -313,8 +301,22 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       }
     }
 
+    // Collect txs from the proposal
+    const { missing, txs } = await this.txCollector.collectForBlockProposal(proposal, proposalSender);
+
+    // Check that all of the transactions in the proposal are available in the tx pool before attesting
+    if (missing && missing.length > 0) {
+      this.log.warn(`Missing ${missing.length}/${proposal.payload.txHashes.length} txs to attest to proposal`, {
+        ...proposalInfo,
+        missing,
+      });
+      if (partOfCommittee) {
+        this.metrics.incFailedAttestations(1, 'tx_not_available');
+      }
+      return undefined;
+    }
+
     // Check that I have the same set of l1ToL2Messages as the proposal
-    // Q: Same as above, should this be part of p2p validation?
     const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(blockNumber);
     const computedInHash = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
     const proposalInHash = proposal.payload.header.contentCommitment.inHash;
@@ -330,12 +332,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
       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');
-      }
+    if (!partOfCommittee) {
+      this.log.verbose(`No validator in the committee, skipping attestation`);
       return undefined;
     }
 
@@ -378,8 +376,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
    * @param proposal - The proposal to re-execute
    */
   async reExecuteTransactions(proposal: BlockProposal, txs: Tx[], l1ToL2Messages: Fr[]): Promise<void> {
-    const { header } = proposal.payload;
-    const { txHashes } = proposal;
+    const { header, txHashes } = proposal.payload;
 
     // If we do not have all of the transactions, then we should fail
     if (txs.length !== txHashes.length) {
@@ -514,7 +511,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     const proposalId = proposal.archive.toString();
     // adds attestations for all of my addresses locally
-    const inCommittee = await this.epochCache.filterInCommittee(slot, this.keyStore.getAddresses());
+    const inCommittee = await this.epochCache.filterInCommittee(this.keyStore.getAddresses());
     await this.doAttestToProposal(proposal, inCommittee);
 
     const myAddresses = this.keyStore.getAddresses();