@aztec/validator-ha-signer 0.0.1-commit.ff7989d6c → 0.0.1-commit.fff30aa

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.
@@ -29,11 +29,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
29
29
  pollingIntervalMs;
30
30
  signingTimeoutMs;
31
31
  maxStuckDutiesAgeMs;
32
- metrics;
33
- dateProvider;
34
32
  cleanupRunningPromise;
35
33
  lastOldDutiesCleanupAtMs;
36
- constructor(db, config, deps){
34
+ constructor(db, config){
37
35
  this.db = db;
38
36
  this.config = config;
39
37
  this.log = createLogger('slashing-protection');
@@ -42,8 +40,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
42
40
  // Default to 144s (2x 72s Aztec slot duration) if not explicitly configured
43
41
  this.maxStuckDutiesAgeMs = config.maxStuckDutiesAgeMs ?? 144_000;
44
42
  this.cleanupRunningPromise = new RunningPromise(this.cleanup.bind(this), this.log, this.maxStuckDutiesAgeMs);
45
- this.metrics = deps.metrics;
46
- this.dateProvider = deps.dateProvider;
47
43
  }
48
44
  /**
49
45
  * Check if a duty can be performed and acquire the lock if so.
@@ -61,7 +57,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
61
57
  * @throws SlashingProtectionError if attempting to sign different data for same slot/duty
62
58
  */ async checkAndRecord(params) {
63
59
  const { validatorAddress, slot, dutyType, messageHash, nodeId } = params;
64
- const startTime = this.dateProvider.now();
60
+ const startTime = Date.now();
65
61
  this.log.debug(`Checking duty: ${dutyType} for slot ${slot}`, {
66
62
  validatorAddress: validatorAddress.toString(),
67
63
  nodeId
@@ -71,11 +67,10 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
71
67
  const { isNew, record } = await this.db.tryInsertOrGetExisting(params);
72
68
  if (isNew) {
73
69
  // We successfully acquired the lock
74
- this.log.info(`Acquired lock for duty ${dutyType} at slot ${slot}`, {
70
+ this.log.verbose(`Acquired lock for duty ${dutyType} at slot ${slot}`, {
75
71
  validatorAddress: validatorAddress.toString(),
76
72
  nodeId
77
73
  });
78
- this.metrics.recordLockAcquire(true);
79
74
  return record.lockToken;
80
75
  }
81
76
  // Record already exists - handle based on status
@@ -89,20 +84,17 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
89
84
  existingNodeId: record.nodeId,
90
85
  attemptingNodeId: nodeId
91
86
  });
92
- this.metrics.recordSlashingProtection(dutyType);
93
87
  throw new SlashingProtectionError(slot, dutyType, record.blockIndexWithinCheckpoint, record.messageHash, messageHash, record.nodeId);
94
88
  }
95
- this.metrics.recordDutyAlreadySigned(dutyType);
96
89
  throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, record.nodeId);
97
90
  } else if (record.status === DutyStatus.SIGNING) {
98
91
  // Another node is currently signing - check for timeout
99
- if (this.dateProvider.now() - startTime > this.signingTimeoutMs) {
92
+ if (Date.now() - startTime > this.signingTimeoutMs) {
100
93
  this.log.warn(`Timeout waiting for signing to complete for duty ${dutyType} at slot ${slot}`, {
101
94
  validatorAddress: validatorAddress.toString(),
102
95
  timeoutMs: this.signingTimeoutMs,
103
96
  signingNodeId: record.nodeId
104
97
  });
105
- this.metrics.recordDutyAlreadySigned(dutyType);
106
98
  throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, 'unknown (timeout)');
107
99
  }
108
100
  // Wait and poll
@@ -128,7 +120,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
128
120
  const blockIndexWithinCheckpoint = getBlockIndexFromDutyIdentifier(params);
129
121
  const success = await this.db.updateDutySigned(rollupAddress, validatorAddress, slot, dutyType, signature.toString(), lockToken, blockIndexWithinCheckpoint);
130
122
  if (success) {
131
- this.log.info(`Recorded successful signing for duty ${dutyType} at slot ${slot}`, {
123
+ this.log.verbose(`Recorded successful signing for duty ${dutyType} at slot ${slot}`, {
132
124
  validatorAddress: validatorAddress.toString(),
133
125
  nodeId
134
126
  });
@@ -179,7 +171,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
179
171
  this.log.info(`Cleaned up ${numOutdatedRollupDuties} duties with outdated rollup address at startup`, {
180
172
  currentRollupAddress: this.config.l1Contracts.rollupAddress.toString()
181
173
  });
182
- this.metrics.recordCleanup('outdated_rollup', numOutdatedRollupDuties);
183
174
  }
184
175
  this.cleanupRunningPromise.start();
185
176
  this.log.info('Slashing protection service started', {
@@ -212,13 +203,12 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
212
203
  nodeId: this.config.nodeId,
213
204
  maxStuckDutiesAgeMs: this.maxStuckDutiesAgeMs
214
205
  });
215
- this.metrics.recordCleanup('stuck', numStuckDuties);
216
206
  }
217
207
  // 2. Clean up old signed duties if configured
218
208
  // we shouldn't run this as often as stuck duty cleanup.
219
209
  if (this.config.cleanupOldDutiesAfterHours !== undefined) {
220
210
  const maxAgeMs = this.config.cleanupOldDutiesAfterHours * 60 * 60 * 1000;
221
- const nowMs = this.dateProvider.now();
211
+ const nowMs = Date.now();
222
212
  const shouldRun = this.lastOldDutiesCleanupAtMs === undefined || nowMs - this.lastOldDutiesCleanupAtMs >= maxAgeMs;
223
213
  if (shouldRun) {
224
214
  const numOldDuties = await this.db.cleanupOldDuties(maxAgeMs);
@@ -228,7 +218,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
228
218
  cleanupOldDutiesAfterHours: this.config.cleanupOldDutiesAfterHours,
229
219
  maxAgeMs
230
220
  });
231
- this.metrics.recordCleanup('old', numOldDuties);
232
221
  }
233
222
  }
234
223
  }
