@aztec/slasher 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

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 (99) hide show
  1. package/README.md +83 -79
  2. package/dest/config.d.ts +1 -1
  3. package/dest/config.d.ts.map +1 -1
  4. package/dest/config.js +28 -28
  5. package/dest/factory/create_facade.d.ts +7 -4
  6. package/dest/factory/create_facade.d.ts.map +1 -1
  7. package/dest/factory/create_facade.js +5 -2
  8. package/dest/factory/create_implementation.d.ts +6 -7
  9. package/dest/factory/create_implementation.d.ts.map +1 -1
  10. package/dest/factory/create_implementation.js +7 -59
  11. package/dest/factory/get_settings.d.ts +4 -4
  12. package/dest/factory/get_settings.d.ts.map +1 -1
  13. package/dest/factory/get_settings.js +3 -3
  14. package/dest/factory/index.d.ts +2 -2
  15. package/dest/factory/index.d.ts.map +1 -1
  16. package/dest/factory/index.js +1 -1
  17. package/dest/generated/slasher-defaults.d.ts +4 -4
  18. package/dest/generated/slasher-defaults.js +4 -4
  19. package/dest/index.d.ts +6 -4
  20. package/dest/index.d.ts.map +1 -1
  21. package/dest/index.js +5 -3
  22. package/dest/metrics.d.ts +23 -0
  23. package/dest/metrics.d.ts.map +1 -0
  24. package/dest/metrics.js +38 -0
  25. package/dest/null_slasher_client.d.ts +3 -4
  26. package/dest/null_slasher_client.d.ts.map +1 -1
  27. package/dest/null_slasher_client.js +1 -4
  28. package/dest/own_validator_slash_monitor.d.ts +66 -0
  29. package/dest/own_validator_slash_monitor.d.ts.map +1 -0
  30. package/dest/own_validator_slash_monitor.js +172 -0
  31. package/dest/slash_offenses_collector.d.ts +6 -8
  32. package/dest/slash_offenses_collector.d.ts.map +1 -1
  33. package/dest/slash_offenses_collector.js +48 -28
  34. package/dest/slasher_client.d.ts +118 -0
  35. package/dest/slasher_client.d.ts.map +1 -0
  36. package/dest/{tally_slasher_client.js → slasher_client.js} +62 -49
  37. package/dest/slasher_client_facade.d.ts +7 -8
  38. package/dest/slasher_client_facade.d.ts.map +1 -1
  39. package/dest/slasher_client_facade.js +6 -9
  40. package/dest/slasher_client_interface.d.ts +7 -21
  41. package/dest/slasher_client_interface.d.ts.map +1 -1
  42. package/dest/slasher_client_interface.js +1 -4
  43. package/dest/stores/offenses_store.d.ts +12 -12
  44. package/dest/stores/offenses_store.d.ts.map +1 -1
  45. package/dest/stores/offenses_store.js +61 -38
  46. package/dest/watcher.d.ts +8 -1
  47. package/dest/watcher.d.ts.map +1 -1
  48. package/dest/watcher.js +1 -0
  49. package/dest/watchers/attestations_block_watcher.d.ts +26 -13
  50. package/dest/watchers/attestations_block_watcher.d.ts.map +1 -1
  51. package/dest/watchers/attestations_block_watcher.js +76 -61
  52. package/dest/watchers/attested_invalid_proposal_watcher.d.ts +42 -0
  53. package/dest/watchers/attested_invalid_proposal_watcher.d.ts.map +1 -0
  54. package/dest/watchers/attested_invalid_proposal_watcher.js +117 -0
  55. package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.d.ts +38 -0
  56. package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.d.ts.map +1 -0
  57. package/dest/watchers/broadcasted_invalid_checkpoint_proposal_watcher.js +138 -0
  58. package/dest/watchers/checkpoint_equivocation_watcher.d.ts +30 -0
  59. package/dest/watchers/checkpoint_equivocation_watcher.d.ts.map +1 -0
  60. package/dest/watchers/checkpoint_equivocation_watcher.js +69 -0
  61. package/dest/watchers/data_withholding_watcher.d.ts +69 -0
  62. package/dest/watchers/data_withholding_watcher.d.ts.map +1 -0
  63. package/dest/watchers/data_withholding_watcher.js +223 -0
  64. package/package.json +10 -10
  65. package/src/config.ts +33 -28
  66. package/src/factory/create_facade.ts +7 -4
  67. package/src/factory/create_implementation.ts +17 -118
  68. package/src/factory/get_settings.ts +8 -8
  69. package/src/factory/index.ts +1 -1
  70. package/src/generated/slasher-defaults.ts +4 -4
  71. package/src/index.ts +5 -3
  72. package/src/metrics.ts +59 -0
  73. package/src/null_slasher_client.ts +2 -6
  74. package/src/own_validator_slash_monitor.ts +195 -0
  75. package/src/slash_offenses_collector.ts +62 -29
  76. package/src/{tally_slasher_client.ts → slasher_client.ts} +79 -55
  77. package/src/slasher_client_facade.ts +7 -11
  78. package/src/slasher_client_interface.ts +6 -21
  79. package/src/stores/offenses_store.ts +73 -47
  80. package/src/watcher.ts +8 -0
  81. package/src/watchers/attestations_block_watcher.ts +88 -82
  82. package/src/watchers/attested_invalid_proposal_watcher.ts +168 -0
  83. package/src/watchers/broadcasted_invalid_checkpoint_proposal_watcher.ts +192 -0
  84. package/src/watchers/checkpoint_equivocation_watcher.ts +96 -0
  85. package/src/watchers/data_withholding_watcher.ts +257 -0
  86. package/dest/empire_slasher_client.d.ts +0 -190
  87. package/dest/empire_slasher_client.d.ts.map +0 -1
  88. package/dest/empire_slasher_client.js +0 -564
  89. package/dest/stores/payloads_store.d.ts +0 -29
  90. package/dest/stores/payloads_store.d.ts.map +0 -1
  91. package/dest/stores/payloads_store.js +0 -128
  92. package/dest/tally_slasher_client.d.ts +0 -125
  93. package/dest/tally_slasher_client.d.ts.map +0 -1
  94. package/dest/watchers/epoch_prune_watcher.d.ts +0 -39
  95. package/dest/watchers/epoch_prune_watcher.d.ts.map +0 -1
  96. package/dest/watchers/epoch_prune_watcher.js +0 -176
  97. package/src/empire_slasher_client.ts +0 -649
  98. package/src/stores/payloads_store.ts +0 -149
  99. package/src/watchers/epoch_prune_watcher.ts +0 -253
