@aztec/slasher 5.0.0-private.20260319 → 5.0.0-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +76 -79
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +28 -28
- package/dest/factory/create_facade.d.ts +2 -2
- package/dest/factory/create_facade.d.ts.map +1 -1
- package/dest/factory/create_facade.js +1 -1
- package/dest/factory/create_implementation.d.ts +4 -6
- package/dest/factory/create_implementation.d.ts.map +1 -1
- package/dest/factory/create_implementation.js +7 -59
- package/dest/factory/get_settings.d.ts +4 -4
- package/dest/factory/get_settings.d.ts.map +1 -1
- package/dest/factory/get_settings.js +3 -3
- package/dest/factory/index.d.ts +2 -2
- package/dest/factory/index.d.ts.map +1 -1
- package/dest/factory/index.js +1 -1
- package/dest/generated/slasher-defaults.d.ts +4 -4
- package/dest/generated/slasher-defaults.js +4 -4
- package/dest/index.d.ts +6 -4
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -3
- package/dest/null_slasher_client.d.ts +3 -4
- package/dest/null_slasher_client.d.ts.map +1 -1
- package/dest/null_slasher_client.js +1 -4
- package/dest/slash_offenses_collector.d.ts +6 -8
- package/dest/slash_offenses_collector.d.ts.map +1 -1
- package/dest/slash_offenses_collector.js +48 -28
- package/dest/slasher_client.d.ts +112 -0
- package/dest/slasher_client.d.ts.map +1 -0
- package/dest/{tally_slasher_client.js → slasher_client.js} +40 -40
- package/dest/slasher_client_facade.d.ts +4 -7
- package/dest/slasher_client_facade.d.ts.map +1 -1
- package/dest/slasher_client_facade.js +4 -9
- package/dest/slasher_client_interface.d.ts +7 -21
- package/dest/slasher_client_interface.d.ts.map +1 -1
- package/dest/slasher_client_interface.js +1 -4
- package/dest/stores/offenses_store.d.ts +12 -12
- package/dest/stores/offenses_store.d.ts.map +1 -1
- package/dest/stores/offenses_store.js +61 -38
- package/dest/watcher.d.ts +8 -1
- package/dest/watcher.d.ts.map +1 -1
- package/dest/watcher.js +1 -0
- package/dest/watchers/attestations_block_watcher.d.ts +26 -13
- package/dest/watchers/attestations_block_watcher.d.ts.map +1 -1
- package/dest/watchers/attestations_block_watcher.js +76 -61
- package/dest/watchers/attested_invalid_proposal_watcher.d.ts +42 -0
- package/dest/watchers/attested_invalid_proposal_watcher.d.ts.map +1 -0
- package/dest/watchers/attested_invalid_proposal_watcher.js +117 -0
- package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.d.ts +38 -0
- package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.d.ts.map +1 -0
- package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.js +138 -0
- package/dest/watchers/checkpoint_equivocation_watcher.d.ts +30 -0
- package/dest/watchers/checkpoint_equivocation_watcher.d.ts.map +1 -0
- package/dest/watchers/checkpoint_equivocation_watcher.js +69 -0
- package/dest/watchers/data_withholding_watcher.d.ts +63 -0
- package/dest/watchers/data_withholding_watcher.d.ts.map +1 -0
- package/dest/watchers/data_withholding_watcher.js +193 -0
- package/package.json +10 -10
- package/src/config.ts +33 -28
- package/src/factory/create_facade.ts +1 -2
- package/src/factory/create_implementation.ts +11 -117
- package/src/factory/get_settings.ts +8 -8
- package/src/factory/index.ts +1 -1
- package/src/generated/slasher-defaults.ts +4 -4
- package/src/index.ts +5 -3
- package/src/null_slasher_client.ts +2 -6
- package/src/slash_offenses_collector.ts +62 -29
- package/src/{tally_slasher_client.ts → slasher_client.ts} +56 -48
- package/src/slasher_client_facade.ts +3 -10
- package/src/slasher_client_interface.ts +6 -21
- package/src/stores/offenses_store.ts +73 -47
- package/src/watcher.ts +8 -0
- package/src/watchers/attestations_block_watcher.ts +88 -82
- package/src/watchers/attested_invalid_proposal_watcher.ts +168 -0
- package/src/watchers/broadcasted_invalid_checkpoint_proposal_watcher.ts +192 -0
- package/src/watchers/checkpoint_equivocation_watcher.ts +96 -0
- package/src/watchers/data_withholding_watcher.ts +225 -0
- package/dest/empire_slasher_client.d.ts +0 -190
- package/dest/empire_slasher_client.d.ts.map +0 -1
- package/dest/empire_slasher_client.js +0 -564
- package/dest/stores/payloads_store.d.ts +0 -29
- package/dest/stores/payloads_store.d.ts.map +0 -1
- package/dest/stores/payloads_store.js +0 -128
- package/dest/tally_slasher_client.d.ts +0 -125
- package/dest/tally_slasher_client.d.ts.map +0 -1
- package/dest/watchers/epoch_prune_watcher.d.ts +0 -39
- package/dest/watchers/epoch_prune_watcher.d.ts.map +0 -1
- package/dest/watchers/epoch_prune_watcher.js +0 -179
- package/src/empire_slasher_client.ts +0 -649
- package/src/stores/payloads_store.ts +0 -149
- package/src/watchers/epoch_prune_watcher.ts +0 -256
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import type { EpochCache } from '@aztec/epoch-cache';
|
|
3
|
-
import { RollupContract, SlasherContract,
|
|
3
|
+
import { RollupContract, SlasherContract, SlashingProposerContract } from '@aztec/ethereum/contracts';
|
|
4
4
|
import { maxBigint } from '@aztec/foundation/bigint';
|
|
5
5
|
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
6
6
|
import { compactArray, partition, times } from '@aztec/foundation/collection';
|
|
@@ -13,8 +13,8 @@ import {
|
|
|
13
13
|
OffenseType,
|
|
14
14
|
type ProposerSlashAction,
|
|
15
15
|
type ProposerSlashActionProvider,
|
|
16
|
-
type SlashPayloadRound,
|
|
17
16
|
getEpochsForRound,
|
|
17
|
+
getOffenseTypeName,
|
|
18
18
|
getSlashConsensusVotesFromOffenses,
|
|
19
19
|
} from '@aztec/stdlib/slashing';
|
|
20
20
|
|
|
@@ -30,8 +30,8 @@ import type { SlasherClientInterface } from './slasher_client_interface.js';
|
|
|
30
30
|
import type { SlasherOffensesStore } from './stores/offenses_store.js';
|
|
31
31
|
import type { Watcher } from './watcher.js';
|
|
32
32
|
|
|
33
|
-
/** Settings used in the
|
|
34
|
-
export type
|
|
33
|
+
/** Settings used in the slasher client, loaded from the L1 contracts during initialization */
|
|
34
|
+
export type SlasherSettings = Prettify<
|
|
35
35
|
SlashRoundMonitorSettings &
|
|
36
36
|
SlashOffensesCollectorSettings & {
|
|
37
37
|
slashingLifetimeInRounds: number;
|
|
@@ -45,14 +45,22 @@ export type TallySlasherSettings = Prettify<
|
|
|
45
45
|
}
|
|
46
46
|
>;
|
|
47
47
|
|
|
48
|
-
export type
|
|
48
|
+
export type SlasherClientConfig = SlashOffensesCollectorConfig &
|
|
49
49
|
Pick<
|
|
50
50
|
SlasherConfig,
|
|
51
51
|
'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack' | 'slashMaxPayloadSize'
|
|
52
52
|
>;
|
|
53
53
|
|
|
54
|
+
type AlwaysSlashOffense = {
|
|
55
|
+
validator: EthAddress;
|
|
56
|
+
amount: bigint;
|
|
57
|
+
offenseType: OffenseType.UNKNOWN;
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
type SlashVoteOffense = Offense | AlwaysSlashOffense;
|
|
61
|
+
|
|
54
62
|
/**
|
|
55
|
-
* The
|
|
63
|
+
* The Slasher client is responsible for managing slashable offenses using
|
|
56
64
|
* the consensus-based slashing model where proposers vote on individual validator offenses.
|
|
57
65
|
*
|
|
58
66
|
* The client subscribes to several slash watchers that emit offenses and tracks them. When the slasher is the
|
|
@@ -76,22 +84,16 @@ export type TallySlasherClientConfig = SlashOffensesCollectorConfig &
|
|
|
76
84
|
* - Validators that reach the quorum threshold are slashed. A vote for slashing N units is also considered
|
|
77
85
|
* a vote for slashing N-1, N-2, ..., 1 units. The system slashes for the largest amount that reaches quorum.
|
|
78
86
|
* - The client monitors executable rounds and triggers execution when appropriate.
|
|
79
|
-
*
|
|
80
|
-
* Differences from Empire model
|
|
81
|
-
* - No fixed slash payloads - votes are for individual validator offenses encoded in bytes
|
|
82
|
-
* - The L1 contract determines which offenses reach quorum rather than nodes agreeing on a payload
|
|
83
|
-
* - Proposers vote directly on which validators to slash and by how much
|
|
84
|
-
* - Uses a slash offset to vote on validators from past rounds (e.g., round N votes on round N-2)
|
|
85
87
|
*/
|
|
86
|
-
export class
|
|
88
|
+
export class SlasherClient implements ProposerSlashActionProvider, SlasherClientInterface {
|
|
87
89
|
protected unwatchCallbacks: (() => void)[] = [];
|
|
88
90
|
protected roundMonitor: SlashRoundMonitor;
|
|
89
91
|
protected offensesCollector: SlashOffensesCollector;
|
|
90
92
|
|
|
91
93
|
constructor(
|
|
92
|
-
private config:
|
|
93
|
-
private settings:
|
|
94
|
-
private
|
|
94
|
+
private config: SlasherClientConfig,
|
|
95
|
+
private settings: SlasherSettings,
|
|
96
|
+
private slashingProposer: SlashingProposerContract,
|
|
95
97
|
private slasher: SlasherContract,
|
|
96
98
|
private rollup: RollupContract,
|
|
97
99
|
watchers: Watcher[],
|
|
@@ -105,14 +107,14 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
105
107
|
}
|
|
106
108
|
|
|
107
109
|
public async start() {
|
|
108
|
-
this.log.debug('Starting
|
|
110
|
+
this.log.debug('Starting slasher client...');
|
|
109
111
|
|
|
110
112
|
this.roundMonitor.start();
|
|
111
113
|
await this.offensesCollector.start();
|
|
112
114
|
|
|
113
115
|
// Listen for RoundExecuted events
|
|
114
116
|
this.unwatchCallbacks.push(
|
|
115
|
-
this.
|
|
117
|
+
this.slashingProposer.listenToRoundExecuted(
|
|
116
118
|
({ round, slashCount, l1BlockHash }) =>
|
|
117
119
|
void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch(err =>
|
|
118
120
|
this.log.error('Error handling round executed', err),
|
|
@@ -123,15 +125,13 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
123
125
|
// Check for round changes
|
|
124
126
|
this.unwatchCallbacks.push(this.roundMonitor.listenToNewRound(round => this.handleNewRound(round)));
|
|
125
127
|
|
|
126
|
-
this.log.info(`Started
|
|
128
|
+
this.log.info(`Started slasher client`);
|
|
127
129
|
return Promise.resolve();
|
|
128
130
|
}
|
|
129
131
|
|
|
130
|
-
/**
|
|
131
|
-
* Stop the tally slasher client
|
|
132
|
-
*/
|
|
132
|
+
/** Stop the slasher client */
|
|
133
133
|
public async stop() {
|
|
134
|
-
this.log.debug('Stopping
|
|
134
|
+
this.log.debug('Stopping slasher client...');
|
|
135
135
|
|
|
136
136
|
for (const unwatchCallback of this.unwatchCallbacks) {
|
|
137
137
|
unwatchCallback();
|
|
@@ -140,7 +140,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
140
140
|
this.roundMonitor.stop();
|
|
141
141
|
await this.offensesCollector.stop();
|
|
142
142
|
|
|
143
|
-
this.log.info('
|
|
143
|
+
this.log.info('Slasher client stopped');
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
/** Returns the current config */
|
|
@@ -155,11 +155,11 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
155
155
|
|
|
156
156
|
/** Triggered on a time basis when we enter a new slashing round. Clears expired offenses. */
|
|
157
157
|
protected async handleNewRound(round: bigint) {
|
|
158
|
-
this.log.info(`Starting new
|
|
158
|
+
this.log.info(`Starting new slashing round ${round}`);
|
|
159
159
|
await this.offensesCollector.handleNewRound(round);
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
-
/** Called when we see a RoundExecuted event on the
|
|
162
|
+
/** Called when we see a RoundExecuted event on the SlashingProposer (just for logging). */
|
|
163
163
|
protected async handleRoundExecuted(round: bigint, slashCount: bigint, l1BlockHash: Hex) {
|
|
164
164
|
const slashes = await this.rollup.getSlashEvents(l1BlockHash);
|
|
165
165
|
this.log.info(`Slashing round ${round} has been executed with ${slashCount} slashes`, { slashes });
|
|
@@ -240,7 +240,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
240
240
|
this.log.debug(`Testing if slashing round ${executableRound} is executable`, logData);
|
|
241
241
|
|
|
242
242
|
try {
|
|
243
|
-
const roundInfo = await this.
|
|
243
|
+
const roundInfo = await this.slashingProposer.getRound(executableRound);
|
|
244
244
|
logData = { ...logData, roundInfo };
|
|
245
245
|
if (roundInfo.isExecuted) {
|
|
246
246
|
this.log.verbose(`Round ${executableRound} has already been executed`, logData);
|
|
@@ -254,7 +254,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
254
254
|
}
|
|
255
255
|
|
|
256
256
|
// Check if round is ready to execute at the given slot
|
|
257
|
-
const isReadyToExecute = await this.
|
|
257
|
+
const isReadyToExecute = await this.slashingProposer.isRoundReadyToExecute(executableRound, slotNumber);
|
|
258
258
|
if (!isReadyToExecute) {
|
|
259
259
|
this.log.warn(
|
|
260
260
|
`Round ${executableRound} is not ready to execute at slot ${slotNumber} according to contract check`,
|
|
@@ -264,14 +264,14 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
264
264
|
}
|
|
265
265
|
|
|
266
266
|
// Check if the round yields any slashing at all
|
|
267
|
-
const { actions: slashActions, committees } = await this.
|
|
267
|
+
const { actions: slashActions, committees } = await this.slashingProposer.getTally(executableRound);
|
|
268
268
|
if (slashActions.length === 0) {
|
|
269
269
|
this.log.verbose(`Round ${executableRound} does not resolve in any slashing`, logData);
|
|
270
270
|
return undefined;
|
|
271
271
|
}
|
|
272
272
|
|
|
273
273
|
// Check if the slash payload is vetoed
|
|
274
|
-
const payload = await this.
|
|
274
|
+
const payload = await this.slashingProposer.getPayload(executableRound);
|
|
275
275
|
const isVetoed = await this.slasher.isPayloadVetoed(payload.address);
|
|
276
276
|
if (isVetoed) {
|
|
277
277
|
this.log.warn(`Round ${executableRound} payload is vetoed (skipping execution)`, {
|
|
@@ -318,7 +318,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
318
318
|
// Compute offenses to slash, by loading the offenses for this round, adding synthetic offenses
|
|
319
319
|
// for validators that should always be slashed, and removing the ones that should never be slashed.
|
|
320
320
|
const offensesForRound = await this.gatherOffensesForRound(currentRound);
|
|
321
|
-
const offensesFromAlwaysSlash = (this.config.slashValidatorsAlways ?? []).map(validator => ({
|
|
321
|
+
const offensesFromAlwaysSlash: AlwaysSlashOffense[] = (this.config.slashValidatorsAlways ?? []).map(validator => ({
|
|
322
322
|
validator,
|
|
323
323
|
amount: this.settings.slashingAmounts[2],
|
|
324
324
|
offenseType: OffenseType.UNKNOWN,
|
|
@@ -332,7 +332,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
332
332
|
slotNumber,
|
|
333
333
|
currentRound,
|
|
334
334
|
slashedRound,
|
|
335
|
-
|
|
335
|
+
offensesFromAlwaysSlash: offensesFromAlwaysSlash.map(getOffenseLogData),
|
|
336
336
|
slashValidatorsAlways: this.config.slashValidatorsAlways,
|
|
337
337
|
});
|
|
338
338
|
}
|
|
@@ -342,7 +342,7 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
342
342
|
slotNumber,
|
|
343
343
|
currentRound,
|
|
344
344
|
slashedRound,
|
|
345
|
-
offensesToForgive,
|
|
345
|
+
offensesToForgive: offensesToForgive.map(getOffenseLogData),
|
|
346
346
|
slashValidatorsNever: this.config.slashValidatorsNever,
|
|
347
347
|
});
|
|
348
348
|
}
|
|
@@ -352,11 +352,11 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
352
352
|
return undefined;
|
|
353
353
|
}
|
|
354
354
|
|
|
355
|
-
this.log.
|
|
355
|
+
this.log.debug(`Computing slash votes for ${offensesToSlash.length} offenses`, {
|
|
356
356
|
slotNumber,
|
|
357
357
|
currentRound,
|
|
358
358
|
slashedRound,
|
|
359
|
-
offensesToSlash,
|
|
359
|
+
offensesToSlash: offensesToSlash.map(getOffenseLogData),
|
|
360
360
|
});
|
|
361
361
|
|
|
362
362
|
const committees = await this.collectCommitteesActiveDuringRound(slashedRound);
|
|
@@ -374,12 +374,20 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
374
374
|
slotNumber,
|
|
375
375
|
currentRound,
|
|
376
376
|
slashedRound,
|
|
377
|
-
offensesToSlash,
|
|
377
|
+
offensesToSlash: offensesToSlash.map(getOffenseLogData),
|
|
378
378
|
committees,
|
|
379
379
|
});
|
|
380
380
|
return undefined;
|
|
381
381
|
}
|
|
382
382
|
|
|
383
|
+
this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
|
|
384
|
+
slotNumber,
|
|
385
|
+
slashedRound,
|
|
386
|
+
currentRound,
|
|
387
|
+
votes,
|
|
388
|
+
offensesToSlash: offensesToSlash.map(getOffenseLogData),
|
|
389
|
+
});
|
|
390
|
+
|
|
383
391
|
this.log.debug(`Computed votes for slashing ${offensesToSlash.length} offenses`, {
|
|
384
392
|
slashedRound,
|
|
385
393
|
currentRound,
|
|
@@ -405,17 +413,9 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
405
413
|
);
|
|
406
414
|
}
|
|
407
415
|
|
|
408
|
-
/**
|
|
409
|
-
* Get slash payloads is NOT SUPPORTED in tally model
|
|
410
|
-
* @throws Error indicating this operation is not supported
|
|
411
|
-
*/
|
|
412
|
-
public getSlashPayloads(): Promise<SlashPayloadRound[]> {
|
|
413
|
-
return Promise.reject(new Error('Tally slashing model does not support slash payloads'));
|
|
414
|
-
}
|
|
415
|
-
|
|
416
416
|
/**
|
|
417
417
|
* Gather offenses to be slashed on a given round.
|
|
418
|
-
*
|
|
418
|
+
* Round N slashes validators from round N - slashOffsetInRounds.
|
|
419
419
|
* @param round - The round to get offenses for, defaults to current round
|
|
420
420
|
* @returns Array of pending offenses for the round with offset applied
|
|
421
421
|
*/
|
|
@@ -428,9 +428,9 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
428
428
|
return await this.offensesStore.getOffensesForRound(targetRound);
|
|
429
429
|
}
|
|
430
430
|
|
|
431
|
-
/** Returns all
|
|
432
|
-
public
|
|
433
|
-
return this.offensesStore.
|
|
431
|
+
/** Returns all offenses stored */
|
|
432
|
+
public getOffenses(): Promise<Offense[]> {
|
|
433
|
+
return this.offensesStore.getOffenses();
|
|
434
434
|
}
|
|
435
435
|
|
|
436
436
|
/**
|
|
@@ -446,3 +446,11 @@ export class TallySlasherClient implements ProposerSlashActionProvider, SlasherC
|
|
|
446
446
|
return round - BigInt(this.settings.slashingOffsetInRounds);
|
|
447
447
|
}
|
|
448
448
|
}
|
|
449
|
+
|
|
450
|
+
function getOffenseLogData(offense: SlashVoteOffense) {
|
|
451
|
+
return {
|
|
452
|
+
...offense,
|
|
453
|
+
validator: offense.validator.toString(),
|
|
454
|
+
offenseType: getOffenseTypeName(offense.offenseType),
|
|
455
|
+
};
|
|
456
|
+
}
|
|
@@ -2,13 +2,12 @@ import { EpochCache } from '@aztec/epoch-cache';
|
|
|
2
2
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
3
3
|
import type { ViemClient } from '@aztec/ethereum/types';
|
|
4
4
|
import type { SlotNumber } from '@aztec/foundation/branded-types';
|
|
5
|
-
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
7
6
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
8
7
|
import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
|
|
9
8
|
import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
|
|
10
9
|
import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
|
|
11
|
-
import type { Offense, ProposerSlashAction
|
|
10
|
+
import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
|
|
12
11
|
|
|
13
12
|
import { createSlasherImplementation } from './factory/create_implementation.js';
|
|
14
13
|
import type { SlasherClientInterface } from './slasher_client_interface.js';
|
|
@@ -27,7 +26,6 @@ export class SlasherClientFacade implements SlasherClientInterface {
|
|
|
27
26
|
private config: SlasherConfig & DataStoreConfig & { ethereumSlotDuration: number },
|
|
28
27
|
private rollup: RollupContract,
|
|
29
28
|
private l1Client: ViemClient,
|
|
30
|
-
private slashFactoryAddress: EthAddress | undefined,
|
|
31
29
|
private watchers: Watcher[],
|
|
32
30
|
private epochCache: EpochCache,
|
|
33
31
|
private dateProvider: DateProvider,
|
|
@@ -63,16 +61,12 @@ export class SlasherClientFacade implements SlasherClientInterface {
|
|
|
63
61
|
this.watchers.forEach(watcher => watcher.updateConfig?.(config));
|
|
64
62
|
}
|
|
65
63
|
|
|
66
|
-
public getSlashPayloads(): Promise<SlashPayloadRound[]> {
|
|
67
|
-
return this.client?.getSlashPayloads() ?? Promise.reject(new Error('Slasher client not initialized'));
|
|
68
|
-
}
|
|
69
|
-
|
|
70
64
|
public gatherOffensesForRound(round?: bigint): Promise<Offense[]> {
|
|
71
65
|
return this.client?.gatherOffensesForRound(round) ?? Promise.reject(new Error('Slasher client not initialized'));
|
|
72
66
|
}
|
|
73
67
|
|
|
74
|
-
public
|
|
75
|
-
return this.client?.
|
|
68
|
+
public getOffenses(): Promise<Offense[]> {
|
|
69
|
+
return this.client?.getOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
|
|
76
70
|
}
|
|
77
71
|
|
|
78
72
|
public getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]> {
|
|
@@ -84,7 +78,6 @@ export class SlasherClientFacade implements SlasherClientInterface {
|
|
|
84
78
|
this.config,
|
|
85
79
|
this.rollup,
|
|
86
80
|
this.l1Client,
|
|
87
|
-
this.slashFactoryAddress,
|
|
88
81
|
this.watchers,
|
|
89
82
|
this.epochCache,
|
|
90
83
|
this.dateProvider,
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import type { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
|
|
3
|
-
import type { Offense, ProposerSlashAction
|
|
3
|
+
import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
|
|
4
4
|
|
|
5
|
-
/**
|
|
6
|
-
* Common interface for slasher clients used by the Aztec node.
|
|
7
|
-
* Both Empire and Consensus slasher clients implement this interface.
|
|
8
|
-
*/
|
|
5
|
+
/** Common interface for slasher clients used by the Aztec node. */
|
|
9
6
|
export interface SlasherClientInterface {
|
|
10
7
|
/** Start the slasher client */
|
|
11
8
|
start(): Promise<void>;
|
|
@@ -13,25 +10,13 @@ export interface SlasherClientInterface {
|
|
|
13
10
|
/** Stop the slasher client */
|
|
14
11
|
stop(): Promise<void>;
|
|
15
12
|
|
|
16
|
-
/**
|
|
17
|
-
* Get slash payloads for the Empire model.
|
|
18
|
-
* The Consensus model should throw an error when this is called.
|
|
19
|
-
*/
|
|
20
|
-
getSlashPayloads(): Promise<SlashPayloadRound[]>;
|
|
21
|
-
|
|
22
|
-
/**
|
|
23
|
-
* Gather offenses for a given round, defaults to current.
|
|
24
|
-
* Used by both Empire and Consensus models.
|
|
25
|
-
*/
|
|
13
|
+
/** Gather offenses for a given round, defaults to current. */
|
|
26
14
|
gatherOffensesForRound(round?: bigint): Promise<Offense[]>;
|
|
27
15
|
|
|
28
|
-
/** Returns all
|
|
29
|
-
|
|
16
|
+
/** Returns all offenses */
|
|
17
|
+
getOffenses(): Promise<Offense[]>;
|
|
30
18
|
|
|
31
|
-
/**
|
|
32
|
-
* Update the configuration.
|
|
33
|
-
* Used by both Empire and Consensus models.
|
|
34
|
-
*/
|
|
19
|
+
/** Update the configuration. */
|
|
35
20
|
updateConfig(config: Partial<SlasherConfig>): void;
|
|
36
21
|
|
|
37
22
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createLogger } from '@aztec/aztec.js/log';
|
|
2
|
-
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap
|
|
2
|
+
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncMultiMap } from '@aztec/kv-store';
|
|
3
3
|
import {
|
|
4
4
|
type Offense,
|
|
5
5
|
type OffenseIdentifier,
|
|
@@ -10,14 +10,15 @@ import {
|
|
|
10
10
|
|
|
11
11
|
export const SCHEMA_VERSION = 1;
|
|
12
12
|
|
|
13
|
+
type ClearOffensesFilter = Pick<Offense, 'offenseType' | 'epochOrSlot'> & {
|
|
14
|
+
validators?: Offense['validator'][];
|
|
15
|
+
};
|
|
16
|
+
|
|
13
17
|
export class SlasherOffensesStore {
|
|
14
18
|
/** Map from offense key to offense data */
|
|
15
19
|
private offenses: AztecAsyncMap<string, Buffer>;
|
|
16
20
|
|
|
17
|
-
/**
|
|
18
|
-
private offensesSlashed: AztecAsyncSet<string>;
|
|
19
|
-
|
|
20
|
-
/** Multimap from round to offense keys (only used for consensus based slashing) */
|
|
21
|
+
/** Multimap from round to offense keys */
|
|
21
22
|
private roundsOffenses: AztecAsyncMultiMap<string, string>;
|
|
22
23
|
|
|
23
24
|
private log = createLogger('slasher:store:offenses');
|
|
@@ -32,18 +33,13 @@ export class SlasherOffensesStore {
|
|
|
32
33
|
) {
|
|
33
34
|
this.offenses = kvStore.openMap('offenses');
|
|
34
35
|
this.roundsOffenses = kvStore.openMultiMap('rounds-offenses');
|
|
35
|
-
this.offensesSlashed = kvStore.openSet('offenses-slashed');
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
/** Returns all offenses
|
|
39
|
-
public async
|
|
38
|
+
/** Returns all offenses */
|
|
39
|
+
public async getOffenses(): Promise<Offense[]> {
|
|
40
40
|
const offenses: Offense[] = [];
|
|
41
|
-
for await (const [
|
|
42
|
-
|
|
43
|
-
continue; // Skip executed offenses
|
|
44
|
-
}
|
|
45
|
-
const offense = deserializeOffense(buffer);
|
|
46
|
-
offenses.push(offense);
|
|
41
|
+
for await (const [, buffer] of this.offenses.entriesAsync()) {
|
|
42
|
+
offenses.push(deserializeOffense(buffer));
|
|
47
43
|
}
|
|
48
44
|
return offenses;
|
|
49
45
|
}
|
|
@@ -61,36 +57,68 @@ export class SlasherOffensesStore {
|
|
|
61
57
|
return offenses;
|
|
62
58
|
}
|
|
63
59
|
|
|
64
|
-
/** Returns whether an offense is pending (ie not marked as slashed) */
|
|
65
|
-
public async hasPendingOffense(offense: OffenseIdentifier): Promise<boolean> {
|
|
66
|
-
const key = this.getOffenseKey(offense);
|
|
67
|
-
return (await this.offenses.getAsync(key)) !== undefined && !(await this.offensesSlashed.hasAsync(key));
|
|
68
|
-
}
|
|
69
|
-
|
|
70
60
|
/** Returns whether we have seen this offense */
|
|
71
61
|
public async hasOffense(offense: OffenseIdentifier): Promise<boolean> {
|
|
72
62
|
const key = this.getOffenseKey(offense);
|
|
73
63
|
return (await this.offenses.getAsync(key)) !== undefined;
|
|
74
64
|
}
|
|
75
65
|
|
|
76
|
-
/** Adds a new offense
|
|
77
|
-
public async
|
|
66
|
+
/** Adds a new offense. Returns false if the offense is already pending. */
|
|
67
|
+
public async addOffense(offense: Offense): Promise<boolean> {
|
|
78
68
|
const key = this.getOffenseKey(offense);
|
|
79
69
|
const round = getRoundForOffense(offense, this.settings);
|
|
80
|
-
await this.kvStore.transactionAsync(async () => {
|
|
70
|
+
const added = await this.kvStore.transactionAsync(async () => {
|
|
71
|
+
if ((await this.offenses.getAsync(key)) !== undefined) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
|
|
81
75
|
await this.offenses.set(key, serializeOffense(offense));
|
|
82
76
|
await this.roundsOffenses.set(this.getRoundKey(round), key);
|
|
77
|
+
return true;
|
|
83
78
|
});
|
|
84
|
-
|
|
79
|
+
|
|
80
|
+
if (added) {
|
|
81
|
+
this.log.trace(`Adding pending offense ${key} for round ${round}`);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
return added;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
-
/**
|
|
88
|
-
public async
|
|
89
|
-
await this.kvStore.transactionAsync(async () => {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
87
|
+
/** Removes pending offenses matching the given offense type, epoch/slot, and optional validators. */
|
|
88
|
+
public async clearOffenses(filter: ClearOffensesFilter): Promise<number> {
|
|
89
|
+
return await this.kvStore.transactionAsync(async () => {
|
|
90
|
+
const offensesToClear = new Map<string, Offense>();
|
|
91
|
+
|
|
92
|
+
if (filter.validators && filter.validators.length > 0) {
|
|
93
|
+
for (const validator of filter.validators) {
|
|
94
|
+
const identifier = { validator, offenseType: filter.offenseType, epochOrSlot: filter.epochOrSlot };
|
|
95
|
+
const key = this.getOffenseKey(identifier);
|
|
96
|
+
const buffer = await this.offenses.getAsync(key);
|
|
97
|
+
if (buffer) {
|
|
98
|
+
offensesToClear.set(key, deserializeOffense(buffer));
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
} else {
|
|
102
|
+
for await (const [key, buffer] of this.offenses.entriesAsync()) {
|
|
103
|
+
const offense = deserializeOffense(buffer);
|
|
104
|
+
if (offense.offenseType === filter.offenseType && offense.epochOrSlot === filter.epochOrSlot) {
|
|
105
|
+
offensesToClear.set(key, offense);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
93
108
|
}
|
|
109
|
+
|
|
110
|
+
if (offensesToClear.size === 0) {
|
|
111
|
+
return 0;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
for (const [key, offense] of offensesToClear) {
|
|
115
|
+
const round = getRoundForOffense(offense, this.settings);
|
|
116
|
+
await this.offenses.delete(key);
|
|
117
|
+
await this.roundsOffenses.deleteValue(this.getRoundKey(round), key);
|
|
118
|
+
this.log.trace(`Cleared pending offense ${key} for round ${round}`);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
return offensesToClear.size;
|
|
94
122
|
});
|
|
95
123
|
}
|
|
96
124
|
|
|
@@ -106,34 +134,32 @@ export class SlasherOffensesStore {
|
|
|
106
134
|
return 0; // Not enough rounds have passed to expire anything
|
|
107
135
|
}
|
|
108
136
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
137
|
+
return await this.kvStore.transactionAsync(async () => {
|
|
138
|
+
// Collect expired offenses and rounds
|
|
139
|
+
const expiredRoundKeys = new Set<string>();
|
|
140
|
+
const expiredOffenseKeys = new Set<string>();
|
|
141
|
+
for await (const [roundKey, offenseKey] of this.roundsOffenses.entriesAsync({
|
|
142
|
+
end: this.getRoundKey(expiredBefore),
|
|
143
|
+
})) {
|
|
144
|
+
expiredOffenseKeys.add(offenseKey);
|
|
145
|
+
expiredRoundKeys.add(roundKey);
|
|
146
|
+
}
|
|
118
147
|
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
148
|
+
if (expiredOffenseKeys.size === 0 && expiredRoundKeys.size === 0) {
|
|
149
|
+
return 0; // Nothing to clean up
|
|
150
|
+
}
|
|
122
151
|
|
|
123
|
-
// Remove expired stuff in a transaction
|
|
124
|
-
await this.kvStore.transactionAsync(async () => {
|
|
125
152
|
for (const key of expiredOffenseKeys) {
|
|
126
153
|
this.log.trace(`Deleting offense ${key}`);
|
|
127
154
|
await this.offenses.delete(key);
|
|
128
|
-
await this.offensesSlashed.delete(key);
|
|
129
155
|
}
|
|
130
156
|
for (const roundKey of expiredRoundKeys) {
|
|
131
157
|
this.log.trace(`Deleting round info for ${roundKey}`);
|
|
132
158
|
await this.roundsOffenses.delete(roundKey);
|
|
133
159
|
}
|
|
134
|
-
});
|
|
135
160
|
|
|
136
|
-
|
|
161
|
+
return expiredOffenseKeys.size;
|
|
162
|
+
});
|
|
137
163
|
}
|
|
138
164
|
|
|
139
165
|
/** Generate a unique key for an offense */
|
package/src/watcher.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { OffenseType } from '@aztec/stdlib/slashing';
|
|
|
5
5
|
import type { SlasherConfig } from './config.js';
|
|
6
6
|
|
|
7
7
|
export const WANT_TO_SLASH_EVENT = 'want-to-slash' as const;
|
|
8
|
+
export const WANT_TO_CLEAR_SLASH_EVENT = 'want-to-clear-slash' as const;
|
|
8
9
|
|
|
9
10
|
export interface WantToSlashArgs {
|
|
10
11
|
validator: EthAddress;
|
|
@@ -13,9 +14,16 @@ export interface WantToSlashArgs {
|
|
|
13
14
|
epochOrSlot: bigint; // Epoch number for epoch-based offenses, slot number for slot-based
|
|
14
15
|
}
|
|
15
16
|
|
|
17
|
+
export interface WantToClearSlashArgs {
|
|
18
|
+
offenseType: OffenseType;
|
|
19
|
+
epochOrSlot: bigint; // Epoch number for epoch-based offenses, slot number for slot-based
|
|
20
|
+
validators?: EthAddress[];
|
|
21
|
+
}
|
|
22
|
+
|
|
16
23
|
// Event map for specific, known events of a watcher
|
|
17
24
|
export interface WatcherEventMap {
|
|
18
25
|
[WANT_TO_SLASH_EVENT]: (args: WantToSlashArgs[]) => void;
|
|
26
|
+
[WANT_TO_CLEAR_SLASH_EVENT]: (args: WantToClearSlashArgs[]) => void;
|
|
19
27
|
}
|
|
20
28
|
|
|
21
29
|
export type WatcherEmitter = TypedEventEmitter<WatcherEventMap>;
|