@aztec/validator-ha-signer 0.0.1-commit.7d4e6cd → 0.0.1-commit.86469d5

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 (46) hide show
  1. package/README.md +42 -37
  2. package/dest/config.d.ts +66 -17
  3. package/dest/config.d.ts.map +1 -1
  4. package/dest/config.js +41 -19
  5. package/dest/db/postgres.d.ts +20 -5
  6. package/dest/db/postgres.d.ts.map +1 -1
  7. package/dest/db/postgres.js +56 -19
  8. package/dest/db/schema.d.ts +11 -7
  9. package/dest/db/schema.d.ts.map +1 -1
  10. package/dest/db/schema.js +35 -15
  11. package/dest/db/types.d.ts +80 -23
  12. package/dest/db/types.d.ts.map +1 -1
  13. package/dest/db/types.js +34 -0
  14. package/dest/errors.d.ts +9 -5
  15. package/dest/errors.d.ts.map +1 -1
  16. package/dest/errors.js +7 -4
  17. package/dest/factory.d.ts +6 -14
  18. package/dest/factory.d.ts.map +1 -1
  19. package/dest/factory.js +6 -11
  20. package/dest/migrations.d.ts +1 -1
  21. package/dest/migrations.d.ts.map +1 -1
  22. package/dest/migrations.js +13 -2
  23. package/dest/slashing_protection_service.d.ts +9 -3
  24. package/dest/slashing_protection_service.d.ts.map +1 -1
  25. package/dest/slashing_protection_service.js +23 -11
  26. package/dest/test/pglite_pool.d.ts +92 -0
  27. package/dest/test/pglite_pool.d.ts.map +1 -0
  28. package/dest/test/pglite_pool.js +210 -0
  29. package/dest/types.d.ts +78 -14
  30. package/dest/types.d.ts.map +1 -1
  31. package/dest/types.js +21 -1
  32. package/dest/validator_ha_signer.d.ts +9 -12
  33. package/dest/validator_ha_signer.d.ts.map +1 -1
  34. package/dest/validator_ha_signer.js +31 -30
  35. package/package.json +9 -8
  36. package/src/config.ts +75 -50
  37. package/src/db/postgres.ts +76 -19
  38. package/src/db/schema.ts +35 -15
  39. package/src/db/types.ts +110 -21
  40. package/src/errors.ts +7 -2
  41. package/src/factory.ts +8 -13
  42. package/src/migrations.ts +17 -1
  43. package/src/slashing_protection_service.ts +55 -13
  44. package/src/test/pglite_pool.ts +256 -0
  45. package/src/types.ts +125 -19
  46. package/src/validator_ha_signer.ts +38 -40
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC;;GAEG;AACH,eAAO,MAAM,6BAA6B,itBAkBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,yGAG/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,wGAG7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mJAKvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,6FAIjC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,4jCAKf,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,0EAE9B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,08BAkD9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,0OAU9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,4JAOvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,wFAIrC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,8GAI9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,2GAKpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,2CAA2C,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,yBAAyB,yCAAyC,CAAC;AAEhF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,6SAe5B,CAAC"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC;;GAEG;AACH,eAAO,MAAM,6BAA6B,g6BAoBzC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,yGAG/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,wGAG7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mJAKvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,6FAIjC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,2wCAKf,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,0EAE9B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,6uCA0D9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,+SAY9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,iOASvB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,wFAIrC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,8GAI9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,2GAKpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,2CAA2C,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,yBAAyB,yCAAyC,CAAC;AAEhF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,kWAiB5B,CAAC"}
package/dest/db/schema.js CHANGED
@@ -11,10 +11,12 @@
11
11
  * SQL to create the validator_duties table
12
12
  */ export const CREATE_VALIDATOR_DUTIES_TABLE = `
13
13
  CREATE TABLE IF NOT EXISTS validator_duties (
14
+ rollup_address VARCHAR(42) NOT NULL,
14
15
  validator_address VARCHAR(42) NOT NULL,
15
16
  slot BIGINT NOT NULL,
16
17
  block_number BIGINT NOT NULL,
17
- duty_type VARCHAR(30) NOT NULL CHECK (duty_type IN ('BLOCK_PROPOSAL', 'ATTESTATION', 'ATTESTATIONS_AND_SIGNERS')),
18
+ block_index_within_checkpoint INTEGER NOT NULL DEFAULT 0,
19
+ duty_type VARCHAR(30) NOT NULL CHECK (duty_type IN ('BLOCK_PROPOSAL', 'CHECKPOINT_PROPOSAL', 'ATTESTATION', 'ATTESTATIONS_AND_SIGNERS', 'GOVERNANCE_VOTE', 'SLASHING_VOTE')),
18
20
  status VARCHAR(20) NOT NULL CHECK (status IN ('signing', 'signed', 'failed')),
19
21
  message_hash VARCHAR(66) NOT NULL,
20
22
  signature VARCHAR(132),
@@ -24,7 +26,7 @@ CREATE TABLE IF NOT EXISTS validator_duties (
24
26
  completed_at TIMESTAMP,
25
27
  error_message TEXT,
26
28
 
27
- PRIMARY KEY (validator_address, slot, duty_type),
29
+ PRIMARY KEY (rollup_address, validator_address, slot, duty_type, block_index_within_checkpoint),
28
30
  CHECK (completed_at IS NULL OR completed_at >= started_at)
29
31
  );
30
32
  `;
@@ -74,24 +76,32 @@ SELECT version FROM schema_version ORDER BY version DESC LIMIT 1;
74
76
  * returns the existing record instead.
75
77
  *
76
78
  * Returns the record with an `is_new` flag indicating whether we inserted or got existing.
