@aztec/validator-client 4.2.0-nightly.20260402 → 4.2.0-nightly.20260403
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/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,7 +38,7 @@ 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
44
|
import { createHASigner, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
|
|
@@ -53,13 +48,13 @@ import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-
|
|
|
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,11 +97,7 @@ 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
103
|
private haSigner: ValidatorHASigner | undefined,
|
|
@@ -204,7 +195,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
204
195
|
txsPermitted: !config.disableTransactions,
|
|
205
196
|
maxTxsPerBlock: config.validateMaxTxsPerBlock,
|
|
206
197
|
});
|
|
207
|
-
const
|
|
198
|
+
const proposalHandler = new ProposalHandler(
|
|
208
199
|
checkpointsBuilder,
|
|
209
200
|
worldState,
|
|
210
201
|
blockSource,
|
|
@@ -213,6 +204,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
213
204
|
blockProposalValidator,
|
|
214
205
|
epochCache,
|
|
215
206
|
config,
|
|
207
|
+
blobClient,
|
|
216
208
|
metrics,
|
|
217
209
|
dateProvider,
|
|
218
210
|
telemetry,
|
|
@@ -241,11 +233,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
241
233
|
validatorKeyStore,
|
|
242
234
|
epochCache,
|
|
243
235
|
p2pClient,
|
|
244
|
-
|
|
245
|
-
blockSource,
|
|
246
|
-
checkpointsBuilder,
|
|
247
|
-
worldState,
|
|
248
|
-
l1ToL2MessageSource,
|
|
236
|
+
proposalHandler,
|
|
249
237
|
config,
|
|
250
238
|
blobClient,
|
|
251
239
|
haSigner,
|
|
@@ -262,8 +250,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
262
250
|
.filter(addr => !this.config.disabledValidators.some(disabled => disabled.equals(addr)));
|
|
263
251
|
}
|
|
264
252
|
|
|
265
|
-
public
|
|
266
|
-
return this.
|
|
253
|
+
public getProposalHandler() {
|
|
254
|
+
return this.proposalHandler;
|
|
267
255
|
}
|
|
268
256
|
|
|
269
257
|
public signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext) {
|
|
@@ -421,7 +409,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
421
409
|
alwaysReexecuteBlockProposals ||
|
|
422
410
|
this.blobClient.canUpload();
|
|
423
411
|
|
|
424
|
-
const validationResult = await this.
|
|
412
|
+
const validationResult = await this.proposalHandler.handleBlockProposal(
|
|
425
413
|
proposal,
|
|
426
414
|
proposalSender,
|
|
427
415
|
!!shouldReexecute && !escapeHatchOpen,
|
|
@@ -495,14 +483,8 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
495
483
|
return undefined;
|
|
496
484
|
}
|
|
497
485
|
|
|
498
|
-
// Reject proposals with invalid signatures
|
|
499
|
-
if (!proposer) {
|
|
500
|
-
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
501
|
-
return undefined;
|
|
502
|
-
}
|
|
503
|
-
|
|
504
486
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
505
|
-
if (this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
487
|
+
if (proposer && this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
506
488
|
this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
507
489
|
proposer: proposer.toString(),
|
|
508
490
|
slotNumber,
|
|
@@ -510,44 +492,31 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
510
492
|
return undefined;
|
|
511
493
|
}
|
|
512
494
|
|
|
513
|
-
//
|
|
514
|
-
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
515
|
-
this.log.warn(
|
|
516
|
-
`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`,
|
|
517
|
-
);
|
|
518
|
-
return undefined;
|
|
519
|
-
}
|
|
520
|
-
|
|
521
|
-
// 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
|
|
522
496
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
523
497
|
const partOfCommittee = inCommittee.length > 0;
|
|
524
498
|
|
|
525
499
|
const proposalInfo = {
|
|
526
500
|
slotNumber,
|
|
527
501
|
archive: proposal.archive.toString(),
|
|
528
|
-
proposer: proposer
|
|
502
|
+
proposer: proposer?.toString(),
|
|
529
503
|
};
|
|
530
504
|
this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
|
|
531
505
|
...proposalInfo,
|
|
532
506
|
fishermanMode: this.config.fishermanMode || false,
|
|
533
507
|
});
|
|
534
508
|
|
|
535
|
-
// Validate the checkpoint proposal
|
|
509
|
+
// Validate the checkpoint proposal and upload blobs (unless skipCheckpointProposalValidation is set)
|
|
536
510
|
if (this.config.skipCheckpointProposalValidation) {
|
|
537
511
|
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
538
512
|
} else {
|
|
539
|
-
const validationResult = await this.
|
|
513
|
+
const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
|
|
540
514
|
if (!validationResult.isValid) {
|
|
541
515
|
this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
542
516
|
return undefined;
|
|
543
517
|
}
|
|
544
518
|
}
|
|
545
519
|
|
|
546
|
-
// Upload blobs to filestore if we can (fire and forget)
|
|
547
|
-
if (this.blobClient.canUpload()) {
|
|
548
|
-
void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
|
|
549
|
-
}
|
|
550
|
-
|
|
551
520
|
// Check that I have any address in current committee before attesting
|
|
552
521
|
// In fisherman mode, we still create attestations for validation even if not in committee
|
|
553
522
|
if (!partOfCommittee && !this.config.fishermanMode) {
|
|
@@ -642,201 +611,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
642
611
|
return attestations;
|
|
643
612
|
}
|
|
644
613
|
|
|
645
|
-
/**
|
|
646
|
-
* Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
|
|
647
|
-
* @returns Validation result with isValid flag and reason if invalid.
|
|
648
|
-
*/
|
|
649
|
-
private async validateCheckpointProposal(
|
|
650
|
-
proposal: CheckpointProposalCore,
|
|
651
|
-
proposalInfo: LogData,
|
|
652
|
-
): Promise<{ isValid: true } | { isValid: false; reason: string }> {
|
|
653
|
-
const slot = proposal.slotNumber;
|
|
654
|
-
|
|
655
|
-
// Timeout block syncing at the start of the next slot
|
|
656
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
657
|
-
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
658
|
-
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
659
|
-
|
|
660
|
-
// Wait for last block to sync by archive
|
|
661
|
-
let lastBlockHeader: BlockHeader | undefined;
|
|
662
|
-
try {
|
|
663
|
-
lastBlockHeader = await retryUntil(
|
|
664
|
-
async () => {
|
|
665
|
-
await this.blockSource.syncImmediate();
|
|
666
|
-
return this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
667
|
-
},
|
|
668
|
-
`waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
|
|
669
|
-
timeoutSeconds,
|
|
670
|
-
0.5,
|
|
671
|
-
);
|
|
672
|
-
} catch (err) {
|
|
673
|
-
if (err instanceof TimeoutError) {
|
|
674
|
-
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
675
|
-
return { isValid: false, reason: 'last_block_not_found' };
|
|
676
|
-
}
|
|
677
|
-
this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
|
|
678
|
-
return { isValid: false, reason: 'block_fetch_error' };
|
|
679
|
-
}
|
|
680
|
-
|
|
681
|
-
if (!lastBlockHeader) {
|
|
682
|
-
this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
|
|
683
|
-
return { isValid: false, reason: 'last_block_not_found' };
|
|
684
|
-
}
|
|
685
|
-
|
|
686
|
-
// Get all full blocks for the slot and checkpoint
|
|
687
|
-
const blocks = await this.blockSource.getBlocksForSlot(slot);
|
|
688
|
-
if (blocks.length === 0) {
|
|
689
|
-
this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
|
|
690
|
-
return { isValid: false, reason: 'no_blocks_for_slot' };
|
|
691
|
-
}
|
|
692
|
-
|
|
693
|
-
// Ensure the last block for this slot matches the archive in the checkpoint proposal
|
|
694
|
-
if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
|
|
695
|
-
this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
|
|
696
|
-
return { isValid: false, reason: 'last_block_archive_mismatch' };
|
|
697
|
-
}
|
|
698
|
-
|
|
699
|
-
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
700
|
-
...proposalInfo,
|
|
701
|
-
blockNumbers: blocks.map(b => b.number),
|
|
702
|
-
});
|
|
703
|
-
|
|
704
|
-
// Get checkpoint constants from first block
|
|
705
|
-
const firstBlock = blocks[0];
|
|
706
|
-
const constants = this.extractCheckpointConstants(firstBlock);
|
|
707
|
-
const checkpointNumber = firstBlock.checkpointNumber;
|
|
708
|
-
|
|
709
|
-
// Get L1-to-L2 messages for this checkpoint
|
|
710
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
711
|
-
|
|
712
|
-
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
713
|
-
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
714
|
-
const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch))
|
|
715
|
-
.filter(c => c.checkpointNumber < checkpointNumber)
|
|
716
|
-
.map(c => c.checkpointOutHash);
|
|
717
|
-
|
|
718
|
-
// Fork world state at the block before the first block
|
|
719
|
-
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
720
|
-
const fork = await this.worldState.fork(parentBlockNumber);
|
|
721
|
-
|
|
722
|
-
try {
|
|
723
|
-
// Create checkpoint builder with all existing blocks
|
|
724
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(
|
|
725
|
-
checkpointNumber,
|
|
726
|
-
constants,
|
|
727
|
-
proposal.feeAssetPriceModifier,
|
|
728
|
-
l1ToL2Messages,
|
|
729
|
-
previousCheckpointOutHashes,
|
|
730
|
-
fork,
|
|
731
|
-
blocks,
|
|
732
|
-
this.log.getBindings(),
|
|
733
|
-
);
|
|
734
|
-
|
|
735
|
-
// Complete the checkpoint to get computed values
|
|
736
|
-
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
737
|
-
|
|
738
|
-
// Compare checkpoint header with proposal
|
|
739
|
-
if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
|
|
740
|
-
this.log.warn(`Checkpoint header mismatch`, {
|
|
741
|
-
...proposalInfo,
|
|
742
|
-
computed: computedCheckpoint.header.toInspect(),
|
|
743
|
-
proposal: proposal.checkpointHeader.toInspect(),
|
|
744
|
-
});
|
|
745
|
-
return { isValid: false, reason: 'checkpoint_header_mismatch' };
|
|
746
|
-
}
|
|
747
|
-
|
|
748
|
-
// Compare archive root with proposal
|
|
749
|
-
if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
|
|
750
|
-
this.log.warn(`Archive root mismatch`, {
|
|
751
|
-
...proposalInfo,
|
|
752
|
-
computed: computedCheckpoint.archive.root.toString(),
|
|
753
|
-
proposal: proposal.archive.toString(),
|
|
754
|
-
});
|
|
755
|
-
return { isValid: false, reason: 'archive_mismatch' };
|
|
756
|
-
}
|
|
757
|
-
|
|
758
|
-
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
759
|
-
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
760
|
-
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
761
|
-
const computedEpochOutHash = accumulateCheckpointOutHashes([...previousCheckpointOutHashes, checkpointOutHash]);
|
|
762
|
-
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
763
|
-
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
764
|
-
this.log.warn(`Epoch out hash mismatch`, {
|
|
765
|
-
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
766
|
-
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
767
|
-
checkpointOutHash: checkpointOutHash.toString(),
|
|
768
|
-
previousCheckpointOutHashes: previousCheckpointOutHashes.map(h => h.toString()),
|
|
769
|
-
...proposalInfo,
|
|
770
|
-
});
|
|
771
|
-
return { isValid: false, reason: 'out_hash_mismatch' };
|
|
772
|
-
}
|
|
773
|
-
|
|
774
|
-
// Final round of validations on the checkpoint, just in case.
|
|
775
|
-
try {
|
|
776
|
-
validateCheckpoint(computedCheckpoint, {
|
|
777
|
-
rollupManaLimit: this.checkpointsBuilder.getConfig().rollupManaLimit,
|
|
778
|
-
maxDABlockGas: this.config.validateMaxDABlockGas,
|
|
779
|
-
maxL2BlockGas: this.config.validateMaxL2BlockGas,
|
|
780
|
-
maxTxsPerBlock: this.config.validateMaxTxsPerBlock,
|
|
781
|
-
maxTxsPerCheckpoint: this.config.validateMaxTxsPerCheckpoint,
|
|
782
|
-
});
|
|
783
|
-
} catch (err) {
|
|
784
|
-
this.log.warn(`Checkpoint validation failed: ${err}`, proposalInfo);
|
|
785
|
-
return { isValid: false, reason: 'checkpoint_validation_failed' };
|
|
786
|
-
}
|
|
787
|
-
|
|
788
|
-
this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
|
|
789
|
-
return { isValid: true };
|
|
790
|
-
} finally {
|
|
791
|
-
await fork.close();
|
|
792
|
-
}
|
|
793
|
-
}
|
|
794
|
-
|
|
795
|
-
/**
|
|
796
|
-
* Extract checkpoint global variables from a block.
|
|
797
|
-
*/
|
|
798
|
-
private extractCheckpointConstants(block: L2Block): CheckpointGlobalVariables {
|
|
799
|
-
const gv = block.header.globalVariables;
|
|
800
|
-
return {
|
|
801
|
-
chainId: gv.chainId,
|
|
802
|
-
version: gv.version,
|
|
803
|
-
slotNumber: gv.slotNumber,
|
|
804
|
-
timestamp: gv.timestamp,
|
|
805
|
-
coinbase: gv.coinbase,
|
|
806
|
-
feeRecipient: gv.feeRecipient,
|
|
807
|
-
gasFees: gv.gasFees,
|
|
808
|
-
};
|
|
809
|
-
}
|
|
810
|
-
|
|
811
|
-
/**
|
|
812
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
813
|
-
*/
|
|
814
|
-
protected async uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void> {
|
|
815
|
-
try {
|
|
816
|
-
const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
817
|
-
if (!lastBlockHeader) {
|
|
818
|
-
this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
|
|
819
|
-
return;
|
|
820
|
-
}
|
|
821
|
-
|
|
822
|
-
const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
|
|
823
|
-
if (blocks.length === 0) {
|
|
824
|
-
this.log.warn(`No blocks found for blob upload`, proposalInfo);
|
|
825
|
-
return;
|
|
826
|
-
}
|
|
827
|
-
|
|
828
|
-
const blobFields = blocks.flatMap(b => b.toBlobFields());
|
|
829
|
-
const blobs: Blob[] = await getBlobsPerL1Block(blobFields);
|
|
830
|
-
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
831
|
-
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
832
|
-
...proposalInfo,
|
|
833
|
-
numBlobs: blobs.length,
|
|
834
|
-
});
|
|
835
|
-
} catch (err) {
|
|
836
|
-
this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
|
|
837
|
-
}
|
|
838
|
-
}
|
|
839
|
-
|
|
840
614
|
private slashInvalidBlock(proposal: BlockProposal) {
|
|
841
615
|
const proposer = proposal.getSender();
|
|
842
616
|
|
|
@@ -1,64 +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' | 'block_source_not_synced' | 'parent_block_wrong_slot' | 'in_hash_mismatch' | 'global_variables_mismatch' | 'block_number_already_exists' | 'txs_not_available' | 'state_mismatch' | 'failed_txs' | 'initial_state_mismatch' | '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 waitForBlockSourceSync;
|
|
60
|
-
private getReexecuteFailureReason;
|
|
61
|
-
reexecuteTransactions(proposal: BlockProposal, blockNumber: BlockNumber, checkpointNumber: CheckpointNumber, txs: Tx[], l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[]): Promise<ReexecuteTransactionsResult>;
|
|
62
|
-
}
|
|
63
|
-
export {};
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfaGFuZGxlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jsb2NrX3Byb3Bvc2FsX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBRTVGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUlwRCxPQUFPLEVBQUUsWUFBWSxFQUFTLE1BQU0seUJBQXlCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM5QyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBYSxPQUFPLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzFGLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RILE9BQU8sRUFBRSxLQUFLLG1CQUFtQixFQUFtQyxNQUFNLHlCQUF5QixDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXZELE9BQU8sS0FBSyxFQUE2QixRQUFRLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFRaEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBRWhHLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFckQsTUFBTSxNQUFN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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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"}
|