package/dest/types.d.ts CHANGED
@@ -1,14 +1,10 @@
1
- import { SlotNumber } from '@aztec/foundation/branded-types';
1
+ import { BlockNumber, type CheckpointNumber, type IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
2
2
  import type { EthAddress } from '@aztec/foundation/eth-address';
3
- import { DateProvider } from '@aztec/foundation/timer';
4
- import { DutyType, type HAProtectedSigningContext, type SigningContext, type ValidatorHASignerConfig, getBlockNumberFromSigningContext as getBlockNumberFromSigningContextFromStdlib, isHAProtectedContext } from '@aztec/stdlib/ha-signing';
5
- import type { TelemetryClient } from '@aztec/telemetry-client';
6
3
  import type { Pool } from 'pg';
7
- import type { BlockProposalDutyIdentifier, CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, DutyRow, OtherDutyIdentifier, RecordSuccessParams, ValidatorDutyRecord } from './db/types.js';
8
- export type { BlockProposalDutyIdentifier, CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, DutyRow, HAProtectedSigningContext, OtherDutyIdentifier, RecordSuccessParams, SigningContext, ValidatorDutyRecord, ValidatorHASignerConfig, };
4
+ import type { ValidatorHASignerConfig } from './config.js';
5
+ import { type BlockProposalDutyIdentifier, type CheckAndRecordParams, type DeleteDutyParams, type DutyIdentifier, type DutyRow, DutyType, type OtherDutyIdentifier, type RecordSuccessParams, type ValidatorDutyRecord } from './db/types.js';
6
+ export type { BlockProposalDutyIdentifier, CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, DutyRow, OtherDutyIdentifier, RecordSuccessParams, ValidatorDutyRecord, ValidatorHASignerConfig, };
9
7
  export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
10
- export { isHAProtectedContext };
11
- export { getBlockNumberFromSigningContextFromStdlib as getBlockNumberFromSigningContext };
12
8
  /**
13
9
  * Result of tryInsertOrGetExisting operation
14
10
  */
@@ -27,15 +23,76 @@ export interface CreateHASignerDeps {
27
23
  * If provided, databaseUrl and poolConfig are ignored
28
24
  */
29
25
  pool?: Pool;
26
+ }
27
+ /**
28
+ * Base context for signing operations
29
+ */
30
+ interface BaseSigningContext {
31
+ /** Slot number for this duty */
32
+ slot: SlotNumber;
30
33
  /**
31
- * Optional telemetry client for metrics
32
- */
33
- telemetryClient?: TelemetryClient;
34
- /**
35
- * Optional date provider for timestamps
34
+ * Block or checkpoint number for this duty.
35
+ * For block proposals, this is the block number.
36
+ * For checkpoint proposals, this is the checkpoint number.
36
37
  */
37
- dateProvider?: DateProvider;
38
+ blockNumber: BlockNumber | CheckpointNumber;
38
39
  }
40
+ /**
41
+ * Signing context for block proposals.
42
+ * blockIndexWithinCheckpoint is REQUIRED and must be >= 0.
43
+ */
44
+ export interface BlockProposalSigningContext extends BaseSigningContext {
45
+ /** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
46
+ blockIndexWithinCheckpoint: IndexWithinCheckpoint;
47
+ dutyType: DutyType.BLOCK_PROPOSAL;
48
+ }
49
+ /**
50
+ * Signing context for non-block-proposal duties that require HA protection.
51
+ * blockIndexWithinCheckpoint is not applicable (internally always -1).
52
+ */
53
+ export interface OtherSigningContext extends BaseSigningContext {
54
+ dutyType: DutyType.CHECKPOINT_PROPOSAL | DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS;
55
+ }
56
+ /**
57
+ * Signing context for governance/slashing votes which only need slot for HA protection.
58
+ * blockNumber is not applicable (internally always 0).
59
+ */
60
+ export interface VoteSigningContext {
61
+ slot: SlotNumber;
62
+ dutyType: DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE;
63
+ }
64
+ /**
65
+ * Signing context for duties which don't require slot/blockNumber
66
+ * as they don't need HA protection (AUTH_REQUEST, TXS).
67
+ */
68
+ export interface NoHAProtectionSigningContext {
69
+ dutyType: DutyType.AUTH_REQUEST | DutyType.TXS;
70
+ }
71
+ /**
72
+ * Signing contexts that require HA protection (excludes AUTH_REQUEST).
73
+ * Used by the HA signer's signWithProtection method.
74
+ */
75
+ export type HAProtectedSigningContext = BlockProposalSigningContext | OtherSigningContext | VoteSigningContext;
76
+ /**
77
+ * Type guard to check if a SigningContext requires HA protection.
78
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
79
+ */
80
+ export declare function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext;
81
+ /**
82
+ * Gets the block number from a signing context.
83
+ * - Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE): returns BlockNumber(0)
84
+ * - Other duties: returns the blockNumber from the context
85
+ */
86
+ export declare function getBlockNumberFromSigningContext(context: HAProtectedSigningContext): BlockNumber | CheckpointNumber;
87
+ /**
88
+ * Context required for slashing protection during signing operations.
89
+ * Uses discriminated union to enforce type safety:
90
+ * - BLOCK_PROPOSAL duties MUST have blockIndexWithinCheckpoint >= 0
91
+ * - Other duty types do NOT have blockIndexWithinCheckpoint (internally -1)
92
+ * - Vote duties only need slot (blockNumber is internally 0)
93
+ * - AUTH_REQUEST and TXS duties don't need slot/blockNumber (no HA protection needed)
94
+ */
95
+ export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningContext;
39
96
  /**
40
97
  * Database interface for slashing protection operations
41
98
  * This abstraction allows for different database implementations (PostgreSQL, SQLite, etc.)
@@ -92,4 +149,4 @@ export interface SlashingProtectionDatabase {
92
149
  */
93
150
  close(): Promise<void>;
94
151
  }
95
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sRUFDTCxRQUFRLEVBQ1IsS0FBSyx5QkFBeUIsRUFDOUIsS0FBSyxjQUFjLEVBQ25CLEtBQUssdUJBQXVCLEVBQzVCLGdDQUFnQyxJQUFJLDBDQUEwQyxFQUM5RSxvQkFBb0IsRUFDckIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUUvRCxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFL0IsT0FBTyxLQUFLLEVBQ1YsMkJBQTJCLEVBQzNCLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLE9BQU8sRUFDUCxtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNwQixNQUFNLGVBQWUsQ0FBQztBQUV2QixZQUFZLEVBQ1YsMkJBQTJCLEVBQzNCLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLE9BQU8sRUFDUCx5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixjQUFjLEVBQ2QsbUJBQW1CLEVBQ25CLHVCQUF1QixHQUN4QixDQUFDO0FBQ0YsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsK0JBQStCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0csT0FBTyxFQUFFLG9CQUFvQixFQUFFLENBQUM7QUFDaEMsT0FBTyxFQUFFLDBDQUEwQyxJQUFJLGdDQUFnQyxFQUFFLENBQUM7QUFFMUY7O0dBRUc7QUFDSCxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLDJFQUEyRTtJQUMzRSxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ2YscURBQXFEO0lBQ3JELE1BQU0sRUFBRSxtQkFBbUIsQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQzs7O09BR0c7SUFDSCxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUM7SUFDWjs7T0FFRztJQUNILGVBQWUsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUNsQzs7T0FFRztJQUNILFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QjtBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxXQUFXLDBCQUEwQjtJQUN6Qzs7Ozs7T0FLRztJQUNILHNCQUFzQixDQUFDLE1BQU0sRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVwRjs7Ozs7T0FLRztJQUNILGdCQUFnQixDQUNkLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFDakIsMEJBQTBCLEVBQUUsTUFBTSxHQUNqQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFcEI7Ozs7OztPQU1HO0lBQ0gsVUFBVSxDQUNSLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsMEJBQTBCLEVBQUUsTUFBTSxHQUNqQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFcEI7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUV6RTs7Ozs7T0FLRztJQUNILDJCQUEyQixDQUFDLG9CQUFvQixFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFL0U7Ozs7T0FJRztJQUNILGdCQUFnQixDQUFDLFFBQVEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXBEOzs7T0FHRztJQUNILEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDeEIifQ==
152
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssVUFBVSxFQUNoQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQztBQUUvQixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxjQUFjLEVBQ25CLEtBQUssT0FBTyxFQUNaLFFBQVEsRUFDUixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixZQUFZLEVBQ1YsMkJBQTJCLEVBQzNCLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLE9BQU8sRUFDUCxtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQix1QkFBdUIsR0FDeEIsQ0FBQztBQUNGLE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLCtCQUErQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNHOztHQUVHO0FBQ0gsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQywyRUFBMkU7SUFDM0UsS0FBSyxFQUFFLE9BQU8sQ0FBQztJQUNmLHFEQUFxRDtJQUNyRCxNQUFNLEVBQUUsbUJBQW1CLENBQUM7Q0FDN0I7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakM7OztPQUdHO0lBQ0gsSUFBSSxD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
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,QAAQ,EACR,KAAK,yBAAyB,EAC9B,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,gCAAgC,IAAI,0CAA0C,EAC9E,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,KAAK,EACV,2BAA2B,EAC3B,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,OAAO,EACP,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,2BAA2B,EAC3B,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,OAAO,EACP,yBAAyB,EACzB,mBAAmB,EACnB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,uBAAuB,GACxB,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC3G,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAChC,OAAO,EAAE,0CAA0C,IAAI,gCAAgC,EAAE,CAAC;AAE1F;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,2EAA2E;IAC3E,KAAK,EAAE,OAAO,CAAC;IACf,qDAAqD;IACrD,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ;;OAEG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEpF;;;;;OAKG;IACH,gBAAgB,CACd,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,UAAU,EAC5B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,UAAU,CACR,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,UAAU,EAC5B,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;OAGG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEzE;;;;;OAKG;IACH,2BAA2B,CAAC,oBAAoB,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/E;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpD;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
package/dest/types.js CHANGED
@@ -1,4 +1,21 @@
1
- import { getBlockNumberFromSigningContext as getBlockNumberFromSigningContextFromStdlib, isHAProtectedContext } from '@aztec/stdlib/ha-signing';
1
+ import { BlockNumber } from '@aztec/foundation/branded-types';
2
+ import { DutyType } from './db/types.js';
2
3
  export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
3
- export { isHAProtectedContext };
4
- export { getBlockNumberFromSigningContextFromStdlib as getBlockNumberFromSigningContext };
4
+ /**
5
+ * Type guard to check if a SigningContext requires HA protection.
6
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
7
+ */ export function isHAProtectedContext(context) {
8
+ return context.dutyType !== DutyType.AUTH_REQUEST && context.dutyType !== DutyType.TXS;
9
+ }
10
+ /**
11
+ * Gets the block number from a signing context.
12
+ * - Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE): returns BlockNumber(0)
13
+ * - Other duties: returns the blockNumber from the context
14
+ */ export function getBlockNumberFromSigningContext(context) {
15
+ // Check for duty types that have blockNumber
16
+ if (context.dutyType === DutyType.BLOCK_PROPOSAL || context.dutyType === DutyType.CHECKPOINT_PROPOSAL || context.dutyType === DutyType.ATTESTATION || context.dutyType === DutyType.ATTESTATIONS_AND_SIGNERS) {
17
+ return context.blockNumber;
18
+ }
19
+ // Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE) don't have blockNumber
20
+ return BlockNumber(0);
21
+ }
@@ -8,14 +8,8 @@
8
8
  import type { Buffer32 } from '@aztec/foundation/buffer';
9
9
  import { EthAddress } from '@aztec/foundation/eth-address';
10
10
  import type { Signature } from '@aztec/foundation/eth-signature';
11
- import type { DateProvider } from '@aztec/foundation/timer';
12
- import { type HAProtectedSigningContext, type ValidatorHASignerConfig } from '@aztec/stdlib/ha-signing';
13
- import type { HASignerMetrics } from './metrics.js';
14
- import type { SlashingProtectionDatabase } from './types.js';
15
- export interface ValidatorHASignerDeps {
16
- metrics: HASignerMetrics;
17
- dateProvider: DateProvider;
18
- }
11
+ import type { ValidatorHASignerConfig } from './config.js';
12
+ import { type HAProtectedSigningContext, type SlashingProtectionDatabase } from './types.js';
19
13
  /**
20
14
  * Validator High Availability Signer
21
15
  *
@@ -40,9 +34,7 @@ export declare class ValidatorHASigner {
40
34
  private readonly log;
41
35
  private readonly slashingProtection;
42
36
  private readonly rollupAddress;
43
- private readonly dateProvider;
44
- private readonly metrics;
45
- constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig, deps: ValidatorHASignerDeps);
37
+ constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig);
46
38
  /**
47
39
  * Sign a message with slashing protection.
48
40
  *
@@ -76,4 +68,4 @@ export declare class ValidatorHASigner {
76
68
  */
77
69
  stop(): Promise<void>;
78
70
  }