79
+ *
80
+ * Note: In high concurrency scenarios, if the INSERT conflicts and another transaction
81
+ * just committed the row, there's a small window where the SELECT might not see it yet.
82
+ * The application layer should retry if no rows are returned.
77
83
  */ export const INSERT_OR_GET_DUTY = `
78
84
  WITH inserted AS (
79
85
  INSERT INTO validator_duties (
86
+ rollup_address,
80
87
  validator_address,
81
88
  slot,
82
89
  block_number,
90
+ block_index_within_checkpoint,
83
91
  duty_type,
84
92
  status,
85
93
  message_hash,
86
94
  node_id,
87
95
  lock_token,
88
96
  started_at
89
- ) VALUES ($1, $2, $3, $4, 'signing', $5, $6, $7, CURRENT_TIMESTAMP)
90
- ON CONFLICT (validator_address, slot, duty_type) DO NOTHING
97
+ ) VALUES ($1, $2, $3, $4, $5, $6, 'signing', $7, $8, $9, CURRENT_TIMESTAMP)
98
+ ON CONFLICT (rollup_address, validator_address, slot, duty_type, block_index_within_checkpoint) DO NOTHING
91
99
  RETURNING
100
+ rollup_address,
92
101
  validator_address,
93
102
  slot,
94
103
  block_number,
104
+ block_index_within_checkpoint,
95
105
  duty_type,
96
106
  status,
97
107
  message_hash,
@@ -106,9 +116,11 @@ WITH inserted AS (
106
116
  SELECT * FROM inserted
107
117
  UNION ALL
108
118
  SELECT
119
+ rollup_address,
109
120
  validator_address,
110
121
  slot,
111
122
  block_number,
123
+ block_index_within_checkpoint,
112
124
  duty_type,
113
125
  status,
114
126
  message_hash,
@@ -120,9 +132,11 @@ SELECT
120
132
  error_message,
121
133
  FALSE as is_new
122
134
  FROM validator_duties
123
- WHERE validator_address = $1
124
- AND slot = $2
125
- AND duty_type = $4
135
+ WHERE rollup_address = $1
136
+ AND validator_address = $2
137
+ AND slot = $3
138
+ AND duty_type = $6
139
+ AND block_index_within_checkpoint = $5
126
140
  AND NOT EXISTS (SELECT 1 FROM inserted);
127
141
  `;
128
142
  /**
@@ -132,22 +146,26 @@ UPDATE validator_duties
132
146
  SET status = 'signed',
133
147
  signature = $1,
134
148
  completed_at = CURRENT_TIMESTAMP
135
- WHERE validator_address = $2
136
- AND slot = $3
137
- AND duty_type = $4
149
+ WHERE rollup_address = $2
150
+ AND validator_address = $3
151
+ AND slot = $4
152
+ AND duty_type = $5
153
+ AND block_index_within_checkpoint = $6
138
154
  AND status = 'signing'
139
- AND lock_token = $5;
155
+ AND lock_token = $7;
140
156
  `;
141
157
  /**
142
158
  * Query to delete a duty
143
159
  * Only deletes if the lockToken matches
144
160
  */ export const DELETE_DUTY = `
145
161
  DELETE FROM validator_duties
146
- WHERE validator_address = $1
147
- AND slot = $2
148
- AND duty_type = $3
162
+ WHERE rollup_address = $1
163
+ AND validator_address = $2
164
+ AND slot = $3
165
+ AND duty_type = $4
166
+ AND block_index_within_checkpoint = $5
149
167
  AND status = 'signing'
150
- AND lock_token = $4;
168
+ AND lock_token = $6;
151
169
  `;
