@aztec/validator-client 0.0.1-commit.d431d1c → 0.0.1-commit.d58ff9d0

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.
Files changed (58) hide show
  1. package/README.md +64 -19
  2. package/dest/checkpoint_builder.d.ts +29 -15
  3. package/dest/checkpoint_builder.d.ts.map +1 -1
  4. package/dest/checkpoint_builder.js +144 -45
  5. package/dest/config.d.ts +9 -3
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +49 -13
  8. package/dest/duties/validation_service.d.ts +12 -13
  9. package/dest/duties/validation_service.d.ts.map +1 -1
  10. package/dest/duties/validation_service.js +33 -45
  11. package/dest/factory.d.ts +10 -4
  12. package/dest/factory.d.ts.map +1 -1
  13. package/dest/factory.js +19 -6
  14. package/dest/index.d.ts +2 -3
  15. package/dest/index.d.ts.map +1 -1
  16. package/dest/index.js +1 -2
  17. package/dest/key_store/ha_key_store.d.ts +1 -1
  18. package/dest/key_store/ha_key_store.d.ts.map +1 -1
  19. package/dest/key_store/ha_key_store.js +3 -3
  20. package/dest/key_store/web3signer_key_store.d.ts +10 -2
  21. package/dest/key_store/web3signer_key_store.d.ts.map +1 -1
  22. package/dest/key_store/web3signer_key_store.js +32 -41
  23. package/dest/metrics.d.ts +16 -3
  24. package/dest/metrics.d.ts.map +1 -1
  25. package/dest/metrics.js +58 -5
  26. package/dest/proposal_handler.d.ts +165 -0
  27. package/dest/proposal_handler.d.ts.map +1 -0
  28. package/dest/proposal_handler.js +1207 -0
  29. package/dest/validator.d.ts +65 -25
  30. package/dest/validator.d.ts.map +1 -1
  31. package/dest/validator.js +377 -240
  32. package/package.json +19 -17
  33. package/src/checkpoint_builder.ts +196 -54
  34. package/src/config.ts +57 -15
  35. package/src/duties/validation_service.ts +59 -54
  36. package/src/factory.ts +29 -4
  37. package/src/index.ts +1 -2
  38. package/src/key_store/ha_key_store.ts +3 -3
  39. package/src/key_store/web3signer_key_store.ts +43 -59
  40. package/src/metrics.ts +81 -6
  41. package/src/proposal_handler.ts +1314 -0
  42. package/src/validator.ts +512 -291
  43. package/dest/block_proposal_handler.d.ts +0 -65
  44. package/dest/block_proposal_handler.d.ts.map +0 -1
  45. package/dest/block_proposal_handler.js +0 -561
  46. package/dest/tx_validator/index.d.ts +0 -3
  47. package/dest/tx_validator/index.d.ts.map +0 -1
  48. package/dest/tx_validator/index.js +0 -2
  49. package/dest/tx_validator/nullifier_cache.d.ts +0 -14
  50. package/dest/tx_validator/nullifier_cache.d.ts.map +0 -1
  51. package/dest/tx_validator/nullifier_cache.js +0 -24
  52. package/dest/tx_validator/tx_validator_factory.d.ts +0 -18
  53. package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
  54. package/dest/tx_validator/tx_validator_factory.js +0 -54
  55. package/src/block_proposal_handler.ts +0 -576
  56. package/src/tx_validator/index.ts +0 -2
  57. package/src/tx_validator/nullifier_cache.ts +0 -30
  58. package/src/tx_validator/tx_validator_factory.ts +0 -135
package/dest/validator.js CHANGED
@@ -1,45 +1,44 @@
1
1
  import { getBlobsPerL1Block } from '@aztec/blob-lib';
2
- import { BlockNumber } from '@aztec/foundation/branded-types';
3
- import { TimeoutError } from '@aztec/foundation/error';
2
+ import { CheckpointNumber } from '@aztec/foundation/branded-types';
3
+ import { FifoSet } from '@aztec/foundation/fifo-set';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
- import { retryUntil } from '@aztec/foundation/retry';
6
5
  import { RunningPromise } from '@aztec/foundation/running-promise';
7
6
  import { sleep } from '@aztec/foundation/sleep';
8
7
  import { DateProvider } from '@aztec/foundation/timer';
9
8
  import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