79
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yX2hhX3NpZ25lci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZhbGlkYXRvcl9oYV9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRWpFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sRUFFTCxLQUFLLHlCQUF5QixFQUM5QixLQUFLLHVCQUF1QixFQUU3QixNQUFNLDBCQUEwQixDQUFDO0FBR2xDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUU3RCxNQUFNLFdBQVcscUJBQXFCO0lBQ3BDLE9BQU8sRUFBRSxlQUFlLENBQUM7SUFDekIsWUFBWSxFQUFFLFlBQVksQ0FBQztDQUM1QjtBQUVEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQkc7QUFDSCxxQkFBYSxpQkFBaUI7SUFVMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBVHpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQTRCO0lBQy9ELE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFhO0lBRTNDLE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFlO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFrQjtJQUUxQyxZQUNFLEVBQUUsRUFBRSwwQkFBMEIsRUFDYixNQUFNLEVBQUUsdUJBQXVCLEVBQ2hELElBQUksRUFBRSxxQkFBcUIsRUF3QjVCO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7T0FnQkc7SUFDRyxrQkFBa0IsQ0FDdEIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixXQUFXLEVBQUUsUUFBUSxFQUNyQixPQUFPLEVBQUUseUJBQXlCLEVBQ2xDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxRQUFRLEtBQUssT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUNwRCxPQUFPLENBQUMsU0FBUyxDQUFDLENBdURwQjtJQUVEOztPQUVHO0lBQ0gsSUFBSSxNQUFNLElBQUksTUFBTSxDQUVuQjtJQUVEOzs7T0FHRztJQUNHLEtBQUssa0JBRVY7SUFFRDs7O09BR0c7SUFDRyxJQUFJLGtCQUdUO0NBQ0YifQ==
71
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yX2hhX3NpZ25lci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZhbGlkYXRvcl9oYV9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRzNELE9BQU8sRUFDTCxLQUFLLHlCQUF5QixFQUM5QixLQUFLLDBCQUEwQixFQUVoQyxNQUFNLFlBQVksQ0FBQztBQUVwQjs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBa0JHO0FBQ0gscUJBQWEsaUJBQWlCO0lBTzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQU56QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUE0QjtJQUMvRCxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBYTtJQUUzQyxZQUNFLEVBQUUsRUFBRSwwQkFBMEIsRUFDYixNQUFNLEVBQUUsdUJBQXVCLEVBa0JqRDtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7O09BZ0JHO0lBQ0csa0JBQWtCLENBQ3RCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsV0FBVyxFQUFFLFFBQVEsRUFDckIsT0FBTyxFQUFFLHlCQUF5QixFQUNsQyxNQUFNLEVBQUUsQ0FBQyxXQUFXLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FDcEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQStDcEI7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRDs7O09BR0c7SUFDRyxLQUFLLGtCQUVWO0lBRUQ7OztPQUdHO0lBQ0csSUFBSSxrQkFHVDtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"validator_ha_signer.d.ts","sourceRoot":"","sources":["../src/validator_ha_signer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAEL,KAAK,yBAAyB,EAC9B,KAAK,uBAAuB,EAE7B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,iBAAiB;IAU1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAa;IAE3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAE1C,YACE,EAAE,EAAE,0BAA0B,EACb,MAAM,EAAE,uBAAuB,EAChD,IAAI,EAAE,qBAAqB,EAwB5B;IAED;;;;;;;;;;;;;;;;OAgBG;IACG,kBAAkB,CACtB,gBAAgB,EAAE,UAAU,EAC5B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,SAAS,CAAC,CAuDpB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACG,KAAK,kBAEV;IAED;;;OAGG;IACG,IAAI,kBAGT;CACF"}
1
+ {"version":3,"file":"validator_ha_signer.d.ts","sourceRoot":"","sources":["../src/validator_ha_signer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAG3D,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAEhC,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,iBAAiB;IAO1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAa;IAE3C,YACE,EAAE,EAAE,0BAA0B,EACb,MAAM,EAAE,uBAAuB,EAkBjD;IAED;;;;;;;;;;;;;;;;OAgBG;IACG,kBAAkB,CACtB,gBAAgB,EAAE,UAAU,EAC5B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,SAAS,CAAC,CA+CpB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACG,KAAK,kBAEV;IAED;;;OAGG;IACG,IAAI,kBAGT;CACF"}
@@ -5,8 +5,9 @@
5
5
  * This ensures that even with multiple validator nodes running, only one
6
6
  * node will sign for a given duty (slot + duty type).
7
7
  */ import { createLogger } from '@aztec/foundation/log';
8
- import { DutyType, getBlockNumberFromSigningContext } from '@aztec/stdlib/ha-signing';
8
+ import { DutyType } from './db/types.js';
9
9
  import { SlashingProtectionService } from './slashing_protection_service.js';
10
+ import { getBlockNumberFromSigningContext } from './types.js';
10
11
  /**
11
12
  * Validator High Availability Signer
12
13
  *
@@ -30,13 +31,9 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
30
31
  log;
31
32
  slashingProtection;
32
33
  rollupAddress;
33
- dateProvider;
34
- metrics;
35
- constructor(db, config, deps){
34
+ constructor(db, config){
36
35
  this.config = config;
37
36
  this.log = createLogger('validator-ha-signer');
38
- this.metrics = deps.metrics;
39
- this.dateProvider = deps.dateProvider;
40
37
  if (!config.haSigningEnabled) {
41
38
  // this shouldn't happen, the validator should use different signer for non-HA setups
42
39
  throw new Error('Validator HA Signer is not enabled in config');
@@ -45,10 +42,7 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
45
42
  throw new Error('NODE_ID is required for high-availability setups');
46
43
  }
47
44
  this.rollupAddress = config.l1Contracts.rollupAddress;
48
- this.slashingProtection = new SlashingProtectionService(db, config, {
49
- metrics: deps.metrics,
50
- dateProvider: deps.dateProvider
51
- });
45
+ this.slashingProtection = new SlashingProtectionService(db, config);
52
46
  this.log.info('Validator HA Signer initialized with slashing protection', {
53
47
  nodeId: config.nodeId,
54
48
  rollupAddress: this.rollupAddress.toString()
@@ -71,8 +65,6 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
71
65
  * @throws DutyAlreadySignedError if the duty was already signed (expected in HA)
72
66
  * @throws SlashingProtectionError if attempting to sign different data for same slot (expected in HA)
73
67
  */ async signWithProtection(validatorAddress, messageHash, context, signFn) {
74
- const startTime = this.dateProvider.now();
75
- const dutyType = context.dutyType;
76
68
  let dutyIdentifier;
77
69
  if (context.dutyType === DutyType.BLOCK_PROPOSAL) {
78
70
  dutyIdentifier = {
@@ -91,7 +83,6 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
91
83
  };
92
84
  }
93
85
  // Acquire lock and get the token for ownership verification
94
- // DutyAlreadySignedError and SlashingProtectionError may be thrown here and are recorded in the service
95
86
  const blockNumber = getBlockNumberFromSigningContext(context);
96
87
  const lockToken = await this.slashingProtection.checkAndRecord({
97
88
  ...dutyIdentifier,
@@ -109,7 +100,6 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
109
100
  ...dutyIdentifier,
110
101
  lockToken
111
102
  });
112
- this.metrics.recordSigningError(dutyType);
113
103
  throw error;
114
104
  }
115
105
  // Record success (only succeeds if we own the lock)
@@ -119,8 +109,6 @@ import { SlashingProtectionService } from './slashing_protection_service.js';
119
109
  nodeId: this.config.nodeId,
120
110
  lockToken
121
111
  });