152
170
  /**
153
171
  * Query to clean up old signed duties (for maintenance)
@@ -185,9 +203,11 @@ WHERE node_id = $1
185
203
  * Returns duties in 'signing' status that have been stuck for too long
186
204
  */ export const GET_STUCK_DUTIES = `
187
205
  SELECT
206
+ rollup_address,
188
207
  validator_address,
189
208
  slot,
190
209
  block_number,
210
+ block_index_within_checkpoint,
191
211
  duty_type,
192
212
  status,
193
213
  message_hash,
@@ -1,12 +1,15 @@
1
+ import type { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
1
2
  import type { EthAddress } from '@aztec/foundation/eth-address';
2
3
  import type { Signature } from '@aztec/foundation/eth-signature';
3
4
  /**
4
5
  * Row type from PostgreSQL query
5
6
  */
6
7
  export interface DutyRow {
8
+ rollup_address: string;
7
9
  validator_address: string;
8
10
  slot: string;
9
11
  block_number: string;
12
+ block_index_within_checkpoint: number;
10
13
  duty_type: DutyType;
11
14
  status: DutyStatus;
12
15
  message_hash: string;
@@ -28,8 +31,13 @@ export interface InsertOrGetRow extends DutyRow {
28
31
  */
29
32
  export declare enum DutyType {
30
33
  BLOCK_PROPOSAL = "BLOCK_PROPOSAL",
34
+ CHECKPOINT_PROPOSAL = "CHECKPOINT_PROPOSAL",
31
35
  ATTESTATION = "ATTESTATION",
32
- ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS"
36
+ ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS",
37
+ GOVERNANCE_VOTE = "GOVERNANCE_VOTE",
38
+ SLASHING_VOTE = "SLASHING_VOTE",
39
+ AUTH_REQUEST = "AUTH_REQUEST",
40
+ TXS = "TXS"
33
41
  }
34
42
  /**
35
43
  * Status of a duty in the database
@@ -42,12 +50,16 @@ export declare enum DutyStatus {
42
50
  * Record of a validator duty in the database
43
51
  */
44
52
  export interface ValidatorDutyRecord {
53
+ /** Ethereum address of the rollup contract */
54
+ rollupAddress: EthAddress;
45
55
  /** Ethereum address of the validator */
46
56
  validatorAddress: EthAddress;
47
57
  /** Slot number for this duty */
48
- slot: bigint;
58
+ slot: SlotNumber;
49
59
  /** Block number for this duty */
50
- blockNumber: bigint;
60
+ blockNumber: BlockNumber;
61
+ /** Block index within checkpoint (0, 1, 2... for block proposals, -1 for other duty types) */
62
+ blockIndexWithinCheckpoint: number;
51
63
  /** Type of duty being performed */
52
64
  dutyType: DutyType;
53
65
  /** Current status of the duty */
@@ -68,42 +80,87 @@ export interface ValidatorDutyRecord {
68
80
  errorMessage?: string;
69
81
  }
70
82
  /**
71
- * Minimal info needed to identify a unique duty
83
+ * Duty identifier for block proposals.
84
+ * blockIndexWithinCheckpoint is REQUIRED and must be >= 0.
72
85
  */
73
- export interface DutyIdentifier {
86
+ export interface BlockProposalDutyIdentifier {
87
+ rollupAddress: EthAddress;
74
88
  validatorAddress: EthAddress;
75
- slot: bigint;
76
- dutyType: DutyType;
89
+ slot: SlotNumber;
90
+ /** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
91
+ blockIndexWithinCheckpoint: IndexWithinCheckpoint;
92
+ dutyType: DutyType.BLOCK_PROPOSAL;
77
93
  }
78
94
  /**
79
- * Parameters for checking and recording a new duty
95
+ * Duty identifier for non-block-proposal duties.
96
+ * blockIndexWithinCheckpoint is not applicable (internally stored as -1).
80
97
  */
81
- export interface CheckAndRecordParams {
98
+ export interface OtherDutyIdentifier {
99
+ rollupAddress: EthAddress;
82
100
  validatorAddress: EthAddress;
83
- slot: bigint;
84
- blockNumber: bigint;
85
- dutyType: DutyType;
101
+ slot: SlotNumber;
102
+ dutyType: DutyType.CHECKPOINT_PROPOSAL | DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS | DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE | DutyType.AUTH_REQUEST | DutyType.TXS;
103
+ }
104
+ /**
105
+ * Minimal info needed to identify a unique duty.
106
+ * Uses discriminated union to enforce type safety:
107
+ * - BLOCK_PROPOSAL duties MUST have blockIndexWithinCheckpoint >= 0
108
+ * - Other duty types do NOT have blockIndexWithinCheckpoint (internally -1)
109
+ */
110
+ export type DutyIdentifier = BlockProposalDutyIdentifier | OtherDutyIdentifier;
111
+ /**
112
+ * Validates and normalizes the block index for a duty.
113
+ * - BLOCK_PROPOSAL: validates blockIndexWithinCheckpoint is provided and >= 0
114
+ * - Other duty types: always returns -1
115
+ *
116
+ * @throws Error if BLOCK_PROPOSAL is missing blockIndexWithinCheckpoint or has invalid value
117
+ */
118
+ export declare function normalizeBlockIndex(dutyType: DutyType, blockIndexWithinCheckpoint: number | undefined): number;
119
+ /**
120
+ * Gets the block index from a DutyIdentifier.
121
+ * - BLOCK_PROPOSAL: returns the blockIndexWithinCheckpoint
122
+ * - Other duty types: returns -1
123
+ */
124
+ export declare function getBlockIndexFromDutyIdentifier(duty: DutyIdentifier): number;
125
+ /**
126
+ * Additional parameters for checking and recording a new duty
127
+ */
128
+ interface CheckAndRecordExtra {
129
+ /** Block number for this duty */
130
+ blockNumber: BlockNumber | CheckpointNumber;
131
+ /** The signing root (hash) for this duty */
86
132
  messageHash: string;
133
+ /** Identifier for the node that acquired the lock */
87
134
  nodeId: string;
88
135
  }
89
136
  /**
90
- * Parameters for recording a successful signing
137
+ * Parameters for checking and recording a new duty.
138
+ * Uses intersection with DutyIdentifier to preserve the discriminated union.
91
139
  */
92
- export interface RecordSuccessParams {
93
- validatorAddress: EthAddress;
94
- slot: bigint;
95
- dutyType: DutyType;
140
+ export type CheckAndRecordParams = DutyIdentifier & CheckAndRecordExtra;
141
+ /**
142
+ * Additional parameters for recording a successful signing
143
+ */
144
+ interface RecordSuccessExtra {
96
145
  signature: Signature;
97
146
  nodeId: string;
98
147
  lockToken: string;
99
148
  }
100
149
  /**
101
- * Parameters for deleting a duty
150
+ * Parameters for recording a successful signing.
151
+ * Uses intersection with DutyIdentifier to preserve the discriminated union.
102
152
  */
103
- export interface DeleteDutyParams {
104
- validatorAddress: EthAddress;
105
- slot: bigint;
106
- dutyType: DutyType;
153
+ export type RecordSuccessParams = DutyIdentifier & RecordSuccessExtra;
154
+ /**
155
+ * Additional parameters for deleting a duty
156
+ */
157
+ interface DeleteDutyExtra {
107
158
  lockToken: string;
108
159
  }
109
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYi90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7R0FFRztBQUNILE1BQU0sV0FBVyxPQUFPO0lBQ3RCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixTQUFTLEVBQUUsUUFBUSxDQUFDO0lBQ3BCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixTQUFTLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUN6QixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsVUFBVSxFQUFFLElBQUksQ0FBQztJQUNqQixZQUFZLEVBQUUsSUFBSSxHQUFHLElBQUksQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztDQUM5QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGNBQWUsU0FBUSxPQUFPO0lBQzdDLE1BQU0sRUFBRSxPQUFPLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILG9CQUFZLFFBQVE7SUFDbEIsY0FBYyxtQkFBbUI7SUFDakMsV0FBVyxnQkFBZ0I7SUFDM0Isd0JBQXdCLDZCQUE2QjtDQUN0RDtBQUVEOztHQUVHO0FBQ0gsb0JBQVksVUFBVTtJQUNwQixPQUFPLFlBQVk7SUFDbkIsTUFBTSxXQUFXO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLHdDQUF3QztJQUN4QyxnQkFBZ0IsRUFBRSxVQUFVLENBQUM7SUFDN0IsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixpQ0FBaUM7SUFDakMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixtQ0FBbUM7SUFDbkMsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixpQ0FBaUM7SUFDakMsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQix5REFBeUQ7SUFDekQsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDREQUE0RDtJQUM1RCxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsNERBQTREO0lBQzVELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsd0NBQXdDO0lBQ3hDLFNBQVMsRUFBRSxJQUFJLENBQUM7SUFDaEIsK0RBQStEO0lBQy9ELFdBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQztJQUNuQiwwQ0FBMEM7SUFDMUMsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsY0FBYztJQUM3QixnQkFBZ0IsRUFBRSxVQUFVLENBQUM7SUFDN0IsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFFBQVEsRUFBRSxRQUFRLENBQUM7Q0FDcEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxvQkFBb0I7SUFDbkMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDO0lBQzdCLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFFBQVEsRUFBRSxRQUFRLENBQUM7SUFDbkIsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQztJQUM3QixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLGdCQUFnQixFQUFFLFVBQVUsQ0FBQztJQUM3QixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CIn0=
160
+ /**
161
+ * Parameters for deleting a duty.
162
+ * Uses intersection with DutyIdentifier to preserve the discriminated union.
163
+ */
164
+ export type DeleteDutyParams = DutyIdentifier & DeleteDutyExtra;
165
+ export {};
166
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYi90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDeEgsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakU7O0dBRUc7QUFDSCxNQUFNLFdBQVcsT0FBTztJQUN0QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQiw2QkFBNkIsRUFBRSxNQUFNLENBQUM7SUFDdEMsU0FBUyxFQUFFLFFBQVEsQ0FBQztJQUNwQixNQUFNLEVBQUUsVUFBVSxDQUFDO0lBQ25CLFlBQVksRUFBRSxNQUFNLENBQUM7SUFDckIsU0FBUyxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDekIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLFVBQVUsRUFBRSxJQUFJLENBQUM7SUFDakIsWUFBWSxFQUFFLElBQUksR0FBRyxJQUFJLENBQUM7SUFDMUIsYUFBYSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7Q0FDOUI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxjQUFlLFNBQVEsT0FBTztJQUM3QyxNQUFNLEVBQUUsT0FBTyxDQUFDO0NBQ2pCO0FBRUQ7O0dBRUc7QUFDSCxvQkFBWSxRQUFRO0lBQ2xCLGNBQWMsbUJBQW1CO0lBQ2pDLG1CQUFtQix3QkFBd0I7SUFDM0MsV0FBVyxnQkFBZ0I7SUFDM0Isd0JBQXdCLDZCQUE2QjtJQUNyRCxlQUFlLG9CQUFvQjtJQUNuQyxhQUFhLGtCQUFrQjtJQUMvQixZQUFZLGlCQUFpQjtJQUM3QixHQUFHLFFBQVE7Q0FDWjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksVUFBVTtJQUNwQixPQUFPLFlBQVk7SUFDbkIsTUFBTSxXQUFXO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDLDhDQUE4QztJQUM5QyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQzFCLHdDQUF3QztJQUN4QyxnQkFBZ0IsRUFBRSxVQUFVLENBQUM7SUFDN0IsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsaUNBQWlDO0lBQ2pDLFdBQVcsRUFBRSxXQUFXLENBQUM7SUFDekIsOEZBQThGO0lBQzlGLDBCQUEwQixFQUFFLE1BQU0sQ0FBQztJQUNuQyxtQ0FBbUM7SUFDbkMsUUFBUSxFQUFFLFFBQVEsQ0FBQztJQUNuQixpQ0FBaUM7SUFDakMsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQiw0Q0FBNEM7SUFDNUMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQix5REFBeUQ7SUFDekQsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDREQUE0RDtJQUM1RCxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsNERBQTREO0lBQzVELFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsd0NBQXdDO0lBQ3hDLFNBQVMsRUFBRSxJQUFJLENBQUM7SUFDaEIsK0RBQStEO0lBQy9ELFdBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQztJQUNuQiwwQ0FBMEM7SUFDMUMsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxXQUFXLDJCQUEyQjtJQUMxQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQzFCLGdCQUFnQixFQUFFLFVBQVUsQ0FBQztJQUM3QixJQUFJLEVBQUUsVUFBVSxDQUFDO0lBQ2pCLGdGQUFnRjtJQUNoRiwwQkFBMEIsRUFBRSxxQkFBcUIsQ0FBQztJQUNsRCxRQUFRLEVBQUUsUUFBUSxDQUFDLGNBQWMsQ0FBQztDQUNuQztBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxtQkFBbUI7SUFDbEMsYUFBYSxFQUFFLFVBQVUsQ0FBQztJQUMxQixnQkFBZ0IsRUFBRSxVQUFVLENBQUM7SUFDN0IsSUFBSSxFQUFFLFVBQVUsQ0FBQztJQUNqQixRQUFRLEVBQ0osUUFBUSxDQUFDLG1CQUFtQixHQUM1QixRQUFRLENBQUMsV0FBVyxHQUNwQixRQUFRLENBQUMsd0JBQXdCLEdBQ2pDLFFBQVEsQ0FBQyxlQUFlLEdBQ3hCLFFBQVEsQ0FBQyxhQUFhLEdBQ3RCLFFBQVEsQ0FBQyxZQUFZLEdBQ3JCLFFBQVEsQ0FBQyxHQUFHLENBQUM7Q0FDbEI7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcsMkJBQTJCLEdBQUcsbUJBQW1CLENBQUM7QUFFL0U7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxHQUFHLFNBQVMsR0FBRyxNQUFNLENBYzlHO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQiwrQkFBK0IsQ0FBQyxJQUFJLEVBQUUsY0FBYyxHQUFHLE1BQU0sQ0FLNUU7QUFFRDs7R0FFRztBQUNILFVBQVUsbUJBQW1CO0lBQzNCLGlDQUFpQztJQUNqQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGdCQUFnQixDQUFDO0lBQzVDLDRDQUE0QztJQUM1QyxXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLHFEQUFxRDtJQUNyRCxNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCO0FBRUQ7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLG9CQUFvQixHQUFHLGNBQWMsR0FBRyxtQkFBbUIsQ0FBQztBQUV4RTs7R0FFRztBQUNILFVBQVUsa0JBQWtCO0lBQzFCLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkI7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sbUJBQW1CLEdBQUcsY0FBYyxHQUFHLGtCQUFrQixDQUFDO0FBRXRFOztHQUVHO0FBQ0gsVUFBVSxlQUFlO0lBQ3ZCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkI7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsY0FBYyxHQUFHLGVBQWUsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/db/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,YAAY,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,oBAAY,QAAQ;IAClB,cAAc,mBAAmB;IACjC,WAAW,gBAAgB;IAC3B,wBAAwB,6BAA6B;CACtD;AAED;;GAEG;AACH,oBAAY,UAAU;IACpB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,iCAAiC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,SAAS,EAAE,IAAI,CAAC;IAChB,+DAA+D;IAC/D,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/db/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACxH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B,EAAE,MAAM,CAAC;IACtC,SAAS,EAAE,QAAQ,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;IACjB,YAAY,EAAE,IAAI,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,oBAAY,QAAQ;IAClB,cAAc,mBAAmB;IACjC,mBAAmB,wBAAwB;IAC3C,WAAW,gBAAgB;IAC3B,wBAAwB,6BAA6B;IACrD,eAAe,oBAAoB;IACnC,aAAa,kBAAkB;IAC/B,YAAY,iBAAiB;IAC7B,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,oBAAY,UAAU;IACpB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,8CAA8C;IAC9C,aAAa,EAAE,UAAU,CAAC;IAC1B,wCAAwC;IACxC,gBAAgB,EAAE,UAAU,CAAC;IAC7B,gCAAgC;IAChC,IAAI,EAAE,UAAU,CAAC;IACjB,iCAAiC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,8FAA8F;IAC9F,0BAA0B,EAAE,MAAM,CAAC;IACnC,mCAAmC;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,iCAAiC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,SAAS,EAAE,IAAI,CAAC;IAChB,+DAA+D;IAC/D,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,aAAa,EAAE,UAAU,CAAC;IAC1B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,gFAAgF;IAChF,0BAA0B,EAAE,qBAAqB,CAAC;IAClD,QAAQ,EAAE,QAAQ,CAAC,cAAc,CAAC;CACnC;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,UAAU,CAAC;IAC1B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EACJ,QAAQ,CAAC,mBAAmB,GAC5B,QAAQ,CAAC,WAAW,GACpB,QAAQ,CAAC,wBAAwB,GACjC,QAAQ,CAAC,eAAe,GACxB,QAAQ,CAAC,aAAa,GACtB,QAAQ,CAAC,YAAY,GACrB,QAAQ,CAAC,GAAG,CAAC;CAClB;AAED;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,2BAA2B,GAAG,mBAAmB,CAAC;AAE/E;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,0BAA0B,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAc9G;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAK5E;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,iCAAiC;IACjC,WAAW,EAAE,WAAW,GAAG,gBAAgB,CAAC;IAC5C,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAExE;;GAEG;AACH,UAAU,kBAAkB;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,kBAAkB,CAAC;AAEtE;;GAEG;AACH,UAAU,eAAe;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,eAAe,CAAC"}
package/dest/db/types.js CHANGED
@@ -2,8 +2,13 @@
2
2
  * Type of validator duty being performed
3
3
  */ export var DutyType = /*#__PURE__*/ function(DutyType) {
4
4
  DutyType["BLOCK_PROPOSAL"] = "BLOCK_PROPOSAL";
5
+ DutyType["CHECKPOINT_PROPOSAL"] = "CHECKPOINT_PROPOSAL";
5
6
  DutyType["ATTESTATION"] = "ATTESTATION";
6
7
  DutyType["ATTESTATIONS_AND_SIGNERS"] = "ATTESTATIONS_AND_SIGNERS";
8
+ DutyType["GOVERNANCE_VOTE"] = "GOVERNANCE_VOTE";
9
+ DutyType["SLASHING_VOTE"] = "SLASHING_VOTE";
10
+ DutyType["AUTH_REQUEST"] = "AUTH_REQUEST";
11
+ DutyType["TXS"] = "TXS";
7
12
  return DutyType;
8
13
  }({});
9
14
  /**
@@ -13,3 +18,32 @@
13
18
  DutyStatus["SIGNED"] = "signed";
14
19
  return DutyStatus;
15
20
  }({});
21
+ /**
22
+ * Validates and normalizes the block index for a duty.
23
+ * - BLOCK_PROPOSAL: validates blockIndexWithinCheckpoint is provided and >= 0
24
+ * - Other duty types: always returns -1
25
+ *
26
+ * @throws Error if BLOCK_PROPOSAL is missing blockIndexWithinCheckpoint or has invalid value
27
+ */ export function normalizeBlockIndex(dutyType, blockIndexWithinCheckpoint) {
28
+ if (dutyType === "BLOCK_PROPOSAL") {
29
+ if (blockIndexWithinCheckpoint === undefined) {
30
+ throw new Error('BLOCK_PROPOSAL duties require blockIndexWithinCheckpoint to be specified');
31
+ }
32
+ if (blockIndexWithinCheckpoint < 0) {
33
+ throw new Error(`BLOCK_PROPOSAL duties require blockIndexWithinCheckpoint >= 0, got ${blockIndexWithinCheckpoint}`);
34
+ }
35
+ return blockIndexWithinCheckpoint;
36
+ }
37
+ // For all other duty types, always use -1
38
+ return -1;
39
+ }
40
+ /**
41
+ * Gets the block index from a DutyIdentifier.
42
+ * - BLOCK_PROPOSAL: returns the blockIndexWithinCheckpoint
43
+ * - Other duty types: returns -1
44
+ */ export function getBlockIndexFromDutyIdentifier(duty) {
45
+ if (duty.dutyType === "BLOCK_PROPOSAL") {
46
+ return duty.blockIndexWithinCheckpoint;
47
+ }
48
+ return -1;
49
+ }
package/dest/errors.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  /**
2
2
  * Custom errors for the validator HA signer
3
3
  */
4
+ import type { SlotNumber } from '@aztec/foundation/branded-types';
4
5
  import type { DutyType } from './db/types.js';
5
6
  /**
6
7
  * Thrown when a duty has already been signed (by any node).
@@ -8,10 +9,11 @@ import type { DutyType } from './db/types.js';
8
9
  * the first one wins, and subsequent attempts get this error.
9
10
  */
10
11
  export declare class DutyAlreadySignedError extends Error {
11
- readonly slot: bigint;
12
+ readonly slot: SlotNumber;
12
13
  readonly dutyType: DutyType;
14
+ readonly blockIndexWithinCheckpoint: number;
13
15
  readonly signedByNode: string;
14
- constructor(slot: bigint, dutyType: DutyType, signedByNode: string);
16
+ constructor(slot: SlotNumber, dutyType: DutyType, blockIndexWithinCheckpoint: number, signedByNode: string);
15
17
  }
16
18
  /**
17
19
  * Thrown when attempting to sign data that conflicts with an already-signed duty.
@@ -21,10 +23,12 @@ export declare class DutyAlreadySignedError extends Error {
21
23
  * (e.g., different transaction ordering) - the protection prevents double-signing.
22
24
  */
23
25
  export declare class SlashingProtectionError extends Error {
24
- readonly slot: bigint;
26
+ readonly slot: SlotNumber;
25
27
  readonly dutyType: DutyType;
28
+ readonly blockIndexWithinCheckpoint: number;
26
29
  readonly existingMessageHash: string;
27
30
  readonly attemptedMessageHash: string;
28
- constructor(slot: bigint, dutyType: DutyType, existingMessageHash: string, attemptedMessageHash: string);
31
+ readonly signedByNode: string;
32
+ constructor(slot: SlotNumber, dutyType: DutyType, blockIndexWithinCheckpoint: number, existingMessageHash: string, attemptedMessageHash: string, signedByNode: string);
29
33
  }
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTlDOzs7O0dBSUc7QUFDSCxxQkFBYSxzQkFBdUIsU0FBUSxLQUFLO2FBRTdCLElBQUksRUFBRSxNQUFNO2FBQ1osUUFBUSxFQUFFLFFBQVE7YUFDbEIsWUFBWSxFQUFFLE1BQU07SUFIdEMsWUFDa0IsSUFBSSxFQUFFLE1BQU0sRUFDWixRQUFRLEVBQUUsUUFBUSxFQUNsQixZQUFZLEVBQUUsTUFBTSxFQUlyQztDQUNGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gscUJBQWEsdUJBQXdCLFNBQVEsS0FBSzthQUU5QixJQUFJLEVBQUUsTUFBTTthQUNaLFFBQVEsRUFBRSxRQUFRO2FBQ2xCLG1CQUFtQixFQUFFLE1BQU07YUFDM0Isb0JBQW9CLEVBQUUsTUFBTTtJQUo5QyxZQUNrQixJQUFJLEVBQUUsTUFBTSxFQUNaLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLG1CQUFtQixFQUFFLE1BQU0sRUFDM0Isb0JBQW9CLEVBQUUsTUFBTSxFQU83QztDQUNGIn0=
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTlDOzs7O0dBSUc7QUFDSCxxQkFBYSxzQkFBdUIsU0FBUSxLQUFLO2FBRTdCLElBQUksRUFBRSxVQUFVO2FBQ2hCLFFBQVEsRUFBRSxRQUFRO2FBQ2xCLDBCQUEwQixFQUFFLE1BQU07YUFDbEMsWUFBWSxFQUFFLE1BQU07SUFKdEMsWUFDa0IsSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsMEJBQTBCLEVBQUUsTUFBTSxFQUNsQyxZQUFZLEVBQUUsTUFBTSxFQUlyQztDQUNGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gscUJBQWEsdUJBQXdCLFNBQVEsS0FBSzthQUU5QixJQUFJLEVBQUUsVUFBVTthQUNoQixRQUFRLEVBQUUsUUFBUTthQUNsQiwwQkFBMEIsRUFBRSxNQUFNO2FBQ2xDLG1CQUFtQixFQUFFLE1BQU07YUFDM0Isb0JBQW9CLEVBQUUsTUFBTTthQUM1QixZQUFZLEVBQUUsTUFBTTtJQU50QyxZQUNrQixJQUFJLEVBQUUsVUFBVSxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQiwwQkFBMEIsRUFBRSxNQUFNLEVBQ2xDLG1CQUFtQixFQUFFLE1BQU0sRUFDM0Isb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixZQUFZLEVBQUUsTUFBTSxFQU9yQztDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aAE7B,IAAI,EAAE,MAAM;aACZ,QAAQ,EAAE,QAAQ;aAClB,YAAY,EAAE,MAAM;IAHtC,YACkB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,MAAM,EAIrC;CACF;AAED;;;;;;GAMG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;aAE9B,IAAI,EAAE,MAAM;aACZ,QAAQ,EAAE,QAAQ;aAClB,mBAAmB,EAAE,MAAM;aAC3B,oBAAoB,EAAE,MAAM;IAJ9C,YACkB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,MAAM,EAC3B,oBAAoB,EAAE,MAAM,EAO7C;CACF"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;GAIG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;aAE7B,IAAI,EAAE,UAAU;aAChB,QAAQ,EAAE,QAAQ;aAClB,0BAA0B,EAAE,MAAM;aAClC,YAAY,EAAE,MAAM;IAJtC,YACkB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,MAAM,EAClC,YAAY,EAAE,MAAM,EAIrC;CACF;AAED;;;;;;GAMG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;aAE9B,IAAI,EAAE,UAAU;aAChB,QAAQ,EAAE,QAAQ;aAClB,0BAA0B,EAAE,MAAM;aAClC,mBAAmB,EAAE,MAAM;aAC3B,oBAAoB,EAAE,MAAM;aAC5B,YAAY,EAAE,MAAM;IANtC,YACkB,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,QAAQ,EAClB,0BAA0B,EAAE,MAAM,EAClC,mBAAmB,EAAE,MAAM,EAC3B,oBAAoB,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EAOrC;CACF"}
package/dest/errors.js CHANGED
@@ -7,9 +7,10 @@
7
7
  */ export class DutyAlreadySignedError extends Error {
8
8
  slot;
9
9
  dutyType;
10
+ blockIndexWithinCheckpoint;
10
11
  signedByNode;
11
- constructor(slot, dutyType, signedByNode){
12
- super(`Duty ${dutyType} for slot ${slot} already signed by node ${signedByNode}`), this.slot = slot, this.dutyType = dutyType, this.signedByNode = signedByNode;
12
+ constructor(slot, dutyType, blockIndexWithinCheckpoint, signedByNode){
13
+ super(`Duty ${dutyType} for slot ${slot} already signed by node ${signedByNode}`), this.slot = slot, this.dutyType = dutyType, this.blockIndexWithinCheckpoint = blockIndexWithinCheckpoint, this.signedByNode = signedByNode;
13
14
  this.name = 'DutyAlreadySignedError';
14
15
  }
15
16
  }
@@ -22,10 +23,12 @@
22
23
  */ export class SlashingProtectionError extends Error {
23
24
  slot;
24
25
  dutyType;
26
+ blockIndexWithinCheckpoint;
25
27
  existingMessageHash;
26
28
  attemptedMessageHash;
27
- constructor(slot, dutyType, existingMessageHash, attemptedMessageHash){
28
- super(`Slashing protection: ${dutyType} for slot ${slot} was already signed with different data. ` + `Existing: ${existingMessageHash.slice(0, 10)}..., Attempted: ${attemptedMessageHash.slice(0, 10)}...`), this.slot = slot, this.dutyType = dutyType, this.existingMessageHash = existingMessageHash, this.attemptedMessageHash = attemptedMessageHash;
29
+ signedByNode;
30
+ constructor(slot, dutyType, blockIndexWithinCheckpoint, existingMessageHash, attemptedMessageHash, signedByNode){
31
+ super(`Slashing protection: ${dutyType} for slot ${slot} was already signed with different data. ` + `Existing: ${existingMessageHash.slice(0, 10)}..., Attempted: ${attemptedMessageHash.slice(0, 10)}...`), this.slot = slot, this.dutyType = dutyType, this.blockIndexWithinCheckpoint = blockIndexWithinCheckpoint, this.existingMessageHash = existingMessageHash, this.attemptedMessageHash = attemptedMessageHash, this.signedByNode = signedByNode;
29
32
  this.name = 'SlashingProtectionError';
30
33
  }
31
34
  }
package/dest/factory.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { CreateHASignerConfig } from './config.js';
1
+ import type { ValidatorHASignerConfig } from './config.js';
2
2
  import type { CreateHASignerDeps, SlashingProtectionDatabase } from './types.js';
3
3
  import { ValidatorHASigner } from './validator_ha_signer.js';
4
4
  /**
@@ -16,7 +16,7 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
16
16
  * ```typescript
