@aztec/validator-client 0.0.1-commit.ffe5b04ea → 0.0.1-commit.fff30aa
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/README.md +9 -10
- package/dest/checkpoint_builder.d.ts +10 -7
- package/dest/checkpoint_builder.d.ts.map +1 -1
- package/dest/checkpoint_builder.js +64 -41
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +1 -2
- package/dest/duties/validation_service.js +1 -1
- package/dest/factory.d.ts +7 -4
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +5 -5
- package/dest/index.d.ts +2 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -1
- package/dest/key_store/ha_key_store.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} +313 -12
- package/dest/validator.d.ts +10 -23
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +44 -248
- package/package.json +19 -19
- package/src/checkpoint_builder.ts +79 -52
- package/src/config.ts +1 -2
- package/src/duties/validation_service.ts +1 -1
- package/src/factory.ts +9 -4
- package/src/index.ts +1 -1
- package/src/key_store/ha_key_store.ts +1 -1
- package/src/metrics.ts +1 -1
- package/src/{block_proposal_handler.ts → proposal_handler.ts} +362 -13
- package/src/validator.ts +57 -270
- package/dest/block_proposal_handler.d.ts +0 -63
- package/dest/block_proposal_handler.d.ts.map +0 -1
package/src/validator.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
2
|
-
import { type Blob, getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
3
2
|
import type { EpochCache } from '@aztec/epoch-cache';
|
|
4
|
-
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
5
3
|
import {
|
|
6
4
|
BlockNumber,
|
|
7
5
|
CheckpointNumber,
|
|
@@ -10,11 +8,9 @@ import {
|
|
|
10
8
|
SlotNumber,
|
|
11
9
|
} from '@aztec/foundation/branded-types';
|
|
12
10
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
13
|
-
import { TimeoutError } from '@aztec/foundation/error';
|
|
14
11
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
15
12
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
16
|
-
import { type
|
|
17
|
-
import { retryUntil } from '@aztec/foundation/retry';
|
|
13
|
+
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
18
14
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
19
15
|
import { sleep } from '@aztec/foundation/sleep';
|
|
20
16
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -23,9 +19,8 @@ import type { DuplicateAttestationInfo, DuplicateProposalInfo, P2P, PeerId } fro
|
|
|
23
19
|
import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
|
|
24
20
|
import { OffenseType, WANT_TO_SLASH_EVENT, type Watcher, type WatcherEmitter } from '@aztec/slasher';
|
|
25
21
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
26
|
-
import type { CommitteeAttestationsAndSigners,
|
|
27
|
-
import {
|
|
28
|
-
import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
22
|
+
import type { CommitteeAttestationsAndSigners, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
23
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
29
24
|
import type {
|
|
30
25
|
CreateCheckpointProposalLastBlockData,
|
|
31
26
|
ITxProvider,
|
|
@@ -33,7 +28,7 @@ import type {
|
|
|
33
28
|
ValidatorClientFullConfig,
|
|
34
29
|
WorldStateSynchronizer,
|
|
35
30
|
} from '@aztec/stdlib/interfaces/server';
|
|
36
|
-
import {
|
|
31
|
+
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
37
32
|
import {
|
|
38
33
|
type BlockProposal,
|
|
39
34
|
type BlockProposalOptions,
|
|
@@ -43,23 +38,23 @@ import {
|
|
|
43
38
|
type CheckpointProposalOptions,
|
|
44
39
|
} from '@aztec/stdlib/p2p';
|
|
45
40
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
46
|
-
import type { BlockHeader,
|
|
41
|
+
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
47
42
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
48
43
|
import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
|
|
49
|
-
import { createHASigner,
|
|
50
|
-
import { DutyType, type SigningContext } from '@aztec/validator-ha-signer/types';
|
|
44
|
+
import { createHASigner, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
|
|
45
|
+
import { DutyType, type SigningContext, type SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
51
46
|
import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
|
|
52
47
|
|
|
53
48
|
import { EventEmitter } from 'events';
|
|
54
49
|
import type { TypedDataDefinition } from 'viem';
|
|
55
50
|
|
|
56
|
-
import { BlockProposalHandler, type BlockProposalValidationFailureReason } from './block_proposal_handler.js';
|
|
57
51
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
58
52
|
import { ValidationService } from './duties/validation_service.js';
|
|
59
53
|
import { HAKeyStore } from './key_store/ha_key_store.js';
|
|
60
54
|
import type { ExtendedValidatorKeyStore } from './key_store/interface.js';
|
|
61
55
|
import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
|
|
62
56
|
import { ValidatorMetrics } from './metrics.js';
|
|
57
|
+
import { type BlockProposalValidationFailureReason, ProposalHandler } from './proposal_handler.js';
|
|
63
58
|
|
|
64
59
|
// We maintain a set of proposers who have proposed invalid blocks.
|
|
65
60
|
// Just cap the set to avoid unbounded growth.
|
|
@@ -102,14 +97,10 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
102
97
|
private keyStore: ExtendedValidatorKeyStore,
|
|
103
98
|
private epochCache: EpochCache,
|
|
104
99
|
private p2pClient: P2P,
|
|
105
|
-
private
|
|
106
|
-
private blockSource: L2BlockSource,
|
|
107
|
-
private checkpointsBuilder: FullNodeCheckpointsBuilder,
|
|
108
|
-
private worldState: WorldStateSynchronizer,
|
|
109
|
-
private l1ToL2MessageSource: L1ToL2MessageSource,
|
|
100
|
+
private proposalHandler: ProposalHandler,
|
|
110
101
|
private config: ValidatorClientFullConfig,
|
|
111
102
|
private blobClient: BlobClientInterface,
|
|
112
|
-
private
|
|
103
|
+
private haSigner: ValidatorHASigner | undefined,
|
|
113
104
|
private dateProvider: DateProvider = new DateProvider(),
|
|
114
105
|
telemetry: TelemetryClient = getTelemetryClient(),
|
|
115
106
|
log = createLogger('validator'),
|
|
@@ -197,13 +188,14 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
197
188
|
blobClient: BlobClientInterface,
|
|
198
189
|
dateProvider: DateProvider = new DateProvider(),
|
|
199
190
|
telemetry: TelemetryClient = getTelemetryClient(),
|
|
191
|
+
slashingProtectionDb?: SlashingProtectionDatabase,
|
|
200
192
|
) {
|
|
201
193
|
const metrics = new ValidatorMetrics(telemetry);
|
|
202
194
|
const blockProposalValidator = new BlockProposalValidator(epochCache, {
|
|
203
195
|
txsPermitted: !config.disableTransactions,
|
|
204
196
|
maxTxsPerBlock: config.validateMaxTxsPerBlock,
|
|
205
197
|
});
|
|
206
|
-
const
|
|
198
|
+
const proposalHandler = new ProposalHandler(
|
|
207
199
|
checkpointsBuilder,
|
|
208
200
|
worldState,
|
|
209
201
|
blockSource,
|
|
@@ -212,46 +204,39 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
212
204
|
blockProposalValidator,
|
|
213
205
|
epochCache,
|
|
214
206
|
config,
|
|
207
|
+
blobClient,
|
|
215
208
|
metrics,
|
|
216
209
|
dateProvider,
|
|
217
210
|
telemetry,
|
|
218
211
|
);
|
|
219
212
|
|
|
220
213
|
const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
|
|
221
|
-
let
|
|
222
|
-
|
|
223
|
-
|
|
214
|
+
let validatorKeyStore: ExtendedValidatorKeyStore = nodeKeystoreAdapter;
|
|
215
|
+
let haSigner: ValidatorHASigner | undefined;
|
|
216
|
+
if (slashingProtectionDb) {
|
|
217
|
+
// Shared database mode: use a pre-existing database (e.g. for testing HA setups).
|
|
218
|
+
const { signer } = createSignerFromSharedDb(slashingProtectionDb, config);
|
|
219
|
+
haSigner = signer;
|
|
220
|
+
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
221
|
+
} else if (config.haSigningEnabled) {
|
|
224
222
|
// If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
|
|
225
223
|
const haConfig = {
|
|
226
224
|
...config,
|
|
227
225
|
maxStuckDutiesAgeMs: config.maxStuckDutiesAgeMs ?? epochCache.getL1Constants().slotDuration * 2 * 1000,
|
|
228
226
|
};
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
}));
|
|
233
|
-
} else {
|
|
234
|
-
// Single-node mode: use LMDB-backed local signing protection.
|
|
235
|
-
// This prevents double-signing if the node crashes and restarts mid-proposal.
|
|
236
|
-
({ signer: slashingProtectionSigner } = await createLocalSignerWithProtection(config, {
|
|
237
|
-
telemetryClient: telemetry,
|
|
238
|
-
dateProvider,
|
|
239
|
-
}));
|
|
227
|
+
const { signer } = await createHASigner(haConfig);
|
|
228
|
+
haSigner = signer;
|
|
229
|
+
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
240
230
|
}
|
|
241
|
-
const validatorKeyStore: ExtendedValidatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, slashingProtectionSigner);
|
|
242
231
|
|
|
243
232
|
const validator = new ValidatorClient(
|
|
244
233
|
validatorKeyStore,
|
|
245
234
|
epochCache,
|
|
246
235
|
p2pClient,
|
|
247
|
-
|
|
248
|
-
blockSource,
|
|
249
|
-
checkpointsBuilder,
|
|
250
|
-
worldState,
|
|
251
|
-
l1ToL2MessageSource,
|
|
236
|
+
proposalHandler,
|
|
252
237
|
config,
|
|
253
238
|
blobClient,
|
|
254
|
-
|
|
239
|
+
haSigner,
|
|
255
240
|
dateProvider,
|
|
256
241
|
telemetry,
|
|
257
242
|
);
|
|
@@ -265,8 +250,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
265
250
|
.filter(addr => !this.config.disabledValidators.some(disabled => disabled.equals(addr)));
|
|
266
251
|
}
|
|
267
252
|
|
|
268
|
-
public
|
|
269
|
-
return this.
|
|
253
|
+
public getProposalHandler() {
|
|
254
|
+
return this.proposalHandler;
|
|
270
255
|
}
|
|
271
256
|
|
|
272
257
|
public signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext) {
|
|
@@ -290,8 +275,24 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
290
275
|
}
|
|
291
276
|
|
|
292
277
|
public reloadKeystore(newManager: KeystoreManager): void {
|
|
278
|
+
if (this.config.haSigningEnabled && !this.haSigner) {
|
|
279
|
+
this.log.warn(
|
|
280
|
+
'HA signing is enabled in config but was not initialized at startup. ' +
|
|
281
|
+
'Restart the node to enable HA signing.',
|
|
282
|
+
);
|
|
283
|
+
} else if (!this.config.haSigningEnabled && this.haSigner) {
|
|
284
|
+
this.log.warn(
|
|
285
|
+
'HA signing was disabled via config update but the HA signer is still active. ' +
|
|
286
|
+
'Restart the node to fully disable HA signing.',
|
|
287
|
+
);
|
|
288
|
+
}
|
|
289
|
+
|
|
293
290
|
const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
|
|
294
|
-
|
|
291
|
+
if (this.haSigner) {
|
|
292
|
+
this.keyStore = new HAKeyStore(newAdapter, this.haSigner);
|
|
293
|
+
} else {
|
|
294
|
+
this.keyStore = newAdapter;
|
|
295
|
+
}
|
|
295
296
|
this.validationService = new ValidationService(this.keyStore, this.log.createChild('validation-service'));
|
|
296
297
|
}
|
|
297
298
|
|
|
@@ -378,13 +379,12 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
378
379
|
return false;
|
|
379
380
|
}
|
|
380
381
|
|
|
381
|
-
//
|
|
382
|
+
// Log self-proposals from HA peers (same validator key on different nodes)
|
|
382
383
|
if (this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
383
|
-
this.log.
|
|
384
|
+
this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
|
|
384
385
|
proposer: proposer.toString(),
|
|
385
386
|
slotNumber,
|
|
386
387
|
});
|
|
387
|
-
return false;
|
|
388
388
|
}
|
|
389
389
|
|
|
390
390
|
// Check if we're in the committee (for metrics purposes)
|
|
@@ -409,16 +409,17 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
409
409
|
alwaysReexecuteBlockProposals ||
|
|
410
410
|
this.blobClient.canUpload();
|
|
411
411
|
|
|
412
|
-
const validationResult = await this.
|
|
412
|
+
const validationResult = await this.proposalHandler.handleBlockProposal(
|
|
413
413
|
proposal,
|
|
414
414
|
proposalSender,
|
|
415
415
|
!!shouldReexecute && !escapeHatchOpen,
|
|
416
416
|
);
|
|
417
417
|
|
|
418
418
|
if (!validationResult.isValid) {
|
|
419
|
-
this.log.warn(`Block proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
420
|
-
|
|
421
419
|
const reason = validationResult.reason || 'unknown';
|
|
420
|
+
|
|
421
|
+
this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
|
|
422
|
+
|
|
422
423
|
// Classify failure reason: bad proposal vs node issue
|
|
423
424
|
const badProposalReasons: BlockProposalValidationFailureReason[] = [
|
|
424
425
|
'invalid_proposal',
|
|
@@ -482,59 +483,40 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
482
483
|
return undefined;
|
|
483
484
|
}
|
|
484
485
|
|
|
485
|
-
// Reject proposals with invalid signatures
|
|
486
|
-
if (!proposer) {
|
|
487
|
-
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
488
|
-
return undefined;
|
|
489
|
-
}
|
|
490
|
-
|
|
491
486
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
492
|
-
if (this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
493
|
-
this.log.
|
|
487
|
+
if (proposer && this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
488
|
+
this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
494
489
|
proposer: proposer.toString(),
|
|
495
490
|
slotNumber,
|
|
496
491
|
});
|
|
497
492
|
return undefined;
|
|
498
493
|
}
|
|
499
494
|
|
|
500
|
-
//
|
|
501
|
-
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
502
|
-
this.log.warn(
|
|
503
|
-
`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`,
|
|
504
|
-
);
|
|
505
|
-
return undefined;
|
|
506
|
-
}
|
|
507
|
-
|
|
508
|
-
// Check that I have any address in current committee before attesting
|
|
495
|
+
// Check that I have any address in the committee where this checkpoint will land before attesting
|
|
509
496
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
510
497
|
const partOfCommittee = inCommittee.length > 0;
|
|
511
498
|
|
|
512
499
|
const proposalInfo = {
|
|
513
500
|
slotNumber,
|
|
514
501
|
archive: proposal.archive.toString(),
|
|
515
|
-
proposer: proposer
|
|
502
|
+
proposer: proposer?.toString(),
|
|
516
503
|
};
|
|
517
504
|
this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
|
|
518
505
|
...proposalInfo,
|
|
519
506
|
fishermanMode: this.config.fishermanMode || false,
|
|
520
507
|
});
|
|
521
508
|
|
|
522
|
-
// Validate the checkpoint proposal
|
|
509
|
+
// Validate the checkpoint proposal and upload blobs (unless skipCheckpointProposalValidation is set)
|
|
523
510
|
if (this.config.skipCheckpointProposalValidation) {
|
|
524
511
|
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
525
512
|
} else {
|
|
526
|
-
const validationResult = await this.
|
|
513
|
+
const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
|
|
527
514
|
if (!validationResult.isValid) {
|
|
528
515
|
this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
529
516
|
return undefined;
|
|
530
517
|
}
|
|
531
518
|
}
|
|
532
519
|
|
|
533
|
-
// Upload blobs to filestore if we can (fire and forget)
|
|
534
|
-
if (this.blobClient.canUpload()) {
|
|
535
|
-
void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
|
|
536
|
-
}
|
|
537
|
-
|
|
538
520
|
// Check that I have any address in current committee before attesting
|
|
539
521
|
// In fisherman mode, we still create attestations for validation even if not in committee
|
|
540
522
|
if (!partOfCommittee && !this.config.fishermanMode) {
|
|
@@ -629,201 +611,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
629
611
|
return attestations;
|
|
630
612
|
}
|
|
631
613
|
|
|
632
|
-
/**
|
|
633
|
-
* Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
|
|
634
|
-
* @returns Validation result with isValid flag and reason if invalid.
|
|
635
|
-
*/
|
|
636
|
-
private async validateCheckpointProposal(
|
|
637
|
-
proposal: CheckpointProposalCore,
|
|
638
|
-
proposalInfo: LogData,
|
|
639
|
-
): Promise<{ isValid: true } | { isValid: false; reason: string }> {
|
|
640
|
-
const slot = proposal.slotNumber;
|
|
641
|
-
|
|
642
|
-
// Timeout block syncing at the start of the next slot
|
|
643
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
644
|
-
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
645
|
-
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
646
|
-
|
|
647
|
-
// Wait for last block to sync by archive
|
|
648
|
-
let lastBlockHeader: BlockHeader | undefined;
|
|
649
|
-
try {
|
|
650
|
-
lastBlockHeader = await retryUntil(
|
|
651
|
-
async () => {
|
|
652
|
-
await this.blockSource.syncImmediate();
|
|
653
|
-
return this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
654
|
-
},
|
|
655
|
-
`waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
|
|
656
|
-
timeoutSeconds,
|
|
657
|
-
0.5,
|
|
658
|
-
);
|
|
659
|
-
} catch (err) {
|
|
660
|
-
if (err instanceof TimeoutError) {
|
|
661
|
-
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
662
|
-
return { isValid: false, reason: 'last_block_not_found' };
|
|
663
|
-
}
|
|
664
|
-
this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
|
|
665
|
-
return { isValid: false, reason: 'block_fetch_error' };
|
|
666
|
-
}
|
|
667
|
-
|
|
668
|
-
if (!lastBlockHeader) {
|
|
669
|
-
this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
|
|
670
|
-
return { isValid: false, reason: 'last_block_not_found' };
|
|
671
|
-
}
|
|
672
|
-
|
|
673
|
-
// Get all full blocks for the slot and checkpoint
|
|
674
|
-
const blocks = await this.blockSource.getBlocksForSlot(slot);
|
|
675
|
-
if (blocks.length === 0) {
|
|
676
|
-
this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
|
|
677
|
-
return { isValid: false, reason: 'no_blocks_for_slot' };
|
|
678
|
-
}
|
|
679
|
-
|
|
680
|
-
// Ensure the last block for this slot matches the archive in the checkpoint proposal
|
|
681
|
-
if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
|
|
682
|
-
this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
|
|
683
|
-
return { isValid: false, reason: 'last_block_archive_mismatch' };
|
|
684
|
-
}
|
|
685
|
-
|
|
686
|
-
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
687
|
-
...proposalInfo,
|
|
688
|
-
blockNumbers: blocks.map(b => b.number),
|
|
689
|
-
});
|
|
690
|
-
|
|
691
|
-
// Get checkpoint constants from first block
|
|
692
|
-
const firstBlock = blocks[0];
|
|
693
|
-
const constants = this.extractCheckpointConstants(firstBlock);
|
|
694
|
-
const checkpointNumber = firstBlock.checkpointNumber;
|
|
695
|
-
|
|
696
|
-
// Get L1-to-L2 messages for this checkpoint
|
|
697
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
698
|
-
|
|
699
|
-
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
700
|
-
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
701
|
-
const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch))
|
|
702
|
-
.filter(c => c.checkpointNumber < checkpointNumber)
|
|
703
|
-
.map(c => c.checkpointOutHash);
|
|
704
|
-
|
|
705
|
-
// Fork world state at the block before the first block
|
|
706
|
-
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
707
|
-
const fork = await this.worldState.fork(parentBlockNumber);
|
|
708
|
-
|
|
709
|
-
try {
|
|
710
|
-
// Create checkpoint builder with all existing blocks
|
|
711
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(
|
|
712
|
-
checkpointNumber,
|
|
713
|
-
constants,
|
|
714
|
-
proposal.feeAssetPriceModifier,
|
|
715
|
-
l1ToL2Messages,
|
|
716
|
-
previousCheckpointOutHashes,
|
|
717
|
-
fork,
|
|
718
|
-
blocks,
|
|
719
|
-
this.log.getBindings(),
|
|
720
|
-
);
|
|
721
|
-
|
|
722
|
-
// Complete the checkpoint to get computed values
|
|
723
|
-
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
724
|
-
|
|
725
|
-
// Compare checkpoint header with proposal
|
|
726
|
-
if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
|
|
727
|
-
this.log.warn(`Checkpoint header mismatch`, {
|
|
728
|
-
...proposalInfo,
|
|
729
|
-
computed: computedCheckpoint.header.toInspect(),
|
|
730
|
-
proposal: proposal.checkpointHeader.toInspect(),
|
|
731
|
-
});
|
|
732
|
-
return { isValid: false, reason: 'checkpoint_header_mismatch' };
|
|
733
|
-
}
|
|
734
|
-
|
|
735
|
-
// Compare archive root with proposal
|
|
736
|
-
if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
|
|
737
|
-
this.log.warn(`Archive root mismatch`, {
|
|
738
|
-
...proposalInfo,
|
|
739
|
-
computed: computedCheckpoint.archive.root.toString(),
|
|
740
|
-
proposal: proposal.archive.toString(),
|
|
741
|
-
});
|
|
742
|
-
return { isValid: false, reason: 'archive_mismatch' };
|
|
743
|
-
}
|
|
744
|
-
|
|
745
|
-
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
746
|
-
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
747
|
-
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
748
|
-
const computedEpochOutHash = accumulateCheckpointOutHashes([...previousCheckpointOutHashes, checkpointOutHash]);
|
|
749
|
-
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
750
|
-
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
751
|
-
this.log.warn(`Epoch out hash mismatch`, {
|
|
752
|
-
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
753
|
-
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
754
|
-
checkpointOutHash: checkpointOutHash.toString(),
|
|
755
|
-
previousCheckpointOutHashes: previousCheckpointOutHashes.map(h => h.toString()),
|
|
756
|
-
...proposalInfo,
|
|
757
|
-
});
|
|
758
|
-
return { isValid: false, reason: 'out_hash_mismatch' };
|
|
759
|
-
}
|
|
760
|
-
|
|
761
|
-
// Final round of validations on the checkpoint, just in case.
|
|
762
|
-
try {
|
|
763
|
-
validateCheckpoint(computedCheckpoint, {
|
|
764
|
-
rollupManaLimit: this.checkpointsBuilder.getConfig().rollupManaLimit,
|
|
765
|
-
maxDABlockGas: this.config.validateMaxDABlockGas,
|
|
766
|
-
maxL2BlockGas: this.config.validateMaxL2BlockGas,
|
|
767
|
-
maxTxsPerBlock: this.config.validateMaxTxsPerBlock,
|
|
768
|
-
maxTxsPerCheckpoint: this.config.validateMaxTxsPerCheckpoint,
|
|
769
|
-
});
|
|
770
|
-
} catch (err) {
|
|
771
|
-
this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
|
|
772
|
-
return { isValid: false, reason: 'checkpoint_validation_failed' };
|
|
773
|
-
}
|
|
774
|
-
|
|
775
|
-
this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
|
|
776
|
-
return { isValid: true };
|
|
777
|
-
} finally {
|
|
778
|
-
await fork.close();
|
|
779
|
-
}
|
|
780
|
-
}
|
|
781
|
-
|
|
782
|
-
/**
|
|
783
|
-
* Extract checkpoint global variables from a block.
|
|
784
|
-
*/
|
|
785
|
-
private extractCheckpointConstants(block: L2Block): CheckpointGlobalVariables {
|
|
786
|
-
const gv = block.header.globalVariables;
|
|
787
|
-
return {
|
|
788
|
-
chainId: gv.chainId,
|
|
789
|
-
version: gv.version,
|
|
790
|
-
slotNumber: gv.slotNumber,
|
|
791
|
-
timestamp: gv.timestamp,
|
|
792
|
-
coinbase: gv.coinbase,
|
|
793
|
-
feeRecipient: gv.feeRecipient,
|
|
794
|
-
gasFees: gv.gasFees,
|
|
795
|
-
};
|
|
796
|
-
}
|
|
797
|
-
|
|
798
|
-
/**
|
|
799
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
800
|
-
*/
|
|
801
|
-
protected async uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void> {
|
|
802
|
-
try {
|
|
803
|
-
const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
804
|
-
if (!lastBlockHeader) {
|
|
805
|
-
this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
|
|
806
|
-
return;
|
|
807
|
-
}
|
|
808
|
-
|
|
809
|
-
const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
|
|
810
|
-
if (blocks.length === 0) {
|
|
811
|
-
this.log.warn(`No blocks found for blob upload`, proposalInfo);
|
|
812
|
-
return;
|
|
813
|
-
}
|
|
814
|
-
|
|
815
|
-
const blobFields = blocks.flatMap(b => b.toBlobFields());
|
|
816
|
-
const blobs: Blob[] = await getBlobsPerL1Block(blobFields);
|
|
817
|
-
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
818
|
-
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
819
|
-
...proposalInfo,
|
|
820
|
-
numBlobs: blobs.length,
|
|
821
|
-
});
|
|
822
|
-
} catch (err) {
|
|
823
|
-
this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
|
|
824
|
-
}
|
|
825
|
-
}
|
|
826
|
-
|
|
827
614
|
private slashInvalidBlock(proposal: BlockProposal) {
|
|
828
615
|
const proposer = proposal.getSender();
|
|
829
616
|
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
import type { EpochCache } from '@aztec/epoch-cache';
|
|
2
|
-
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
3
|
-
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
4
|
-
import { DateProvider } from '@aztec/foundation/timer';
|
|
5
|
-
import type { P2P, PeerId } from '@aztec/p2p';
|
|
6
|
-
import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
|
|
7
|
-
import type { L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
8
|
-
import type { ITxProvider, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
9
|
-
import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
10
|
-
import type { BlockProposal } from '@aztec/stdlib/p2p';
|
|
11
|
-
import type { FailedTx, Tx } from '@aztec/stdlib/tx';
|
|
12
|
-
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
13
|
-
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
14
|
-
import type { ValidatorMetrics } from './metrics.js';
|
|
15
|
-
export type BlockProposalValidationFailureReason = 'invalid_proposal' | 'parent_block_not_found' | 'parent_block_wrong_slot' | 'in_hash_mismatch' | 'global_variables_mismatch' | 'block_number_already_exists' | 'txs_not_available' | 'state_mismatch' | 'failed_txs' | 'timeout' | 'unknown_error';
|
|
16
|
-
type ReexecuteTransactionsResult = {
|
|
17
|
-
block: L2Block;
|
|
18
|
-
failedTxs: FailedTx[];
|
|
19
|
-
reexecutionTimeMs: number;
|
|
20
|
-
totalManaUsed: number;
|
|
21
|
-
};
|
|
22
|
-
export type BlockProposalValidationSuccessResult = {
|
|
23
|
-
isValid: true;
|
|
24
|
-
blockNumber: BlockNumber;
|
|
25
|
-
reexecutionResult?: ReexecuteTransactionsResult;
|
|
26
|
-
};
|
|
27
|
-
export type BlockProposalValidationFailureResult = {
|
|
28
|
-
isValid: false;
|
|
29
|
-
reason: BlockProposalValidationFailureReason;
|
|
30
|
-
blockNumber?: BlockNumber;
|
|
31
|
-
reexecutionResult?: ReexecuteTransactionsResult;
|
|
32
|
-
};
|
|
33
|
-
export type BlockProposalValidationResult = BlockProposalValidationSuccessResult | BlockProposalValidationFailureResult;
|
|
34
|
-
export declare class BlockProposalHandler {
|
|
35
|
-
private checkpointsBuilder;
|
|
36
|
-
private worldState;
|
|
37
|
-
private blockSource;
|
|
38
|
-
private l1ToL2MessageSource;
|
|
39
|
-
private txProvider;
|
|
40
|
-
private blockProposalValidator;
|
|
41
|
-
private epochCache;
|
|
42
|
-
private config;
|
|
43
|
-
private metrics?;
|
|
44
|
-
private dateProvider;
|
|
45
|
-
private log;
|
|
46
|
-
readonly tracer: Tracer;
|
|
47
|
-
constructor(checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, blockProposalValidator: BlockProposalValidator, epochCache: EpochCache, config: ValidatorClientFullConfig, metrics?: ValidatorMetrics | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
|
|
48
|
-
register(p2pClient: P2P, shouldReexecute: boolean): BlockProposalHandler;
|
|
49
|
-
handleBlockProposal(proposal: BlockProposal, proposalSender: PeerId, shouldReexecute: boolean): Promise<BlockProposalValidationResult>;
|
|
50
|
-
private getParentBlock;
|
|
51
|
-
private computeCheckpointNumber;
|
|
52
|
-
/**
|
|
53
|
-
* Validates that a non-first block in a checkpoint has consistent global variables with its parent.
|
|
54
|
-
* For blocks with indexWithinCheckpoint > 0, all global variables except blockNumber must match the parent.
|
|
55
|
-
* @returns A failure result if validation fails, undefined if validation passes
|
|
56
|
-
*/
|
|
57
|
-
private validateNonFirstBlockInCheckpoint;
|
|
58
|
-
private getReexecutionDeadline;
|
|
59
|
-
private getReexecuteFailureReason;
|
|
60
|
-
reexecuteTransactions(proposal: BlockProposal, blockNumber: BlockNumber, checkpointNumber: CheckpointNumber, txs: Tx[], l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[]): Promise<ReexecuteTransactionsResult>;
|
|
61
|
-
}
|
|
62
|
-
export {};
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfaGFuZGxlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jsb2NrX3Byb3Bvc2FsX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBRTVGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUlwRCxPQUFPLEVBQUUsWUFBWSxFQUFTLE1BQU0seUJBQXlCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM5QyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBYSxPQUFPLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzFGLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RILE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFtQyxNQUFNLHlCQUF5QixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUE2QixRQUFRLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFPaEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFckQsTUFBTSxNQUFN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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"block_proposal_handler.d.ts","sourceRoot":"","sources":["../src/block_proposal_handler.ts"],"names":[],"mappings":"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"}
|