122
- const duration = this.dateProvider.now() - startTime;
123
- this.metrics.recordSigningSuccess(dutyType, duration);
124
112
  return signature;
125
113
  }
126
114
  /**
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@aztec/validator-ha-signer",
3
- "version": "0.0.1-commit.ff7989d6c",
3
+ "version": "0.0.1-commit.fff30aa",
4
4
  "type": "module",
5
5
  "exports": {
6
+ "./config": "./dest/config.js",
6
7
  "./db": "./dest/db/index.js",
7
8
  "./errors": "./dest/errors.js",
8
9
  "./factory": "./dest/factory.js",
9
- "./metrics": "./dest/metrics.js",
10
10
  "./migrations": "./dest/migrations.js",
11
11
  "./slashing-protection-service": "./dest/slashing_protection_service.js",
12
12
  "./types": "./dest/types.js",
@@ -15,10 +15,10 @@
15
15
  },
16
16
  "typedocOptions": {
17
17
  "entryPoints": [
18
+ "./src/config.ts",
18
19
  "./src/db/index.ts",
19
20
  "./src/errors.ts",
20
21
  "./src/factory.ts",
21
- "./src/metrics.ts",
22
22
  "./src/migrations.ts",
23
23
  "./src/slashing_protection_service.ts",
24
24
  "./src/types.ts",
@@ -74,10 +74,8 @@
74
74
  ]
75
75
  },
76
76
  "dependencies": {
77
- "@aztec/ethereum": "0.0.1-commit.ff7989d6c",
78
- "@aztec/foundation": "0.0.1-commit.ff7989d6c",
79
- "@aztec/stdlib": "0.0.1-commit.ff7989d6c",
80
- "@aztec/telemetry-client": "0.0.1-commit.ff7989d6c",
77
+ "@aztec/ethereum": "0.0.1-commit.fff30aa",
78
+ "@aztec/foundation": "0.0.1-commit.fff30aa",
81
79
  "node-pg-migrate": "^8.0.4",
82
80
  "pg": "^8.11.3",
83
81
  "tslib": "^2.4.0",
package/src/config.ts ADDED
@@ -0,0 +1,149 @@
1
+ import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
2
+ import {
3
+ type ConfigMappingsType,
4
+ booleanConfigHelper,
5
+ getConfigFromMappings,
6
+ getDefaultConfig,
7
+ numberConfigHelper,
8
+ optionalNumberConfigHelper,
9
+ } from '@aztec/foundation/config';
10
+ import { EthAddress } from '@aztec/foundation/eth-address';
11
+ import type { ZodFor } from '@aztec/foundation/schemas';
12
+
13
+ import { z } from 'zod';
14
+
15
+ /**
16
+ * Configuration for the Validator HA Signer
17
+ *
18
+ * This config is used for distributed locking and slashing protection
19
+ * when running multiple validator nodes in a high-availability setup.
20
+ */
21
+ export interface ValidatorHASignerConfig {
22
+ /** Whether HA signing / slashing protection is enabled */
23
+ haSigningEnabled: boolean;
24
+ /** L1 contract addresses (rollup address required) */
25
+ l1Contracts: Pick<L1ContractAddresses, 'rollupAddress'>;
26
+ /** Unique identifier for this node */
27
+ nodeId: string;
28
+ /** How long to wait between polls when a duty is being signed (ms) */
29
+ pollingIntervalMs: number;
30
+ /** Maximum time to wait for a duty being signed to complete (ms) */
31
+ signingTimeoutMs: number;
32
+ /** Maximum age of a stuck duty in ms (defaults to 2x hardcoded Aztec slot duration if not set) */
33
+ maxStuckDutiesAgeMs?: number;
34
+ /** Optional: clean up old duties after this many hours (disabled if not set) */
35
+ cleanupOldDutiesAfterHours?: number;
36
+ /**
37
+ * PostgreSQL connection string
38
+ * Format: postgresql://user:password@host:port/database
39
+ */
40
+ databaseUrl?: string;
41
+ /**
42
+ * PostgreSQL connection pool configuration
43
+ */
44
+ /** Maximum number of clients in the pool (default: 10) */
45
+ poolMaxCount?: number;
46
+ /** Minimum number of clients in the pool (default: 0) */
47
+ poolMinCount?: number;
48
+ /** Idle timeout in milliseconds (default: 10000) */
49
+ poolIdleTimeoutMs?: number;
50
+ /** Connection timeout in milliseconds (default: 0, no timeout) */
51
+ poolConnectionTimeoutMs?: number;
52
+ }
53
+
54
+ export const validatorHASignerConfigMappings: ConfigMappingsType<ValidatorHASignerConfig> = {
55
+ haSigningEnabled: {
56
+ env: 'VALIDATOR_HA_SIGNING_ENABLED',
57
+ description: 'Whether HA signing / slashing protection is enabled',
58
+ ...booleanConfigHelper(false),
59
+ },
60
+ l1Contracts: {
61
+ description: 'L1 contract addresses (rollup address required)',
62
+ nested: {
63
+ rollupAddress: {
64
+ description: 'The Ethereum address of the rollup contract (must be set programmatically)',
65
+ parseEnv: (val: string) => EthAddress.fromString(val),
66
+ },
67
+ },
68
+ },
69
+ nodeId: {
70
+ env: 'VALIDATOR_HA_NODE_ID',
71
+ description: 'The unique identifier for this node',
72
+ defaultValue: '',
73
+ },
74
+ pollingIntervalMs: {
75
+ env: 'VALIDATOR_HA_POLLING_INTERVAL_MS',
76
+ description: 'The number of ms to wait between polls when a duty is being signed',
77
+ ...numberConfigHelper(100),
78
+ },
79
+ signingTimeoutMs: {
80
+ env: 'VALIDATOR_HA_SIGNING_TIMEOUT_MS',
81
+ description: 'The maximum time to wait for a duty being signed to complete',
82
+ ...numberConfigHelper(3_000),
83
+ },
84
+ maxStuckDutiesAgeMs: {
85
+ env: 'VALIDATOR_HA_MAX_STUCK_DUTIES_AGE_MS',
86
+ description: 'The maximum age of a stuck duty in ms (defaults to 2x Aztec slot duration)',
87
+ ...optionalNumberConfigHelper(),
88
+ },
89
+ cleanupOldDutiesAfterHours: {
90
+ env: 'VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H',
91
+ description: 'Optional: clean up old duties after this many hours (disabled if not set)',
92
+ ...optionalNumberConfigHelper(),
93
+ },
94
+ databaseUrl: {
95
+ env: 'VALIDATOR_HA_DATABASE_URL',
96
+ description:
97
+ 'PostgreSQL connection string for validator HA signer (format: postgresql://user:password@host:port/database)',
98
+ },
99
+ poolMaxCount: {
100
+ env: 'VALIDATOR_HA_POOL_MAX',
101
+ description: 'Maximum number of clients in the pool',
102
+ ...numberConfigHelper(10),
103
+ },
104
+ poolMinCount: {
105
+ env: 'VALIDATOR_HA_POOL_MIN',
106
+ description: 'Minimum number of clients in the pool',
107
+ ...numberConfigHelper(0),
108
+ },
109
+ poolIdleTimeoutMs: {
110
+ env: 'VALIDATOR_HA_POOL_IDLE_TIMEOUT_MS',
111
+ description: 'Idle timeout in milliseconds',
112
+ ...numberConfigHelper(10_000),
113
+ },
114
+ poolConnectionTimeoutMs: {
115
+ env: 'VALIDATOR_HA_POOL_CONNECTION_TIMEOUT_MS',
116
+ description: 'Connection timeout in milliseconds (0 means no timeout)',
117
+ ...numberConfigHelper(0),
118
+ },
119
+ };
120
+
121
+ export const defaultValidatorHASignerConfig: ValidatorHASignerConfig = getDefaultConfig(
122
+ validatorHASignerConfigMappings,
123
+ );
124
+
125
+ /**
126
+ * Returns the validator HA signer configuration from environment variables.
127
+ * Note: If an environment variable is not set, the default value is used.
128
+ * @returns The validator HA signer configuration.
129
+ */
130
+ export function getConfigEnvVars(): ValidatorHASignerConfig {
131
+ return getConfigFromMappings<ValidatorHASignerConfig>(validatorHASignerConfigMappings);
132
+ }
133
+
134
+ export const ValidatorHASignerConfigSchema = z.object({
135
+ haSigningEnabled: z.boolean(),
136
+ l1Contracts: z.object({
137
+ rollupAddress: z.instanceof(EthAddress),
138
+ }),
139
+ nodeId: z.string(),
140
+ pollingIntervalMs: z.number().min(0),
141
+ signingTimeoutMs: z.number().min(0),
142
+ maxStuckDutiesAgeMs: z.number().min(0).optional(),
143
+ cleanupOldDutiesAfterHours: z.number().min(0).optional(),
144
+ databaseUrl: z.string().optional(),
145
+ poolMaxCount: z.number().min(0).optional(),
146
+ poolMinCount: z.number().min(0).optional(),
147
+ poolIdleTimeoutMs: z.number().min(0).optional(),
148
+ poolConnectionTimeoutMs: z.number().min(0).optional(),
149
+ }) satisfies ZodFor<ValidatorHASignerConfig>;