10
- import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
9
+ import { OffenseType, WANT_TO_CLEAR_SLASH_EVENT, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec/slasher';
11
10
  import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
11
+ import { ConsensusTimetable } from '@aztec/stdlib/timetable';
12
12
  import { AttestationTimeoutError } from '@aztec/stdlib/validators';
13
13
  import { getTelemetryClient } from '@aztec/telemetry-client';
14
- import { createHASigner } from '@aztec/validator-ha-signer/factory';
14
+ import { createHASigner, createLocalSignerWithProtection, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
15
15
  import { DutyType } from '@aztec/validator-ha-signer/types';
16
16
  import { EventEmitter } from 'events';
17
- import { BlockProposalHandler } from './block_proposal_handler.js';
17
+ import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
18
18
  import { ValidationService } from './duties/validation_service.js';
19
19
  import { HAKeyStore } from './key_store/ha_key_store.js';
20
20
  import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
21
21
  import { ValidatorMetrics } from './metrics.js';
22
+ import { ProposalHandler, SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT, SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT } from './proposal_handler.js';
22
23
  // We maintain a set of proposers who have proposed invalid blocks.
23
24
  // Just cap the set to avoid unbounded growth.
24
25
  const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
25
- // What errors from the block proposal handler result in slashing
26
- const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
27
- 'state_mismatch',
28
- 'failed_txs'
29
- ];
26
+ const MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS = 1000;
27
+ const MAX_TRACKED_BAD_ATTESTATIONS = 10_000;
30
28
  /**
31
29
  * Validator Client
32
30
  */ export class ValidatorClient extends EventEmitter {
33
31
  keyStore;
34
32
  epochCache;
35
33
  p2pClient;
36
- blockProposalHandler;
34
+ proposalHandler;
37
35
  blockSource;
38
36
  checkpointsBuilder;
39
37
  worldState;
40
38
  l1ToL2MessageSource;
41
39
  config;
42
40
  blobClient;
41
+ slashingProtectionSigner;
43
42
  dateProvider;
44
43
  tracer;
45
44
  validationService;
@@ -47,22 +46,24 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
47
46
  log;
48
47
  // Whether it has already registered handlers on the p2p client
49
48
  hasRegisteredHandlers;
50
- // Used to check if we are sending the same proposal twice
51
- previousProposal;
49
+ /** Tracks the last block proposal we created, to detect duplicate proposal attempts. */ lastProposedBlock;
50
+ /** Tracks the last checkpoint proposal we created. */ lastProposedCheckpoint;
52
51
  lastEpochForCommitteeUpdateLoop;
53
52
  epochCacheUpdateLoop;
53
+ /** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
54
54
  proposersOfInvalidBlocks;
55
- // TODO(palla/mbps): Remove this once checkpoint validation is stable and we can validate all blocks properly.
56
- // Tracks slots for which we have successfully validated a block proposal, so we can attest to checkpoint proposals for those slots.
57
- // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
58
- validatedBlockSlots;
59
- constructor(keyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
60
- super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set(), this.validatedBlockSlots = new Set();
55
+ invalidCheckpointProposalOffenseKeys;
56
+ oversizedProposalOffenseKeys;
57
+ badAttestationOffenseKeys;
58
+ /** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
59
+ constructor(keyStore, epochCache, p2pClient, proposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, slashingProtectionSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
60
+ super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.slashingProtectionSigner = slashingProtectionSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = FifoSet.withLimit(MAX_PROPOSERS_OF_INVALID_BLOCKS), this.invalidCheckpointProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.oversizedProposalOffenseKeys = FifoSet.withLimit(MAX_TRACKED_INVALID_CHECKPOINT_PROPOSALS), this.badAttestationOffenseKeys = FifoSet.withLimit(MAX_TRACKED_BAD_ATTESTATIONS);
61
61
  // Create child logger with fisherman prefix if in fisherman mode
62
62
  this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
63
63
  this.tracer = telemetry.getTracer('Validator');
64
64
  this.metrics = new ValidatorMetrics(telemetry);
65
- this.validationService = new ValidationService(keyStore, this.log.createChild('validation-service'));
65
+ this.validationService = new ValidationService(keyStore, this.getSignatureContext(), this.log.createChild('validation-service'));
66
+ this.proposalHandler.setCheckpointProposalValidationFailureCallback((proposal, result, proposalInfo)=>this.handleInvalidCheckpointProposal(proposal, result, proposalInfo));
66
67
  // Refresh epoch cache every second to trigger alert if participation in committee changes
67
68
  this.epochCacheUpdateLoop = new RunningPromise(this.handleEpochCommitteeUpdate.bind(this), this.log, 1000);
68
69
  const myAddresses = this.getValidatorAddresses();
@@ -96,6 +97,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
96
97
  this.log.trace(`No committee found for slot`);
97
98
  return;
98
99
  }
100
+ this.metrics.setCurrentEpoch(epoch);
99
101
  if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
100
102
  const me = this.getValidatorAddresses();
101
103
  const committeeSet = new Set(committee.map((v)=>v.toString()));
@@ -111,34 +113,70 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
111
113
  this.log.error(`Error updating epoch committee`, err);
112
114
  }
113
115
  }
114
- static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
116
+ static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, reexecutionTracker, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), slashingProtectionDb) {
115
117
  const metrics = new ValidatorMetrics(telemetry);
116
- const blockProposalValidator = new BlockProposalValidator(epochCache, {
117
- txsPermitted: !config.disableTransactions
118
+ const consensusTimetable = new ConsensusTimetable({
119
+ l1Constants: epochCache.getL1Constants(),
120
+ blockDuration: config.blockDurationMs / 1000
118
121
  });
119
- const blockProposalHandler = new BlockProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, metrics, dateProvider, telemetry);
120
- let validatorKeyStore = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
121
- if (config.haSigningEnabled) {
122
+ const blockProposalValidator = new BlockProposalValidator(epochCache, consensusTimetable, {
123
+ txsPermitted: !config.disableTransactions,
124
+ maxTxsPerBlock: config.validateMaxTxsPerBlock,
125
+ maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
126
+ skipSlotValidation: config.skipProposalSlotValidation,
127
+ signatureContext: {
128
+ chainId: config.l1ChainId,
129
+ rollupAddress: config.rollupAddress
130
+ },
131
+ clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS
132
+ });
133
+ const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, consensusTimetable, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
134
+ const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
135
+ let slashingProtectionSigner;
136
+ if (slashingProtectionDb) {
137
+ // Shared database mode: use a pre-existing database (e.g. for testing HA setups).
138
+ ({ signer: slashingProtectionSigner } = createSignerFromSharedDb(slashingProtectionDb, config, {
139
+ telemetryClient: telemetry,
140
+ dateProvider
141
+ }));
142
+ } else if (config.haSigningEnabled) {
143
+ // Multi-node HA mode: use PostgreSQL-backed distributed locking.
122
144
  // If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
123
145
  const haConfig = {
124
146
  ...config,
125
147
  maxStuckDutiesAgeMs: config.maxStuckDutiesAgeMs ?? epochCache.getL1Constants().slotDuration * 2 * 1000
126
148
  };
127
- const { signer } = await createHASigner(haConfig);
128
- validatorKeyStore = new HAKeyStore(validatorKeyStore, signer);
149
+ ({ signer: slashingProtectionSigner } = await createHASigner(haConfig, {
150
+ telemetryClient: telemetry,
151
+ dateProvider
152
+ }));
153
+ } else {
154
+ // Single-node mode: use LMDB-backed local signing protection.
155
+ // This prevents double-signing if the node crashes and restarts mid-proposal.
156
+ ({ signer: slashingProtectionSigner } = await createLocalSignerWithProtection(config, {
157
+ telemetryClient: telemetry,
158
+ dateProvider
159
+ }));
129
160
  }
130
- const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, dateProvider, telemetry);
161
+ const validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, slashingProtectionSigner);
162
+ const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, proposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, slashingProtectionSigner, dateProvider, telemetry);
131
163
  return validator;
132
164
  }
133
165
  getValidatorAddresses() {
134
166
  return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
135
167
  }
136
- getBlockProposalHandler() {
137
- return this.blockProposalHandler;
168
+ getProposalHandler() {
169
+ return this.proposalHandler;
138
170
  }
139
171
  signWithAddress(addr, msg, context) {
140
172
  return this.keyStore.signTypedDataWithAddress(addr, msg, context);
141
173
  }
174
+ getSignatureContext() {
175
+ return {
176
+ chainId: this.config.l1ChainId,
177
+ rollupAddress: this.config.rollupAddress
178
+ };
179
+ }
142
180
  getCoinbaseForAttestor(attestor) {
143
181
  return this.keyStore.getCoinbaseAddress(attestor);
144
182
  }
@@ -148,11 +186,23 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
148
186
  getConfig() {
149
187
  return this.config;
150
188
  }
189
+ hasProposalEquivocation(slotNumber) {
190
+ return this.proposalHandler.hasProposalEquivocation(slotNumber);
191
+ }
192
+ hasInvalidProposals(slotNumber) {
193
+ return this.proposalHandler.hasInvalidProposals(slotNumber);
194
+ }
151
195
  updateConfig(config) {
152
196
  this.config = {
153
197
  ...this.config,
154
198
  ...config
155
199
  };
200
+ this.proposalHandler.updateConfig(config);
201
+ }
202
+ reloadKeystore(newManager) {
203
+ const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
204
+ this.keyStore = new HAKeyStore(newAdapter, this.slashingProtectionSigner);
205
+ this.validationService = new ValidationService(this.keyStore, this.getSignatureContext(), this.log.createChild('validation-service'));
156
206
  }
157
207
  async start() {
158
208
  if (this.epochCacheUpdateLoop.isRunning()) {
@@ -185,7 +235,22 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
185
235
  // The checkpoint is received as CheckpointProposalCore since the lastBlock is extracted
186
236
  // and processed separately via the block handler above.
187
237
  const checkpointHandler = (checkpoint, proposalSender)=>this.attestToCheckpointProposal(checkpoint, proposalSender);
188
- this.p2pClient.registerCheckpointProposalHandler(checkpointHandler);
238
+ this.p2pClient.registerValidatorCheckpointProposalHandler(checkpointHandler);
239
+ // Duplicate proposal handler - triggers slashing for equivocation
240
+ this.p2pClient.registerDuplicateProposalCallback((info)=>{
241
+ this.handleDuplicateProposal(info);
242
+ });
243
+ // Oversized proposal handler - triggers slashing for proposals beyond the per-checkpoint block limit
244
+ this.p2pClient.registerOversizedProposalCallback((info)=>{
245
+ this.handleOversizedProposal(info);
246
+ });
247
+ // Duplicate attestation handler - triggers slashing for attestation equivocation
248
+ this.p2pClient.registerDuplicateAttestationCallback((info)=>{
249
+ this.handleDuplicateAttestation(info);
250
+ });
251
+ this.p2pClient.registerCheckpointAttestationCallback((attestation)=>{
252
+ this.handleCheckpointAttestation(attestation);
253
+ });
189
254
  const myAddresses = this.getValidatorAddresses();
190
255
  this.p2pClient.registerThisValidatorAddresses(myAddresses);
191
256
  await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
@@ -206,6 +271,13 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
206
271
  this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
207
272
  return false;
208
273
  }
274
+ // Log self-proposals from HA peers (same validator key on different nodes)
275
+ if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
276
+ this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
277
+ proposer: proposer.toString(),
278
+ slotNumber
279
+ });
280
+ }
209
281
  // Check if we're in the committee (for metrics purposes)
210
282
  const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
211
283
  const partOfCommittee = inCommittee.length > 0;
@@ -218,14 +290,11 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
218
290
  txHashes: proposal.txHashes.map((t)=>t.toString()),
219
291
  fishermanMode: this.config.fishermanMode || false
220
292
  });
221
- // Reexecute txs if we are part of the committee, or if slashing is enabled, or if we are configured to always reexecute.
222
- // In fisherman mode, we always reexecute to validate proposals.
223
- const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
224
- const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
225
- const validationResult = await this.blockProposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
293
+ // Reexecute outside the escape hatch so slashing observers can detect invalid proposals even when penalties are 0.
294
+ const validationResult = await this.proposalHandler.handleBlockProposal(proposal, proposalSender, !escapeHatchOpen);
226
295
  if (!validationResult.isValid) {
227
- this.log.warn(`Block proposal validation failed: ${validationResult.reason}`, proposalInfo);
228
296
  const reason = validationResult.reason || 'unknown';
297
+ this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
229
298
  // Classify failure reason: bad proposal vs node issue
230
299
  const badProposalReasons = [
231
300
  'invalid_proposal',
@@ -240,10 +309,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
240
309
  // Node issues so we can't validate
241
310
  this.metrics.incFailedAttestationsNodeIssue(1, reason, partOfCommittee);
242
311
  }
243
- // Slash invalid block proposals (can happen even when not in committee)
244
- if (!escapeHatchOpen && validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) && slashBroadcastedInvalidBlockPenalty > 0n) {
245
- this.log.warn(`Slashing proposer for invalid block proposal`, proposalInfo);
312
+ if (!escapeHatchOpen && validationResult.reason && SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason)) {
313
+ this.log.info(`Detected invalid block proposal offense`, {
314
+ ...proposalInfo,
315
+ amount: this.config.slashBroadcastedInvalidBlockPenalty,
316
+ offenseType: getOffenseTypeName(OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL)
317
+ });
246
318
  this.slashInvalidBlock(proposal);
319
+ this.markInvalidProposalSlot(proposal.slotNumber);
247
320
  }
248
321
  return false;
249
322
  }
@@ -257,9 +330,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
257
330
  this.log.warn(`Escape hatch open for slot ${slotNumber}, rejecting block proposal`, proposalInfo);
258
331
  return false;
259
332
  }
260
- // TODO(palla/mbps): Remove this once checkpoint validation is stable.
261
- // Track that we successfully validated a block for this slot, so we can attest to checkpoint proposals for it.
262
- this.validatedBlockSlots.add(slotNumber);
263
333
  return true;
264
334
  }
265
335
  /**
@@ -268,52 +338,50 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
268
338
  * the lastBlock is extracted and processed separately via the block handler.
269
339
  * @returns Checkpoint attestations if valid, undefined otherwise
270
340
  */ async attestToCheckpointProposal(proposal, _proposalSender) {
271
- const slotNumber = proposal.slotNumber;
341
+ const proposalSlotNumber = proposal.slotNumber;
272
342
  const proposer = proposal.getSender();
273
343
  // If escape hatch is open for this slot's epoch, do not attest.
274
- if (await this.epochCache.isEscapeHatchOpenAtSlot(slotNumber)) {
275
- this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
344
+ if (await this.epochCache.isEscapeHatchOpenAtSlot(proposalSlotNumber)) {
345
+ this.log.warn(`Escape hatch open for slot ${proposalSlotNumber}, skipping checkpoint attestation handling`);
276
346
  return undefined;
277
347
  }
278
- // Reject proposals with invalid signatures
279
- if (!proposer) {
280
- this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
348
+ // Early-out for equivocation: refuses if we've already attested to a higher slot.
349
+ if (!this.shouldAttestToSlot(proposalSlotNumber)) {
281
350
  return undefined;
282
351
  }
283
- // Check that I have any address in current committee before attesting
284
- const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
352
+ // Ignore proposals from ourselves (may happen in HA setups)
353
+ if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
354
+ this.log.debug(`Not attesting to block proposal from self for slot ${proposalSlotNumber}`, {
355
+ proposer: proposer.toString(),
356
+ proposalSlotNumber
357
+ });
358
+ return undefined;
359
+ }
360
+ // Check that I have any address in the committee where this checkpoint will land before attesting
361
+ const inCommittee = await this.epochCache.filterInCommittee(proposalSlotNumber, this.getValidatorAddresses());
285
362
  const partOfCommittee = inCommittee.length > 0;
286
363
  const proposalInfo = {
287
- slotNumber,
364
+ proposalSlotNumber,
288
365
  archive: proposal.archive.toString(),
289
- proposer: proposer.toString(),
290
- txCount: proposal.txHashes.length
366
+ proposer: proposer?.toString()
291
367
  };
292
- this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
368
+ this.log.info(`Received checkpoint proposal for slot ${proposalSlotNumber}`, {
293
369
  ...proposalInfo,
294
- txHashes: proposal.txHashes.map((t)=>t.toString()),
295
370
  fishermanMode: this.config.fishermanMode || false
296
371
  });
297
- // TODO(palla/mbps): Remove this once checkpoint validation is stable.
298
- // Check that we have successfully validated a block for this slot before attesting to the checkpoint.
299
- if (!this.validatedBlockSlots.has(slotNumber)) {
300
- this.log.warn(`No validated block found for slot ${slotNumber}, refusing to attest to checkpoint`, proposalInfo);
301
- return undefined;
302
- }
303
- // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set)
304
- // TODO(palla/mbps): Change default to false once checkpoint validation is stable.
305
- if (this.config.skipCheckpointProposalValidation !== false) {
306
- this.log.verbose(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
372
+ // Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set).
373
+ // Uses the cached result from the all-nodes callback if available (avoids double validation).
374
+ let checkpointNumber;
375
+ if (this.config.skipCheckpointProposalValidation) {
376
+ this.log.warn(`Skipping checkpoint proposal validation for slot ${proposalSlotNumber}`, proposalInfo);
377
+ checkpointNumber = CheckpointNumber(0);
307
378
  } else {
308
- const validationResult = await this.validateCheckpointProposal(proposal, proposalInfo);
379
+ const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
309
380
  if (!validationResult.isValid) {
310
381
  this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
311
382
  return undefined;
312
383
  }
313
- }
314
- // Upload blobs to filestore if we can (fire and forget)
315
- if (this.blobClient.canUpload()) {
316
- void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
384
+ checkpointNumber = validationResult.checkpointNumber;
317
385
  }
318
386
  // Check that I have any address in current committee before attesting
319
387
  // In fisherman mode, we still create attestations for validation even if not in committee
@@ -322,12 +390,22 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
322
390
  return undefined;
323
391
  }
324
392
  // Provided all of the above checks pass, we can attest to the proposal
325
- this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${slotNumber}`, {
393
+ this.log.info(`${partOfCommittee ? 'Attesting to' : 'Validated'} checkpoint proposal for slot ${proposalSlotNumber}`, {
326
394
  ...proposalInfo,
327
395
  inCommittee: partOfCommittee,
328
396
  fishermanMode: this.config.fishermanMode || false
329
397
  });
330
398
  this.metrics.incSuccessfulAttestations(inCommittee.length);
399
+ // Track epoch participation per attester: count each (attester, epoch) pair at most once
400
+ const proposalEpoch = getEpochAtSlot(proposalSlotNumber, this.epochCache.getL1Constants());
401
+ for (const attester of inCommittee){
402
+ const key = attester.toString();
403
+ const lastEpoch = this.lastAttestedEpochByAttester.get(key);
404
+ if (lastEpoch === undefined || proposalEpoch > lastEpoch) {
405
+ this.lastAttestedEpochByAttester.set(key, proposalEpoch);
406
+ this.metrics.incAttestedEpochCount(attester);
407
+ }
408
+ }
331
409
  // Determine which validators should attest
332
410
  let attestors;
333
411
  if (partOfCommittee) {
@@ -344,150 +422,47 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
344
422
  }
345
423
  if (this.config.fishermanMode) {
346
424
  // bail out early and don't save attestations to the pool in fisherman mode
347
- this.log.info(`Creating checkpoint attestations for slot ${slotNumber}`, {
425
+ this.log.info(`Creating checkpoint attestations for slot ${proposalSlotNumber}`, {
348
426
  ...proposalInfo,
349
427
  attestors: attestors.map((a)=>a.toString())
350
428
  });
351
429
  return undefined;
352
430
  }
353
- return this.createCheckpointAttestationsFromProposal(proposal, attestors);
354
- }
355
- async createCheckpointAttestationsFromProposal(proposal, attestors = []) {
356
- const attestations = await this.validationService.attestToCheckpointProposal(proposal, attestors);
357
- await this.p2pClient.addCheckpointAttestations(attestations);
358
- return attestations;
431
+ return await this.createCheckpointAttestationsFromProposal(proposal, attestors, checkpointNumber);
359
432
  }
360
433
  /**
361
- * Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
362
- * @returns Validation result with isValid flag and reason if invalid.
363
- */ async validateCheckpointProposal(proposal, proposalInfo) {
364
- const slot = proposal.slotNumber;
365
- const timeoutSeconds = 10;
366
- // Wait for last block to sync by archive
367
- let lastBlockHeader;
368
- try {
369
- lastBlockHeader = await retryUntil(async ()=>{
370
- await this.blockSource.syncImmediate();
371
- return this.blockSource.getBlockHeaderByArchive(proposal.archive);
372
- }, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, timeoutSeconds, 0.5);
373
- } catch (err) {
374
- if (err instanceof TimeoutError) {
375
- this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
376
- return {
377
- isValid: false,
378
- reason: 'last_block_not_found'
379
- };
380
- }
381
- this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
382
- return {
383
- isValid: false,
384
- reason: 'block_fetch_error'
385
- };
434
+ * Checks if we should attest to a slot based on equivocation prevention rules.
435
+ * @returns true if we should attest, false if we should skip
436
+ */ shouldAttestToSlot(slotNumber) {
437
+ // If attestToEquivocatedProposals is true, always allow
438
+ if (this.config.attestToEquivocatedProposals) {
439
+ return true;
386
440
  }
387
- if (!lastBlockHeader) {
388
- this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
389
- return {
390
- isValid: false,
391
- reason: 'last_block_not_found'
392
- };
393
- }
394
- // Get all full blocks for the slot and checkpoint
395
- const blocks = await this.blockSource.getBlocksForSlot(slot);
396
- if (blocks.length === 0) {
397
- this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
398
- return {
399
- isValid: false,
400
- reason: 'no_blocks_for_slot'
401
- };
402
- }
403
- this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
404
- ...proposalInfo,
405
- blockNumbers: blocks.map((b)=>b.number)
406
- });
407
- // Get checkpoint constants from first block
408
- const firstBlock = blocks[0];
409
- const constants = this.extractCheckpointConstants(firstBlock);
410
- const checkpointNumber = firstBlock.checkpointNumber;
411
- // Get L1-to-L2 messages for this checkpoint
412
- const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
413
- // Compute the previous checkpoint out hashes for the epoch.
414
- // TODO: There can be a more efficient way to get the previous checkpoint out hashes without having to fetch the
415
- // actual checkpoints and the blocks/txs in them.
416
- const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
417
- const previousCheckpoints = (await this.blockSource.getCheckpointsForEpoch(epoch)).filter((b)=>b.number < checkpointNumber).sort((a, b)=>a.number - b.number);
418
- const previousCheckpointOutHashes = previousCheckpoints.map((c)=>c.getCheckpointOutHash());
419
- // Fork world state at the block before the first block
420
- const parentBlockNumber = BlockNumber(firstBlock.number - 1);
421
- const fork = await this.worldState.fork(parentBlockNumber);
422
- try {
423
- // Create checkpoint builder with all existing blocks
424
- const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks);
425
- // Complete the checkpoint to get computed values
426
- const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
427
- // Compare checkpoint header with proposal
428
- if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
429
- this.log.warn(`Checkpoint header mismatch`, {
430
- ...proposalInfo,
431
- computed: computedCheckpoint.header.toInspect(),
432
- proposal: proposal.checkpointHeader.toInspect()
433
- });
434
- return {
435
- isValid: false,
436
- reason: 'checkpoint_header_mismatch'
437
- };
438
- }
439
- // Compare archive root with proposal
440
- if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
441
- this.log.warn(`Archive root mismatch`, {
442
- ...proposalInfo,
443
- computed: computedCheckpoint.archive.root.toString(),
444
- proposal: proposal.archive.toString()
445
- });
446
- return {
447
- isValid: false,
448
- reason: 'archive_mismatch'
449
- };
450
- }
451
- // Check that the accumulated out hash matches the value in the proposal.
452
- const computedOutHash = computedCheckpoint.getCheckpointOutHash();
453
- const proposalOutHash = proposal.checkpointHeader.epochOutHash;
454
- if (!computedOutHash.equals(proposalOutHash)) {
455
- this.log.warn(`Epoch out hash mismatch`, {
456
- proposalOutHash: proposalOutHash.toString(),
457
- computedOutHash: computedOutHash.toString(),
458
- ...proposalInfo
459
- });
460
- return {
461
- isValid: false,
462
- reason: 'out_hash_mismatch'
463
- };
464
- }
465
- this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
466
- return {
467
- isValid: true
468
- };
469
- } finally{
470
- await fork.close();
441
+ // Check if incoming slot is strictly greater than last attested
442
+ if (this.lastAttestedProposal && slotNumber <= this.lastAttestedProposal.slotNumber) {
443
+ this.log.warn(`Refusing to process a proposal for slot ${slotNumber} given we already attested to a proposal for slot ${this.lastAttestedProposal.slotNumber}`);
444
+ return false;
471
445
  }
446
+ return true;
472
447
  }
473
- /**
474
- * Extract checkpoint global variables from a block.
475
- */ extractCheckpointConstants(block) {
476
- const gv = block.header.globalVariables;
477
- return {
478
- chainId: gv.chainId,
479
- version: gv.version,
480
- slotNumber: gv.slotNumber,
481
- coinbase: gv.coinbase,
482
- feeRecipient: gv.feeRecipient,
483
- gasFees: gv.gasFees
484
- };
448
+ async createCheckpointAttestationsFromProposal(proposal, attestors = [], checkpointNumber) {
449
+ // Equivocation check: must happen right before signing to minimize the race window
450
+ if (!this.shouldAttestToSlot(proposal.slotNumber)) {
451
+ return undefined;
452
+ }
453
+ const attestations = await this.validationService.attestToCheckpointProposal(proposal, attestors, checkpointNumber);
454
+ // Track the proposal we attested to (to prevent equivocation)
455
+ this.lastAttestedProposal = proposal;
456
+ await this.p2pClient.addOwnCheckpointAttestations(attestations);
457
+ return attestations;
485
458
  }
486
459
  /**
487
460
  * Uploads blobs for a checkpoint to the filestore (fire and forget).
488
461
  */ async uploadBlobsForCheckpoint(proposal, proposalInfo) {
489
462
  try {
490
- const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
463
+ const lastBlockHeader = (await this.blockSource.getBlockData({
464
+ archive: proposal.archive
465
+ }))?.header;
491
466
  if (!lastBlockHeader) {
492
467
  this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
493
468
  return;
@@ -498,7 +473,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
498
473
  return;
499
474
  }
500
475
  const blobFields = blocks.flatMap((b)=>b.toBlobFields());
501
- const blobs = getBlobsPerL1Block(blobFields);
476
+ const blobs = await getBlobsPerL1Block(blobFields);
502
477
  await this.blobClient.sendBlobsToFilestore(blobs);
503
478
  this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
504
479
  ...proposalInfo,
@@ -515,11 +490,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
515
490
  this.log.warn(`Cannot slash proposal with invalid signature`);
516
491
  return;
517
492
  }
518
- // Trim the set if it's too big.
519
- if (this.proposersOfInvalidBlocks.size > MAX_PROPOSERS_OF_INVALID_BLOCKS) {
520
- // remove oldest proposer. `values` is guaranteed to be in insertion order.
521
- this.proposersOfInvalidBlocks.delete(this.proposersOfInvalidBlocks.values().next().value);
522
- }
523
493
  this.proposersOfInvalidBlocks.add(proposer.toString());
524
494
  this.emit(WANT_TO_SLASH_EVENT, [
525
495
  {
@@ -530,37 +500,212 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
530
500
  }
531
501
  ]);
532
502
  }
533
- async createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, options) {
534
- // TODO(palla/mbps): Prevent double proposals properly
535
- // if (this.previousProposal?.slotNumber === blockHeader.globalVariables.slotNumber) {
536
- // this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);
537
- // return Promise.resolve(undefined);
538
- // }
503
+ handleInvalidCheckpointProposal(proposal, result, proposalInfo) {
504
+ if (!SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT[result.reason]) {
505
+ return;
506
+ }
507
+ // The slot is already marked invalid by the all-nodes checkpoint handler that invokes this callback,
508
+ // so we only emit the proposer slash event here.
509
+ if (this.slashInvalidCheckpointProposal(proposal)) {
510
+ this.log.info(`Detected invalid checkpoint proposal offense`, {
511
+ ...proposalInfo,
512
+ reason: result.reason,
513
+ amount: this.config.slashBroadcastedInvalidCheckpointProposalPenalty,
514
+ offenseType: getOffenseTypeName(OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL)
515
+ });
516
+ }
517
+ }
518
+ slashInvalidCheckpointProposal(proposal) {
519
+ const proposer = proposal.getSender();
520
+ if (!proposer) {
521
+ this.log.warn(`Cannot slash checkpoint proposal with invalid signature`, {
522
+ slotNumber: proposal.slotNumber,
523
+ archive: proposal.archive.toString()
524
+ });
525
+ return false;
526
+ }
527
+ const offenseType = OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL;
528
+ const offenseKey = `${proposer.toString()}:${offenseType}:${proposal.slotNumber}`;
529
+ if (!this.invalidCheckpointProposalOffenseKeys.addIfAbsent(offenseKey)) {
530
+ return false;
531
+ }
532
+ this.emit(WANT_TO_SLASH_EVENT, [
533
+ {
534
+ validator: proposer,
535
+ amount: this.config.slashBroadcastedInvalidCheckpointProposalPenalty,
536
+ offenseType,
537
+ epochOrSlot: BigInt(proposal.slotNumber)
538
+ }
539
+ ]);
540
+ return true;
541
+ }
542
+ markInvalidProposalSlot(slotNumber) {
543
+ this.proposalHandler.markInvalidProposalSlot(slotNumber);
544
+ }
545
+ handleCheckpointAttestation(attestation) {
546
+ const slotNumber = attestation.slotNumber;
547
+ if (!this.proposalHandler.hasInvalidProposals(slotNumber) || this.proposalHandler.hasProposalEquivocation(slotNumber)) {
548
+ return;
549
+ }
550
+ const attester = attestation.getSender();
551
+ if (!attester) {
552
+ this.log.warn(`Cannot slash checkpoint attestation with invalid signature`, {
553
+ slotNumber,
554
+ archive: attestation.archive.toString()
555
+ });
556
+ return;
557
+ }
558
+ this.slashAttestedToInvalidCheckpointProposal(slotNumber, attester);
559
+ }
560
+ slashAttestedToInvalidCheckpointProposal(slotNumber, attester) {
561
+ const offenseKey = `${attester.toString()}:${OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL}:${slotNumber}`;
562
+ if (!this.badAttestationOffenseKeys.addIfAbsent(offenseKey)) {
563
+ return;
564
+ }
565
+ this.log.info(`Detected attestation to invalid checkpoint proposal offense`, {
566
+ attester: attester.toString(),
567
+ slotNumber,
568
+ amount: this.config.slashAttestInvalidCheckpointProposalPenalty,
569
+ offenseType: getOffenseTypeName(OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL)
570
+ });
571
+ this.emit(WANT_TO_SLASH_EVENT, [
572
+ {
573
+ validator: attester,
574
+ amount: this.config.slashAttestInvalidCheckpointProposalPenalty,
575
+ offenseType: OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL,
576
+ epochOrSlot: BigInt(slotNumber)
577
+ }
578
+ ]);
579
+ }
580
+ /**
581
+ * Handle detection of an oversized block proposal: one whose index within its checkpoint lands at or
582
+ * beyond the consensus per-checkpoint block limit. A single signed proposal at an illegal index is
583
+ * self-contained evidence, so emit an invalid-block-proposal slash event for the proposer, deduped per
584
+ * (proposer, slot) since the p2p layer reports every oversized proposal it stores.
585
+ */ handleOversizedProposal(info) {
586
+ const { slot, proposer } = info;
587
+ const offenseType = OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL;
588
+ if (!this.oversizedProposalOffenseKeys.addIfAbsent(`${proposer.toString()}:${offenseType}:${slot}`)) {
589
+ return;
590
+ }
591
+ this.log.info(`Detected oversized block proposal offense from ${proposer.toString()} at slot ${slot}`, {
592
+ proposer: proposer.toString(),
593
+ slot,
594
+ amount: this.config.slashBroadcastedInvalidBlockPenalty,
595
+ offenseType: getOffenseTypeName(offenseType)
596
+ });
597
+ this.emit(WANT_TO_SLASH_EVENT, [
598
+ {
599
+ validator: proposer,
600
+ amount: this.config.slashBroadcastedInvalidBlockPenalty,
601
+ offenseType,
602
+ epochOrSlot: BigInt(slot)
603
+ }
604
+ ]);
605
+ }
606
+ /**
607
+ * Handle detection of a duplicate proposal (equivocation).
608
+ * Emits a slash event when a proposer sends multiple proposals for the same position.
609
+ */ handleDuplicateProposal(info) {
610
+ const { slot, proposer, type } = info;
611
+ this.proposalHandler.markProposalEquivocation(slot);
612
+ this.log.info(`Detected duplicate ${type} proposal offense from ${proposer.toString()} at slot ${slot}`, {
613
+ proposer: proposer.toString(),
614
+ slot,
615
+ type,
616
+ amount: this.config.slashDuplicateProposalPenalty,
617
+ offenseType: getOffenseTypeName(OffenseType.DUPLICATE_PROPOSAL)
618
+ });
619
+ this.emit(WANT_TO_SLASH_EVENT, [
620
+ {
621
+ validator: proposer,
622
+ amount: this.config.slashDuplicateProposalPenalty,
623
+ offenseType: OffenseType.DUPLICATE_PROPOSAL,
624
+ epochOrSlot: BigInt(slot)
625
+ }
626
+ ]);
627
+ this.emit(WANT_TO_CLEAR_SLASH_EVENT, [
628
+ {
629
+ offenseType: OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL,
630
+ epochOrSlot: BigInt(slot)
631
+ }
632
+ ]);
633
+ }
634
+ /**
635
+ * Handle detection of a duplicate attestation (equivocation).
636
+ * Emits a slash event when an attester signs attestations for different proposals at the same slot.
637
+ */ handleDuplicateAttestation(info) {
638
+ const { slot, attester } = info;
639
+ this.log.info(`Detected duplicate attestation offense from ${attester.toString()} at slot ${slot}`, {
640
+ attester: attester.toString(),
641
+ slot,
642
+ amount: this.config.slashDuplicateAttestationPenalty,
643
+ offenseType: getOffenseTypeName(OffenseType.DUPLICATE_ATTESTATION)
644
+ });
645
+ this.emit(WANT_TO_SLASH_EVENT, [
646
+ {
647
+ validator: attester,
648
+ amount: this.config.slashDuplicateAttestationPenalty,
649
+ offenseType: OffenseType.DUPLICATE_ATTESTATION,
650
+ epochOrSlot: BigInt(slot)
651
+ }
652
+ ]);
653
+ }
654
+ async createBlockProposal(blockHeader, checkpointNumber, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, options = {}) {
655
+ // Validate that we're not creating a proposal for an older or equal position
656
+ if (this.lastProposedBlock) {
657
+ const lastSlot = this.lastProposedBlock.slotNumber;
658
+ const lastIndex = this.lastProposedBlock.indexWithinCheckpoint;
659
+ const newSlot = blockHeader.globalVariables.slotNumber;
660
+ if (newSlot < lastSlot || newSlot === lastSlot && indexWithinCheckpoint <= lastIndex) {
661
+ throw new Error(`Cannot create block proposal for slot ${newSlot} index ${indexWithinCheckpoint}: ` + `already proposed block for slot ${lastSlot} index ${lastIndex}`);
662
+ }
663
+ }
539
664
  this.log.info(`Assembling block proposal for block ${blockHeader.globalVariables.blockNumber} slot ${blockHeader.globalVariables.slotNumber}`);
540
- const newProposal = await this.validationService.createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, {
665
+ const newProposal = await this.validationService.createBlockProposal(blockHeader, checkpointNumber, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, {
541
666
  ...options,
542
- broadcastInvalidBlockProposal: this.config.broadcastInvalidBlockProposal
667
+ broadcastInvalidBlockProposal: options.broadcastInvalidBlockProposal || this.config.broadcastInvalidBlockProposal
543
668
  });
544
- this.previousProposal = newProposal;
669
+ this.lastProposedBlock = newProposal;
545
670
  return newProposal;
546
671
  }
547
- async createCheckpointProposal(checkpointHeader, archive, lastBlockInfo, proposerAddress, options) {
672
+ async createCheckpointProposal(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, proposerAddress, options = {}) {
673
+ // Validate that we're not creating a proposal for an older or equal slot
674
+ if (this.lastProposedCheckpoint) {
675
+ const lastSlot = this.lastProposedCheckpoint.slotNumber;
676
+ const newSlot = checkpointHeader.slotNumber;
677
+ if (newSlot <= lastSlot) {
678
+ throw new Error(`Cannot create checkpoint proposal for slot ${newSlot}: ` + `already proposed checkpoint for slot ${lastSlot}`);
679
+ }
680
+ }
548
681
  this.log.info(`Assembling checkpoint proposal for slot ${checkpointHeader.slotNumber}`);
549
- return await this.validationService.createCheckpointProposal(checkpointHeader, archive, lastBlockInfo, proposerAddress, options);
682
+ const newProposal = await this.validationService.createCheckpointProposal(checkpointHeader, archive, checkpointNumber, feeAssetPriceModifier, lastBlockProposal, proposerAddress, options);
683
+ this.lastProposedCheckpoint = newProposal;
684
+ // Self-record this slot's outcome on the re-execution tracker. Proposers don't run their
685
+ // own proposals through `handleCheckpointProposal`, so without this call the proposer's
686
+ // sentinel would see no outcome for slots it proposed and would mis-attribute itself as
687
+ // inactive. We pass the locally-computed `archive` (not `newProposal.archive`, which may
688
+ // be intentionally corrupted under test-only flags); from the proposer's local-view
689
+ // perspective the work it just completed is valid by definition.
690
+ this.proposalHandler.recordOwnCheckpointProposalAsValid(checkpointHeader.slotNumber, archive, checkpointNumber);
691
+ return newProposal;
550
692
  }
551
693
  async broadcastBlockProposal(proposal) {
552
694
  await this.p2pClient.broadcastProposal(proposal);
553
695
  }
554
- async signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber) {
555
- return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer, slot, blockNumber);
696
+ async signAttestationsAndSigners(attestationsAndSigners, proposer, slot, checkpointNumber) {
697
+ return await this.validationService.signAttestationsAndSigners(attestationsAndSigners, proposer, slot, checkpointNumber);
556
698
  }
557
- async collectOwnAttestations(proposal) {
699
+ async collectOwnAttestations(proposal, checkpointNumber) {
558
700
  const slot = proposal.slotNumber;
559
701
  const inCommittee = await this.epochCache.filterInCommittee(slot, this.getValidatorAddresses());
560
702
  this.log.debug(`Collecting ${inCommittee.length} self-attestations for slot ${slot}`, {
561
703
  inCommittee
562
704
  });
563
- const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee);
705
+ const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee, checkpointNumber);
706
+ if (!attestations) {
707
+ return [];
708
+ }
564
709
  // We broadcast our own attestations to our peers so, in case our block does not get mined on L1,
565
710
  // other nodes can see that our validators did attest to this block proposal, and do not slash us
566
711
  // due to inactivity for missed attestations.
@@ -569,7 +714,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
569
714
  });
570
715
  return attestations;
571
716
  }
572
- async collectAttestations(proposal, required, deadline) {
717
+ async collectAttestations(proposal, required, deadline, checkpointNumber) {
573
718
  // Wait and poll the p2pClient's attestation pool for this checkpoint until we have enough attestations
574
719
  const slot = proposal.slotNumber;
575
720
  this.log.debug(`Collecting ${required} attestations for slot ${slot} with deadline ${deadline.toISOString()}`);
@@ -577,28 +722,20 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
577
722
  this.log.error(`Deadline ${deadline.toISOString()} for collecting ${required} attestations for slot ${slot} is in the past`);
578
723
  throw new AttestationTimeoutError(0, required, slot);
579
724
  }
580
- await this.collectOwnAttestations(proposal);
581
- const proposalId = proposal.archive.toString();
725
+ await this.collectOwnAttestations(proposal, checkpointNumber);
726
+ const proposalPayloadHash = proposal.getPayloadHash();
582
727
  const myAddresses = this.getValidatorAddresses();
583
728
  let attestations = [];
584
729
  while(true){
585
- // Filter out attestations with a mismatching archive. This should NOT happen since we have verified
586
- // the proposer signature (ie our own) before accepting the attestation into the pool via the p2p client.
587
- const collectedAttestations = (await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalId)).filter((attestation)=>{
588
- if (!attestation.archive.equals(proposal.archive)) {
589
- this.log.warn(`Received attestation for slot ${slot} with mismatched archive from ${attestation.getSender()?.toString()}`, {
590
- attestationArchive: attestation.archive.toString(),
591
- proposalArchive: proposal.archive.toString()
592
- });
593
- return false;
594
- }
595
- return true;
596
- });
730
+ // The pool already filters by proposal payload hash; if any attestation slips through with a
731
+ // mismatched payload hash, drop it defensively. Equivocations are emitted as separate slash
732
+ // events from libp2p_service.
733
+ const collectedAttestations = await this.p2pClient.getCheckpointAttestationsForSlot(slot, proposalPayloadHash);
597
734
  // Log new attestations we collected
598
735
  const oldSenders = attestations.map((attestation)=>attestation.getSender());
599
736
  for (const collected of collectedAttestations){
600
737
  const collectedSender = collected.getSender();
601
- // Skip attestations with invalid signatures
738
+ // Skip attestations with invalid signatures. Should not happen as we don't add invalid attestations to our pool.
602
739
  if (!collectedSender) {
603
740
  this.log.warn(`Skipping attestation with invalid signature for slot ${slot}`);
604
741
  continue;