@aztec/validator-client 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9
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 +2 -0
- package/dest/checkpoint_builder.d.ts +17 -7
- package/dest/checkpoint_builder.d.ts.map +1 -1
- package/dest/checkpoint_builder.js +26 -9
- package/dest/config.d.ts +9 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +9 -1
- package/dest/factory.d.ts +1 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +10 -3
- package/dest/key_store/web3signer_key_store.d.ts +10 -2
- package/dest/key_store/web3signer_key_store.d.ts.map +1 -1
- package/dest/key_store/web3signer_key_store.js +32 -41
- package/dest/proposal_handler.d.ts +38 -7
- package/dest/proposal_handler.d.ts.map +1 -1
- package/dest/proposal_handler.js +230 -49
- package/dest/validator.d.ts +11 -5
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +51 -42
- package/package.json +19 -19
- package/src/checkpoint_builder.ts +28 -10
- package/src/config.ts +16 -3
- package/src/factory.ts +9 -1
- package/src/key_store/web3signer_key_store.ts +43 -59
- package/src/proposal_handler.ts +250 -53
- package/src/validator.ts +61 -46
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal_handler.d.ts","sourceRoot":"","sources":["../src/proposal_handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"proposal_handler.d.ts","sourceRoot":"","sources":["../src/proposal_handler.ts"],"names":[],"mappings":"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"}
|
package/dest/proposal_handler.js
CHANGED
|
@@ -65,17 +65,17 @@ function _ts_dispose_resources(env) {
|
|
|
65
65
|
}
|
|
66
66
|
import { encodeCheckpointBlobDataFromBlocks, getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
67
67
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
68
|
-
import { PROPOSER_PIPELINING_SLOT_OFFSET } from '@aztec/epoch-cache';
|
|
69
68
|
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
70
|
-
import { BlockNumber, CheckpointNumber
|
|
69
|
+
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
71
70
|
import { pick } from '@aztec/foundation/collection';
|
|
72
71
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
73
72
|
import { TimeoutError } from '@aztec/foundation/error';
|
|
73
|
+
import { FifoSet } from '@aztec/foundation/fifo-set';
|
|
74
74
|
import { createLogger } from '@aztec/foundation/log';
|
|
75
75
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
76
76
|
import { DateProvider, Timer } from '@aztec/foundation/timer';
|
|
77
77
|
import { getPreviousCheckpointOutHashes, validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
78
|
-
import { getEpochAtSlot
|
|
78
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
79
79
|
import { Gas } from '@aztec/stdlib/gas';
|
|
80
80
|
import { accumulateCheckpointOutHashes, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
|
|
81
81
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
@@ -91,6 +91,8 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
91
91
|
checkpoint_already_published: undefined,
|
|
92
92
|
last_block_not_found: 'unvalidated',
|
|
93
93
|
block_fetch_error: 'unvalidated',
|
|
94
|
+
world_state_not_synced: 'unvalidated',
|
|
95
|
+
initial_archive_mismatch: 'unvalidated',
|
|
94
96
|
no_blocks_for_slot: 'unvalidated',
|
|
95
97
|
last_block_archive_mismatch: 'invalid',
|
|
96
98
|
too_many_blocks_in_checkpoint: 'invalid',
|
|
@@ -99,7 +101,43 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
99
101
|
out_hash_mismatch: 'invalid',
|
|
100
102
|
checkpoint_validation_failed: 'invalid'
|
|
101
103
|
};
|
|
102
|
-
|
|
104
|
+
const MAX_TRACKED_INVALID_PROPOSAL_SLOTS = 1000;
|
|
105
|
+
/** Block-proposal validation failures that constitute a slashable invalid-block offense. */ export const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
106
|
+
'state_mismatch',
|
|
107
|
+
'failed_txs',
|
|
108
|
+
'global_variables_mismatch',
|
|
109
|
+
'invalid_proposal',
|
|
110
|
+
'parent_block_wrong_slot',
|
|
111
|
+
'in_hash_mismatch'
|
|
112
|
+
];
|
|
113
|
+
/** Checkpoint-proposal validation failures that constitute a slashable invalid-checkpoint offense. */ export const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
|
|
114
|
+
// enabled
|
|
115
|
+
['invalid_fee_asset_price_modifier']: true,
|
|
116
|
+
['checkpoint_header_mismatch']: true,
|
|
117
|
+
// These late mismatches should normally be caught by earlier checks, but if reached after validating the local
|
|
118
|
+
// checkpoint inputs, the proposer-signed payload disagrees with deterministic recomputation.
|
|
119
|
+
['archive_mismatch']: true,
|
|
120
|
+
['out_hash_mismatch']: true,
|
|
121
|
+
['no_blocks_for_slot']: true,
|
|
122
|
+
['too_many_blocks_in_checkpoint']: true,
|
|
123
|
+
['checkpoint_validation_failed']: true,
|
|
124
|
+
['last_block_archive_mismatch']: true,
|
|
125
|
+
// disabled
|
|
126
|
+
['invalid_signature']: false,
|
|
127
|
+
['last_block_not_found']: false,
|
|
128
|
+
['block_fetch_error']: false,
|
|
129
|
+
['world_state_not_synced']: false,
|
|
130
|
+
// A reorg / divergent local chain, not a proposer offense (mirrors the block path's initial_state_mismatch).
|
|
131
|
+
['initial_archive_mismatch']: false,
|
|
132
|
+
['checkpoint_already_published']: false
|
|
133
|
+
};
|
|
134
|
+
/**
|
|
135
|
+
* Handles block and checkpoint proposals for both validator and non-validator nodes. Also tracks which slots
|
|
136
|
+
* had a slashable invalid proposal or a proposal equivocation, exposing them via the
|
|
137
|
+
* `InvalidProposalSlotSource` interface consumed by the attested-invalid-proposal slashing watcher. The
|
|
138
|
+
* tracking is populated as a side effect of validating/re-executing proposals, so any node that re-executes
|
|
139
|
+
* proposals (the default) can serve it — not only validators.
|
|
140
|
+
*/ export class ProposalHandler {
|
|
103
141
|
checkpointsBuilder;
|
|
104
142
|
worldState;
|
|
105
143
|
blockSource;
|
|
@@ -107,6 +145,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
107
145
|
txProvider;
|
|
108
146
|
blockProposalValidator;
|
|
109
147
|
epochCache;
|
|
148
|
+
timetable;
|
|
110
149
|
config;
|
|
111
150
|
blobClient;
|
|
112
151
|
reexecutionTracker;
|
|
@@ -121,7 +160,9 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
121
160
|
/** Returns current validator addresses for own-proposal detection. Set via register(). */ getOwnValidatorAddresses;
|
|
122
161
|
/** P2P proposal pool access for deciding when retained proposals should block archiver processing. */ p2pClient;
|
|
123
162
|
checkpointProposalValidationFailureCallback;
|
|
124
|
-
|
|
163
|
+
/** Slots at which a slashable invalid block or checkpoint proposal was observed. */ slotsWithInvalidProposals;
|
|
164
|
+
/** Slots at which a proposal equivocation was observed; suppresses attested-to-invalid-proposal slashing. */ slotsWithProposalEquivocation;
|
|
165
|
+
constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, timetable, config, blobClient, reexecutionTracker, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:proposal-handler')){
|
|
125
166
|
this.checkpointsBuilder = checkpointsBuilder;
|
|
126
167
|
this.worldState = worldState;
|
|
127
168
|
this.blockSource = blockSource;
|
|
@@ -129,12 +170,15 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
129
170
|
this.txProvider = txProvider;
|
|
130
171
|
this.blockProposalValidator = blockProposalValidator;
|
|
131
172
|
this.epochCache = epochCache;
|
|
173
|
+
this.timetable = timetable;
|
|
132
174
|
this.config = config;
|
|
133
175
|
this.blobClient = blobClient;
|
|
134
176
|
this.reexecutionTracker = reexecutionTracker;
|
|
135
177
|
this.metrics = metrics;
|
|
136
178
|
this.dateProvider = dateProvider;
|
|
137
179
|
this.log = log;
|
|
180
|
+
this.slotsWithInvalidProposals = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
|
|
181
|
+
this.slotsWithProposalEquivocation = FifoSet.withLimit(MAX_TRACKED_INVALID_PROPOSAL_SLOTS);
|
|
138
182
|
if (config.fishermanMode) {
|
|
139
183
|
this.log = this.log.createChild('[FISHERMAN]');
|
|
140
184
|
}
|
|
@@ -162,6 +206,18 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
162
206
|
*/ recordOwnCheckpointProposalAsValid(slot, archive, checkpointNumber) {
|
|
163
207
|
this.reexecutionTracker.recordOutcome(slot, archive, 'valid', checkpointNumber);
|
|
164
208
|
}
|
|
209
|
+
/** Whether a slashable invalid block or checkpoint proposal was observed at the given slot (InvalidProposalSlotSource). */ hasInvalidProposals(slotNumber) {
|
|
210
|
+
return this.slotsWithInvalidProposals.has(slotNumber);
|
|
211
|
+
}
|
|
212
|
+
/** Whether a proposal equivocation was observed at the given slot (InvalidProposalSlotSource). */ hasProposalEquivocation(slotNumber) {
|
|
213
|
+
return this.slotsWithProposalEquivocation.has(slotNumber);
|
|
214
|
+
}
|
|
215
|
+
/** Records a slot as having a slashable invalid proposal, for offense observers (sentinel/slasher watchers). */ markInvalidProposalSlot(slotNumber) {
|
|
216
|
+
this.slotsWithInvalidProposals.add(slotNumber);
|
|
217
|
+
}
|
|
218
|
+
/** Records a slot as having a proposal equivocation, which suppresses attested-to-invalid-proposal slashing. */ markProposalEquivocation(slotNumber) {
|
|
219
|
+
this.slotsWithProposalEquivocation.add(slotNumber);
|
|
220
|
+
}
|
|
165
221
|
/**
|
|
166
222
|
* Registers handlers for block and checkpoint proposals on the p2p client.
|
|
167
223
|
* Records the p2p client so validation can inspect retained proposals.
|
|
@@ -190,6 +246,15 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
190
246
|
});
|
|
191
247
|
return true;
|
|
192
248
|
} else {
|
|
249
|
+
// Track invalid proposals / equivocations so offense observers (the attested-invalid-proposal
|
|
250
|
+
// watcher) work on non-validator nodes too. Validators populate these via their own handlers.
|
|
251
|
+
// Skip invalid-proposal marking while the escape hatch is open, matching the validator path,
|
|
252
|
+
// which intentionally disables invalid-block slashing then.
|
|
253
|
+
if (result.reason === 'checkpoint_proposal_equivocation') {
|
|
254
|
+
this.markProposalEquivocation(slotNumber);
|
|
255
|
+
} else if (SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(result.reason) && !await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber)) {
|
|
256
|
+
this.markInvalidProposalSlot(slotNumber);
|
|
257
|
+
}
|
|
193
258
|
this.log.warn(`Non-validator block proposal ${blockNumber} at slot ${slotNumber} failed processing with ${result.reason}`, {
|
|
194
259
|
blockNumber: result.blockNumber,
|
|
195
260
|
slotNumber,
|
|
@@ -203,6 +268,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
203
268
|
}
|
|
204
269
|
};
|
|
205
270
|
p2pClient.registerBlockProposalHandler(blockHandler);
|
|
271
|
+
// p2p detects duplicate (equivocated) proposals without routing them through the handlers above, so mark
|
|
272
|
+
// the slot as equivocated here. This suppresses false-positive attested-to-invalid-proposal slashing on
|
|
273
|
+
// non-validator offense collectors. Validators overwrite this with their own richer handler.
|
|
274
|
+
p2pClient.registerDuplicateProposalCallback((info)=>this.markProposalEquivocation(info.slot));
|
|
206
275
|
// All-nodes checkpoint proposal handler: validates, caches, and sets proposed checkpoint for pipelining.
|
|
207
276
|
// Runs for all nodes (validators and non-validators). Validators get the cached result in the
|
|
208
277
|
// validator-specific callback (attestToCheckpointProposal) which runs after this one.
|
|
@@ -222,23 +291,35 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
222
291
|
this.log.warn(`Escape hatch open for slot ${proposal.slotNumber}, skipping checkpoint proposal validation`, proposalInfo);
|
|
223
292
|
return undefined;
|
|
224
293
|
}
|
|
225
|
-
//
|
|
226
|
-
//
|
|
227
|
-
//
|
|
228
|
-
//
|
|
229
|
-
//
|
|
294
|
+
// A proposal is "own" when it was signed by a validator key this node also owns. The true local
|
|
295
|
+
// proposer already built, validated, and stored this checkpoint before broadcasting, so a matching
|
|
296
|
+
// proposed checkpoint is already in its archiver — skip the redundant re-validation. An HA peer that
|
|
297
|
+
// shares the proposer's keys sees the same "own" proposal over gossip but never built it, so it has
|
|
298
|
+
// nothing stored; it falls through to the normal validate-and-persist path below to hydrate the
|
|
299
|
+
// proposed-checkpoint metadata it needs to build the next slot on top of this checkpoint.
|
|
230
300
|
const proposer = proposal.getSender();
|
|
231
301
|
const ownAddresses = this.getOwnValidatorAddresses?.();
|
|
232
302
|
const isOwnProposal = proposer && ownAddresses?.some((addr)=>addr === proposer.toString());
|
|
233
303
|
if (isOwnProposal) {
|
|
234
|
-
|
|
235
|
-
|
|
304
|
+
const existing = await this.archiver?.getProposedCheckpointData({
|
|
305
|
+
slot: proposal.slotNumber
|
|
306
|
+
});
|
|
307
|
+
if (existing?.archive.root.equals(proposal.archive)) {
|
|
308
|
+
this.log.debug(`Skipping sync for existing own checkpoint proposal at slot ${proposal.slotNumber}`);
|
|
309
|
+
return undefined;
|
|
310
|
+
}
|
|
236
311
|
}
|
|
237
312
|
const result = await this.handleCheckpointProposal(proposal, proposalInfo);
|
|
238
313
|
if (!result.isValid) {
|
|
314
|
+
// Track invalid checkpoint proposals so offense observers (the attested-invalid-proposal watcher)
|
|
315
|
+
// work on non-validator nodes too. This handler runs for all nodes; validators also mark via the
|
|
316
|
+
// failure callback below (idempotent).
|
|
317
|
+
if (SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT[result.reason]) {
|
|
318
|
+
this.markInvalidProposalSlot(proposal.slotNumber);
|
|
319
|
+
}
|
|
239
320
|
await this.checkpointProposalValidationFailureCallback?.(proposal, result, proposalInfo);
|
|
240
321
|
} else if (this.archiver) {
|
|
241
|
-
const set = await this.
|
|
322
|
+
const set = await this.setProposedCheckpoint(proposal);
|
|
242
323
|
if (set) {
|
|
243
324
|
this.metrics?.recordCheckpointProposalToPipelinedStateDuration(pipeliningTimer.ms());
|
|
244
325
|
}
|
|
@@ -256,7 +337,6 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
256
337
|
async handleBlockProposal(proposal, proposalSender, shouldReexecute) {
|
|
257
338
|
const slotNumber = proposal.slotNumber;
|
|
258
339
|
const proposer = proposal.getSender();
|
|
259
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
260
340
|
// Reject proposals with invalid signatures
|
|
261
341
|
if (!proposer) {
|
|
262
342
|
this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
|
|
@@ -327,10 +407,12 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
327
407
|
// Compute the block number based on the parent block
|
|
328
408
|
const blockNumber = parentBlock === 'genesis' ? BlockNumber(INITIAL_L2_BLOCK_NUM) : BlockNumber(parentBlock.header.getBlockNumber() + 1);
|
|
329
409
|
proposalInfo.blockNumber = blockNumber;
|
|
330
|
-
// Check that this block number does not exist already
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
410
|
+
// Check that this block number does not exist already. During a reorg the archiver can still hold a
|
|
411
|
+
// stale block at this number (a different archive, about to be pruned) while the proposal carries the
|
|
412
|
+
// rebuilt replacement; resolveExistingBlockAtNumber waits for the local prune in that case so the
|
|
413
|
+
// rebuilt block is processed in time to attest, rather than being permanently dropped on a bare
|
|
414
|
+
// number collision.
|
|
415
|
+
const existingBlock = await this.resolveExistingBlockAtNumber(blockNumber, proposal.archive, slotNumber);
|
|
334
416
|
if (existingBlock) {
|
|
335
417
|
this.log.warn(`Block number ${blockNumber} already exists, skipping processing`, proposalInfo);
|
|
336
418
|
return {
|
|
@@ -343,7 +425,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
343
425
|
// and we do it even if we don't plan to re-execute the txs, so that we have them if another node needs them.
|
|
344
426
|
const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
|
|
345
427
|
pinnedPeer: proposalSender,
|
|
346
|
-
deadline: this.getReexecutionDeadline(slotNumber
|
|
428
|
+
deadline: this.getReexecutionDeadline(slotNumber)
|
|
347
429
|
});
|
|
348
430
|
// Record the tx-collection outcome on the re-execution tracker
|
|
349
431
|
this.reexecutionTracker.recordTxsCollected(slotNumber, proposal.indexWithinCheckpoint, missingTxs.length === 0);
|
|
@@ -422,7 +504,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
422
504
|
};
|
|
423
505
|
}
|
|
424
506
|
// If we succeeded, push this block into the archiver (unless disabled)
|
|
425
|
-
if (reexecutionResult?.block && this.config.skipPushProposedBlocksToArchiver
|
|
507
|
+
if (reexecutionResult?.block && !this.config.skipPushProposedBlocksToArchiver) {
|
|
426
508
|
await this.blockSource.addBlock(reexecutionResult.block);
|
|
427
509
|
}
|
|
428
510
|
this.log.info(`Successfully re-executed block ${blockNumber} proposal at index ${proposal.indexWithinCheckpoint} on slot ${slotNumber}`, {
|
|
@@ -464,20 +546,21 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
464
546
|
}
|
|
465
547
|
async getParentBlock(proposal) {
|
|
466
548
|
const parentArchive = proposal.blockHeader.lastArchive.root;
|
|
467
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
468
549
|
const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
|
|
469
550
|
if (parentArchive.equals(genesisArchiveRoot)) {
|
|
470
551
|
return 'genesis';
|
|
471
552
|
}
|
|
472
|
-
const deadline = this.getReexecutionDeadline(proposal.slotNumber
|
|
473
|
-
const
|
|
474
|
-
const timeoutDurationMs = deadline.getTime() - currentTime;
|
|
553
|
+
const deadline = this.getReexecutionDeadline(proposal.slotNumber);
|
|
554
|
+
const timeoutDurationMs = deadline.getTime() - this.dateProvider.now();
|
|
475
555
|
try {
|
|
476
556
|
return await this.blockSource.getBlockData({
|
|
477
557
|
archive: parentArchive
|
|
478
558
|
}) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockData({
|
|
479
559
|
archive: parentArchive
|
|
480
|
-
})), 'force archiver sync',
|
|
560
|
+
})), 'force archiver sync', {
|
|
561
|
+
deadline,
|
|
562
|
+
dateProvider: this.dateProvider
|
|
563
|
+
}, 0.5));
|
|
481
564
|
} catch (err) {
|
|
482
565
|
if (err instanceof TimeoutError) {
|
|
483
566
|
this.log.debug(`Timed out getting parent block by archive root`, {
|
|
@@ -491,6 +574,60 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
491
574
|
return undefined;
|
|
492
575
|
}
|
|
493
576
|
}
|
|
577
|
+
/**
|
|
578
|
+
* Resolves whether a block genuinely already exists at `blockNumber`. Returns the existing block only if
|
|
579
|
+
* it is a true duplicate of the proposal (matching archive). During a reorg the archiver can still hold a
|
|
580
|
+
* stale fork at this number (different archive) that is about to be pruned; in that case this forces L1
|
|
581
|
+
* sync and waits, bounded by the re-execution deadline, for the prune to land, then returns `undefined` so
|
|
582
|
+
* the rebuilt block proposal can be processed in time to attest. If the prune does not complete before the
|
|
583
|
+
* deadline it returns the stale block, so the caller falls back to the safe `block_number_already_exists`
|
|
584
|
+
* rejection.
|
|
585
|
+
*/ async resolveExistingBlockAtNumber(blockNumber, proposalArchive, slotNumber) {
|
|
586
|
+
const existingBlock = await this.blockSource.getBlockData({
|
|
587
|
+
number: blockNumber
|
|
588
|
+
});
|
|
589
|
+
if (!existingBlock || existingBlock.archive.root.equals(proposalArchive)) {
|
|
590
|
+
return existingBlock;
|
|
591
|
+
}
|
|
592
|
+
// A different block already occupies this number: it may be a stale fork being pruned during a reorg, not a
|
|
593
|
+
// genuine duplicate. Wait for the local prune rather than permanently rejecting the proposal.
|
|
594
|
+
const deadline = this.getReexecutionDeadline(slotNumber);
|
|
595
|
+
if (deadline.getTime() - this.dateProvider.now() <= 0) {
|
|
596
|
+
return existingBlock;
|
|
597
|
+
}
|
|
598
|
+
this.log.warn(`Block number ${blockNumber} already exists, awaiting potential prune`, {
|
|
599
|
+
blockNumber,
|
|
600
|
+
existingArchive: existingBlock.archive.root.toString(),
|
|
601
|
+
proposalArchive: proposalArchive.toString()
|
|
602
|
+
});
|
|
603
|
+
try {
|
|
604
|
+
const { block } = await retryUntil(async ()=>{
|
|
605
|
+
await this.blockSource.syncImmediate();
|
|
606
|
+
const block = await this.blockSource.getBlockData({
|
|
607
|
+
number: blockNumber
|
|
608
|
+
});
|
|
609
|
+
// Resolve once the existing block is gone (pruned) or has been replaced by one matching the
|
|
610
|
+
// proposal — the same condition as the early return above. A matching block is returned so the
|
|
611
|
+
// caller still treats it as a genuine duplicate; an `undefined` (pruned) block lets the proposal
|
|
612
|
+
// be processed. Wrap in an object so the `undefined` case is still a truthy retry result.
|
|
613
|
+
return block === undefined || block.archive.root.equals(proposalArchive) ? {
|
|
614
|
+
block
|
|
615
|
+
} : undefined;
|
|
616
|
+
}, `prune of stale block ${blockNumber}`, {
|
|
617
|
+
deadline,
|
|
618
|
+
dateProvider: this.dateProvider
|
|
619
|
+
}, 0.5);
|
|
620
|
+
return block;
|
|
621
|
+
} catch (err) {
|
|
622
|
+
if (err instanceof TimeoutError) {
|
|
623
|
+
this.log.warn(`Timed out waiting for stale block ${blockNumber} to be pruned`, {
|
|
624
|
+
blockNumber
|
|
625
|
+
});
|
|
626
|
+
return existingBlock;
|
|
627
|
+
}
|
|
628
|
+
throw err;
|
|
629
|
+
}
|
|
630
|
+
}
|
|
494
631
|
computeCheckpointNumber(proposal, parentBlock, proposalInfo) {
|
|
495
632
|
if (parentBlock === 'genesis') {
|
|
496
633
|
// First block is in checkpoint 1
|
|
@@ -619,12 +756,13 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
619
756
|
}
|
|
620
757
|
return undefined;
|
|
621
758
|
}
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
759
|
+
/**
|
|
760
|
+
* Hard re-execution/validation deadline for any block or checkpoint proposal targeting `slotNumber`:
|
|
761
|
+
* the single consensus `attestation_deadline` (`target_slot_start + S - 2E`). This is the latest the
|
|
762
|
+
* checkpoint can land on L1 in the target slot; all nodes agree on it. Loosened from the previous
|
|
763
|
+
* next-wall-clock-slot-boundary bound (see the timetable spec / refactor notes).
|
|
764
|
+
*/ getReexecutionDeadline(slotNumber) {
|
|
765
|
+
return new Date(this.timetable.getAttestationDeadline(slotNumber) * 1000);
|
|
628
766
|
}
|
|
629
767
|
getReexecuteFailureReason(err) {
|
|
630
768
|
if (err instanceof TransactionsNotAvailableError) {
|
|
@@ -684,7 +822,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
684
822
|
// Create checkpoint builder with prior blocks
|
|
685
823
|
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, 0n, l1ToL2Messages, previousCheckpointOutHashes, fork, priorBlocks, this.log.getBindings());
|
|
686
824
|
// Build the new block
|
|
687
|
-
const deadline = this.getReexecutionDeadline(slot
|
|
825
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
688
826
|
const maxBlockGas = this.config.validateMaxL2BlockGas !== undefined || this.config.validateMaxDABlockGas !== undefined ? new Gas(this.config.validateMaxDABlockGas ?? Infinity, this.config.validateMaxL2BlockGas ?? Infinity) : undefined;
|
|
689
827
|
const result = await checkpointBuilder.buildBlock(txs, blockNumber, blockHeader.globalVariables.timestamp, {
|
|
690
828
|
isBuildingProposal: false,
|
|
@@ -807,16 +945,14 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
807
945
|
};
|
|
808
946
|
try {
|
|
809
947
|
const slot = proposal.slotNumber;
|
|
810
|
-
// Block-sync deadline = the
|
|
811
|
-
// this checkpoint and still have it land on L1 in
|
|
812
|
-
//
|
|
813
|
-
//
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
const timeoutSeconds = Math.max(1, Math.floor((deadline.getTime() - this.dateProvider.now()) / 1000));
|
|
819
|
-
// Wait for last block to sync by archive
|
|
948
|
+
// Block-sync/validation deadline = the single consensus attestation_deadline (target_slot_start + S
|
|
949
|
+
// - 2E): the latest moment the proposer can submit this checkpoint and still have it land on L1 in
|
|
950
|
+
// the target slot. Keeping validation/attestation alive until then lets validators keep attesting
|
|
951
|
+
// right up to the proposer's real publish cutoff.
|
|
952
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
953
|
+
// Wait for last block to sync by archive. The deadline is passed to retryUntil as an absolute date so
|
|
954
|
+
// the remaining budget is derived from the date provider; a deadline already in the past times out
|
|
955
|
+
// after a single attempt instead of looping (the immediate-timeout semantics of the deadline overload).
|
|
820
956
|
let lastBlockData;
|
|
821
957
|
try {
|
|
822
958
|
lastBlockData = await retryUntil(async ()=>{
|
|
@@ -824,7 +960,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
824
960
|
return await this.blockSource.getBlockData({
|
|
825
961
|
archive: proposal.archive
|
|
826
962
|
});
|
|
827
|
-
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
|
|
963
|
+
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, {
|
|
964
|
+
deadline,
|
|
965
|
+
dateProvider: this.dateProvider
|
|
966
|
+
}, 0.5);
|
|
828
967
|
} catch (err) {
|
|
829
968
|
if (err instanceof TimeoutError) {
|
|
830
969
|
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
@@ -880,6 +1019,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
880
1019
|
checkpointNumber: lastBlockData.checkpointNumber
|
|
881
1020
|
};
|
|
882
1021
|
}
|
|
1022
|
+
// Note this condition should never trigger, since we dont process block proposals that exceed indexWithinCheckpoint
|
|
883
1023
|
const maxBlocksPerCheckpoint = this.config.maxBlocksPerCheckpoint;
|
|
884
1024
|
if (maxBlocksPerCheckpoint !== undefined && blocks.length > maxBlocksPerCheckpoint) {
|
|
885
1025
|
this.log.warn(`Checkpoint proposal exceeds maxBlocksPerCheckpoint`, {
|
|
@@ -914,9 +1054,50 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
914
1054
|
pipeliningEnabled: true,
|
|
915
1055
|
log: this.log
|
|
916
1056
|
});
|
|
917
|
-
// Fork world state at the block before the first block
|
|
1057
|
+
// Fork world state at the block before the first block. getFork syncs world state to the parent block
|
|
1058
|
+
// first (see its doc): the block source (archiver) can already hold the block while world state still
|
|
1059
|
+
// trails it by one, and forking a not-yet-applied block throws a raw tree error that would otherwise
|
|
1060
|
+
// escape as an uncaught gossipsub error. We pass the parent's expected block hash so the sync detects a
|
|
1061
|
+
// world-state reorg (undefined for the genesis parent, where no block exists to pin). On failure we map
|
|
1062
|
+
// to a clean validation result rather than letting it escape.
|
|
918
1063
|
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
919
|
-
|
|
1064
|
+
let forkResult;
|
|
1065
|
+
try {
|
|
1066
|
+
const parentBlockHash = (await this.blockSource.getBlockData({
|
|
1067
|
+
number: parentBlockNumber
|
|
1068
|
+
}))?.blockHash;
|
|
1069
|
+
forkResult = await this.checkpointsBuilder.getFork(parentBlockNumber, parentBlockHash);
|
|
1070
|
+
} catch (err) {
|
|
1071
|
+
this.log.warn(`Failed to fork world state at block ${parentBlockNumber} for checkpoint proposal`, {
|
|
1072
|
+
...proposalInfo,
|
|
1073
|
+
parentBlockNumber,
|
|
1074
|
+
err
|
|
1075
|
+
});
|
|
1076
|
+
return {
|
|
1077
|
+
isValid: false,
|
|
1078
|
+
reason: 'world_state_not_synced',
|
|
1079
|
+
checkpointNumber
|
|
1080
|
+
};
|
|
1081
|
+
}
|
|
1082
|
+
const fork = _ts_add_disposable_resource(env, forkResult, true);
|
|
1083
|
+
// Verify the fork's archive root matches the checkpoint's expected starting archive (the archive after
|
|
1084
|
+
// the parent block). A mismatch means world state forked from a different chain than the proposal was
|
|
1085
|
+
// built on (e.g. a reorg), so recomputing the checkpoint against it would be meaningless. This mirrors
|
|
1086
|
+
// the block-proposal re-execution check and fails fast with a clean, non-slashable result instead of a
|
|
1087
|
+
// confusing downstream mismatch.
|
|
1088
|
+
const forkArchiveRoot = new Fr((await fork.getTreeInfo(MerkleTreeId.ARCHIVE)).root);
|
|
1089
|
+
if (!forkArchiveRoot.equals(proposal.checkpointHeader.lastArchiveRoot)) {
|
|
1090
|
+
this.log.warn(`Fork archive root does not match checkpoint proposal's last archive`, {
|
|
1091
|
+
...proposalInfo,
|
|
1092
|
+
forkArchiveRoot: forkArchiveRoot.toString(),
|
|
1093
|
+
expectedLastArchiveRoot: proposal.checkpointHeader.lastArchiveRoot.toString()
|
|
1094
|
+
});
|
|
1095
|
+
return {
|
|
1096
|
+
isValid: false,
|
|
1097
|
+
reason: 'initial_archive_mismatch',
|
|
1098
|
+
checkpointNumber
|
|
1099
|
+
};
|
|
1100
|
+
}
|
|
920
1101
|
// Create checkpoint builder with all existing blocks
|
|
921
1102
|
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
|
|
922
1103
|
// Complete the checkpoint to get computed values
|
|
@@ -1043,10 +1224,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
1043
1224
|
}
|
|
1044
1225
|
}
|
|
1045
1226
|
/**
|
|
1046
|
-
* Derives proposed checkpoint data from validated blocks and sets it on the archiver
|
|
1047
|
-
*
|
|
1048
|
-
*
|
|
1049
|
-
*/ async
|
|
1227
|
+
* Derives proposed checkpoint data from validated blocks and sets it on the archiver, so this node can
|
|
1228
|
+
* pipeline building on top of the checkpoint. Does not retry, since validation already waited for the
|
|
1229
|
+
* last block to sync.
|
|
1230
|
+
*/ async setProposedCheckpoint(proposal) {
|
|
1050
1231
|
if (!this.archiver) {
|
|
1051
1232
|
return false;
|
|
1052
1233
|
}
|
package/dest/validator.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { EpochCache } from '@aztec/epoch-cache';
|
|
|
3
3
|
import { CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
|
-
import
|
|
6
|
+
import { Signature } from '@aztec/foundation/eth-signature';
|
|
7
7
|
import { type LogData, type Logger } from '@aztec/foundation/log';
|
|
8
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
9
|
import type { KeystoreManager } from '@aztec/node-keystore';
|
|
@@ -14,7 +14,7 @@ import type { CommitteeAttestationsAndSigners, L2BlockSink, L2BlockSource } from
|
|
|
14
14
|
import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
|
|
15
15
|
import type { ITxProvider, Validator, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
16
16
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
17
|
-
import { type BlockProposal, type BlockProposalOptions,
|
|
17
|
+
import { type BlockProposal, type BlockProposalOptions, CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore, type CheckpointProposalOptions } from '@aztec/stdlib/p2p';
|
|
18
18
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
19
19
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
20
20
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
@@ -55,10 +55,9 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
55
55
|
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */
|
|
56
56
|
private lastAttestedEpochByAttester;
|
|
57
57
|
private proposersOfInvalidBlocks;
|
|
58
|
-
private slotsWithInvalidProposals;
|
|
59
58
|
private invalidCheckpointProposalOffenseKeys;
|
|
59
|
+
private oversizedProposalOffenseKeys;
|
|
60
60
|
private badAttestationOffenseKeys;
|
|
61
|
-
private slotsWithProposalEquivocation;
|
|
62
61
|
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */
|
|
63
62
|
private lastAttestedProposal?;
|
|
64
63
|
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, proposalHandler: ProposalHandler, blockSource: L2BlockSource, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, l1ToL2MessageSource: L1ToL2MessageSource, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, slashingProtectionSigner: ValidatorHASigner, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: Logger);
|
|
@@ -109,6 +108,13 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
109
108
|
private markInvalidProposalSlot;
|
|
110
109
|
private handleCheckpointAttestation;
|
|
111
110
|
private slashAttestedToInvalidCheckpointProposal;
|
|
111
|
+
/**
|
|
112
|
+
* Handle detection of an oversized block proposal: one whose index within its checkpoint lands at or
|
|
113
|
+
* beyond the consensus per-checkpoint block limit. A single signed proposal at an illegal index is
|
|
114
|
+
* self-contained evidence, so emit an invalid-block-proposal slash event for the proposer, deduped per
|
|
115
|
+
* (proposer, slot) since the p2p layer reports every oversized proposal it stores.
|
|
116
|
+
*/
|
|
117
|
+
private handleOversizedProposal;
|
|
112
118
|
/**
|
|
113
119
|
* Handle detection of a duplicate proposal (equivocation).
|
|
114
120
|
* Emits a slash event when a proposer sends multiple proposals for the same position.
|
|
@@ -128,4 +134,4 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
128
134
|
private handleAuthRequest;
|
|
129
135
|
}
|
|
130
136
|
export {};
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLGdCQUFnQixFQUFlLHFCQUFxQixFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25ILE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFNUQsT0FBTyxFQUFFLEtBQUssT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2hGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBMEUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0SCxPQUFPLEVBSUwsS0FBSyxPQUFPLEVBQ1osS0FBSyxjQUFjLEVBRXBCLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsK0JBQStCLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3ZHLE9BQU8sS0FBSyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0UsT0FBTyxLQUFLLEVBQ1YsV0FBVyxFQUNYLFNBQVMsRUFDVCx5QkFBeUIs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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;AAErE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAe,qBAAqB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACnH,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|