@aztec/validator-client 4.2.0-nightly.20260402 → 4.2.0-nightly.20260404
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/factory.d.ts +5 -4
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +3 -3
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- package/dest/metrics.d.ts +2 -2
- package/dest/metrics.d.ts.map +1 -1
- package/dest/proposal_handler.d.ts +94 -0
- package/dest/proposal_handler.d.ts.map +1 -0
- package/dest/{block_proposal_handler.js → proposal_handler.js} +249 -7
- package/dest/validator.d.ts +7 -20
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +15 -223
- package/package.json +19 -19
- package/src/factory.ts +5 -3
- package/src/index.ts +1 -1
- package/src/metrics.ts +1 -1
- package/src/{block_proposal_handler.ts → proposal_handler.ts} +283 -8
- package/src/validator.ts +18 -244
- package/dest/block_proposal_handler.d.ts +0 -64
- package/dest/block_proposal_handler.d.ts.map +0 -1
package/dest/validator.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from
|
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
7
|
-
import { type
|
|
7
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
8
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
9
|
import type { KeystoreManager } from '@aztec/node-keystore';
|
|
10
10
|
import type { P2P, PeerId } from '@aztec/p2p';
|
|
@@ -12,7 +12,7 @@ import { type Watcher, type WatcherEmitter } from '@aztec/slasher';
|
|
|
12
12
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
13
13
|
import type { CommitteeAttestationsAndSigners, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
14
14
|
import type { CreateCheckpointProposalLastBlockData, ITxProvider, Validator, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
15
|
-
import {
|
|
15
|
+
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
16
16
|
import { type BlockProposal, type BlockProposalOptions, type CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore, type CheckpointProposalOptions } from '@aztec/stdlib/p2p';
|
|
17
17
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
18
18
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
@@ -20,9 +20,9 @@ import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
|
20
20
|
import { type SigningContext, type SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
21
21
|
import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
|
|
22
22
|
import type { TypedDataDefinition } from 'viem';
|
|
23
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
24
23
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
25
24
|
import type { ExtendedValidatorKeyStore } from './key_store/interface.js';
|
|
25
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
26
26
|
declare const ValidatorClient_base: new () => WatcherEmitter;
|
|
27
27
|
/**
|
|
28
28
|
* Validator Client
|
|
@@ -31,11 +31,7 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
31
31
|
private keyStore;
|
|
32
32
|
private epochCache;
|
|
33
33
|
private p2pClient;
|
|
34
|
-
private
|
|
35
|
-
private blockSource;
|
|
36
|
-
private checkpointsBuilder;
|
|
37
|
-
private worldState;
|
|
38
|
-
private l1ToL2MessageSource;
|
|
34
|
+
private proposalHandler;
|
|
39
35
|
private config;
|
|
40
36
|
private blobClient;
|
|
41
37
|
private haSigner;
|
|
@@ -56,12 +52,12 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
56
52
|
private proposersOfInvalidBlocks;
|
|
57
53
|
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */
|
|
58
54
|
private lastAttestedProposal?;
|
|
59
|
-
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P,
|
|
55
|
+
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, proposalHandler: ProposalHandler, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, haSigner: ValidatorHASigner | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: Logger);
|
|
60
56
|
static validateKeyStoreConfiguration(keyStoreManager: KeystoreManager, logger?: Logger): void;
|
|
61
57
|
private handleEpochCommitteeUpdate;
|
|
62
58
|
static new(config: ValidatorClientFullConfig, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, keyStoreManager: KeystoreManager, blobClient: BlobClientInterface, dateProvider?: DateProvider, telemetry?: TelemetryClient, slashingProtectionDb?: SlashingProtectionDatabase): Promise<ValidatorClient>;
|
|
63
59
|
getValidatorAddresses(): EthAddress[];
|
|
64
|
-
|
|
60
|
+
getProposalHandler(): ProposalHandler;
|
|
65
61
|
signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext): Promise<Signature>;
|
|
66
62
|
getCoinbaseForAttestor(attestor: EthAddress): EthAddress;
|
|
67
63
|
getFeeRecipientForAttestor(attestor: EthAddress): AztecAddress;
|
|
@@ -91,15 +87,6 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
91
87
|
*/
|
|
92
88
|
private shouldAttestToSlot;
|
|
93
89
|
private createCheckpointAttestationsFromProposal;
|
|
94
|
-
private validateCheckpointProposal;
|
|
95
|
-
/**
|
|
96
|
-
* Extract checkpoint global variables from a block.
|
|
97
|
-
*/
|
|
98
|
-
private extractCheckpointConstants;
|
|
99
|
-
/**
|
|
100
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
101
|
-
*/
|
|
102
|
-
protected uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void>;
|
|
103
90
|
private slashInvalidBlock;
|
|
104
91
|
/**
|
|
105
92
|
* Handle detection of a duplicate proposal (equivocation).
|
|
@@ -120,4 +107,4 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
120
107
|
private handleAuthRequest;
|
|
121
108
|
}
|
|
122
109
|
export {};
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUNMLFdBQVcsRUFDWCxnQkFBZ0IsRUFFaEIscUJBQXFCLEVBQ3JCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFtRCxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRS9GLE9BQU8sRUFBb0MsS0FBSyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFdkcsT0FBTyxLQUFLLEVBQ1YscUNBQXFDLEVBQ3JDLFdBQVcsRUFDWCxTQUFTLEVBQ1QseUJBQXlCLEVBQ3pCLHNCQUFzQixFQUN2QixNQUFNLGlDQUFpQyxDQUFD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
|
package/dest/validator.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/dest/validator.js
CHANGED
|
@@ -1,27 +1,20 @@
|
|
|
1
|
-
import { getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
2
|
-
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
3
|
-
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
4
|
-
import { TimeoutError } from '@aztec/foundation/error';
|
|
5
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { retryUntil } from '@aztec/foundation/retry';
|
|
7
2
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
8
3
|
import { sleep } from '@aztec/foundation/sleep';
|
|
9
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
10
5
|
import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
|
|
11
6
|
import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
|
|
12
|
-
import {
|
|
13
|
-
import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
14
|
-
import { accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
|
|
7
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
15
8
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
16
9
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
17
10
|
import { createHASigner, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
|
|
18
11
|
import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
19
12
|
import { EventEmitter } from 'events';
|
|
20
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
21
13
|
import { ValidationService } from './duties/validation_service.js';
|
|
22
14
|
import { HAKeyStore } from './key_store/ha_key_store.js';
|
|
23
15
|
import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
|
|
24
16
|
import { ValidatorMetrics } from './metrics.js';
|
|
17
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
25
18
|
// We maintain a set of proposers who have proposed invalid blocks.
|
|
26
19
|
// Just cap the set to avoid unbounded growth.
|
|
27
20
|
const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
|
|
@@ -36,11 +29,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
36
29
|
keyStore;
|
|
37
30
|
epochCache;
|
|
38
31
|
p2pClient;
|
|
39
|
-
|
|
40
|
-
blockSource;
|
|
41
|
-
checkpointsBuilder;
|
|
42
|
-
worldState;
|
|
43
|
-
l1ToL2MessageSource;
|
|
32
|
+
proposalHandler;
|
|
44
33
|
config;
|
|
45
34
|
blobClient;
|
|
46
35
|
haSigner;
|
|
@@ -58,8 +47,8 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
58
47
|
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
|
|
59
48
|
proposersOfInvalidBlocks;
|
|
60
49
|
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
|
|
61
|
-
constructor(keyStore, epochCache, p2pClient,
|
|
62
|
-
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.
|
|
50
|
+
constructor(keyStore, epochCache, p2pClient, proposalHandler, config, blobClient, haSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
|
|
51
|
+
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.config = config, this.blobClient = blobClient, this.haSigner = haSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = new Set();
|
|
63
52
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
64
53
|
this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
|
|
65
54
|
this.tracer = telemetry.getTracer('Validator');
|
|
@@ -120,7 +109,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
120
109
|
txsPermitted: !config.disableTransactions,
|
|
121
110
|
maxTxsPerBlock: config.validateMaxTxsPerBlock
|
|
122
111
|
});
|
|
123
|
-
const
|
|
112
|
+
const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, metrics, dateProvider, telemetry);
|
|
124
113
|
const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
|
|
125
114
|
let validatorKeyStore = nodeKeystoreAdapter;
|
|
126
115
|
let haSigner;
|
|
@@ -139,14 +128,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
139
128
|
haSigner = signer;
|
|
140
129
|
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
141
130
|
}
|
|
142
|
-
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient,
|
|
131
|
+
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, proposalHandler, config, blobClient, haSigner, dateProvider, telemetry);
|
|
143
132
|
return validator;
|
|
144
133
|
}
|
|
145
134
|
getValidatorAddresses() {
|
|
146
135
|
return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
|
|
147
136
|
}
|
|
148
|
-
|
|
149
|
-
return this.
|
|
137
|
+
getProposalHandler() {
|
|
138
|
+
return this.proposalHandler;
|
|
150
139
|
}
|
|
151
140
|
signWithAddress(addr, msg, context) {
|
|
152
141
|
return this.keyStore.signTypedDataWithAddress(addr, msg, context);
|
|
@@ -263,7 +252,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
263
252
|
// In fisherman mode, we always reexecute to validate proposals.
|
|
264
253
|
const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
|
|
265
254
|
const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
|
|
266
|
-
const validationResult = await this.
|
|
255
|
+
const validationResult = await this.proposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
|
|
267
256
|
if (!validationResult.isValid) {
|
|
268
257
|
const reason = validationResult.reason || 'unknown';
|
|
269
258
|
this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
|
|
@@ -313,50 +302,36 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
313
302
|
this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
|
|
314
303
|
return undefined;
|
|
315
304
|
}
|
|
316
|
-
// Reject proposals with invalid signatures
|
|
317
|
-
if (!proposer) {
|
|
318
|
-
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
319
|
-
return undefined;
|
|
320
|
-
}
|
|
321
305
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
322
|
-
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
306
|
+
if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
323
307
|
this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
324
308
|
proposer: proposer.toString(),
|
|
325
309
|
slotNumber
|
|
326
310
|
});
|
|
327
311
|
return undefined;
|
|
328
312
|
}
|
|
329
|
-
//
|
|
330
|
-
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
331
|
-
this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`);
|
|
332
|
-
return undefined;
|
|
333
|
-
}
|
|
334
|
-
// Check that I have any address in current committee before attesting
|
|
313
|
+
// Check that I have any address in the committee where this checkpoint will land before attesting
|
|
335
314
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
336
315
|
const partOfCommittee = inCommittee.length > 0;
|
|
337
316
|
const proposalInfo = {
|
|
338
317
|
slotNumber,
|
|
339
318
|
archive: proposal.archive.toString(),
|
|
340
|
-
proposer: proposer
|
|
319
|
+
proposer: proposer?.toString()
|
|
341
320
|
};
|
|
342
321
|
this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
|
|
343
322
|
...proposalInfo,
|
|
344
323
|
fishermanMode: this.config.fishermanMode || false
|
|
345
324
|
});
|
|
346
|
-
// Validate the checkpoint proposal
|
|
325
|
+
// Validate the checkpoint proposal and upload blobs (unless skipCheckpointProposalValidation is set)
|
|
347
326
|
if (this.config.skipCheckpointProposalValidation) {
|
|
348
327
|
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
349
328
|
} else {
|
|
350
|
-
const validationResult = await this.
|
|
329
|
+
const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
|
|
351
330
|
if (!validationResult.isValid) {
|
|
352
331
|
this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
353
332
|
return undefined;
|
|
354
333
|
}
|
|
355
334
|
}
|
|
356
|
-
// Upload blobs to filestore if we can (fire and forget)
|
|
357
|
-
if (this.blobClient.canUpload()) {
|
|
358
|
-
void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
|
|
359
|
-
}
|
|
360
335
|
// Check that I have any address in current committee before attesting
|
|
361
336
|
// In fisherman mode, we still create attestations for validation even if not in committee
|
|
362
337
|
if (!partOfCommittee && !this.config.fishermanMode) {
|
|
@@ -430,189 +405,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
430
405
|
await this.p2pClient.addOwnCheckpointAttestations(attestations);
|
|
431
406
|
return attestations;
|
|
432
407
|
}
|
|
433
|
-
/**
|
|
434
|
-
* Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
|
|
435
|
-
* @returns Validation result with isValid flag and reason if invalid.
|
|
436
|
-
*/ async validateCheckpointProposal(proposal, proposalInfo) {
|
|
437
|
-
const slot = proposal.slotNumber;
|
|
438
|
-
// Timeout block syncing at the start of the next slot
|
|
439
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
440
|
-
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
441
|
-
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
442
|
-
// Wait for last block to sync by archive
|
|
443
|
-
let lastBlockHeader;
|
|
444
|
-
try {
|
|
445
|
-
lastBlockHeader = await retryUntil(async ()=>{
|
|
446
|
-
await this.blockSource.syncImmediate();
|
|
447
|
-
return this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
448
|
-
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, timeoutSeconds, 0.5);
|
|
449
|
-
} catch (err) {
|
|
450
|
-
if (err instanceof TimeoutError) {
|
|
451
|
-
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
452
|
-
return {
|
|
453
|
-
isValid: false,
|
|
454
|
-
reason: 'last_block_not_found'
|
|
455
|
-
};
|
|
456
|
-
}
|
|
457
|
-
this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
|
|
458
|
-
return {
|
|
459
|
-
isValid: false,
|
|
460
|
-
reason: 'block_fetch_error'
|
|
461
|
-
};
|
|
462
|
-
}
|
|
463
|
-
if (!lastBlockHeader) {
|
|
464
|
-
this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
|
|
465
|
-
return {
|
|
466
|
-
isValid: false,
|
|
467
|
-
reason: 'last_block_not_found'
|
|
468
|
-
};
|
|
469
|
-
}
|
|
470
|
-
// Get all full blocks for the slot and checkpoint
|
|
471
|
-
const blocks = await this.blockSource.getBlocksForSlot(slot);
|
|
472
|
-
if (blocks.length === 0) {
|
|
473
|
-
this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
|
|
474
|
-
return {
|
|
475
|
-
isValid: false,
|
|
476
|
-
reason: 'no_blocks_for_slot'
|
|
477
|
-
};
|
|
478
|
-
}
|
|
479
|
-
// Ensure the last block for this slot matches the archive in the checkpoint proposal
|
|
480
|
-
if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
|
|
481
|
-
this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
|
|
482
|
-
return {
|
|
483
|
-
isValid: false,
|
|
484
|
-
reason: 'last_block_archive_mismatch'
|
|
485
|
-
};
|
|
486
|
-
}
|
|
487
|
-
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
488
|
-
...proposalInfo,
|
|
489
|
-
blockNumbers: blocks.map((b)=>b.number)
|
|
490
|
-
});
|
|
491
|
-
// Get checkpoint constants from first block
|
|
492
|
-
const firstBlock = blocks[0];
|
|
493
|
-
const constants = this.extractCheckpointConstants(firstBlock);
|
|
494
|
-
const checkpointNumber = firstBlock.checkpointNumber;
|
|
495
|
-
// Get L1-to-L2 messages for this checkpoint
|
|
496
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
497
|
-
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
498
|
-
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
499
|
-
const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
|
|
500
|
-
// Fork world state at the block before the first block
|
|
501
|
-
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
502
|
-
const fork = await this.worldState.fork(parentBlockNumber);
|
|
503
|
-
try {
|
|
504
|
-
// Create checkpoint builder with all existing blocks
|
|
505
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
|
|
506
|
-
// Complete the checkpoint to get computed values
|
|
507
|
-
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
508
|
-
// Compare checkpoint header with proposal
|
|
509
|
-
if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
|
|
510
|
-
this.log.warn(`Checkpoint header mismatch`, {
|
|
511
|
-
...proposalInfo,
|
|
512
|
-
computed: computedCheckpoint.header.toInspect(),
|
|
513
|
-
proposal: proposal.checkpointHeader.toInspect()
|
|
514
|
-
});
|
|
515
|
-
return {
|
|
516
|
-
isValid: false,
|
|
517
|
-
reason: 'checkpoint_header_mismatch'
|
|
518
|
-
};
|
|
519
|
-
}
|
|
520
|
-
// Compare archive root with proposal
|
|
521
|
-
if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
|
|
522
|
-
this.log.warn(`Archive root mismatch`, {
|
|
523
|
-
...proposalInfo,
|
|
524
|
-
computed: computedCheckpoint.archive.root.toString(),
|
|
525
|
-
proposal: proposal.archive.toString()
|
|
526
|
-
});
|
|
527
|
-
return {
|
|
528
|
-
isValid: false,
|
|
529
|
-
reason: 'archive_mismatch'
|
|
530
|
-
};
|
|
531
|
-
}
|
|
532
|
-
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
533
|
-
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
534
|
-
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
535
|
-
const computedEpochOutHash = accumulateCheckpointOutHashes([
|
|
536
|
-
...previousCheckpointOutHashes,
|
|
537
|
-
checkpointOutHash
|
|
538
|
-
]);
|
|
539
|
-
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
540
|
-
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
541
|
-
this.log.warn(`Epoch out hash mismatch`, {
|
|
542
|
-
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
543
|
-
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
544
|
-
checkpointOutHash: checkpointOutHash.toString(),
|
|
545
|
-
previousCheckpointOutHashes: previousCheckpointOutHashes.map((h)=>h.toString()),
|
|
546
|
-
...proposalInfo
|
|
547
|
-
});
|
|
548
|
-
return {
|
|
549
|
-
isValid: false,
|
|
550
|
-
reason: 'out_hash_mismatch'
|
|
551
|
-
};
|
|
552
|
-
}
|
|
553
|
-
// Final round of validations on the checkpoint, just in case.
|
|
554
|
-
try {
|
|
555
|
-
validateCheckpoint(computedCheckpoint, {
|
|
556
|
-
rollupManaLimit: this.checkpointsBuilder.getConfig().rollupManaLimit,
|
|
557
|
-
maxDABlockGas: this.config.validateMaxDABlockGas,
|
|
558
|
-
maxL2BlockGas: this.config.validateMaxL2BlockGas,
|
|
559
|
-
maxTxsPerBlock: this.config.validateMaxTxsPerBlock,
|
|
560
|
-
maxTxsPerCheckpoint: this.config.validateMaxTxsPerCheckpoint
|
|
561
|
-
});
|
|
562
|
-
} catch (err) {
|
|
563
|
-
this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
|
|
564
|
-
return {
|
|
565
|
-
isValid: false,
|
|
566
|
-
reason: 'checkpoint_validation_failed'
|
|
567
|
-
};
|
|
568
|
-
}
|
|
569
|
-
this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
|
|
570
|
-
return {
|
|
571
|
-
isValid: true
|
|
572
|
-
};
|
|
573
|
-
} finally{
|
|
574
|
-
await fork.close();
|
|
575
|
-
}
|
|
576
|
-
}
|
|
577
|
-
/**
|
|
578
|
-
* Extract checkpoint global variables from a block.
|
|
579
|
-
*/ extractCheckpointConstants(block) {
|
|
580
|
-
const gv = block.header.globalVariables;
|
|
581
|
-
return {
|
|
582
|
-
chainId: gv.chainId,
|
|
583
|
-
version: gv.version,
|
|
584
|
-
slotNumber: gv.slotNumber,
|
|
585
|
-
timestamp: gv.timestamp,
|
|
586
|
-
coinbase: gv.coinbase,
|
|
587
|
-
feeRecipient: gv.feeRecipient,
|
|
588
|
-
gasFees: gv.gasFees
|
|
589
|
-
};
|
|
590
|
-
}
|
|
591
|
-
/**
|
|
592
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
593
|
-
*/ async uploadBlobsForCheckpoint(proposal, proposalInfo) {
|
|
594
|
-
try {
|
|
595
|
-
const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
596
|
-
if (!lastBlockHeader) {
|
|
597
|
-
this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
|
|
598
|
-
return;
|
|
599
|
-
}
|
|
600
|
-
const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
|
|
601
|
-
if (blocks.length === 0) {
|
|
602
|
-
this.log.warn(`No blocks found for blob upload`, proposalInfo);
|
|
603
|
-
return;
|
|
604
|
-
}
|
|
605
|
-
const blobFields = blocks.flatMap((b)=>b.toBlobFields());
|
|
606
|
-
const blobs = await getBlobsPerL1Block(blobFields);
|
|
607
|
-
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
608
|
-
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
609
|
-
...proposalInfo,
|
|
610
|
-
numBlobs: blobs.length
|
|
611
|
-
});
|
|
612
|
-
} catch (err) {
|
|
613
|
-
this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
|
|
614
|
-
}
|
|
615
|
-
}
|
|
616
408
|
slashInvalidBlock(proposal) {
|
|
617
409
|
const proposer = proposal.getSender();
|
|
618
410
|
// Skip if signature is invalid (shouldn't happen since we validate earlier)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/validator-client",
|
|
3
|
-
"version": "4.2.0-nightly.
|
|
3
|
+
"version": "4.2.0-nightly.20260404",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -64,30 +64,30 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/blob-client": "4.2.0-nightly.
|
|
68
|
-
"@aztec/blob-lib": "4.2.0-nightly.
|
|
69
|
-
"@aztec/constants": "4.2.0-nightly.
|
|
70
|
-
"@aztec/epoch-cache": "4.2.0-nightly.
|
|
71
|
-
"@aztec/ethereum": "4.2.0-nightly.
|
|
72
|
-
"@aztec/foundation": "4.2.0-nightly.
|
|
73
|
-
"@aztec/node-keystore": "4.2.0-nightly.
|
|
74
|
-
"@aztec/noir-protocol-circuits-types": "4.2.0-nightly.
|
|
75
|
-
"@aztec/p2p": "4.2.0-nightly.
|
|
76
|
-
"@aztec/protocol-contracts": "4.2.0-nightly.
|
|
77
|
-
"@aztec/prover-client": "4.2.0-nightly.
|
|
78
|
-
"@aztec/simulator": "4.2.0-nightly.
|
|
79
|
-
"@aztec/slasher": "4.2.0-nightly.
|
|
80
|
-
"@aztec/stdlib": "4.2.0-nightly.
|
|
81
|
-
"@aztec/telemetry-client": "4.2.0-nightly.
|
|
82
|
-
"@aztec/validator-ha-signer": "4.2.0-nightly.
|
|
67
|
+
"@aztec/blob-client": "4.2.0-nightly.20260404",
|
|
68
|
+
"@aztec/blob-lib": "4.2.0-nightly.20260404",
|
|
69
|
+
"@aztec/constants": "4.2.0-nightly.20260404",
|
|
70
|
+
"@aztec/epoch-cache": "4.2.0-nightly.20260404",
|
|
71
|
+
"@aztec/ethereum": "4.2.0-nightly.20260404",
|
|
72
|
+
"@aztec/foundation": "4.2.0-nightly.20260404",
|
|
73
|
+
"@aztec/node-keystore": "4.2.0-nightly.20260404",
|
|
74
|
+
"@aztec/noir-protocol-circuits-types": "4.2.0-nightly.20260404",
|
|
75
|
+
"@aztec/p2p": "4.2.0-nightly.20260404",
|
|
76
|
+
"@aztec/protocol-contracts": "4.2.0-nightly.20260404",
|
|
77
|
+
"@aztec/prover-client": "4.2.0-nightly.20260404",
|
|
78
|
+
"@aztec/simulator": "4.2.0-nightly.20260404",
|
|
79
|
+
"@aztec/slasher": "4.2.0-nightly.20260404",
|
|
80
|
+
"@aztec/stdlib": "4.2.0-nightly.20260404",
|
|
81
|
+
"@aztec/telemetry-client": "4.2.0-nightly.20260404",
|
|
82
|
+
"@aztec/validator-ha-signer": "4.2.0-nightly.20260404",
|
|
83
83
|
"koa": "^2.16.1",
|
|
84
84
|
"koa-router": "^13.1.1",
|
|
85
85
|
"tslib": "^2.4.0",
|
|
86
86
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
87
87
|
},
|
|
88
88
|
"devDependencies": {
|
|
89
|
-
"@aztec/archiver": "4.2.0-nightly.
|
|
90
|
-
"@aztec/world-state": "4.2.0-nightly.
|
|
89
|
+
"@aztec/archiver": "4.2.0-nightly.20260404",
|
|
90
|
+
"@aztec/world-state": "4.2.0-nightly.20260404",
|
|
91
91
|
"@electric-sql/pglite": "^0.3.14",
|
|
92
92
|
"@jest/globals": "^30.0.0",
|
|
93
93
|
"@types/jest": "^30.0.0",
|
package/src/factory.ts
CHANGED
|
@@ -9,12 +9,12 @@ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
|
9
9
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
11
11
|
|
|
12
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
13
12
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
14
13
|
import { ValidatorMetrics } from './metrics.js';
|
|
14
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
15
15
|
import { ValidatorClient } from './validator.js';
|
|
16
16
|
|
|
17
|
-
export function
|
|
17
|
+
export function createProposalHandler(
|
|
18
18
|
config: ValidatorClientFullConfig,
|
|
19
19
|
deps: {
|
|
20
20
|
checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
@@ -23,6 +23,7 @@ export function createBlockProposalHandler(
|
|
|
23
23
|
l1ToL2MessageSource: L1ToL2MessageSource;
|
|
24
24
|
p2pClient: P2PClient;
|
|
25
25
|
epochCache: EpochCache;
|
|
26
|
+
blobClient: BlobClientInterface;
|
|
26
27
|
dateProvider: DateProvider;
|
|
27
28
|
telemetry: TelemetryClient;
|
|
28
29
|
},
|
|
@@ -32,7 +33,7 @@ export function createBlockProposalHandler(
|
|
|
32
33
|
txsPermitted: !config.disableTransactions,
|
|
33
34
|
maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
|
|
34
35
|
});
|
|
35
|
-
return new
|
|
36
|
+
return new ProposalHandler(
|
|
36
37
|
deps.checkpointsBuilder,
|
|
37
38
|
deps.worldState,
|
|
38
39
|
deps.blockSource,
|
|
@@ -41,6 +42,7 @@ export function createBlockProposalHandler(
|
|
|
41
42
|
blockProposalValidator,
|
|
42
43
|
deps.epochCache,
|
|
43
44
|
config,
|
|
45
|
+
deps.blobClient,
|
|
44
46
|
metrics,
|
|
45
47
|
deps.dateProvider,
|
|
46
48
|
deps.telemetry,
|
package/src/index.ts
CHANGED
package/src/metrics.ts
CHANGED
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
createUpDownCounterWithDefault,
|
|
12
12
|
} from '@aztec/telemetry-client';
|
|
13
13
|
|
|
14
|
-
import type { BlockProposalValidationFailureReason } from './
|
|
14
|
+
import type { BlockProposalValidationFailureReason } from './proposal_handler.js';
|
|
15
15
|
|
|
16
16
|
export class ValidatorMetrics {
|
|
17
17
|
private failedReexecutionCounter: UpDownCounter;
|