17
17
  * const { signer, db } = await createHASigner({
18
18
  * databaseUrl: process.env.DATABASE_URL,
19
- * enabled: true,
19
+ * haSigningEnabled: true,
20
20
  * nodeId: 'validator-node-1',
21
21
  * pollingIntervalMs: 100,
22
22
  * signingTimeoutMs: 3000,
@@ -28,23 +28,15 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
28
28
  * await signer.stop(); // On shutdown
29
29
  * ```
30
30
  *
31
- * Example with automatic migrations (simpler for dev/testing):
32
- * ```typescript
33
- * const { signer, db } = await createHASigner({
34
- * databaseUrl: process.env.DATABASE_URL,
35
- * enabled: true,
36
- * nodeId: 'validator-node-1',
37
- * runMigrations: true, // Auto-run migrations on startup
38
- * });
39
- * signer.start();
40
- * ```
31
+ * Note: Migrations must be run separately using `aztec migrate-ha-db up` before
32
+ * creating the signer. The factory will verify the schema is initialized via `db.initialize()`.
41
33
  *
42
34
  * @param config - Configuration for the HA signer
43
35
  * @param deps - Optional dependencies (e.g., for testing)
44
36
  * @returns An object containing the signer and database instances
45
37
  */
46
- export declare function createHASigner(config: CreateHASignerConfig, deps?: CreateHASignerDeps): Promise<{
38
+ export declare function createHASigner(config: ValidatorHASignerConfig, deps?: CreateHASignerDeps): Promise<{
47
39
  signer: ValidatorHASigner;
48
40
  db: SlashingProtectionDatabase;
49
41
  }>;
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBeUNHO0FBQ0gsd0JBQXNCLGNBQWMsQ0FDbEMsTUFBTSxFQUFFLG9CQUFvQixFQUM1QixJQUFJLENBQUMsRUFBRSxrQkFBa0IsR0FDeEIsT0FBTyxDQUFDO0lBQ1QsTUFBTSxFQUFFLGlCQUFpQixDQUFDO0lBQzFCLEVBQUUsRUFBRSwwQkFBMEIsQ0FBQztDQUNoQyxDQUFDLENBNEJEIn0=
42
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWlDRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSx1QkFBdUIsRUFDL0IsSUFBSSxDQUFDLEVBQUUsa0JBQWtCLEdBQ3hCLE9BQU8sQ0FBQztJQUNULE1BQU0sRUFBRSxpQkFBaUIsQ0FBQztJQUMxQixFQUFFLEVBQUUsMEJBQTBCLENBQUM7Q0FDaEMsQ0FBQyxDQStCRCJ9
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,iBAAiB,CAAC;IAC1B,EAAE,EAAE,0BAA0B,CAAC;CAChC,CAAC,CA4BD"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,iBAAiB,CAAC;IAC1B,EAAE,EAAE,0BAA0B,CAAC;CAChC,CAAC,CA+BD"}
package/dest/factory.js CHANGED
@@ -18,7 +18,7 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
18
18
  * ```typescript
19
19
  * const { signer, db } = await createHASigner({
20
20
  * databaseUrl: process.env.DATABASE_URL,
21
- * enabled: true,
21
+ * haSigningEnabled: true,
22
22
  * nodeId: 'validator-node-1',
23
23
  * pollingIntervalMs: 100,
24
24
  * signingTimeoutMs: 3000,
@@ -30,22 +30,17 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
30
30
  * await signer.stop(); // On shutdown
31
31
  * ```
32
32
  *
33
- * Example with automatic migrations (simpler for dev/testing):
34
- * ```typescript
35
- * const { signer, db } = await createHASigner({
36
- * databaseUrl: process.env.DATABASE_URL,
37
- * enabled: true,
38
- * nodeId: 'validator-node-1',
39
- * runMigrations: true, // Auto-run migrations on startup
40
- * });
41
- * signer.start();
42
- * ```
33
+ * Note: Migrations must be run separately using `aztec migrate-ha-db up` before
34
+ * creating the signer. The factory will verify the schema is initialized via `db.initialize()`.
43
35
  *
44
36
  * @param config - Configuration for the HA signer
45
37
  * @param deps - Optional dependencies (e.g., for testing)
46
38
  * @returns An object containing the signer and database instances
47
39
  */ export async function createHASigner(config, deps) {
48
40
  const { databaseUrl, poolMaxCount, poolMinCount, poolIdleTimeoutMs, poolConnectionTimeoutMs, ...signerConfig } = config;
41
+ if (!databaseUrl) {
42
+ throw new Error('databaseUrl is required for createHASigner');
43
+ }
49
44
  // Create connection pool (or use provided pool)
50
45
  let pool;
51
46
  if (!deps?.pool) {
@@ -12,4 +12,4 @@ export interface RunMigrationsOptions {
12
12
  * @returns Array of applied migration names
13
13
  */
14
14
  export declare function runMigrations(databaseUrl: string, options?: RunMigrationsOptions): Promise<string[]>;
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21pZ3JhdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxpRkFBaUY7SUFDakYsU0FBUyxDQUFDLEVBQUUsSUFBSSxHQUFHLE1BQU0sQ0FBQztJQUMxQixnREFBZ0Q7SUFDaEQsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGFBQWEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxvQkFBeUIsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FnQzlHIn0=
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21pZ3JhdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBYUEsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxpRkFBaUY7SUFDakYsU0FBUyxDQUFDLEVBQUUsSUFBSSxHQUFHLE1BQU0sQ0FBQztJQUMxQixnREFBZ0Q7SUFDaEQsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGFBQWEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxvQkFBeUIsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0ErQzlHIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAC1B,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgC9G"}
1
+ {"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAC1B,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA+C9G"}
@@ -1,6 +1,7 @@
1
1
  /**
2
2
  * Programmatic migration runner
3
3
  */ import { createLogger } from '@aztec/foundation/log';
4
+ import { readdirSync } from 'fs';
4
5
  import { runner } from 'node-pg-migrate';
5
6
  import { dirname, join } from 'path';
6
7
  import { fileURLToPath } from 'url';
@@ -16,16 +17,26 @@ const __dirname = dirname(__filename);
16
17
  const direction = options.direction ?? 'up';
17
18
  const verbose = options.verbose ?? false;
18
19
  const log = createLogger('validator-ha-signer:migrations');
20
+ const migrationsDir = join(__dirname, 'db', 'migrations');
19
21
  try {
20
22
  log.info(`Running migrations ${direction}...`);
23
+ // Filter out .d.ts and .d.ts.map files - node-pg-migrate only needs .js files
24
+ const migrationFiles = readdirSync(migrationsDir);
25
+ const jsMigrationFiles = migrationFiles.filter((file)=>file.endsWith('.js') && !file.endsWith('.d.ts') && !file.endsWith('.d.ts.map'));
26
+ if (jsMigrationFiles.length === 0) {
27
+ log.info('No migration files found');
28
+ return [];
29
+ }
21
30
  const appliedMigrations = await runner({
22
31
  databaseUrl,
23
- dir: join(__dirname, 'db', 'migrations'),
32
+ dir: migrationsDir,
24
33
  direction,
25
34
  migrationsTable: 'pgmigrations',
26
35
  count: direction === 'down' ? 1 : Infinity,
27
36
  verbose,
28
- log: (msg)=>verbose ? log.info(msg) : log.debug(msg)
37
+ log: (msg)=>verbose ? log.info(msg) : log.debug(msg),
38
+ // Ignore TypeScript declaration files - node-pg-migrate will try to import them otherwise
39
+ ignorePattern: '.*\\.d\\.(ts|js)$|.*\\.d\\.ts\\.map$'
29
40
  });
30
41
  if (appliedMigrations.length === 0) {
31
42
  log.info('No migrations to apply - schema is up to date');
@@ -1,5 +1,5 @@
1
1
  import { type CheckAndRecordParams, type DeleteDutyParams, type RecordSuccessParams } from './db/types.js';
2
- import type { SlashingProtectionConfig, SlashingProtectionDatabase } from './types.js';
2
+ import type { SlashingProtectionDatabase, ValidatorHASignerConfig } from './types.js';
3
3
  /**
4
4
  * Slashing Protection Service
5
5
  *
@@ -21,8 +21,9 @@ export declare class SlashingProtectionService {
21
21
  private readonly log;
22
22
  private readonly pollingIntervalMs;
23
23
  private readonly signingTimeoutMs;
24
+ private readonly maxStuckDutiesAgeMs;
24
25
  private cleanupRunningPromise;
25
- constructor(db: SlashingProtectionDatabase, config: SlashingProtectionConfig);
26
+ constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig);
26
27
  /**
27
28
  * Check if a duty can be performed and acquire the lock if so.
28
29
  *
@@ -69,6 +70,11 @@ export declare class SlashingProtectionService {
69
70
  * Stop the background cleanup task.
70
71
  */
71
72
  stop(): Promise<void>;
73
+ /**
74
+ * Close the database connection.
75
+ * Should be called after stop() during graceful shutdown.
76
+ */
77
+ close(): Promise<void>;
72
78
  private cleanupStuckDuties;
73
79
  }
74
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLEtBQUssZ0JBQWdCLEVBQWMsS0FBSyxtQkFBbUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV2SCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSwwQkFBMEIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV2Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVFsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBUnpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUUxQyxPQUFPLENBQUMscUJBQXFCLENBQWlCO0lBRTlDLFlBQ21CLEVBQUUsRUFBRSwwQkFBMEIsRUFDOUIsTUFBTSxFQUFFLHdCQUF3QixFQVdsRDtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7T0FlRztJQUNHLGNBQWMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBEbEU7SUFFRDs7Ozs7O09BTUc7SUFDRyxhQUFhLENBQUMsTUFBTSxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FrQmpFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csVUFBVSxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZ0IzRDtJQUVEOztPQUVHO0lBQ0gsSUFBSSxNQUFNLElBQUksTUFBTSxDQUVuQjtJQUVEOzs7T0FHRztJQUNILEtBQUssU0FHSjtJQUVEOztPQUVHO0lBQ0csSUFBSSxrQkFHVDtZQUthLGtCQUFrQjtDQVNqQyJ9
80
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLGdCQUFnQixFQUVyQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVNsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBVHpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFTO0lBRTdDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBaUI7SUFFOUMsWUFDbUIsRUFBRSxFQUFFLDBCQUEwQixFQUM5QixNQUFNLEVBQUUsdUJBQXVCLEVBYWpEO0lBRUQ7Ozs7Ozs7Ozs7Ozs7OztPQWVHO0lBQ0csY0FBYyxDQUFDLE1BQU0sRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBaUVsRTtJQUVEOzs7Ozs7T0FNRztJQUNHLGFBQWEsQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCakU7SUFFRDs7Ozs7O09BTUc7SUFDRyxVQUFVLENBQUMsTUFBTSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F3QjNEO0lBRUQ7O09BRUc7SUFDSCxJQUFJLE1BQU0sSUFBSSxNQUFNLENBRW5CO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxTQUdKO0lBRUQ7O09BRUc7SUFDRyxJQUFJLGtCQUdUO0lBRUQ7OztPQUdHO0lBQ0csS0FBSyxrQkFHVjtZQUthLGtCQUFrQjtDQVNqQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAc,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEvH,OAAO,KAAK,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAEvF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,yBAAyB;IAQlC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAE1C,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,YACmB,EAAE,EAAE,0BAA0B,EAC9B,MAAM,EAAE,wBAAwB,EAWlD;IAED;;;;;;;;;;;;;;;OAeG;IACG,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0DlE;IAED;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBjE;IAED;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgB3D;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,KAAK,SAGJ;IAED;;OAEG;IACG,IAAI,kBAGT;YAKa,kBAAkB;CASjC"}
1
+ {"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAEtF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,yBAAyB;IASlC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAE7C,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,YACmB,EAAE,EAAE,0BAA0B,EAC9B,MAAM,EAAE,uBAAuB,EAajD;IAED;;;;;;;;;;;;;;;OAeG;IACG,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiElE;IAED;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BjE;IAED;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3D;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,KAAK,SAGJ;IAED;;OAEG;IACG,IAAI,kBAGT;IAED;;;OAGG;IACG,KAAK,kBAGV;YAKa,kBAAkB;CASjC"}