@aztec/validator-client 4.1.1 → 4.1.2-rc.1
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} +248 -7
- package/dest/validator.d.ts +7 -20
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +17 -226
- 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} +282 -8
- package/src/validator.ts +20 -247
- 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 } 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): 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 } 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;
|
|
@@ -134,14 +123,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
134
123
|
haSigner = signer;
|
|
135
124
|
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
136
125
|
}
|
|
137
|
-
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient,
|
|
126
|
+
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, proposalHandler, config, blobClient, haSigner, dateProvider, telemetry);
|
|
138
127
|
return validator;
|
|
139
128
|
}
|
|
140
129
|
getValidatorAddresses() {
|
|
141
130
|
return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
|
|
142
131
|
}
|
|
143
|
-
|
|
144
|
-
return this.
|
|
132
|
+
getProposalHandler() {
|
|
133
|
+
return this.proposalHandler;
|
|
145
134
|
}
|
|
146
135
|
signWithAddress(addr, msg, context) {
|
|
147
136
|
return this.keyStore.signTypedDataWithAddress(addr, msg, context);
|
|
@@ -235,13 +224,12 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
235
224
|
this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
|
|
236
225
|
return false;
|
|
237
226
|
}
|
|
238
|
-
//
|
|
227
|
+
// Log self-proposals from HA peers (same validator key on different nodes)
|
|
239
228
|
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
240
|
-
this.log.
|
|
229
|
+
this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
|
|
241
230
|
proposer: proposer.toString(),
|
|
242
231
|
slotNumber
|
|
243
232
|
});
|
|
244
|
-
return false;
|
|
245
233
|
}
|
|
246
234
|
// Check if we're in the committee (for metrics purposes)
|
|
247
235
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
@@ -259,7 +247,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
259
247
|
// In fisherman mode, we always reexecute to validate proposals.
|
|
260
248
|
const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
|
|
261
249
|
const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
|
|
262
|
-
const validationResult = await this.
|
|
250
|
+
const validationResult = await this.proposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
|
|
263
251
|
if (!validationResult.isValid) {
|
|
264
252
|
const reason = validationResult.reason || 'unknown';
|
|
265
253
|
this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
|
|
@@ -309,50 +297,36 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
309
297
|
this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
|
|
310
298
|
return undefined;
|
|
311
299
|
}
|
|
312
|
-
// Reject proposals with invalid signatures
|
|
313
|
-
if (!proposer) {
|
|
314
|
-
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
315
|
-
return undefined;
|
|
316
|
-
}
|
|
317
300
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
318
|
-
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
301
|
+
if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
319
302
|
this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
320
303
|
proposer: proposer.toString(),
|
|
321
304
|
slotNumber
|
|
322
305
|
});
|
|
323
306
|
return undefined;
|
|
324
307
|
}
|
|
325
|
-
//
|
|
326
|
-
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
327
|
-
this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`);
|
|
328
|
-
return undefined;
|
|
329
|
-
}
|
|
330
|
-
// Check that I have any address in current committee before attesting
|
|
308
|
+
// Check that I have any address in the committee where this checkpoint will land before attesting
|
|
331
309
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
332
310
|
const partOfCommittee = inCommittee.length > 0;
|
|
333
311
|
const proposalInfo = {
|
|
334
312
|
slotNumber,
|
|
335
313
|
archive: proposal.archive.toString(),
|
|
336
|
-
proposer: proposer
|
|
314
|
+
proposer: proposer?.toString()
|
|
337
315
|
};
|
|
338
316
|
this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
|
|
339
317
|
...proposalInfo,
|
|
340
318
|
fishermanMode: this.config.fishermanMode || false
|
|
341
319
|
});
|
|
342
|
-
// Validate the checkpoint proposal
|
|
320
|
+
// Validate the checkpoint proposal and upload blobs (unless skipCheckpointProposalValidation is set)
|
|
343
321
|
if (this.config.skipCheckpointProposalValidation) {
|
|
344
322
|
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
345
323
|
} else {
|
|
346
|
-
const validationResult = await this.
|
|
324
|
+
const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
|
|
347
325
|
if (!validationResult.isValid) {
|
|
348
326
|
this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
349
327
|
return undefined;
|
|
350
328
|
}
|
|
351
329
|
}
|
|
352
|
-
// Upload blobs to filestore if we can (fire and forget)
|
|
353
|
-
if (this.blobClient.canUpload()) {
|
|
354
|
-
void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
|
|
355
|
-
}
|
|
356
330
|
// Check that I have any address in current committee before attesting
|
|
357
331
|
// In fisherman mode, we still create attestations for validation even if not in committee
|
|
358
332
|
if (!partOfCommittee && !this.config.fishermanMode) {
|
|
@@ -426,189 +400,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
426
400
|
await this.p2pClient.addOwnCheckpointAttestations(attestations);
|
|
427
401
|
return attestations;
|
|
428
402
|
}
|
|
429
|
-
/**
|
|
430
|
-
* Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
|
|
431
|
-
* @returns Validation result with isValid flag and reason if invalid.
|
|
432
|
-
*/ async validateCheckpointProposal(proposal, proposalInfo) {
|
|
433
|
-
const slot = proposal.slotNumber;
|
|
434
|
-
// Timeout block syncing at the start of the next slot
|
|
435
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
436
|
-
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
437
|
-
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
438
|
-
// Wait for last block to sync by archive
|
|
439
|
-
let lastBlockHeader;
|
|
440
|
-
try {
|
|
441
|
-
lastBlockHeader = await retryUntil(async ()=>{
|
|
442
|
-
await this.blockSource.syncImmediate();
|
|
443
|
-
return this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
444
|
-
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, timeoutSeconds, 0.5);
|
|
445
|
-
} catch (err) {
|
|
446
|
-
if (err instanceof TimeoutError) {
|
|
447
|
-
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
448
|
-
return {
|
|
449
|
-
isValid: false,
|
|
450
|
-
reason: 'last_block_not_found'
|
|
451
|
-
};
|
|
452
|
-
}
|
|
453
|
-
this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
|
|
454
|
-
return {
|
|
455
|
-
isValid: false,
|
|
456
|
-
reason: 'block_fetch_error'
|
|
457
|
-
};
|
|
458
|
-
}
|
|
459
|
-
if (!lastBlockHeader) {
|
|
460
|
-
this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
|
|
461
|
-
return {
|
|
462
|
-
isValid: false,
|
|
463
|
-
reason: 'last_block_not_found'
|
|
464
|
-
};
|
|
465
|
-
}
|
|
466
|
-
// Get all full blocks for the slot and checkpoint
|
|
467
|
-
const blocks = await this.blockSource.getBlocksForSlot(slot);
|
|
468
|
-
if (blocks.length === 0) {
|
|
469
|
-
this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
|
|
470
|
-
return {
|
|
471
|
-
isValid: false,
|
|
472
|
-
reason: 'no_blocks_for_slot'
|
|
473
|
-
};
|
|
474
|
-
}
|
|
475
|
-
// Ensure the last block for this slot matches the archive in the checkpoint proposal
|
|
476
|
-
if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
|
|
477
|
-
this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
|
|
478
|
-
return {
|
|
479
|
-
isValid: false,
|
|
480
|
-
reason: 'last_block_archive_mismatch'
|
|
481
|
-
};
|
|
482
|
-
}
|
|
483
|
-
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
484
|
-
...proposalInfo,
|
|
485
|
-
blockNumbers: blocks.map((b)=>b.number)
|
|
486
|
-
});
|
|
487
|
-
// Get checkpoint constants from first block
|
|
488
|
-
const firstBlock = blocks[0];
|
|
489
|
-
const constants = this.extractCheckpointConstants(firstBlock);
|
|
490
|
-
const checkpointNumber = firstBlock.checkpointNumber;
|
|
491
|
-
// Get L1-to-L2 messages for this checkpoint
|
|
492
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
493
|
-
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
494
|
-
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
495
|
-
const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
|
|
496
|
-
// Fork world state at the block before the first block
|
|
497
|
-
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
498
|
-
const fork = await this.worldState.fork(parentBlockNumber);
|
|
499
|
-
try {
|
|
500
|
-
// Create checkpoint builder with all existing blocks
|
|
501
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
|
|
502
|
-
// Complete the checkpoint to get computed values
|
|
503
|
-
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
504
|
-
// Compare checkpoint header with proposal
|
|
505
|
-
if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
|
|
506
|
-
this.log.warn(`Checkpoint header mismatch`, {
|
|
507
|
-
...proposalInfo,
|
|
508
|
-
computed: computedCheckpoint.header.toInspect(),
|
|
509
|
-
proposal: proposal.checkpointHeader.toInspect()
|
|
510
|
-
});
|
|
511
|
-
return {
|
|
512
|
-
isValid: false,
|
|
513
|
-
reason: 'checkpoint_header_mismatch'
|
|
514
|
-
};
|
|
515
|
-
}
|
|
516
|
-
// Compare archive root with proposal
|
|
517
|
-
if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
|
|
518
|
-
this.log.warn(`Archive root mismatch`, {
|
|
519
|
-
...proposalInfo,
|
|
520
|
-
computed: computedCheckpoint.archive.root.toString(),
|
|
521
|
-
proposal: proposal.archive.toString()
|
|
522
|
-
});
|
|
523
|
-
return {
|
|
524
|
-
isValid: false,
|
|
525
|
-
reason: 'archive_mismatch'
|
|
526
|
-
};
|
|
527
|
-
}
|
|
528
|
-
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
529
|
-
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
530
|
-
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
531
|
-
const computedEpochOutHash = accumulateCheckpointOutHashes([
|
|
532
|
-
...previousCheckpointOutHashes,
|
|
533
|
-
checkpointOutHash
|
|
534
|
-
]);
|
|
535
|
-
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
536
|
-
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
537
|
-
this.log.warn(`Epoch out hash mismatch`, {
|
|
538
|
-
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
539
|
-
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
540
|
-
checkpointOutHash: checkpointOutHash.toString(),
|
|
541
|
-
previousCheckpointOutHashes: previousCheckpointOutHashes.map((h)=>h.toString()),
|
|
542
|
-
...proposalInfo
|
|
543
|
-
});
|
|
544
|
-
return {
|
|
545
|
-
isValid: false,
|
|
546
|
-
reason: 'out_hash_mismatch'
|
|
547
|
-
};
|
|
548
|
-
}
|
|
549
|
-
// Final round of validations on the checkpoint, just in case.
|
|
550
|
-
try {
|
|
551
|
-
validateCheckpoint(computedCheckpoint, {
|
|
552
|
-
rollupManaLimit: this.checkpointsBuilder.getConfig().rollupManaLimit,
|
|
553
|
-
maxDABlockGas: this.config.validateMaxDABlockGas,
|
|
554
|
-
maxL2BlockGas: this.config.validateMaxL2BlockGas,
|
|
555
|
-
maxTxsPerBlock: this.config.validateMaxTxsPerBlock,
|
|
556
|
-
maxTxsPerCheckpoint: this.config.validateMaxTxsPerCheckpoint
|
|
557
|
-
});
|
|
558
|
-
} catch (err) {
|
|
559
|
-
this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
|
|
560
|
-
return {
|
|
561
|
-
isValid: false,
|
|
562
|
-
reason: 'checkpoint_validation_failed'
|
|
563
|
-
};
|
|
564
|
-
}
|
|
565
|
-
this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
|
|
566
|
-
return {
|
|
567
|
-
isValid: true
|
|
568
|
-
};
|
|
569
|
-
} finally{
|
|
570
|
-
await fork.close();
|
|
571
|
-
}
|
|
572
|
-
}
|
|
573
|
-
/**
|
|
574
|
-
* Extract checkpoint global variables from a block.
|
|
575
|
-
*/ extractCheckpointConstants(block) {
|
|
576
|
-
const gv = block.header.globalVariables;
|
|
577
|
-
return {
|
|
578
|
-
chainId: gv.chainId,
|
|
579
|
-
version: gv.version,
|
|
580
|
-
slotNumber: gv.slotNumber,
|
|
581
|
-
timestamp: gv.timestamp,
|
|
582
|
-
coinbase: gv.coinbase,
|
|
583
|
-
feeRecipient: gv.feeRecipient,
|
|
584
|
-
gasFees: gv.gasFees
|
|
585
|
-
};
|
|
586
|
-
}
|
|
587
|
-
/**
|
|
588
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
589
|
-
*/ async uploadBlobsForCheckpoint(proposal, proposalInfo) {
|
|
590
|
-
try {
|
|
591
|
-
const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
592
|
-
if (!lastBlockHeader) {
|
|
593
|
-
this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
|
|
594
|
-
return;
|
|
595
|
-
}
|
|
596
|
-
const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
|
|
597
|
-
if (blocks.length === 0) {
|
|
598
|
-
this.log.warn(`No blocks found for blob upload`, proposalInfo);
|
|
599
|
-
return;
|
|
600
|
-
}
|
|
601
|
-
const blobFields = blocks.flatMap((b)=>b.toBlobFields());
|
|
602
|
-
const blobs = await getBlobsPerL1Block(blobFields);
|
|
603
|
-
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
604
|
-
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
605
|
-
...proposalInfo,
|
|
606
|
-
numBlobs: blobs.length
|
|
607
|
-
});
|
|
608
|
-
} catch (err) {
|
|
609
|
-
this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
|
|
610
|
-
}
|
|
611
|
-
}
|
|
612
403
|
slashInvalidBlock(proposal) {
|
|
613
404
|
const proposer = proposal.getSender();
|
|
614
405
|
// 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.1.1",
|
|
3
|
+
"version": "4.1.2-rc.1",
|
|
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.1.1",
|
|
68
|
-
"@aztec/blob-lib": "4.1.1",
|
|
69
|
-
"@aztec/constants": "4.1.1",
|
|
70
|
-
"@aztec/epoch-cache": "4.1.1",
|
|
71
|
-
"@aztec/ethereum": "4.1.1",
|
|
72
|
-
"@aztec/foundation": "4.1.1",
|
|
73
|
-
"@aztec/node-keystore": "4.1.1",
|
|
74
|
-
"@aztec/noir-protocol-circuits-types": "4.1.1",
|
|
75
|
-
"@aztec/p2p": "4.1.1",
|
|
76
|
-
"@aztec/protocol-contracts": "4.1.1",
|
|
77
|
-
"@aztec/prover-client": "4.1.1",
|
|
78
|
-
"@aztec/simulator": "4.1.1",
|
|
79
|
-
"@aztec/slasher": "4.1.1",
|
|
80
|
-
"@aztec/stdlib": "4.1.1",
|
|
81
|
-
"@aztec/telemetry-client": "4.1.1",
|
|
82
|
-
"@aztec/validator-ha-signer": "4.1.1",
|
|
67
|
+
"@aztec/blob-client": "4.1.2-rc.1",
|
|
68
|
+
"@aztec/blob-lib": "4.1.2-rc.1",
|
|
69
|
+
"@aztec/constants": "4.1.2-rc.1",
|
|
70
|
+
"@aztec/epoch-cache": "4.1.2-rc.1",
|
|
71
|
+
"@aztec/ethereum": "4.1.2-rc.1",
|
|
72
|
+
"@aztec/foundation": "4.1.2-rc.1",
|
|
73
|
+
"@aztec/node-keystore": "4.1.2-rc.1",
|
|
74
|
+
"@aztec/noir-protocol-circuits-types": "4.1.2-rc.1",
|
|
75
|
+
"@aztec/p2p": "4.1.2-rc.1",
|
|
76
|
+
"@aztec/protocol-contracts": "4.1.2-rc.1",
|
|
77
|
+
"@aztec/prover-client": "4.1.2-rc.1",
|
|
78
|
+
"@aztec/simulator": "4.1.2-rc.1",
|
|
79
|
+
"@aztec/slasher": "4.1.2-rc.1",
|
|
80
|
+
"@aztec/stdlib": "4.1.2-rc.1",
|
|
81
|
+
"@aztec/telemetry-client": "4.1.2-rc.1",
|
|
82
|
+
"@aztec/validator-ha-signer": "4.1.2-rc.1",
|
|
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.1.1",
|
|
90
|
-
"@aztec/world-state": "4.1.1",
|
|
89
|
+
"@aztec/archiver": "4.1.2-rc.1",
|
|
90
|
+
"@aztec/world-state": "4.1.2-rc.1",
|
|
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
|
@@ -8,12 +8,12 @@ import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/s
|
|
|
8
8
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
9
9
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
|
|
11
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
12
11
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
13
12
|
import { ValidatorMetrics } from './metrics.js';
|
|
13
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
14
14
|
import { ValidatorClient } from './validator.js';
|
|
15
15
|
|
|
16
|
-
export function
|
|
16
|
+
export function createProposalHandler(
|
|
17
17
|
config: ValidatorClientFullConfig,
|
|
18
18
|
deps: {
|
|
19
19
|
checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
@@ -22,6 +22,7 @@ export function createBlockProposalHandler(
|
|
|
22
22
|
l1ToL2MessageSource: L1ToL2MessageSource;
|
|
23
23
|
p2pClient: P2PClient;
|
|
24
24
|
epochCache: EpochCache;
|
|
25
|
+
blobClient: BlobClientInterface;
|
|
25
26
|
dateProvider: DateProvider;
|
|
26
27
|
telemetry: TelemetryClient;
|
|
27
28
|
},
|
|
@@ -31,7 +32,7 @@ export function createBlockProposalHandler(
|
|
|
31
32
|
txsPermitted: !config.disableTransactions,
|
|
32
33
|
maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
|
|
33
34
|
});
|
|
34
|
-
return new
|
|
35
|
+
return new ProposalHandler(
|
|
35
36
|
deps.checkpointsBuilder,
|
|
36
37
|
deps.worldState,
|
|
37
38
|
deps.blockSource,
|
|
@@ -40,6 +41,7 @@ export function createBlockProposalHandler(
|
|
|
40
41
|
blockProposalValidator,
|
|
41
42
|
deps.epochCache,
|
|
42
43
|
config,
|
|
44
|
+
deps.blobClient,
|
|
43
45
|
metrics,
|
|
44
46
|
deps.dateProvider,
|
|
45
47
|
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;
|