@aztec/validator-ha-signer 0.0.1-commit.7d4e6cd → 0.0.1-commit.f295ac2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -37
- package/dest/config.d.ts +49 -17
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +28 -19
- package/dest/db/postgres.d.ts +20 -5
- package/dest/db/postgres.d.ts.map +1 -1
- package/dest/db/postgres.js +50 -19
- package/dest/db/schema.d.ts +11 -7
- package/dest/db/schema.d.ts.map +1 -1
- package/dest/db/schema.js +19 -7
- package/dest/db/types.d.ts +75 -23
- package/dest/db/types.d.ts.map +1 -1
- package/dest/db/types.js +34 -0
- package/dest/errors.d.ts +9 -5
- package/dest/errors.d.ts.map +1 -1
- package/dest/errors.js +7 -4
- package/dest/factory.d.ts +6 -14
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +6 -11
- package/dest/migrations.d.ts +1 -1
- package/dest/migrations.d.ts.map +1 -1
- package/dest/migrations.js +13 -2
- package/dest/slashing_protection_service.d.ts +9 -3
- package/dest/slashing_protection_service.d.ts.map +1 -1
- package/dest/slashing_protection_service.js +21 -9
- package/dest/test/pglite_pool.d.ts +92 -0
- package/dest/test/pglite_pool.d.ts.map +1 -0
- package/dest/test/pglite_pool.js +210 -0
- package/dest/types.d.ts +78 -14
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +21 -1
- package/dest/validator_ha_signer.d.ts +7 -11
- package/dest/validator_ha_signer.d.ts.map +1 -1
- package/dest/validator_ha_signer.js +25 -29
- package/package.json +8 -8
- package/src/config.ts +59 -50
- package/src/db/postgres.ts +68 -19
- package/src/db/schema.ts +19 -7
- package/src/db/types.ts +105 -21
- package/src/errors.ts +7 -2
- package/src/factory.ts +8 -13
- package/src/migrations.ts +17 -1
- package/src/slashing_protection_service.ts +46 -12
- package/src/test/pglite_pool.ts +256 -0
- package/src/types.ts +121 -19
- package/src/validator_ha_signer.ts +32 -39
package/dest/db/schema.js
CHANGED
|
@@ -14,7 +14,8 @@ CREATE TABLE IF NOT EXISTS validator_duties (
|
|
|
14
14
|
validator_address VARCHAR(42) NOT NULL,
|
|
15
15
|
slot BIGINT NOT NULL,
|
|
16
16
|
block_number BIGINT NOT NULL,
|
|
17
|
-
|
|
17
|
+
block_index_within_checkpoint INTEGER NOT NULL DEFAULT 0,
|
|
18
|
+
duty_type VARCHAR(30) NOT NULL CHECK (duty_type IN ('BLOCK_PROPOSAL', 'CHECKPOINT_PROPOSAL', 'ATTESTATION', 'ATTESTATIONS_AND_SIGNERS', 'GOVERNANCE_VOTE', 'SLASHING_VOTE')),
|
|
18
19
|
status VARCHAR(20) NOT NULL CHECK (status IN ('signing', 'signed', 'failed')),
|
|
19
20
|
message_hash VARCHAR(66) NOT NULL,
|
|
20
21
|
signature VARCHAR(132),
|
|
@@ -24,7 +25,7 @@ CREATE TABLE IF NOT EXISTS validator_duties (
|
|
|
24
25
|
completed_at TIMESTAMP,
|
|
25
26
|
error_message TEXT,
|
|
26
27
|
|
|
27
|
-
PRIMARY KEY (validator_address, slot, duty_type),
|
|
28
|
+
PRIMARY KEY (validator_address, slot, duty_type, block_index_within_checkpoint),
|
|
28
29
|
CHECK (completed_at IS NULL OR completed_at >= started_at)
|
|
29
30
|
);
|
|
30
31
|
`;
|
|
@@ -74,24 +75,30 @@ SELECT version FROM schema_version ORDER BY version DESC LIMIT 1;
|
|
|
74
75
|
* returns the existing record instead.
|
|
75
76
|
*
|
|
76
77
|
* Returns the record with an `is_new` flag indicating whether we inserted or got existing.
|
|
78
|
+
*
|
|
79
|
+
* Note: In high concurrency scenarios, if the INSERT conflicts and another transaction
|
|
80
|
+
* just committed the row, there's a small window where the SELECT might not see it yet.
|
|
81
|
+
* The application layer should retry if no rows are returned.
|
|
77
82
|
*/ export const INSERT_OR_GET_DUTY = `
|
|
78
83
|
WITH inserted AS (
|
|
79
84
|
INSERT INTO validator_duties (
|
|
80
85
|
validator_address,
|
|
81
86
|
slot,
|
|
82
87
|
block_number,
|
|
88
|
+
block_index_within_checkpoint,
|
|
83
89
|
duty_type,
|
|
84
90
|
status,
|
|
85
91
|
message_hash,
|
|
86
92
|
node_id,
|
|
87
93
|
lock_token,
|
|
88
94
|
started_at
|
|
89
|
-
) VALUES ($1, $2, $3, $4, 'signing', $
|
|
90
|
-
ON CONFLICT (validator_address, slot, duty_type) DO NOTHING
|
|
95
|
+
) VALUES ($1, $2, $3, $4, $5, 'signing', $6, $7, $8, CURRENT_TIMESTAMP)
|
|
96
|
+
ON CONFLICT (validator_address, slot, duty_type, block_index_within_checkpoint) DO NOTHING
|
|
91
97
|
RETURNING
|
|
92
98
|
validator_address,
|
|
93
99
|
slot,
|
|
94
100
|
block_number,
|
|
101
|
+
block_index_within_checkpoint,
|
|
95
102
|
duty_type,
|
|
96
103
|
status,
|
|
97
104
|
message_hash,
|
|
@@ -109,6 +116,7 @@ SELECT
|
|
|
109
116
|
validator_address,
|
|
110
117
|
slot,
|
|
111
118
|
block_number,
|
|
119
|
+
block_index_within_checkpoint,
|
|
112
120
|
duty_type,
|
|
113
121
|
status,
|
|
114
122
|
message_hash,
|
|
@@ -122,7 +130,8 @@ SELECT
|
|
|
122
130
|
FROM validator_duties
|
|
123
131
|
WHERE validator_address = $1
|
|
124
132
|
AND slot = $2
|
|
125
|
-
AND duty_type = $
|
|
133
|
+
AND duty_type = $5
|
|
134
|
+
AND block_index_within_checkpoint = $4
|
|
126
135
|
AND NOT EXISTS (SELECT 1 FROM inserted);
|
|
127
136
|
`;
|
|
128
137
|
/**
|
|
@@ -135,8 +144,9 @@ SET status = 'signed',
|
|
|
135
144
|
WHERE validator_address = $2
|
|
136
145
|
AND slot = $3
|
|
137
146
|
AND duty_type = $4
|
|
147
|
+
AND block_index_within_checkpoint = $5
|
|
138
148
|
AND status = 'signing'
|
|
139
|
-
AND lock_token = $
|
|
149
|
+
AND lock_token = $6;
|
|
140
150
|
`;
|
|
141
151
|
/**
|
|
142
152
|
* Query to delete a duty
|
|
@@ -146,8 +156,9 @@ DELETE FROM validator_duties
|
|
|
146
156
|
WHERE validator_address = $1
|
|
147
157
|
AND slot = $2
|
|
148
158
|
AND duty_type = $3
|
|
159
|
+
AND block_index_within_checkpoint = $4
|
|
149
160
|
AND status = 'signing'
|
|
150
|
-
AND lock_token = $
|
|
161
|
+
AND lock_token = $5;
|
|
151
162
|
`;
|
|
152
163
|
/**
|
|
153
164
|
* Query to clean up old signed duties (for maintenance)
|
|
@@ -188,6 +199,7 @@ SELECT
|
|
|
188
199
|
validator_address,
|
|
189
200
|
slot,
|
|
190
201
|
block_number,
|
|
202
|
+
block_index_within_checkpoint,
|
|
191
203
|
duty_type,
|
|
192
204
|
status,
|
|
193
205
|
message_hash,
|
package/dest/db/types.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
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
|
/**
|
|
@@ -7,6 +8,7 @@ export interface DutyRow {
|
|
|
7
8
|
validator_address: string;
|
|
8
9
|
slot: string;
|
|
9
10
|
block_number: string;
|
|
11
|
+
block_index_within_checkpoint: number;
|
|
10
12
|
duty_type: DutyType;
|
|
11
13
|
status: DutyStatus;
|
|
12
14
|
message_hash: string;
|
|
@@ -28,8 +30,13 @@ export interface InsertOrGetRow extends DutyRow {
|
|
|
28
30
|
*/
|
|
29
31
|
export declare enum DutyType {
|
|
30
32
|
BLOCK_PROPOSAL = "BLOCK_PROPOSAL",
|
|
33
|
+
CHECKPOINT_PROPOSAL = "CHECKPOINT_PROPOSAL",
|
|
31
34
|
ATTESTATION = "ATTESTATION",
|
|
32
|
-
ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS"
|
|
35
|
+
ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS",
|
|
36
|
+
GOVERNANCE_VOTE = "GOVERNANCE_VOTE",
|
|
37
|
+
SLASHING_VOTE = "SLASHING_VOTE",
|
|
38
|
+
AUTH_REQUEST = "AUTH_REQUEST",
|
|
39
|
+
TXS = "TXS"
|
|
33
40
|
}
|
|
34
41
|
/**
|
|
35
42
|
* Status of a duty in the database
|
|
@@ -45,9 +52,11 @@ export interface ValidatorDutyRecord {
|
|
|
45
52
|
/** Ethereum address of the validator */
|
|
46
53
|
validatorAddress: EthAddress;
|
|
47
54
|
/** Slot number for this duty */
|
|
48
|
-
slot:
|
|
55
|
+
slot: SlotNumber;
|
|
49
56
|
/** Block number for this duty */
|
|
50
|
-
blockNumber:
|
|
57
|
+
blockNumber: BlockNumber;
|
|
58
|
+
/** Block index within checkpoint (0, 1, 2... for block proposals, -1 for other duty types) */
|
|
59
|
+
blockIndexWithinCheckpoint: number;
|
|
51
60
|
/** Type of duty being performed */
|
|
52
61
|
dutyType: DutyType;
|
|
53
62
|
/** Current status of the duty */
|
|
@@ -68,42 +77,85 @@ export interface ValidatorDutyRecord {
|
|
|
68
77
|
errorMessage?: string;
|
|
69
78
|
}
|
|
70
79
|
/**
|
|
71
|
-
*
|
|
80
|
+
* Duty identifier for block proposals.
|
|
81
|
+
* blockIndexWithinCheckpoint is REQUIRED and must be >= 0.
|
|
72
82
|
*/
|
|
73
|
-
export interface
|
|
83
|
+
export interface BlockProposalDutyIdentifier {
|
|
74
84
|
validatorAddress: EthAddress;
|
|
75
|
-
slot:
|
|
76
|
-
|
|
85
|
+
slot: SlotNumber;
|
|
86
|
+
/** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
|
|
87
|
+
blockIndexWithinCheckpoint: IndexWithinCheckpoint;
|
|
88
|
+
dutyType: DutyType.BLOCK_PROPOSAL;
|
|
77
89
|
}
|
|
78
90
|
/**
|
|
79
|
-
*
|
|
91
|
+
* Duty identifier for non-block-proposal duties.
|
|
92
|
+
* blockIndexWithinCheckpoint is not applicable (internally stored as -1).
|
|
80
93
|
*/
|
|
81
|
-
export interface
|
|
94
|
+
export interface OtherDutyIdentifier {
|
|
82
95
|
validatorAddress: EthAddress;
|
|
83
|
-
slot:
|
|
84
|
-
|
|
85
|
-
|
|
96
|
+
slot: SlotNumber;
|
|
97
|
+
dutyType: DutyType.CHECKPOINT_PROPOSAL | DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS | DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE | DutyType.AUTH_REQUEST | DutyType.TXS;
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Minimal info needed to identify a unique duty.
|
|
101
|
+
* Uses discriminated union to enforce type safety:
|
|
102
|
+
* - BLOCK_PROPOSAL duties MUST have blockIndexWithinCheckpoint >= 0
|
|
103
|
+
* - Other duty types do NOT have blockIndexWithinCheckpoint (internally -1)
|
|
104
|
+
*/
|
|
105
|
+
export type DutyIdentifier = BlockProposalDutyIdentifier | OtherDutyIdentifier;
|
|
106
|
+
/**
|
|
107
|
+
* Validates and normalizes the block index for a duty.
|
|
108
|
+
* - BLOCK_PROPOSAL: validates blockIndexWithinCheckpoint is provided and >= 0
|
|
109
|
+
* - Other duty types: always returns -1
|
|
110
|
+
*
|
|
111
|
+
* @throws Error if BLOCK_PROPOSAL is missing blockIndexWithinCheckpoint or has invalid value
|
|
112
|
+
*/
|
|
113
|
+
export declare function normalizeBlockIndex(dutyType: DutyType, blockIndexWithinCheckpoint: number | undefined): number;
|
|
114
|
+
/**
|
|
115
|
+
* Gets the block index from a DutyIdentifier.
|
|
116
|
+
* - BLOCK_PROPOSAL: returns the blockIndexWithinCheckpoint
|
|
117
|
+
* - Other duty types: returns -1
|
|
118
|
+
*/
|
|
119
|
+
export declare function getBlockIndexFromDutyIdentifier(duty: DutyIdentifier): number;
|
|
120
|
+
/**
|
|
121
|
+
* Additional parameters for checking and recording a new duty
|
|
122
|
+
*/
|
|
123
|
+
interface CheckAndRecordExtra {
|
|
124
|
+
/** Block number for this duty */
|
|
125
|
+
blockNumber: BlockNumber | CheckpointNumber;
|
|
126
|
+
/** The signing root (hash) for this duty */
|
|
86
127
|
messageHash: string;
|
|
128
|
+
/** Identifier for the node that acquired the lock */
|
|
87
129
|
nodeId: string;
|
|
88
130
|
}
|
|
89
131
|
/**
|
|
90
|
-
* Parameters for recording a
|
|
132
|
+
* Parameters for checking and recording a new duty.
|
|
133
|
+
* Uses intersection with DutyIdentifier to preserve the discriminated union.
|
|
91
134
|
*/
|
|
92
|
-
export
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
135
|
+
export type CheckAndRecordParams = DutyIdentifier & CheckAndRecordExtra;
|
|
136
|
+
/**
|
|
137
|
+
* Additional parameters for recording a successful signing
|
|
138
|
+
*/
|
|
139
|
+
interface RecordSuccessExtra {
|
|
96
140
|
signature: Signature;
|
|
97
141
|
nodeId: string;
|
|
98
142
|
lockToken: string;
|
|
99
143
|
}
|
|
100
144
|
/**
|
|
101
|
-
* Parameters for
|
|
145
|
+
* Parameters for recording a successful signing.
|
|
146
|
+
* Uses intersection with DutyIdentifier to preserve the discriminated union.
|
|
102
147
|
*/
|
|
103
|
-
export
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
148
|
+
export type RecordSuccessParams = DutyIdentifier & RecordSuccessExtra;
|
|
149
|
+
/**
|
|
150
|
+
* Additional parameters for deleting a duty
|
|
151
|
+
*/
|
|
152
|
+
interface DeleteDutyExtra {
|
|
107
153
|
lockToken: string;
|
|
108
154
|
}
|
|
109
|
-
|
|
155
|
+
/**
|
|
156
|
+
* Parameters for deleting a duty.
|
|
157
|
+
* Uses intersection with DutyIdentifier to preserve the discriminated union.
|
|
158
|
+
*/
|
|
159
|
+
export type DeleteDutyParams = DutyIdentifier & DeleteDutyExtra;
|
|
160
|
+
export {};
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYi90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDeEgsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakU7O0dBRUc7QUFDSCxNQUFNLFdBQVcsT0FBTztJQUN0QixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFlBQVksRUFBRSxNQUFNLENBQUM7SUFDckIsNkJBQTZCLEVBQUUsTUFBTSxDQUFDO0lBQ3RDLFNBQVMsRUFBRSxRQUFRLENBQUM7SUFDcEIsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQixZQUFZLEVBQUUsTUFBTSxDQUFDO0lBQ3JCLFNBQVMsRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0lBQ3pCLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixVQUFVLEVBQUUsSUFBSSxDQUFDO0lBQ2pCLFlBQVksRUFBRSxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQzFCLGFBQWEsRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUFDO0NBQzlCO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsY0FBZSxTQUFRLE9BQU87SUFDN0MsTUFBTSxFQUFFLE9BQU8sQ0FBQztDQUNqQjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksUUFBUTtJQUNsQixjQUFjLG1CQUFtQjtJQUNqQyxtQkFBbUIsd0JBQXdCO0lBQzNDLFdBQVcsZ0JBQWdCO0lBQzNCLHdCQUF3Qiw2QkFBNkI7SUFDckQsZUFBZSxvQkFBb0I7SUFDbkMsYUFBYSxr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
|
package/dest/db/types.d.ts.map
CHANGED
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/db/types.ts"],"names":[],"mappings":"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"}
|
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:
|
|
12
|
+
readonly slot: SlotNumber;
|
|
12
13
|
readonly dutyType: DutyType;
|
|
14
|
+
readonly blockIndexWithinCheckpoint: number;
|
|
13
15
|
readonly signedByNode: string;
|
|
14
|
-
constructor(slot:
|
|
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:
|
|
26
|
+
readonly slot: SlotNumber;
|
|
25
27
|
readonly dutyType: DutyType;
|
|
28
|
+
readonly blockIndexWithinCheckpoint: number;
|
|
26
29
|
readonly existingMessageHash: string;
|
|
27
30
|
readonly attemptedMessageHash: string;
|
|
28
|
-
|
|
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,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFbEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTlDOzs7O0dBSUc7QUFDSCxxQkFBYSxzQkFBdUIsU0FBUSxLQUFLO2FBRTdCLElBQUksRUFBRSxVQUFVO2FBQ2hCLFFBQVEsRUFBRSxRQUFRO2FBQ2xCLDBCQUEwQixFQUFFLE1BQU07YUFDbEMsWUFBWSxFQUFFLE1BQU07SUFKdEMsWUFDa0IsSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsMEJBQTBCLEVBQUUsTUFBTSxFQUNsQyxZQUFZLEVBQUUsTUFBTSxFQUlyQztDQUNGO0FBRUQ7Ozs7OztHQU1HO0FBQ0gscUJBQWEsdUJBQXdCLFNBQVEsS0FBSzthQUU5QixJQUFJLEVBQUUsVUFBVTthQUNoQixRQUFRLEVBQUUsUUFBUTthQUNsQiwwQkFBMEIsRUFBRSxNQUFNO2FBQ2xDLG1CQUFtQixFQUFFLE1BQU07YUFDM0Isb0JBQW9CLEVBQUUsTUFBTTthQUM1QixZQUFZLEVBQUUsTUFBTTtJQU50QyxZQUNrQixJQUFJLEVBQUUsVUFBVSxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQiwwQkFBMEIsRUFBRSxNQUFNLEVBQ2xDLG1CQUFtQixFQUFFLE1BQU0sRUFDM0Isb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixZQUFZLEVBQUUsTUFBTSxFQU9yQztDQUNGIn0=
|
package/dest/errors.d.ts.map
CHANGED
|
@@ -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,
|
|
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
|
-
|
|
28
|
-
|
|
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 {
|
|
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
|
-
*
|
|
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
|
-
*
|
|
32
|
-
*
|
|
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:
|
|
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,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWlDRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSx1QkFBdUIsRUFDL0IsSUFBSSxDQUFDLEVBQUUsa0JBQWtCLEdBQ3hCLE9BQU8sQ0FBQztJQUNULE1BQU0sRUFBRSxpQkFBaUIsQ0FBQztJQUMxQixFQUFFLEVBQUUsMEJBQTBCLENBQUM7Q0FDaEMsQ0FBQyxDQStCRCJ9
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,
|
|
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
|
-
*
|
|
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
|
-
*
|
|
34
|
-
*
|
|
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) {
|
package/dest/migrations.d.ts
CHANGED
|
@@ -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,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21pZ3JhdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBYUEsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxpRkFBaUY7SUFDakYsU0FBUyxDQUFDLEVBQUUsSUFBSSxHQUFHLE1BQU0sQ0FBQztJQUMxQixnREFBZ0Q7SUFDaEQsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGFBQWEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxvQkFBeUIsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0ErQzlHIn0=
|
package/dest/migrations.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"
|
|
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"}
|
package/dest/migrations.js
CHANGED
|
@@ -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:
|
|
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 {
|
|
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:
|
|
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,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLGdCQUFnQixFQUVyQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVNsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBVHpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFTO0lBRTdDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBaUI7SUFFOUMsWUFDbUIsRUFBRSxFQUFFLDBCQUEwQixFQUM5QixNQUFNLEVBQUUsdUJBQXVCLEVBYWpEO0lBRUQ7Ozs7Ozs7Ozs7Ozs7OztPQWVHO0lBQ0csY0FBYyxDQUFDLE1BQU0sRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBaUVsRTtJQUVEOzs7Ozs7T0FNRztJQUNHLGFBQWEsQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTBCakU7SUFFRDs7Ozs7O09BTUc7SUFDRyxVQUFVLENBQUMsTUFBTSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FpQjNEO0lBRUQ7O09BRUc7SUFDSCxJQUFJLE1BQU0sSUFBSSxNQUFNLENBRW5CO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxTQUdKO0lBRUQ7O09BRUc7SUFDRyxJQUFJLGtCQUdUO0lBRUQ7OztPQUdHO0lBQ0csS0FBSyxrQkFHVjtZQUthLGtCQUFrQjtDQVNqQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
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,CA0BjE;IAED;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAiB3D;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"}
|