@@ -1,6 +1,7 @@
1
1
  import { createLogger } from '@aztec/foundation/log';
2
- import { getSlotForOffense } from '@aztec/stdlib/slashing';
3
- import { WANT_TO_SLASH_EVENT } from './watcher.js';
2
+ import { SerialQueue } from '@aztec/foundation/queue';
3
+ import { getOffenseTypeName, getSlotForOffense } from '@aztec/stdlib/slashing';
4
+ import { WANT_TO_CLEAR_SLASH_EVENT, WANT_TO_SLASH_EVENT } from './watcher.js';
4
5
  /**
5
6
  * Collects and manages slashable offenses from watchers.
6
7
  * This class handles the common logic for subscribing to slash watcher events,
@@ -12,6 +13,7 @@ import { WANT_TO_SLASH_EVENT } from './watcher.js';
12
13
  offensesStore;
13
14
  log;
14
15
  unwatchCallbacks;
16
+ storeMutationQueue;
15
17
  constructor(config, settings, watchers, offensesStore, log = createLogger('slasher:offenses-collector')){
16
18
  this.config = config;
17
19
  this.settings = settings;
@@ -19,25 +21,30 @@ import { WANT_TO_SLASH_EVENT } from './watcher.js';
19
21
  this.offensesStore = offensesStore;
20
22
  this.log = log;
21
23
  this.unwatchCallbacks = [];
24
+ this.storeMutationQueue = new SerialQueue();
22
25
  }
23
26
  start() {
24
27
  this.log.debug('Starting SlashOffensesCollector...');
25
- // Subscribe to watchers WANT_TO_SLASH_EVENT
28
+ this.storeMutationQueue.start();
29
+ // Subscribe to watcher slashing events.
26
30
  for (const watcher of this.watchers){
27
- const wantToSlashCallback = (args)=>void this.handleWantToSlash(args).catch((err)=>this.log.error('Error handling wantToSlash', err));
31
+ const wantToSlashCallback = (args)=>this.enqueueStoreMutation('wantToSlash', ()=>this.handleWantToSlash(args));
28
32
  watcher.on(WANT_TO_SLASH_EVENT, wantToSlashCallback);
29
33
  this.unwatchCallbacks.push(()=>watcher.removeListener(WANT_TO_SLASH_EVENT, wantToSlashCallback));
34
+ const wantToClearSlashCallback = (args)=>this.enqueueStoreMutation('wantToClearSlash', ()=>this.handleWantToClearSlash(args));
35
+ watcher.on(WANT_TO_CLEAR_SLASH_EVENT, wantToClearSlashCallback);
36
+ this.unwatchCallbacks.push(()=>watcher.removeListener(WANT_TO_CLEAR_SLASH_EVENT, wantToClearSlashCallback));
30
37
  }
31
38
  this.log.info('Started SlashOffensesCollector');
32
39
  return Promise.resolve();
33
40
  }
34
- stop() {
41
+ async stop() {
35
42
  this.log.debug('Stopping SlashOffensesCollector...');
36
43
  for (const unwatchCallback of this.unwatchCallbacks){
37
44
  unwatchCallback();
38
45
  }
46
+ await this.storeMutationQueue.end();
39
47
  this.log.info('SlashOffensesCollector stopped');
40
- return Promise.resolve();
41
48
  }
42
49
  /**
43
50
  * Called when a slash watcher emits WANT_TO_SLASH_EVENT.
@@ -45,28 +52,40 @@ import { WANT_TO_SLASH_EVENT } from './watcher.js';
45
52
  * @param args - the arguments from the watcher, including the validators, amounts, and offenses
46
53
  */ async handleWantToSlash(args) {
47
54
  for (const arg of args){
48
- const pendingOffense = {
55
+ const offense = {
49
56
  validator: arg.validator,
50
57
  amount: arg.amount,
51
58
  offenseType: arg.offenseType,
52
59
  epochOrSlot: arg.epochOrSlot
53
60
  };
54
- if (this.shouldSkipOffense(pendingOffense)) {
55
- this.log.verbose('Skipping offense during grace period', pendingOffense);
56
- continue;
57
- }
58
- if (await this.offensesStore.hasOffense(pendingOffense)) {
59
- this.log.debug('Skipping repeated offense', pendingOffense);
61
+ if (this.shouldSkipOffense(offense)) {
62
+ this.log.verbose('Skipping offense during grace period', this.getOffenseLogData(offense));
60
63
  continue;
61
64
  }
62
- if (this.settings.slashingAmounts) {
63
- const minSlash = this.settings.slashingAmounts[0];
64
- if (arg.amount < minSlash) {
65
- this.log.warn(`Offense amount ${arg.amount} is below minimum slashing amount ${minSlash}`);
65
+ const added = await this.offensesStore.addOffense(offense);
66
+ if (added) {
67
+ if (this.settings.slashingAmounts) {
68
+ const minSlash = this.settings.slashingAmounts[0];
69
+ if (arg.amount < minSlash) {
70
+ this.log.warn(`Offense amount ${arg.amount} is below minimum slashing amount ${minSlash}`, this.getOffenseLogData(offense));
71
+ }
66
72
  }
73
+ this.log.info(`Adding pending offense for validator ${arg.validator}`, this.getOffenseLogData(offense));
74
+ } else {
75
+ this.log.debug('Skipping repeated offense', this.getOffenseLogData(offense));
76
+ }
77
+ }
78
+ }
79
+ async handleWantToClearSlash(args) {
80
+ for (const arg of args){
81
+ const cleared = await this.offensesStore.clearOffenses(arg);
82
+ if (cleared > 0) {
83
+ this.log.info(`Cleared ${cleared} pending offenses`, {
84
+ offenseType: getOffenseTypeName(arg.offenseType),
85
+ epochOrSlot: arg.epochOrSlot,
86
+ validators: arg.validators?.map((validator)=>validator.toString())
87
+ });
67
88
  }
68
- this.log.info(`Adding pending offense for validator ${arg.validator}`, pendingOffense);
69
- await this.offensesStore.addPendingOffense(pendingOffense);
70
89
  }
71
90
  }
72
91
  /**
@@ -78,17 +97,18 @@ import { WANT_TO_SLASH_EVENT } from './watcher.js';
78
97
  this.log.debug(`Cleared ${cleared} expired offenses for round ${round}`);
79
98
  }
80
99
  }
81
- /**
82
- * Marks offenses as slashed (no longer pending)
83
- * @param offenses - The offenses to mark as slashed
84
- */ markAsSlashed(offenses) {
85
- this.log.verbose(`Marking offenses as slashed`, {
86
- offenses
87
- });
88
- return this.offensesStore.markAsSlashed(offenses);
89
- }
90
100
  /** Returns whether to skip an offense if it happened during the grace period after the network upgrade */ shouldSkipOffense(offense) {
91
101
  const offenseSlot = getSlotForOffense(offense, this.settings);
92
102
  return offenseSlot < this.settings.rollupRegisteredAtL2Slot + this.config.slashGracePeriodL2Slots;
93
103
  }
104
+ getOffenseLogData(offense) {
105
+ return {
106
+ ...offense,
107
+ validator: offense.validator.toString(),
108
+ offenseType: getOffenseTypeName(offense.offenseType)
109
+ };
110
+ }
111
+ enqueueStoreMutation(label, callback) {
112
+ void this.storeMutationQueue.put(callback).catch((err)=>this.log.error(`Error handling ${label}`, err));
113
+ }
94
114
  }
@@ -0,0 +1,118 @@
1
+ import { EthAddress } from '@aztec/aztec.js/addresses';
2
+ import type { EpochCache } from '@aztec/epoch-cache';
3
+ import { RollupContract, SlasherContract, SlashingProposerContract } from '@aztec/ethereum/contracts';
4
+ import { SlotNumber } from '@aztec/foundation/branded-types';
5
+ import type { DateProvider } from '@aztec/foundation/timer';
6
+ import type { Prettify } from '@aztec/foundation/types';
7
+ import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
8
+ import { type Offense, type ProposerSlashAction, type ProposerSlashActionProvider } from '@aztec/stdlib/slashing';
9
+ import type { Hex } from 'viem';
10
+ import { SlasherMetrics } from './metrics.js';
11
+ import { OwnValidatorSlashMonitor } from './own_validator_slash_monitor.js';
12
+ import { SlashOffensesCollector, type SlashOffensesCollectorConfig, type SlashOffensesCollectorSettings } from './slash_offenses_collector.js';
13
+ import { SlashRoundMonitor, type SlashRoundMonitorSettings } from './slash_round_monitor.js';
14
+ import type { SlasherClientInterface } from './slasher_client_interface.js';
15
+ import type { SlasherOffensesStore } from './stores/offenses_store.js';
16
+ import type { Watcher } from './watcher.js';
17
+ /** Settings used in the slasher client, loaded from the L1 contracts during initialization */
18
+ export type SlasherSettings = Prettify<SlashRoundMonitorSettings & SlashOffensesCollectorSettings & {
19
+ slashingLifetimeInRounds: number;
20
+ slashingExecutionDelayInRounds: number;
21
+ slashingRoundSizeInEpochs: number;
22
+ slashingOffsetInRounds: number;
23
+ slashingQuorumSize: number;
24
+ slashingAmounts: [bigint, bigint, bigint];
25
+ /** Committee size for block proposal */
26
+ targetCommitteeSize: number;
27
+ }>;
28
+ export type SlasherClientConfig = SlashOffensesCollectorConfig & Pick<SlasherConfig, 'slashValidatorsAlways' | 'slashValidatorsNever' | 'slashExecuteRoundsLookBack' | 'slashMaxPayloadSize'>;
29
+ /**
30
+ * The Slasher client is responsible for managing slashable offenses using
31
+ * the consensus-based slashing model where proposers vote on individual validator offenses.
32
+ *
33
+ * The client subscribes to several slash watchers that emit offenses and tracks them. When the slasher is the
34
+ * proposer, it votes for which validators from past epochs should be slashed based on collected offenses.
35
+ * Voting is handled by the sequencer publisher, the slasher client does not interact with L1 directly.
36
+ * The client also monitors rounds and executes slashing when rounds become executable after reaching quorum.
37
+ *
38
+ * Voting and offense collection
39
+ * - Time is divided into rounds (ROUND_SIZE slots each). During each round, block proposers can submit votes
40
+ * indicating which validators from SLASH_OFFSET_IN_ROUNDS rounds ago should be slashed.
41
+ * - Votes are encoded as bytes where each validator's vote is represented by 2 bits indicating the slash amount (0-3 slash units)
42
+ * for the validator in the committee being slashed.
43
+ * - When gathering offenses for round N, the system looks at offenses from round N-2 (where 2 is the hardcoded
44
+ * offset), giving time to detect offenses and vote on them in a later round.
45
+ * - Each offense carries an epoch or block identifier to differentiate multiple offenses by the same validator.
46
+ *
47
+ * Quorum and execution
48
+ * - After a round ends, there is an execution delay period for review so the VETOER in the Slasher can veto
49
+ * if needed.
50
+ * - Once the delay passes, anyone can call executeRound() to tally votes and execute slashing.
51
+ * - Validators that reach the quorum threshold are slashed. A vote for slashing N units is also considered
52
+ * a vote for slashing N-1, N-2, ..., 1 units. The system slashes for the largest amount that reaches quorum.
53
+ * - The client monitors executable rounds and triggers execution when appropriate.
54
+ */
55
+ export declare class SlasherClient implements ProposerSlashActionProvider, SlasherClientInterface {
56
+ private config;
57
+ private settings;
58
+ private slashingProposer;
59
+ private slasher;
60
+ private rollup;
61
+ private epochCache;
62
+ private dateProvider;
63
+ private offensesStore;
64
+ private readonly ownValidators;
65
+ private log;
66
+ private readonly metrics;
67
+ protected unwatchCallbacks: (() => void)[];
68
+ protected roundMonitor: SlashRoundMonitor;
69
+ protected offensesCollector: SlashOffensesCollector;
70
+ protected readonly ownValidatorMonitor: OwnValidatorSlashMonitor;
71
+ constructor(config: SlasherClientConfig, settings: SlasherSettings, slashingProposer: SlashingProposerContract, slasher: SlasherContract, rollup: RollupContract, watchers: Watcher[], epochCache: EpochCache, dateProvider: DateProvider, offensesStore: SlasherOffensesStore, ownValidators?: EthAddress[], log?: import("@aztec/foundation/log").Logger, metrics?: SlasherMetrics);
72
+ start(): Promise<void>;
73
+ /** Stop the slasher client */
74
+ stop(): Promise<void>;
75
+ /** Returns the current config */
76
+ getConfig(): SlasherConfig;
77
+ /** Update the config of the slasher client */
78
+ updateConfig(config: Partial<SlasherConfig>): void;
79
+ /** Triggered on a time basis when we enter a new slashing round. Clears expired offenses. */
80
+ protected handleNewRound(round: bigint): Promise<void>;
81
+ /** Called when we see a RoundExecuted event on the SlashingProposer (just for logging and metrics). */
82
+ protected handleRoundExecuted(round: bigint, slashCount: bigint, l1BlockHash: Hex): Promise<void>;
83
+ /**
84
+ * Get the actions the proposer should take for slashing
85
+ * @param slotNumber - The current slot number
86
+ * @returns The actions to take
87
+ */
88
+ getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]>;
89
+ /**
90
+ * Returns an execute slash action if there are any rounds ready to be executed.
91
+ * Returns the oldest slash action if there are multiple rounds pending execution.
92
+ */
93
+ protected getExecuteSlashAction(slotNumber: SlotNumber): Promise<ProposerSlashAction | undefined>;
94
+ private tryGetRoundExecuteAction;
95
+ /** Returns a vote action based on offenses from the target round (with offset applied) */
96
+ protected getVoteOffensesAction(slotNumber: SlotNumber): Promise<ProposerSlashAction | undefined>;
97
+ /** Returns the committees that were active during the timespan of a given round */
98
+ private collectCommitteesActiveDuringRound;
99
+ /**
100
+ * Gather offenses to be slashed on a given round.
101
+ * Round N slashes validators from round N - slashOffsetInRounds.
102
+ * @param round - The round to get offenses for, defaults to current round
103
+ * @returns Array of pending offenses for the round with offset applied
104
+ */
105
+ gatherOffensesForRound(round?: bigint): Promise<Offense[]>;
106
+ /** Returns all offenses stored */
107
+ getOffenses(): Promise<Offense[]>;
108
+ /**
109
+ * Returns the round to be slashed given the current round by applying the slash offset.
110
+ * During round N, we cannot slash the validators from the epochs of the same round, since the round is not over,
111
+ * and besides we would be asking the current validators to vote to slash themselves. So during round N we look at the
112
+ * epochs spanned during round N - SLASH_OFFSET_IN_ROUNDS. This offset means that the epochs we slash are complete,
113
+ * and also gives nodes time to detect any misbehavior (eg slashing for prunes requires the proof submission window to
114
+ * pass).
115
+ */
116
+ private getSlashedRound;
117
+ }
118
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zbGFzaGVyX2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV0RyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHN0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxFQUNMLEtBQUssT0FBTyxFQUVaLEtBQUssbUJBQW1CLEVBQ3hCLEtBQUssMkJBQTJCLEVBSWpDLE1BQU0sd0JBQXdCLENBQUM7QUFHaEMsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRWhDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDOUMsT0FBTyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDNUUsT0FBTyxFQUNMLHNCQUFzQixFQUN0QixLQUFLLDRCQUE0QixFQUNqQyxLQUFLLDhCQUE4QixFQUNwQyxNQUFNLCtCQUErQixDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxLQUFLLHlCQUF5QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDN0YsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM1RSxPQUFPLEtBQUssRUFBRSxvQkFBb0Is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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"slasher_client.d.ts","sourceRoot":"","sources":["../src/slasher_client.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,14 @@ import { EthAddress } from '@aztec/aztec.js/addresses';
2
2
  import { maxBigint } from '@aztec/foundation/bigint';
3
3
  import { compactArray, partition, times } from '@aztec/foundation/collection';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
- import { OffenseType, getEpochsForRound, getSlashConsensusVotesFromOffenses } from '@aztec/stdlib/slashing';
5
+ import { OffenseType, getEpochsForRound, getOffenseTypeName, getSlashConsensusVotesFromOffenses } from '@aztec/stdlib/slashing';
6
+ import { getTelemetryClient } from '@aztec/telemetry-client';
7
+ import { SlasherMetrics } from './metrics.js';
8
+ import { OwnValidatorSlashMonitor } from './own_validator_slash_monitor.js';
6
9
  import { SlashOffensesCollector } from './slash_offenses_collector.js';
7
10
  import { SlashRoundMonitor } from './slash_round_monitor.js';
8
11
  /**
9
- * The Tally Slasher client is responsible for managing slashable offenses using
12
+ * The Slasher client is responsible for managing slashable offenses using
10
13
  * the consensus-based slashing model where proposers vote on individual validator offenses.
11
14
  *
12
15
  * The client subscribes to several slash watchers that emit offenses and tracks them. When the slasher is the
@@ -30,60 +33,66 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
30
33
  * - Validators that reach the quorum threshold are slashed. A vote for slashing N units is also considered
31
34
  * a vote for slashing N-1, N-2, ..., 1 units. The system slashes for the largest amount that reaches quorum.
32
35
  * - The client monitors executable rounds and triggers execution when appropriate.
33
- *
34
- * Differences from Empire model
35
- * - No fixed slash payloads - votes are for individual validator offenses encoded in bytes
36
- * - The L1 contract determines which offenses reach quorum rather than nodes agreeing on a payload
37
- * - Proposers vote directly on which validators to slash and by how much
38
- * - Uses a slash offset to vote on validators from past rounds (e.g., round N votes on round N-2)
39
- */ export class TallySlasherClient {
36
+ */ export class SlasherClient {
40
37
  config;
41
38
  settings;
42
- tallySlashingProposer;
39
+ slashingProposer;
43
40
  slasher;
44
41
  rollup;
45
42
  epochCache;
46
43
  dateProvider;
47
44
  offensesStore;
45
+ ownValidators;
48
46
  log;
47
+ metrics;
49
48
  unwatchCallbacks;
50
49
  roundMonitor;
51
50
  offensesCollector;
52
- constructor(config, settings, tallySlashingProposer, slasher, rollup, watchers, epochCache, dateProvider, offensesStore, log = createLogger('slasher:consensus')){
51
+ ownValidatorMonitor;
52
+ constructor(config, settings, slashingProposer, slasher, rollup, watchers, epochCache, dateProvider, offensesStore, ownValidators = [], log = createLogger('slasher:consensus'), metrics = new SlasherMetrics(getTelemetryClient())){
53
53
  this.config = config;
54
54
  this.settings = settings;
55
- this.tallySlashingProposer = tallySlashingProposer;
55
+ this.slashingProposer = slashingProposer;
56
56
  this.slasher = slasher;
57
57
  this.rollup = rollup;
58
58
  this.epochCache = epochCache;
59
59
  this.dateProvider = dateProvider;
60
60
  this.offensesStore = offensesStore;
61
+ this.ownValidators = ownValidators;
61
62
  this.log = log;
63
+ this.metrics = metrics;
62
64
  this.unwatchCallbacks = [];
63
65
  this.roundMonitor = new SlashRoundMonitor(settings, dateProvider);
64
66
  this.offensesCollector = new SlashOffensesCollector(config, settings, watchers, offensesStore);
67
+ this.ownValidatorMonitor = new OwnValidatorSlashMonitor(slashingProposer, settings, ownValidators, this.metrics);
65
68
  }
66
69
  async start() {
67
- this.log.debug('Starting Tally Slasher client...');
70
+ this.log.debug('Starting slasher client...');
68
71
  this.roundMonitor.start();
69
72
  await this.offensesCollector.start();
70
73
  // Listen for RoundExecuted events
71
- this.unwatchCallbacks.push(this.tallySlashingProposer.listenToRoundExecuted(({ round, slashCount, l1BlockHash })=>void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch((err)=>this.log.error('Error handling round executed', err))));
74
+ this.unwatchCallbacks.push(this.slashingProposer.listenToRoundExecuted(({ round, slashCount, l1BlockHash })=>void this.handleRoundExecuted(round, slashCount, l1BlockHash).catch((err)=>this.log.error('Error handling round executed', err))));
72
75
  // Check for round changes
73
76
  this.unwatchCallbacks.push(this.roundMonitor.listenToNewRound((round)=>this.handleNewRound(round)));
74
- this.log.info(`Started tally slasher client`);
77
+ // Warn early when a slashing vote names one of our own validators. Skipped entirely when running none, so
78
+ // those nodes pay no extra L1 subscription. Subscribed only after the monitor's baseline read completes, so a
79
+ // vote cast in between is caught up by a later drain instead of being mistaken for a pre-startup vote.
80
+ if (this.ownValidators.length > 0) {
81
+ await this.ownValidatorMonitor.start(this.roundMonitor.getCurrentRound().round);
82
+ this.unwatchCallbacks.push(this.slashingProposer.listenToVoteCast(({ round })=>void this.ownValidatorMonitor.handleVoteCast(round)));
83
+ }
84
+ this.log.info(`Started slasher client`);
75
85
  return Promise.resolve();
76
86
  }
77
- /**
78
- * Stop the tally slasher client
79
- */ async stop() {
80
- this.log.debug('Stopping Tally Slasher client...');
87
+ /** Stop the slasher client */ async stop() {
88
+ this.log.debug('Stopping slasher client...');
81
89
  for (const unwatchCallback of this.unwatchCallbacks){
82
90
  unwatchCallback();
83
91
  }
84
92
  this.roundMonitor.stop();
93
+ await this.ownValidatorMonitor.stop();
85
94
  await this.offensesCollector.stop();
86
- this.log.info('Tally Slasher client stopped');
95
+ this.log.info('Slasher client stopped');
87
96
  }
88
97
  /** Returns the current config */ getConfig() {
89
98
  return this.config;
@@ -95,14 +104,17 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
95
104
  };
96
105
  }
97
106
  /** Triggered on a time basis when we enter a new slashing round. Clears expired offenses. */ async handleNewRound(round) {
98
- this.log.info(`Starting new tally slashing round ${round}`);
107
+ this.log.info(`Starting new slashing round ${round}`);
108
+ this.ownValidatorMonitor.handleNewRound(round);
99
109
  await this.offensesCollector.handleNewRound(round);
100
110
  }
101
- /** Called when we see a RoundExecuted event on the TallySlashingProposer (just for logging). */ async handleRoundExecuted(round, slashCount, l1BlockHash) {
111
+ /** Called when we see a RoundExecuted event on the SlashingProposer (just for logging and metrics). */ async handleRoundExecuted(round, slashCount, l1BlockHash) {
112
+ this.metrics.recordRoundExecuted();
102
113
  const slashes = await this.rollup.getSlashEvents(l1BlockHash);
103
114
  this.log.info(`Slashing round ${round} has been executed with ${slashCount} slashes`, {
104
115
  slashes
105
116
  });
117
+ this.ownValidatorMonitor.handleSlashes(round, slashes, l1BlockHash);
106
118
  }
107
119
  /**
108
120
  * Get the actions the proposer should take for slashing
@@ -170,7 +182,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
170
182
  };
171
183
  this.log.debug(`Testing if slashing round ${executableRound} is executable`, logData);
172
184
  try {
173
- const roundInfo = await this.tallySlashingProposer.getRound(executableRound);
185
+ const roundInfo = await this.slashingProposer.getRound(executableRound);
174
186
  logData = {
175
187
  ...logData,
176
188
  roundInfo
@@ -186,19 +198,19 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
186
198
  return undefined;
187
199
  }
188
200
  // Check if round is ready to execute at the given slot
189
- const isReadyToExecute = await this.tallySlashingProposer.isRoundReadyToExecute(executableRound, slotNumber);
201
+ const isReadyToExecute = await this.slashingProposer.isRoundReadyToExecute(executableRound, slotNumber);
190
202
  if (!isReadyToExecute) {
191
203
  this.log.warn(`Round ${executableRound} is not ready to execute at slot ${slotNumber} according to contract check`, logData);
192
204
  return undefined;
193
205
  }
194
206
  // Check if the round yields any slashing at all
195
- const { actions: slashActions, committees } = await this.tallySlashingProposer.getTally(executableRound);
207
+ const { actions: slashActions, committees } = await this.slashingProposer.getTally(executableRound);
196
208
  if (slashActions.length === 0) {
197
209
  this.log.verbose(`Round ${executableRound} does not resolve in any slashing`, logData);
198
210
  return undefined;
199
211
  }
200
212
  // Check if the slash payload is vetoed
201
- const payload = await this.tallySlashingProposer.getPayload(executableRound);
213
+ const payload = await this.slashingProposer.getPayload(executableRound);
202
214
  const isVetoed = await this.slasher.isPayloadVetoed(payload.address);
203
215
  if (isVetoed) {
204
216
  this.log.warn(`Round ${executableRound} payload is vetoed (skipping execution)`, {
@@ -256,7 +268,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
256
268
  slotNumber,
257
269
  currentRound,
258
270
  slashedRound,
259
- offensesToForgive,
271
+ offensesFromAlwaysSlash: offensesFromAlwaysSlash.map(getOffenseLogData),
260
272
  slashValidatorsAlways: this.config.slashValidatorsAlways
261
273
  });
262
274
  }
@@ -265,7 +277,7 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
265
277
  slotNumber,
266
278
  currentRound,
267
279
  slashedRound,
268
- offensesToForgive,
280
+ offensesToForgive: offensesToForgive.map(getOffenseLogData),
269
281
  slashValidatorsNever: this.config.slashValidatorsNever
270
282
  });
271
283
  }
@@ -277,36 +289,36 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
277
289
  });
278
290
  return undefined;
279
291
  }
280
- this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
292
+ this.log.debug(`Computing slash votes for ${offensesToSlash.length} offenses`, {
281
293
  slotNumber,
282
294
  currentRound,
283
295
  slashedRound,
284
- offensesToSlash
296
+ offensesToSlash: offensesToSlash.map(getOffenseLogData)
285
297
  });
286
298
  const committees = await this.collectCommitteesActiveDuringRound(slashedRound);
287
299
  const epochsForCommittees = getEpochsForRound(slashedRound, this.settings);
288
300
  const { slashMaxPayloadSize } = this.config;
289
- const { votes, truncatedCount } = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, epochsForCommittees.map((e)=>BigInt(e)), {
301
+ const votes = getSlashConsensusVotesFromOffenses(offensesToSlash, committees, epochsForCommittees.map((e)=>BigInt(e)), {
290
302
  ...this.settings,
291
303
  maxSlashedValidators: slashMaxPayloadSize
292
- });
293
- if (truncatedCount > 0) {
294
- this.log.warn(`Vote truncated: ${truncatedCount} validator-epoch pairs dropped to stay within gas limit of ${slashMaxPayloadSize}`, {
295
- slotNumber,
296
- currentRound,
297
- slashedRound
298
- });
299
- }
304
+ }, this.log);
300
305
  if (votes.every((v)=>v === 0)) {
301
306
  this.log.warn(`Computed votes for offenses are all zero. Skipping vote.`, {
302
307
  slotNumber,
303
308
  currentRound,
304
309
  slashedRound,
305
- offensesToSlash,
310
+ offensesToSlash: offensesToSlash.map(getOffenseLogData),
306
311
  committees
307
312
  });
308
313
  return undefined;
309
314
  }
315
+ this.log.info(`Voting to slash ${offensesToSlash.length} offenses`, {
316
+ slotNumber,
317
+ slashedRound,
318
+ currentRound,
319
+ votes,
320
+ offensesToSlash: offensesToSlash.map(getOffenseLogData)
321
+ });
310
322
  this.log.debug(`Computed votes for slashing ${offensesToSlash.length} offenses`, {
311
323
  slashedRound,
312
324
  currentRound,
@@ -327,14 +339,8 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
327
339
  return Promise.all(epochsToSlash.map((epoch)=>this.epochCache.getCommitteeForEpoch(epoch).then((c)=>c.committee ?? emptyCommittee)));
328
340
  }
329
341
  /**
330
- * Get slash payloads is NOT SUPPORTED in tally model
331
- * @throws Error indicating this operation is not supported
332
- */ getSlashPayloads() {
333
- return Promise.reject(new Error('Tally slashing model does not support slash payloads'));
334
- }
335
- /**
336
342
  * Gather offenses to be slashed on a given round.
337
- * In tally slashing, round N slashes validators from round N - slashOffsetInRounds.
343
+ * Round N slashes validators from round N - slashOffsetInRounds.
338
344
  * @param round - The round to get offenses for, defaults to current round
339
345
  * @returns Array of pending offenses for the round with offset applied
340
346
  */ async gatherOffensesForRound(round) {
@@ -344,8 +350,8 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
344
350
  }
345
351
  return await this.offensesStore.getOffensesForRound(targetRound);
346
352
  }
347
- /** Returns all pending offenses stored */ getPendingOffenses() {
348
- return this.offensesStore.getPendingOffenses();
353
+ /** Returns all offenses stored */ getOffenses() {
354
+ return this.offensesStore.getOffenses();
349
355
  }
350
356
  /**
351
357
  * Returns the round to be slashed given the current round by applying the slash offset.
@@ -359,3 +365,10 @@ import { SlashRoundMonitor } from './slash_round_monitor.js';
359
365
  return round - BigInt(this.settings.slashingOffsetInRounds);
360
366
  }
361
367
  }
368
+ function getOffenseLogData(offense) {
369
+ return {
370
+ ...offense,
371
+ validator: offense.validator.toString(),
372
+ offenseType: getOffenseTypeName(offense.offenseType)
373
+ };
374
+ }
@@ -2,12 +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';
5
+ import type { EthAddress } from '@aztec/foundation/eth-address';
6
6
  import { DateProvider } from '@aztec/foundation/timer';
7
- import type { DataStoreConfig } from '@aztec/kv-store/config';
8
7
  import { AztecLMDBStoreV2 } from '@aztec/kv-store/lmdb-v2';
9
8
  import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
10
- import type { Offense, ProposerSlashAction, SlashPayloadRound } from '@aztec/stdlib/slashing';
9
+ import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
10
+ import type { Offense, ProposerSlashAction } from '@aztec/stdlib/slashing';
11
11
  import type { SlasherClientInterface } from './slasher_client_interface.js';
12
12
  import type { Watcher } from './watcher.js';
13
13
  /**
@@ -19,27 +19,26 @@ export declare class SlasherClientFacade implements SlasherClientInterface {
19
19
  private config;
20
20
  private rollup;
21
21
  private l1Client;
22
- private slashFactoryAddress;
23
22
  private watchers;
24
23
  private epochCache;
25
24
  private dateProvider;
26
25
  private kvStore;
27
26
  private rollupRegisteredAtL2Slot;
27
+ private ownValidators;
28
28
  private logger;
29
29
  private client;
30
30
  private unwatch;
31
31
  constructor(config: SlasherConfig & DataStoreConfig & {
32
32
  ethereumSlotDuration: number;
33
- }, rollup: RollupContract, l1Client: ViemClient, slashFactoryAddress: EthAddress | undefined, watchers: Watcher[], epochCache: EpochCache, dateProvider: DateProvider, kvStore: AztecLMDBStoreV2, rollupRegisteredAtL2Slot: SlotNumber, logger?: import("@aztec/foundation/log").Logger);
33
+ }, rollup: RollupContract, l1Client: ViemClient, watchers: Watcher[], epochCache: EpochCache, dateProvider: DateProvider, kvStore: AztecLMDBStoreV2, rollupRegisteredAtL2Slot: SlotNumber, ownValidators?: EthAddress[], logger?: import("@aztec/foundation/log").Logger);
34
34
  start(): Promise<void>;
35
35
  stop(): Promise<void>;
36
36
  getConfig(): SlasherConfig;
37
37
  updateConfig(config: Partial<SlasherConfig>): void;
38
- getSlashPayloads(): Promise<SlashPayloadRound[]>;
39
38
  gatherOffensesForRound(round?: bigint): Promise<Offense[]>;
40
- getPendingOffenses(): Promise<Offense[]>;
39
+ getOffenses(): Promise<Offense[]>;
41
40
  getProposerActions(slotNumber: SlotNumber): Promise<ProposerSlashAction[]>;
42
41
  private createSlasherClient;
43
42
  private handleSlasherChange;
44
43
  }
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfZmFjYWRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfZmFjYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUc5RixPQUFPLEtBQUssRUFBRSxzQkFBc0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUU1Qzs7OztHQUlHO0FBQ0gscUJBQWEsbUJBQW9CLFlBQVcsc0JBQXNCO0lBSzlELE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsUUFBUTtJQUNoQixPQUFPLENBQUMsbUJBQW1CO0lBQzNCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLHdCQUF3QjtJQUNoQyxPQUFPLENBQUMsTUFBTTtJQWJoQixPQUFPLENBQUMsTUFBTSxDQUFxQztJQUNuRCxPQUFPLENBQUMsT0FBTyxDQUEyQjtJQUUxQyxZQUNVLE1BQU0sRUFBRSxhQUFhLEdBQUcsZUFBZSxHQUFHO1FBQUUsb0JBQW9CLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFDMUUsTUFBTSxFQUFFLGNBQWMsRUFDdEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsbUJBQW1CLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDM0MsUUFBUSxFQUFFLE9BQU8sRUFBRSxFQUNuQixVQUFVLEVBQUUsVUFBVSxFQUN0QixZQUFZLEVBQUUsWUFBWSxFQUMxQixPQUFPLEVBQUUsZ0JBQWdCLEVBQ3pCLHdCQUF3QixFQUFFLFVBQVUsRUFDcEMsTUFBTSx5Q0FBMEIsRUFDdEM7SUFFUyxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQVNsQztJQUVZLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBSWpDO0lBRU0sU0FBUyxJQUFJLGFBQWEsQ0FFaEM7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUMsR0FBRyxJQUFJLENBSXhEO0lBRU0sZ0JBQWdCLElBQUksT0FBTyxDQUFDLGlCQUFpQixFQUFFLENBQUMsQ0FFdEQ7SUFFTSxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRWhFO0lBRU0sa0JBQWtCLElBQUksT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRTlDO0lBRU0sa0JBQWtCLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUVoRjtJQUVELE9BQU8sQ0FBQyxtQkFBbUI7WUFlYixtQkFBbUI7Q0FNbEMifQ==
44
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hlcl9jbGllbnRfZmFjYWRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hlcl9jbGllbnRfZmFjYWRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRzNFLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTVDOzs7O0dBSUc7QUFDSCxxQkFBYSxtQkFBb0IsWUFBVyxzQkFBc0I7SUFLOUQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsTUFBTTtJQUNkLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxRQUFRO0lBQ2hCLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLHdCQUF3QjtJQUNoQyxPQUFPLENBQUMsYUFBYTtJQUNyQixPQUFPLENBQUMsTUFBTTtJQWJoQixPQUFPLENBQUMsTUFBTSxDQUFxQztJQUNuRCxPQUFPLENBQUMsT0FBTyxDQUEyQjtJQUUxQyxZQUNVLE1BQU0sRUFBRSxhQUFhLEdBQUcsZUFBZSxHQUFHO1FBQUUsb0JBQW9CLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFDMUUsTUFBTSxFQUFFLGNBQWMsRUFDdEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsUUFBUSxFQUFFLE9BQU8sRUFBRSxFQUNuQixVQUFVLEVBQUUsVUFBVSxFQUN0QixZQUFZLEVBQUUsWUFBWSxFQUMxQixPQUFPLEVBQUUsZ0JBQWdCLEVBQ3pCLHdCQUF3QixFQUFFLFVBQVUsRUFDcEMsYUFBYSxHQUFFLFVBQVUsRUFBTyxFQUNoQyxNQUFNLHlDQUEwQixFQUN0QztJQUVTLEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBU2xDO0lBRVksSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJakM7SUFFTSxTQUFTLElBQUksYUFBYSxDQUVoQztJQUVNLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGFBQWEsQ0FBQyxHQUFHLElBQUksQ0FJeEQ7SUFFTSxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRWhFO0lBRU0sV0FBVyxJQUFJLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUV2QztJQUVNLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixFQUFFLENBQUMsQ0FFaEY7SUFFRCxPQUFPLENBQUMsbUJBQW1CO1lBZWIsbUJBQW1CO0NBTWxDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"slasher_client_facade.d.ts","sourceRoot":"","sources":["../src/slasher_client_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAK9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,MAAM;IAbhB,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,OAAO,CAA2B;IAE1C,YACU,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG;QAAE,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAC1E,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,UAAU,EACpB,mBAAmB,EAAE,UAAU,GAAG,SAAS,EAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,gBAAgB,EACzB,wBAAwB,EAAE,UAAU,EACpC,MAAM,yCAA0B,EACtC;IAES,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CASlC;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAEM,SAAS,IAAI,aAAa,CAEhC;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAIxD;IAEM,gBAAgB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAEtD;IAEM,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAEhE;IAEM,kBAAkB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAE9C;IAEM,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAEhF;IAED,OAAO,CAAC,mBAAmB;YAeb,mBAAmB;CAMlC"}
1
+ {"version":3,"file":"slasher_client_facade.d.ts","sourceRoot":"","sources":["../src/slasher_client_facade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG3E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAK9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,wBAAwB;IAChC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IAbhB,OAAO,CAAC,MAAM,CAAqC;IACnD,OAAO,CAAC,OAAO,CAA2B;IAE1C,YACU,MAAM,EAAE,aAAa,GAAG,eAAe,GAAG;QAAE,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAC1E,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,UAAU,EACpB,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,gBAAgB,EACzB,wBAAwB,EAAE,UAAU,EACpC,aAAa,GAAE,UAAU,EAAO,EAChC,MAAM,yCAA0B,EACtC;IAES,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CASlC;IAEY,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAIjC;IAEM,SAAS,IAAI,aAAa,CAEhC;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAIxD;IAEM,sBAAsB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAEhE;IAEM,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAEvC;IAEM,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAEhF;IAED,OAAO,CAAC,mBAAmB;YAeb,mBAAmB;CAMlC"}
@@ -8,25 +8,25 @@ import { createSlasherImplementation } from './factory/create_implementation.js'
8
8
  config;
9
9
  rollup;
10
10
  l1Client;
11
- slashFactoryAddress;
12
11
  watchers;
13
12
  epochCache;
14
13
  dateProvider;
15
14
  kvStore;
16
15
  rollupRegisteredAtL2Slot;
16
+ ownValidators;
17
17
  logger;
18
18
  client;
19
19
  unwatch;
20
- constructor(config, rollup, l1Client, slashFactoryAddress, watchers, epochCache, dateProvider, kvStore, rollupRegisteredAtL2Slot, logger = createLogger('slasher')){
20
+ constructor(config, rollup, l1Client, watchers, epochCache, dateProvider, kvStore, rollupRegisteredAtL2Slot, ownValidators = [], logger = createLogger('slasher')){
21
21
  this.config = config;
22
22
  this.rollup = rollup;
23
23
  this.l1Client = l1Client;
24
- this.slashFactoryAddress = slashFactoryAddress;
25
24
  this.watchers = watchers;
26
25
  this.epochCache = epochCache;
27
26
  this.dateProvider = dateProvider;
28
27
  this.kvStore = kvStore;
29
28
  this.rollupRegisteredAtL2Slot = rollupRegisteredAtL2Slot;
29
+ this.ownValidators = ownValidators;
30
30
  this.logger = logger;
31
31
  }
32
32
  async start() {
@@ -54,20 +54,17 @@ import { createSlasherImplementation } from './factory/create_implementation.js'
54
54
  this.client?.updateConfig(config);
55
55
  this.watchers.forEach((watcher)=>watcher.updateConfig?.(config));
56
56
  }
57
- getSlashPayloads() {
58
- return this.client?.getSlashPayloads() ?? Promise.reject(new Error('Slasher client not initialized'));
59
- }
60
57
  gatherOffensesForRound(round) {
61
58
  return this.client?.gatherOffensesForRound(round) ?? Promise.reject(new Error('Slasher client not initialized'));
62
59
  }
63
- getPendingOffenses() {
64
- return this.client?.getPendingOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
60
+ getOffenses() {
61
+ return this.client?.getOffenses() ?? Promise.reject(new Error('Slasher client not initialized'));
65
62
  }
66
63
  getProposerActions(slotNumber) {
67
64
  return this.client?.getProposerActions(slotNumber) ?? Promise.reject(new Error('Slasher client not initialized'));
68
65
  }
69
66
  createSlasherClient() {
70
- return createSlasherImplementation(this.config, this.rollup, this.l1Client, this.slashFactoryAddress, this.watchers, this.epochCache, this.dateProvider, this.kvStore, this.rollupRegisteredAtL2Slot, this.logger);
67
+ return createSlasherImplementation(this.config, this.rollup, this.l1Client, this.watchers, this.epochCache, this.dateProvider, this.kvStore, this.rollupRegisteredAtL2Slot, this.ownValidators, this.logger);
71
68
  }
72
69
  async handleSlasherChange() {
73
70
  this.logger.warn('Slasher contract changed, recreating slasher client');