@aztec-labs/validator-ha-signer 6.0.0-rc.2 → 6.0.0-rc.4
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 +14 -5
- package/dest/db/lmdb.d.ts +2 -10
- package/dest/db/lmdb.d.ts.map +1 -1
- package/dest/db/lmdb.js +2 -11
- package/dest/db/postgres.d.ts +2 -11
- package/dest/db/postgres.d.ts.map +1 -1
- package/dest/db/postgres.js +2 -15
- package/dest/db/schema.d.ts +3 -9
- package/dest/db/schema.d.ts.map +1 -1
- package/dest/db/schema.js +2 -11
- package/dest/metrics.d.ts +2 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +0 -4
- package/dest/slashing_protection_service.d.ts +3 -3
- package/dest/slashing_protection_service.d.ts.map +1 -1
- package/dest/slashing_protection_service.js +17 -27
- package/dest/types.d.ts +2 -10
- package/dest/types.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/db/lmdb.ts +2 -17
- package/src/db/postgres.ts +1 -15
- package/src/db/schema.ts +2 -13
- package/src/metrics.ts +1 -8
- package/src/slashing_protection_service.ts +21 -30
- package/src/types.ts +1 -10
package/README.md
CHANGED
|
@@ -176,15 +176,24 @@ All signing operations require a `SigningContext` that includes:
|
|
|
176
176
|
|
|
177
177
|
Note: `AUTH_REQUEST` duties bypass HA protection since signing multiple times is safe for authentication requests.
|
|
178
178
|
|
|
179
|
-
##
|
|
179
|
+
## Rollup Upgrades
|
|
180
180
|
|
|
181
|
-
|
|
181
|
+
The shared PostgreSQL database isolates duties by rollup address. Replicas serving different rollups can share it during
|
|
182
|
+
an upgrade: starting a replica preserves signing history for every rollup, including rollups still served by other replicas.
|
|
182
183
|
|
|
183
|
-
|
|
184
|
+
Duties are retained for 24 hours by default, measured from when signing started. Override this with a positive
|
|
185
|
+
`VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H` value, using the same value on every replica sharing the database. Configuration
|
|
186
|
+
changes apply to existing records as well as new ones. The validator clamps retention to at least two full slot durations
|
|
187
|
+
using the rollup's on-chain timing, covering the rest of the current slot and the next slot. Signers also enforce a
|
|
188
|
+
minimum of 144 seconds for callers that construct them directly.
|
|
184
189
|
|
|
185
|
-
|
|
190
|
+
Cleanup runs at startup and approximately hourly, removing old duties across all rollups, including retired rollups.
|
|
191
|
+
This includes unfinished duties abandoned by nodes that never return. Cleanup of the node's own stuck signing duties
|
|
192
|
+
remains separate.
|
|
193
|
+
No additional schema migration is required for this retention policy.
|
|
186
194
|
|
|
187
|
-
|
|
195
|
+
Every replica sharing the database must include this fix before a rollup transition: older versions still delete
|
|
196
|
+
other rollups' signing history on startup.
|
|
188
197
|
|
|
189
198
|
## Development
|
|
190
199
|
|
package/dest/db/lmdb.d.ts
CHANGED
|
@@ -51,15 +51,7 @@ export declare class LmdbSlashingProtectionDatabase implements SlashingProtectio
|
|
|
51
51
|
*/
|
|
52
52
|
cleanupOwnStuckDuties(nodeId: string, maxAgeMs: number): Promise<number>;
|
|
53
53
|
/**
|
|
54
|
-
* Cleanup duties
|
|
55
|
-
*
|
|
56
|
-
* This is always a no-op for the LMDB implementation: the underlying store is created via
|
|
57
|
-
* DatabaseVersionManager (in factory.ts), which already resets the entire data directory at
|
|
58
|
-
* startup whenever the rollup address changes.
|
|
59
|
-
*/
|
|
60
|
-
cleanupOutdatedRollupDuties(_currentRollupAddress: EthAddress): Promise<number>;
|
|
61
|
-
/**
|
|
62
|
-
* Cleanup old signed duties older than maxAgeMs.
|
|
54
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
63
55
|
*/
|
|
64
56
|
cleanupOldDuties(maxAgeMs: number): Promise<number>;
|
|
65
57
|
/**
|
|
@@ -67,4 +59,4 @@ export declare class LmdbSlashingProtectionDatabase implements SlashingProtectio
|
|
|
67
59
|
*/
|
|
68
60
|
close(): Promise<void>;
|
|
69
61
|
}
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG1kYi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RiL2xtZGIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7O0dBUUc7QUFDSCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFbEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLHNCQUFzQixDQUFDO0FBRzdFLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLG9CQUFvQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3BGLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUV6QixRQUFRLEVBSVQsTUFBTSxZQUFZLENBQUM7QUFZcEI7O0dBRUc7QUFDSCx3QkFBc0IscUNBQXFDLENBQ3pELGFBQWEsRUFBRSxNQUFNLEVBQ3JCLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLGFBQWEsRUFBRSxNQUFNLEVBQ3JCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sR0FDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXNCZjtBQVlEOzs7OztHQUtHO0FBQ0gscUJBQWEsOEJBQStCLFlBQVcsMEJBQTBCO0lBTzdFLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFQL0IsZ0JBQXVCLGNBQWMsS0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBMEM7SUFDakUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQVM7SUFFN0IsWUFDbUIsS0FBSyxFQUFFLGlCQUFpQixFQUN4QixZQUFZLEVBQUUsWUFBWSxFQUk1QztJQUVEOzs7O09BSUc7SUFDVSxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBNkMvRjtJQUVEOzs7T0FHRztJQUNJLGdCQUFnQixDQUNyQixhQUFhLEVBQUUsVUFBVSxFQUN6QixnQkFBZ0IsRUFBRSxVQUFVLEVBQzVCLElBQUksRUFBRSxVQUFVLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLDBCQUEwQixFQUFFLE1BQU0sR0FDakMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTBDbEI7SUFFRDs7O09BR0c7SUFDSSxVQUFVLENBQ2YsYUFBYSxFQUFFLFVBQVUsRUFDekIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixJQUFJLEVBQUUsVUFBVSxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQixTQUFTLEVBQUUsTUFBTSxFQUNqQiwwQkFBMEIsRUFBRSxNQUFNLEdBQ2pDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QmxCO0lBRUQ7O09BRUc7SUFDSSxxQkFBcUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQWU5RTtJQUVEOztPQUVHO0lBQ0ksZ0JBQWdCLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBZXpEO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztDQUNGIn0=
|
package/dest/db/lmdb.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmdb.d.ts","sourceRoot":"","sources":["../../src/db/lmdb.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,sBAAsB,CAAC;AAG7E,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EACL,KAAK,oBAAoB,EAEzB,QAAQ,EAIT,MAAM,YAAY,CAAC;AAYpB;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAYD;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,0BAA0B;IAO7E,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAP/B,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,YAAY,EAI5C;IAED;;;;OAIG;IACU,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6C/F;IAED;;;OAGG;IACI,gBAAgB,CACrB,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,CA0ClB;IAED;;;OAGG;IACI,UAAU,CACf,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,CAyBlB;IAED;;OAEG;IACI,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAe9E;IAED
|
|
1
|
+
{"version":3,"file":"lmdb.d.ts","sourceRoot":"","sources":["../../src/db/lmdb.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,sBAAsB,CAAC;AAG7E,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACpF,OAAO,EACL,KAAK,oBAAoB,EAEzB,QAAQ,EAIT,MAAM,YAAY,CAAC;AAYpB;;GAEG;AACH,wBAAsB,qCAAqC,CACzD,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAsBf;AAYD;;;;;GAKG;AACH,qBAAa,8BAA+B,YAAW,0BAA0B;IAO7E,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAP/B,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YACmB,KAAK,EAAE,iBAAiB,EACxB,YAAY,EAAE,YAAY,EAI5C;IAED;;;;OAIG;IACU,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA6C/F;IAED;;;OAGG;IACI,gBAAgB,CACrB,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,CA0ClB;IAED;;;OAGG;IACI,UAAU,CACf,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,CAyBlB;IAED;;OAEG;IACI,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAe9E;IAED;;OAEG;IACI,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAezD;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;CACF"}
|
package/dest/db/lmdb.js
CHANGED
|
@@ -189,22 +189,13 @@ function dutyKey(rollupAddress, validatorAddress, slot, dutyType, blockIndexWith
|
|
|
189
189
|
});
|
|
190
190
|
}
|
|
191
191
|
/**
|
|
192
|
-
* Cleanup duties
|
|
193
|
-
*
|
|
194
|
-
* This is always a no-op for the LMDB implementation: the underlying store is created via
|
|
195
|
-
* DatabaseVersionManager (in factory.ts), which already resets the entire data directory at
|
|
196
|
-
* startup whenever the rollup address changes.
|
|
197
|
-
*/ cleanupOutdatedRollupDuties(_currentRollupAddress) {
|
|
198
|
-
return Promise.resolve(0);
|
|
199
|
-
}
|
|
200
|
-
/**
|
|
201
|
-
* Cleanup old signed duties older than maxAgeMs.
|
|
192
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
202
193
|
*/ cleanupOldDuties(maxAgeMs) {
|
|
203
194
|
const cutoffMs = this.dateProvider.now() - maxAgeMs;
|
|
204
195
|
return this.store.transactionAsync(async ()=>{
|
|
205
196
|
const keysToDelete = [];
|
|
206
197
|
for await (const [key, record] of this.duties.entriesAsync()){
|
|
207
|
-
if (record.
|
|
198
|
+
if (record.startedAtMs < cutoffMs) {
|
|
208
199
|
keysToDelete.push(key);
|
|
209
200
|
}
|
|
210
201
|
}
|
package/dest/db/postgres.d.ts
CHANGED
|
@@ -69,18 +69,9 @@ export declare class PostgresSlashingProtectionDatabase implements SlashingProte
|
|
|
69
69
|
*/
|
|
70
70
|
cleanupOwnStuckDuties(nodeId: string, maxAgeMs: number): Promise<number>;
|
|
71
71
|
/**
|
|
72
|
-
* Cleanup duties
|
|
73
|
-
* Removes all duties where the rollup address doesn't match the current one.
|
|
74
|
-
* Used after a rollup upgrade to clean up duties for the old rollup.
|
|
75
|
-
* @returns the number of duties cleaned up
|
|
76
|
-
*/
|
|
77
|
-
cleanupOutdatedRollupDuties(currentRollupAddress: EthAddress): Promise<number>;
|
|
78
|
-
/**
|
|
79
|
-
* Cleanup old signed duties.
|
|
80
|
-
* Removes only signed duties older than the specified age.
|
|
81
|
-
* Does not remove 'signing' duties as they may be in progress.
|
|
72
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
82
73
|
* @returns the number of duties cleaned up
|
|
83
74
|
*/
|
|
84
75
|
cleanupOldDuties(maxAgeMs: number): Promise<number>;
|
|
85
76
|
}
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9zdGdyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYi9wb3N0Z3Jlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFHaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxNQUFNLElBQUksQ0FBQztBQUV0RCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQVNwRixPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBVyxRQUFRLEVBQXVDLE1BQU0sWUFBWSxDQUFDO0FBRy9HOzs7R0FHRztBQUNILE1BQU0sV0FBVyxhQUFhO0lBQzVCLEtBQUssQ0FBQyxDQUFDLFNBQVMsY0FBYyxHQUFHLEdBQUcsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3RixHQUFHLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3RCO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxrQ0FBbUMsWUFBVywwQkFBMEI7SUFHdkUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJO0lBRmpDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBRTdCLFlBQTZCLElBQUksRUFBRSxhQUFhLEVBRS9DO0lBRUQ7Ozs7O09BS0c7SUFDRyxVQUFVLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQWdDaEM7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLHNCQUFzQixDQUFDLE1BQU0sRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FxRHhGO0lBRUQ7Ozs7O09BS0c7SUFDRyxnQkFBZ0IsQ0FDcEIsYUFBYSxFQUFFLFVBQVUsRUFDekIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixJQUFJLEVBQUUsVUFBVSxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQixTQUFTLEVBQUUsTUFBTSxFQUNqQixTQUFTLEVBQUUsTUFBTSxFQUNqQiwwQkFBMEIsRUFBRSxNQUFNLEdBQ2pDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FzQmxCO0lBRUQ7Ozs7OztPQU1HO0lBQ0csVUFBVSxDQUNkLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsSUFBSSxFQUFFLFVBQVUsRUFDaEIsUUFBUSxFQUFFLFFBQVEsRUFDbEIsU0FBUyxFQUFFLE1BQU0sRUFDakIsMEJBQTBCLEVBQUUsTUFBTSxHQUNqQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBcUJsQjtJQUVEOzs7O09BSUc7SUFDSCxPQUFPLENBQUMsV0FBVztJQW9CbkI7O09BRUc7SUFDRyxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUczQjtJQUVEOzs7T0FHRztJQUNHLHFCQUFxQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRzdFO0lBRUQ7OztPQUdHO0lBQ0csZ0JBQWdCLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBR3hEO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/db/postgres.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAEtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../src/db/postgres.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AAEtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AASpF,OAAO,KAAK,EAAE,oBAAoB,EAAW,QAAQ,EAAuC,MAAM,YAAY,CAAC;AAG/G;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,CAAC,SAAS,cAAc,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7F,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB;AAED;;GAEG;AACH,qBAAa,kCAAmC,YAAW,0BAA0B;IAGvE,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAE7B,YAA6B,IAAI,EAAE,aAAa,EAE/C;IAED;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAgChC;IAED;;;;;;;;OAQG;IACG,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAqDxF;IAED;;;;;OAKG;IACG,gBAAgB,CACpB,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,CAsBlB;IAED;;;;;;OAMG;IACG,UAAU,CACd,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,CAqBlB;IAED;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAoBnB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3B;IAED;;;OAGG;IACG,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7E;IAED;;;OAGG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGxD;CACF"}
|
package/dest/db/postgres.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/ import { randomBytes } from '@aztec-labs/foundation/crypto/random';
|
|
4
4
|
import { createLogger } from '@aztec-labs/foundation/log';
|
|
5
5
|
import { makeBackoff, retry } from '@aztec-labs/foundation/retry';
|
|
6
|
-
import { CLEANUP_OLD_DUTIES,
|
|
6
|
+
import { CLEANUP_OLD_DUTIES, CLEANUP_OWN_STUCK_DUTIES, DELETE_DUTY, INSERT_OR_GET_DUTY, SCHEMA_VERSION, UPDATE_DUTY_SIGNED } from './schema.js';
|
|
7
7
|
import { getBlockIndexFromDutyIdentifier, recordFromFields } from './types.js';
|
|
8
8
|
/**
|
|
9
9
|
* PostgreSQL implementation of the slashing protection database
|
|
@@ -186,20 +186,7 @@ import { getBlockIndexFromDutyIdentifier, recordFromFields } from './types.js';
|
|
|
186
186
|
return result.rowCount ?? 0;
|
|
187
187
|
}
|
|
188
188
|
/**
|
|
189
|
-
* Cleanup duties
|
|
190
|
-
* Removes all duties where the rollup address doesn't match the current one.
|
|
191
|
-
* Used after a rollup upgrade to clean up duties for the old rollup.
|
|
192
|
-
* @returns the number of duties cleaned up
|
|
193
|
-
*/ async cleanupOutdatedRollupDuties(currentRollupAddress) {
|
|
194
|
-
const result = await this.pool.query(CLEANUP_OUTDATED_ROLLUP_DUTIES, [
|
|
195
|
-
currentRollupAddress.toString()
|
|
196
|
-
]);
|
|
197
|
-
return result.rowCount ?? 0;
|
|
198
|
-
}
|
|
199
|
-
/**
|
|
200
|
-
* Cleanup old signed duties.
|
|
201
|
-
* Removes only signed duties older than the specified age.
|
|
202
|
-
* Does not remove 'signing' duties as they may be in progress.
|
|
189
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
203
190
|
* @returns the number of duties cleaned up
|
|
204
191
|
*/ async cleanupOldDuties(maxAgeMs) {
|
|
205
192
|
const result = await this.pool.query(CLEANUP_OLD_DUTIES, [
|
package/dest/db/schema.d.ts
CHANGED
|
@@ -65,21 +65,15 @@ export declare const DELETE_DUTY = "\nDELETE FROM validator_duties\nWHERE rollup
|
|
|
65
65
|
export declare const CLEANUP_OLD_SIGNED_DUTIES = "\nDELETE FROM validator_duties\nWHERE status = 'signed'\n AND completed_at < $1;\n";
|
|
66
66
|
/**
|
|
67
67
|
* Query to clean up old duties (for maintenance)
|
|
68
|
-
* Removes
|
|
68
|
+
* Removes duties across all rollups whose signing started more than the specified age ago (in milliseconds)
|
|
69
69
|
*/
|
|
70
|
-
export declare const CLEANUP_OLD_DUTIES = "\nDELETE FROM validator_duties\nWHERE
|
|
70
|
+
export declare const CLEANUP_OLD_DUTIES = "\nDELETE FROM validator_duties\nWHERE started_at < CURRENT_TIMESTAMP - ($1 || ' milliseconds')::INTERVAL;\n";
|
|
71
71
|
/**
|
|
72
72
|
* Query to cleanup own stuck duties
|
|
73
73
|
* Removes duties in 'signing' status for a specific node that are older than maxAgeMs
|
|
74
74
|
* Uses DB's CURRENT_TIMESTAMP to avoid clock skew issues between nodes
|
|
75
75
|
*/
|
|
76
76
|
export declare const CLEANUP_OWN_STUCK_DUTIES = "\nDELETE FROM validator_duties\nWHERE node_id = $1\n AND status = 'signing'\n AND started_at < CURRENT_TIMESTAMP - ($2 || ' milliseconds')::INTERVAL;\n";
|
|
77
|
-
/**
|
|
78
|
-
* Query to cleanup duties with outdated rollup address
|
|
79
|
-
* Removes all duties where the rollup address doesn't match the current one
|
|
80
|
-
* Used after a rollup upgrade to clean up duties for the old rollup
|
|
81
|
-
*/
|
|
82
|
-
export declare const CLEANUP_OUTDATED_ROLLUP_DUTIES = "\nDELETE FROM validator_duties\nWHERE rollup_address != $1;\n";
|
|
83
77
|
/**
|
|
84
78
|
* SQL to drop the validator_duties table
|
|
85
79
|
*/
|
|
@@ -93,4 +87,4 @@ export declare const DROP_SCHEMA_VERSION_TABLE = "DROP TABLE IF EXISTS schema_ve
|
|
|
93
87
|
* Returns duties in 'signing' status that have been stuck for too long
|
|
94
88
|
*/
|
|
95
89
|
export declare const GET_STUCK_DUTIES = "\nSELECT\n rollup_address,\n validator_address,\n slot,\n block_number,\n checkpoint_number,\n block_index_within_checkpoint,\n duty_type,\n status,\n message_hash,\n node_id,\n started_at,\n EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - started_at)) as age_seconds\nFROM validator_duties\nWHERE status = 'signing'\n AND started_at < $1\nORDER BY started_at ASC;\n";
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZGIvc2NoZW1hLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVIOztHQUVHO0FBQ0gsZUFBTyxNQUFNLGNBQWMsSUFBSSxDQUFDO0FBRWhDOztHQUVHO0FBQ0gsZUFBTyxNQUFNLDZCQUE2QixzOEJBcUJ6QyxDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0sbUJBQW1CLHlHQUcvQixDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0saUJBQWlCLHdHQUc3QixDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0sMkJBQTJCLG1KQUt2QyxDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0scUJBQXFCLDZGQUlqQyxDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0sWUFBWSxpekNBS2YsQ0FBQztBQUVYOztHQUVHO0FBQ0gsZUFBTyxNQUFNLGtCQUFrQiwwRUFFOUIsQ0FBQztBQUVGOzs7Ozs7Ozs7O0dBVUc7QUFDSCxlQUFPLE1BQU0sa0JBQWtCLHd6Q0E2RDlCLENBQUM7QUFFRjs7R0FFRztBQUNILGVBQU8sTUFBTSxrQkFBa0IsK1NBWTlCLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sV0FBVyxpT0FTdkIsQ0FBQztBQUVGOzs7R0FHRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsd0ZBSXJDLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sa0JBQWtCLGdIQUc5QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILGVBQU8sTUFBTSx3QkFBd0IsOEpBS3BDLENBQUM7QUFFRjs7R0FFRztBQUNILGVBQU8sTUFBTSwyQkFBMkIsMkNBQTJDLENBQUM7QUFFcEY7O0dBRUc7QUFDSCxlQUFPLE1BQU0seUJBQXlCLHlDQUF5QyxDQUFDO0FBRWhGOzs7R0FHRztBQUNILGVBQU8sTUFBTSxnQkFBZ0Isd1hBa0I1QixDQUFDIn0=
|
package/dest/db/schema.d.ts.map
CHANGED
|
@@ -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,s8BAqBzC,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,izCAKf,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,0EAE9B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,wzCA6D9B,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,
|
|
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,s8BAqBzC,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,izCAKf,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,0EAE9B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,wzCA6D9B,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,gHAG9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,8JAKpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,2CAA2C,CAAC;AAEpF;;GAEG;AACH,eAAO,MAAM,yBAAyB,yCAAyC,CAAC;AAEhF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,wXAkB5B,CAAC"}
|
package/dest/db/schema.js
CHANGED
|
@@ -181,11 +181,10 @@ WHERE status = 'signed'
|
|
|
181
181
|
`;
|
|
182
182
|
/**
|
|
183
183
|
* Query to clean up old duties (for maintenance)
|
|
184
|
-
* Removes
|
|
184
|
+
* Removes duties across all rollups whose signing started more than the specified age ago (in milliseconds)
|
|
185
185
|
*/ export const CLEANUP_OLD_DUTIES = `
|
|
186
186
|
DELETE FROM validator_duties
|
|
187
|
-
WHERE
|
|
188
|
-
AND started_at < CURRENT_TIMESTAMP - ($1 || ' milliseconds')::INTERVAL;
|
|
187
|
+
WHERE started_at < CURRENT_TIMESTAMP - ($1 || ' milliseconds')::INTERVAL;
|
|
189
188
|
`;
|
|
190
189
|
/**
|
|
191
190
|
* Query to cleanup own stuck duties
|
|
@@ -197,14 +196,6 @@ WHERE node_id = $1
|
|
|
197
196
|
AND status = 'signing'
|
|
198
197
|
AND started_at < CURRENT_TIMESTAMP - ($2 || ' milliseconds')::INTERVAL;
|
|
199
198
|
`;
|
|
200
|
-
/**
|
|
201
|
-
* Query to cleanup duties with outdated rollup address
|
|
202
|
-
* Removes all duties where the rollup address doesn't match the current one
|
|
203
|
-
* Used after a rollup upgrade to clean up duties for the old rollup
|
|
204
|
-
*/ export const CLEANUP_OUTDATED_ROLLUP_DUTIES = `
|
|
205
|
-
DELETE FROM validator_duties
|
|
206
|
-
WHERE rollup_address != $1;
|
|
207
|
-
`;
|
|
208
199
|
/**
|
|
209
200
|
* SQL to drop the validator_duties table
|
|
210
201
|
*/ export const DROP_VALIDATOR_DUTIES_TABLE = `DROP TABLE IF EXISTS validator_duties;`;
|
package/dest/metrics.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type TelemetryClient } from '@aztec-labs/telemetry-client';
|
|
2
|
-
export type HACleanupType = 'stuck' | 'old'
|
|
2
|
+
export type HACleanupType = 'stuck' | 'old';
|
|
3
3
|
/**
|
|
4
4
|
* Metrics for HA signer tracking signing operations, lock acquisition, and cleanup.
|
|
5
5
|
*/
|
|
@@ -13,7 +13,6 @@ export declare class HASignerMetrics {
|
|
|
13
13
|
private lockAcquiredCount;
|
|
14
14
|
private cleanupStuckDutiesCount;
|
|
15
15
|
private cleanupOldDutiesCount;
|
|
16
|
-
private cleanupOutdatedRollupDutiesCount;
|
|
17
16
|
constructor(client: TelemetryClient, nodeId: string, name?: string);
|
|
18
17
|
/**
|
|
19
18
|
* Record a successful signing operation.
|
|
@@ -48,4 +47,4 @@ export declare class HASignerMetrics {
|
|
|
48
47
|
*/
|
|
49
48
|
recordCleanup(type: HACleanupType, count: number): void;
|
|
50
49
|
}
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUlMLEtBQUssZUFBZSxFQUdyQixNQUFNLDhCQUE4QixDQUFDO0FBRXRDLE1BQU0sTUFBTSxhQUFhLEdBQUcsT0FBTyxHQUFHLEtBQUssQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGVBQWU7SUFpQnhCLE9BQU8sQ0FBQyxNQUFNO0lBZmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLG1CQUFtQixDQUFnQjtJQUMzQyxPQUFPLENBQUMsc0JBQXNCLENBQWdCO0lBQzlDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBZ0I7SUFDL0MsT0FBTyxDQUFDLGlCQUFpQixDQUFnQjtJQUd6QyxPQUFPLENBQUMsaUJBQWlCLENBQWdCO0lBR3pDLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBZ0I7SUFDL0MsT0FBTyxDQUFDLHFCQUFxQixDQUFnQjtJQUU3QyxZQUNFLE1BQU0sRUFBRSxlQUFlLEVBQ2YsTUFBTSxFQUFFLE1BQU0sRUFDdEIsSUFBSSxTQUFvQixFQWlCekI7SUFFRDs7OztPQUlHO0lBQ0ksb0JBQW9CLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FPdEU7SUFFRDs7O09BR0c7SUFDSSx1QkFBdUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNckQ7SUFFRDs7O09BR0c7SUFDSSx3QkFBd0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNdEQ7SUFFRDs7O09BR0c7SUFDSSxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNaEQ7SUFFRDs7O09BR0c7SUFDSSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FPaEQ7SUFFRDs7OztPQUlHO0lBQ0ksYUFBYSxDQUFDLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxJQUFJLENBVTdEO0NBQ0YifQ==
|
package/dest/metrics.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,KAAK,CAAC;AAE5C;;GAEG;AACH,qBAAa,eAAe;IAiBxB,OAAO,CAAC,MAAM;IAfhB,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,mBAAmB,CAAgB;IAC3C,OAAO,CAAC,sBAAsB,CAAgB;IAC9C,OAAO,CAAC,uBAAuB,CAAgB;IAC/C,OAAO,CAAC,iBAAiB,CAAgB;IAGzC,OAAO,CAAC,iBAAiB,CAAgB;IAGzC,OAAO,CAAC,uBAAuB,CAAgB;IAC/C,OAAO,CAAC,qBAAqB,CAAgB;IAE7C,YACE,MAAM,EAAE,eAAe,EACf,MAAM,EAAE,MAAM,EACtB,IAAI,SAAoB,EAiBzB;IAED;;;;OAIG;IACI,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAOtE;IAED;;;OAGG;IACI,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAMrD;IAED;;;OAGG;IACI,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAMtD;IAED;;;OAGG;IACI,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAMhD;IAED;;;OAGG;IACI,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAOhD;IAED;;;;OAIG;IACI,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAU7D;CACF"}
|
package/dest/metrics.js
CHANGED
|
@@ -14,7 +14,6 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec-labs
|
|
|
14
14
|
// Cleanup metrics
|
|
15
15
|
cleanupStuckDutiesCount;
|
|
16
16
|
cleanupOldDutiesCount;
|
|
17
|
-
cleanupOutdatedRollupDutiesCount;
|
|
18
17
|
constructor(client, nodeId, name = 'HASignerMetrics'){
|
|
19
18
|
this.nodeId = nodeId;
|
|
20
19
|
const meter = client.getMeter(name);
|
|
@@ -29,7 +28,6 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec-labs
|
|
|
29
28
|
// Cleanup
|
|
30
29
|
this.cleanupStuckDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_STUCK_DUTIES_COUNT);
|
|
31
30
|
this.cleanupOldDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OLD_DUTIES_COUNT);
|
|
32
|
-
this.cleanupOutdatedRollupDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OUTDATED_ROLLUP_DUTIES_COUNT);
|
|
33
31
|
}
|
|
34
32
|
/**
|
|
35
33
|
* Record a successful signing operation.
|
|
@@ -96,8 +94,6 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec-labs
|
|
|
96
94
|
this.cleanupStuckDutiesCount.add(count, attributes);
|
|
97
95
|
} else if (type === 'old') {
|
|
98
96
|
this.cleanupOldDutiesCount.add(count, attributes);
|
|
99
|
-
} else if (type === 'outdated_rollup') {
|
|
100
|
-
this.cleanupOutdatedRollupDutiesCount.add(count, attributes);
|
|
101
97
|
}
|
|
102
98
|
}
|
|
103
99
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { DateProvider } from '@aztec-labs/foundation/timer';
|
|
2
|
-
import type
|
|
2
|
+
import { type BaseSignerConfig } from '@aztec-labs/stdlib/ha-signing';
|
|
3
3
|
import { type CheckAndRecordParams, type DeleteDutyParams, type RecordSuccessParams } from './db/types.js';
|
|
4
4
|
import type { HASignerMetrics } from './metrics.js';
|
|
5
5
|
import type { SlashingProtectionDatabase } from './types.js';
|
|
@@ -31,6 +31,7 @@ export declare class SlashingProtectionService {
|
|
|
31
31
|
private readonly pollingIntervalMs;
|
|
32
32
|
private readonly peerSigningTimeoutMs;
|
|
33
33
|
private readonly maxStuckDutiesAgeMs;
|
|
34
|
+
private readonly maxOldDutiesAgeMs;
|
|
34
35
|
private readonly metrics;
|
|
35
36
|
private readonly dateProvider;
|
|
36
37
|
private cleanupRunningPromise;
|
|
@@ -78,7 +79,6 @@ export declare class SlashingProtectionService {
|
|
|
78
79
|
*/
|
|
79
80
|
/**
|
|
80
81
|
* Start the background cleanup task.
|
|
81
|
-
* Also performs one-time cleanup of duties with outdated rollup addresses.
|
|
82
82
|
*/
|
|
83
83
|
start(): Promise<void>;
|
|
84
84
|
/**
|
|
@@ -92,4 +92,4 @@ export declare class SlashingProtectionService {
|
|
|
92
92
|
close(): Promise<void>;
|
|
93
93
|
private cleanup;
|
|
94
94
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVNBLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2pFLE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUd0QixNQUFNLCtCQUErQixDQUFDO0FBRXZDLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLGdCQUFnQixFQUVyQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFN0QsTUFBTSxXQUFXLDZCQUE2QjtJQUM1QyxPQUFPLEVBQUUsZUFBZSxDQUFDO0lBQ3pCLFlBQVksRUFBRSxZQUFZLENBQUM7Q0FDNUI7QUFFRCwrR0FBK0c7QUFDL0csZUFBTyxNQUFNLCtCQUErQixTQUFVLENBQUM7QUFFdkQ7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxxQkFBYSx5QkFBeUI7SUFjbEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFO0lBQ25CLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTTtJQWR6QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBUztJQUM3QixPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFTO0lBQzNDLE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBUztJQUM3QyxPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFTO0lBRTNDLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFrQjtJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBZTtJQUU1QyxPQUFPLENBQUMscUJBQXFCLENBQWlCO0lBQzlDLE9BQU8sQ0FBQyx3QkFBd0IsQ0FBQyxDQUFTO0lBRTFDLFlBQ21CLEVBQUUsRUFBRSwwQkFBMEIsRUFDOUIsTUFBTSxFQUFFLGdCQUFnQixFQUN6QyxJQUFJLEVBQUUsNkJBQTZCLEVBY3BDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7O09BY0c7SUFDRyxjQUFjLENBQUMsTUFBTSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FxRWxFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csYUFBYSxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBMkJqRTtJQUVEOzs7Ozs7T0FNRztJQUNHLFVBQVUsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXdCM0Q7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRDs7O09BR0c7SUFDSDs7T0FFRztJQUNILEtBQUssSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBS3JCO0lBRUQ7O09BRUc7SUFDRyxJQUFJLGtCQUdUO0lBRUQ7OztPQUdHO0lBQ0csS0FBSyxrQkFHVjtZQU1hLE9BQU87Q0F3QnRCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,KAAK,gBAAgB,EAGtB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE7D,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,+GAA+G;AAC/G,eAAO,MAAM,+BAA+B,SAAU,CAAC;AAEvD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,yBAAyB;IAclC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAdzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAE3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAE5C,OAAO,CAAC,qBAAqB,CAAiB;IAC9C,OAAO,CAAC,wBAAwB,CAAC,CAAS;IAE1C,YACmB,EAAE,EAAE,0BAA0B,EAC9B,MAAM,EAAE,gBAAgB,EACzC,IAAI,EAAE,6BAA6B,EAcpC;IAED;;;;;;;;;;;;;;OAcG;IACG,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqElE;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;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAKrB;IAED;;OAEG;IACG,IAAI,kBAGT;IAED;;;OAGG;IACG,KAAK,kBAGV;YAMa,OAAO;CAwBtB"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/ import { createLogger } from '@aztec-labs/foundation/log';
|
|
7
7
|
import { RunningPromise } from '@aztec-labs/foundation/promise';
|
|
8
8
|
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
9
|
+
import { BaseSignerConfigSchema, DEFAULT_SIGNED_DUTIES_RETENTION_HOURS } from '@aztec-labs/stdlib/ha-signing';
|
|
9
10
|
import { DutyStatus, getBlockIndexFromDutyIdentifier } from './db/types.js';
|
|
10
11
|
import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
11
12
|
/** Default max age (ms) of a stuck SIGNING duty before cleanup reclaims it: 2x the 72s Aztec slot duration. */ export const DEFAULT_MAX_STUCK_DUTIES_AGE_MS = 144_000;
|
|
@@ -30,6 +31,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
30
31
|
pollingIntervalMs;
|
|
31
32
|
peerSigningTimeoutMs;
|
|
32
33
|
maxStuckDutiesAgeMs;
|
|
34
|
+
maxOldDutiesAgeMs;
|
|
33
35
|
metrics;
|
|
34
36
|
dateProvider;
|
|
35
37
|
cleanupRunningPromise;
|
|
@@ -41,6 +43,8 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
41
43
|
this.pollingIntervalMs = config.pollingIntervalMs;
|
|
42
44
|
this.peerSigningTimeoutMs = config.peerSigningTimeoutMs;
|
|
43
45
|
this.maxStuckDutiesAgeMs = config.maxStuckDutiesAgeMs ?? DEFAULT_MAX_STUCK_DUTIES_AGE_MS;
|
|
46
|
+
const retentionHours = BaseSignerConfigSchema.shape.cleanupOldDutiesAfterHours.parse(config.cleanupOldDutiesAfterHours) ?? DEFAULT_SIGNED_DUTIES_RETENTION_HOURS;
|
|
47
|
+
this.maxOldDutiesAgeMs = Math.max(retentionHours * 60 * 60 * 1000, DEFAULT_MAX_STUCK_DUTIES_AGE_MS);
|
|
44
48
|
this.cleanupRunningPromise = new RunningPromise(this.cleanup.bind(this), this.log, this.maxStuckDutiesAgeMs);
|
|
45
49
|
this.metrics = deps.metrics;
|
|
46
50
|
this.dateProvider = deps.dateProvider;
|
|
@@ -171,20 +175,13 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
171
175
|
* Cleanup runs immediately on start to recover from any previous crashes.
|
|
172
176
|
*/ /**
|
|
173
177
|
* Start the background cleanup task.
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
// One-time cleanup at startup: remove duties from previous rollup versions
|
|
177
|
-
const numOutdatedRollupDuties = await this.db.cleanupOutdatedRollupDuties(this.config.rollupAddress);
|
|
178
|
-
if (numOutdatedRollupDuties > 0) {
|
|
179
|
-
this.log.info(`Cleaned up ${numOutdatedRollupDuties} duties with outdated rollup address at startup`, {
|
|
180
|
-
currentRollupAddress: this.config.rollupAddress.toString()
|
|
181
|
-
});
|
|
182
|
-
this.metrics.recordCleanup('outdated_rollup', numOutdatedRollupDuties);
|
|
183
|
-
}
|
|
178
|
+
*/ start() {
|
|
179
|
+
// Other replicas may still serve a different rollup, whose signing history must survive our startup.
|
|
184
180
|
this.cleanupRunningPromise.start();
|
|
185
181
|
this.log.info('Slashing protection service started', {
|
|
186
182
|
nodeId: this.config.nodeId
|
|
187
183
|
});
|
|
184
|
+
return Promise.resolve();
|
|
188
185
|
}
|
|
189
186
|
/**
|
|
190
187
|
* Stop the background cleanup task.
|
|
@@ -202,7 +199,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
202
199
|
this.log.info('Slashing protection database connection closed');
|
|
203
200
|
}
|
|
204
201
|
/**
|
|
205
|
-
* Periodic cleanup of stuck duties and
|
|
202
|
+
* Periodic cleanup of stuck duties and old duties across all rollups.
|
|
206
203
|
* Runs in the background via RunningPromise.
|
|
207
204
|
*/ async cleanup() {
|
|
208
205
|
// 1. Clean up stuck duties (our own node's duties that got stuck in 'signing' status).
|
|
@@ -217,22 +214,15 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
217
214
|
});
|
|
218
215
|
this.metrics.recordCleanup('stuck', numStuckDuties);
|
|
219
216
|
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
this.
|
|
229
|
-
if (numOldDuties > 0) {
|
|
230
|
-
this.log.verbose(`Cleaned up ${numOldDuties} old signed duties`, {
|
|
231
|
-
cleanupOldDutiesAfterHours: this.config.cleanupOldDutiesAfterHours,
|
|
232
|
-
maxAgeMs
|
|
233
|
-
});
|
|
234
|
-
this.metrics.recordCleanup('old', numOldDuties);
|
|
235
|
-
}
|
|
217
|
+
const nowMs = this.dateProvider.now();
|
|
218
|
+
if (this.lastOldDutiesCleanupAtMs === undefined || nowMs - this.lastOldDutiesCleanupAtMs >= 60 * 60 * 1000) {
|
|
219
|
+
const numOldDuties = await this.db.cleanupOldDuties(this.maxOldDutiesAgeMs);
|
|
220
|
+
this.lastOldDutiesCleanupAtMs = nowMs;
|
|
221
|
+
if (numOldDuties > 0) {
|
|
222
|
+
this.log.verbose(`Cleaned up ${numOldDuties} old duties`, {
|
|
223
|
+
maxAgeMs: this.maxOldDutiesAgeMs
|
|
224
|
+
});
|
|
225
|
+
this.metrics.recordCleanup('old', numOldDuties);
|
|
236
226
|
}
|
|
237
227
|
}
|
|
238
228
|
}
|
package/dest/types.d.ts
CHANGED
|
@@ -79,15 +79,7 @@ export interface SlashingProtectionDatabase {
|
|
|
79
79
|
*/
|
|
80
80
|
cleanupOwnStuckDuties(nodeId: string, maxAgeMs: number): Promise<number>;
|
|
81
81
|
/**
|
|
82
|
-
* Cleanup duties
|
|
83
|
-
* Removes all duties where the rollup address doesn't match the current one.
|
|
84
|
-
* Used after a rollup upgrade to clean up duties for the old rollup.
|
|
85
|
-
* @returns the number of duties cleaned up
|
|
86
|
-
*/
|
|
87
|
-
cleanupOutdatedRollupDuties(currentRollupAddress: EthAddress): Promise<number>;
|
|
88
|
-
/**
|
|
89
|
-
* Cleanup old signed duties.
|
|
90
|
-
* Removes only signed duties older than the specified age.
|
|
82
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
91
83
|
* @returns the number of duties cleaned up
|
|
92
84
|
*/
|
|
93
85
|
cleanupOldDuties(maxAgeMs: number): Promise<number>;
|
|
@@ -97,4 +89,4 @@ export interface SlashingProtectionDatabase {
|
|
|
97
89
|
*/
|
|
98
90
|
close(): Promise<void>;
|
|
99
91
|
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDckUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzVELE9BQU8sRUFDTCxLQUFLLHlCQUF5QixFQUM5QixLQUFLLGdDQUFnQyxFQUNyQyxRQUFRLEVBQ1IsS0FBSyx5QkFBeUIsRUFDOUIsS0FBSyxjQUFjLEVBQ25CLEtBQUssdUJBQXVCLEVBQzVCLGdDQUFnQyxJQUFJLDBDQUEwQyxFQUM5RSxxQ0FBcUMsSUFBSSwrQ0FBK0MsRUFDeEYsb0JBQW9CLEVBQ3JCLE1BQU0sK0JBQStCLENBQUM7QUFDdkMsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDcEUsT0FBTyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBRS9CLE9BQU8sS0FBSyxFQUNWLDJCQUEyQixFQUMzQixvQkFBb0IsRUFDcEIsZ0JBQWdCLEVBQ2hCLGNBQWMsRUFDZCxPQUFPLEVBQ1AsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixtQkFBbUIsRUFDcEIsTUFBTSxlQUFlLENBQUM7QUFFdkIsWUFBWSxFQUNWLHlCQUF5QixFQUN6QiwyQkFBMkIsRUFDM0Isb0JBQW9CLEVBQ3BCLGdDQUFnQyxFQUNoQyxnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLE9BQU8sRUFDUCx5QkFBeUIsRUFDekIsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixjQUFjLEVBQ2QsbUJBQW1CLEVBQ25CLHVCQUF1QixHQUN4QixDQUFDO0FBQ0YsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsK0JBQStCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0csT0FBTyxFQUFFLG9CQUFvQixFQUFFLENBQUM7QUFDaEMsT0FBTyxFQUFFLDBDQUEwQyxJQUFJLGdDQUFnQyxFQUFFLENBQUM7QUFDMUYsT0FBTyxFQUFFLCtDQUErQyxJQUFJLHFDQUFxQyxFQUFFLENBQUM7QUFFcEc7O0dBRUc7QUFDSCxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLDJFQUEyRTtJQUMzRSxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ2YscURBQXFEO0lBQ3JELE1BQU0sRUFBRSxtQkFBbUIsQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQzs7O09BR0c7SUFDSCxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUM7SUFDWjs7T0FFRztJQUNILGVBQWUsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUNsQzs7T0FFRztJQUNILFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLG1DQUFtQyxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUVuRjs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sV0FBVywwQkFBMEI7SUFDekM7Ozs7O09BS0c7SUFDSCxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7SUFFcEY7Ozs7O09BS0c7SUFDSCxnQkFBZ0IsQ0FDZCxhQUFhLEVBQUUsVUFBVSxFQUN6QixnQkFBZ0IsRUFBRSxVQUFVLEVBQzVCLElBQUksRUFBRSxVQUFVLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLDBCQUEwQixFQUFFLE1BQU0sR0FDakMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXBCOzs7Ozs7T0FNRztJQUNILFVBQVUsQ0FDUixhQUFhLEVBQUUsVUFBVSxFQUN6QixnQkFBZ0IsRUFBRSxVQUFVLEVBQzVCLElBQUksRUFBRSxVQUFVLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLDBCQUEwQixFQUFFLE1BQU0sR0FDakMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXBCOzs7T0FHRztJQUNILHFCQUFxQixDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFekU7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFcEQ7OztPQUdHO0lBQ0gsS0FBSyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUN4QiJ9
|
package/dest/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,QAAQ,EACR,KAAK,yBAAyB,EAC9B,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,gCAAgC,IAAI,0CAA0C,EAC9E,qCAAqC,IAAI,+CAA+C,EACxF,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,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,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,EACpB,gCAAgC,EAChC,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;AAC1F,OAAO,EAAE,+CAA+C,IAAI,qCAAqC,EAAE,CAAC;AAEpG;;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;;GAEG;AACH,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAEnF;;;;;;;;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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,gCAAgC,EACrC,QAAQ,EACR,KAAK,yBAAyB,EAC9B,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,gCAAgC,IAAI,0CAA0C,EAC9E,qCAAqC,IAAI,+CAA+C,EACxF,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,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,yBAAyB,EACzB,2BAA2B,EAC3B,oBAAoB,EACpB,gCAAgC,EAChC,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;AAC1F,OAAO,EAAE,+CAA+C,IAAI,qCAAqC,EAAE,CAAC;AAEpG;;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;;GAEG;AACH,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;AAEnF;;;;;;;;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;;;OAGG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpD;;;OAGG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/validator-ha-signer",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./db": "./dest/db/index.js",
|
|
@@ -75,10 +75,10 @@
|
|
|
75
75
|
]
|
|
76
76
|
},
|
|
77
77
|
"dependencies": {
|
|
78
|
-
"@aztec-labs/foundation": "6.0.0-rc.
|
|
79
|
-
"@aztec-labs/kv-store": "6.0.0-rc.
|
|
80
|
-
"@aztec-labs/stdlib": "6.0.0-rc.
|
|
81
|
-
"@aztec-labs/telemetry-client": "6.0.0-rc.
|
|
78
|
+
"@aztec-labs/foundation": "6.0.0-rc.4",
|
|
79
|
+
"@aztec-labs/kv-store": "6.0.0-rc.4",
|
|
80
|
+
"@aztec-labs/stdlib": "6.0.0-rc.4",
|
|
81
|
+
"@aztec-labs/telemetry-client": "6.0.0-rc.4",
|
|
82
82
|
"node-pg-migrate": "^8.0.4",
|
|
83
83
|
"pg": "^8.11.3",
|
|
84
84
|
"tslib": "^2.4.0",
|
|
@@ -104,6 +104,6 @@
|
|
|
104
104
|
"!*.test.*"
|
|
105
105
|
],
|
|
106
106
|
"engines": {
|
|
107
|
-
"node": ">=20.
|
|
107
|
+
"node": ">=20.16"
|
|
108
108
|
}
|
|
109
109
|
}
|
package/src/db/lmdb.ts
CHANGED
|
@@ -264,18 +264,7 @@ export class LmdbSlashingProtectionDatabase implements SlashingProtectionDatabas
|
|
|
264
264
|
}
|
|
265
265
|
|
|
266
266
|
/**
|
|
267
|
-
* Cleanup duties
|
|
268
|
-
*
|
|
269
|
-
* This is always a no-op for the LMDB implementation: the underlying store is created via
|
|
270
|
-
* DatabaseVersionManager (in factory.ts), which already resets the entire data directory at
|
|
271
|
-
* startup whenever the rollup address changes.
|
|
272
|
-
*/
|
|
273
|
-
public cleanupOutdatedRollupDuties(_currentRollupAddress: EthAddress): Promise<number> {
|
|
274
|
-
return Promise.resolve(0);
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
/**
|
|
278
|
-
* Cleanup old signed duties older than maxAgeMs.
|
|
267
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
279
268
|
*/
|
|
280
269
|
public cleanupOldDuties(maxAgeMs: number): Promise<number> {
|
|
281
270
|
const cutoffMs = this.dateProvider.now() - maxAgeMs;
|
|
@@ -283,11 +272,7 @@ export class LmdbSlashingProtectionDatabase implements SlashingProtectionDatabas
|
|
|
283
272
|
return this.store.transactionAsync(async () => {
|
|
284
273
|
const keysToDelete: string[] = [];
|
|
285
274
|
for await (const [key, record] of this.duties.entriesAsync()) {
|
|
286
|
-
if (
|
|
287
|
-
record.status === DutyStatus.SIGNED &&
|
|
288
|
-
record.completedAtMs !== undefined &&
|
|
289
|
-
record.completedAtMs < cutoffMs
|
|
290
|
-
) {
|
|
275
|
+
if (record.startedAtMs < cutoffMs) {
|
|
291
276
|
keysToDelete.push(key);
|
|
292
277
|
}
|
|
293
278
|
}
|
package/src/db/postgres.ts
CHANGED
|
@@ -11,7 +11,6 @@ import type { QueryResult, QueryResultRow } from 'pg';
|
|
|
11
11
|
import type { SlashingProtectionDatabase, TryInsertOrGetResult } from '../types.js';
|
|
12
12
|
import {
|
|
13
13
|
CLEANUP_OLD_DUTIES,
|
|
14
|
-
CLEANUP_OUTDATED_ROLLUP_DUTIES,
|
|
15
14
|
CLEANUP_OWN_STUCK_DUTIES,
|
|
16
15
|
DELETE_DUTY,
|
|
17
16
|
INSERT_OR_GET_DUTY,
|
|
@@ -262,20 +261,7 @@ export class PostgresSlashingProtectionDatabase implements SlashingProtectionDat
|
|
|
262
261
|
}
|
|
263
262
|
|
|
264
263
|
/**
|
|
265
|
-
* Cleanup duties
|
|
266
|
-
* Removes all duties where the rollup address doesn't match the current one.
|
|
267
|
-
* Used after a rollup upgrade to clean up duties for the old rollup.
|
|
268
|
-
* @returns the number of duties cleaned up
|
|
269
|
-
*/
|
|
270
|
-
async cleanupOutdatedRollupDuties(currentRollupAddress: EthAddress): Promise<number> {
|
|
271
|
-
const result = await this.pool.query(CLEANUP_OUTDATED_ROLLUP_DUTIES, [currentRollupAddress.toString()]);
|
|
272
|
-
return result.rowCount ?? 0;
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
/**
|
|
276
|
-
* Cleanup old signed duties.
|
|
277
|
-
* Removes only signed duties older than the specified age.
|
|
278
|
-
* Does not remove 'signing' duties as they may be in progress.
|
|
264
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
279
265
|
* @returns the number of duties cleaned up
|
|
280
266
|
*/
|
|
281
267
|
async cleanupOldDuties(maxAgeMs: number): Promise<number> {
|
package/src/db/schema.ts
CHANGED
|
@@ -207,12 +207,11 @@ WHERE status = 'signed'
|
|
|
207
207
|
|
|
208
208
|
/**
|
|
209
209
|
* Query to clean up old duties (for maintenance)
|
|
210
|
-
* Removes
|
|
210
|
+
* Removes duties across all rollups whose signing started more than the specified age ago (in milliseconds)
|
|
211
211
|
*/
|
|
212
212
|
export const CLEANUP_OLD_DUTIES = `
|
|
213
213
|
DELETE FROM validator_duties
|
|
214
|
-
WHERE
|
|
215
|
-
AND started_at < CURRENT_TIMESTAMP - ($1 || ' milliseconds')::INTERVAL;
|
|
214
|
+
WHERE started_at < CURRENT_TIMESTAMP - ($1 || ' milliseconds')::INTERVAL;
|
|
216
215
|
`;
|
|
217
216
|
|
|
218
217
|
/**
|
|
@@ -227,16 +226,6 @@ WHERE node_id = $1
|
|
|
227
226
|
AND started_at < CURRENT_TIMESTAMP - ($2 || ' milliseconds')::INTERVAL;
|
|
228
227
|
`;
|
|
229
228
|
|
|
230
|
-
/**
|
|
231
|
-
* Query to cleanup duties with outdated rollup address
|
|
232
|
-
* Removes all duties where the rollup address doesn't match the current one
|
|
233
|
-
* Used after a rollup upgrade to clean up duties for the old rollup
|
|
234
|
-
*/
|
|
235
|
-
export const CLEANUP_OUTDATED_ROLLUP_DUTIES = `
|
|
236
|
-
DELETE FROM validator_duties
|
|
237
|
-
WHERE rollup_address != $1;
|
|
238
|
-
`;
|
|
239
|
-
|
|
240
229
|
/**
|
|
241
230
|
* SQL to drop the validator_duties table
|
|
242
231
|
*/
|
package/src/metrics.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
createUpDownCounterWithDefault,
|
|
8
8
|
} from '@aztec-labs/telemetry-client';
|
|
9
9
|
|
|
10
|
-
export type HACleanupType = 'stuck' | 'old'
|
|
10
|
+
export type HACleanupType = 'stuck' | 'old';
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
13
|
* Metrics for HA signer tracking signing operations, lock acquisition, and cleanup.
|
|
@@ -26,7 +26,6 @@ export class HASignerMetrics {
|
|
|
26
26
|
// Cleanup metrics
|
|
27
27
|
private cleanupStuckDutiesCount: UpDownCounter;
|
|
28
28
|
private cleanupOldDutiesCount: UpDownCounter;
|
|
29
|
-
private cleanupOutdatedRollupDutiesCount: UpDownCounter;
|
|
30
29
|
|
|
31
30
|
constructor(
|
|
32
31
|
client: TelemetryClient,
|
|
@@ -48,10 +47,6 @@ export class HASignerMetrics {
|
|
|
48
47
|
// Cleanup
|
|
49
48
|
this.cleanupStuckDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_STUCK_DUTIES_COUNT);
|
|
50
49
|
this.cleanupOldDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OLD_DUTIES_COUNT);
|
|
51
|
-
this.cleanupOutdatedRollupDutiesCount = createUpDownCounterWithDefault(
|
|
52
|
-
meter,
|
|
53
|
-
Metrics.HA_SIGNER_CLEANUP_OUTDATED_ROLLUP_DUTIES_COUNT,
|
|
54
|
-
);
|
|
55
50
|
}
|
|
56
51
|
|
|
57
52
|
/**
|
|
@@ -131,8 +126,6 @@ export class HASignerMetrics {
|
|
|
131
126
|
this.cleanupStuckDutiesCount.add(count, attributes);
|
|
132
127
|
} else if (type === 'old') {
|
|
133
128
|
this.cleanupOldDutiesCount.add(count, attributes);
|
|
134
|
-
} else if (type === 'outdated_rollup') {
|
|
135
|
-
this.cleanupOutdatedRollupDutiesCount.add(count, attributes);
|
|
136
129
|
}
|
|
137
130
|
}
|
|
138
131
|
}
|
|
@@ -8,7 +8,11 @@ import { type Logger, createLogger } from '@aztec-labs/foundation/log';
|
|
|
8
8
|
import { RunningPromise } from '@aztec-labs/foundation/promise';
|
|
9
9
|
import { sleep } from '@aztec-labs/foundation/sleep';
|
|
10
10
|
import type { DateProvider } from '@aztec-labs/foundation/timer';
|
|
11
|
-
import
|
|
11
|
+
import {
|
|
12
|
+
type BaseSignerConfig,
|
|
13
|
+
BaseSignerConfigSchema,
|
|
14
|
+
DEFAULT_SIGNED_DUTIES_RETENTION_HOURS,
|
|
15
|
+
} from '@aztec-labs/stdlib/ha-signing';
|
|
12
16
|
|
|
13
17
|
import {
|
|
14
18
|
type CheckAndRecordParams,
|
|
@@ -49,6 +53,7 @@ export class SlashingProtectionService {
|
|
|
49
53
|
private readonly pollingIntervalMs: number;
|
|
50
54
|
private readonly peerSigningTimeoutMs: number;
|
|
51
55
|
private readonly maxStuckDutiesAgeMs: number;
|
|
56
|
+
private readonly maxOldDutiesAgeMs: number;
|
|
52
57
|
|
|
53
58
|
private readonly metrics: HASignerMetrics;
|
|
54
59
|
private readonly dateProvider: DateProvider;
|
|
@@ -65,6 +70,10 @@ export class SlashingProtectionService {
|
|
|
65
70
|
this.pollingIntervalMs = config.pollingIntervalMs;
|
|
66
71
|
this.peerSigningTimeoutMs = config.peerSigningTimeoutMs;
|
|
67
72
|
this.maxStuckDutiesAgeMs = config.maxStuckDutiesAgeMs ?? DEFAULT_MAX_STUCK_DUTIES_AGE_MS;
|
|
73
|
+
const retentionHours =
|
|
74
|
+
BaseSignerConfigSchema.shape.cleanupOldDutiesAfterHours.parse(config.cleanupOldDutiesAfterHours) ??
|
|
75
|
+
DEFAULT_SIGNED_DUTIES_RETENTION_HOURS;
|
|
76
|
+
this.maxOldDutiesAgeMs = Math.max(retentionHours * 60 * 60 * 1000, DEFAULT_MAX_STUCK_DUTIES_AGE_MS);
|
|
68
77
|
|
|
69
78
|
this.cleanupRunningPromise = new RunningPromise(this.cleanup.bind(this), this.log, this.maxStuckDutiesAgeMs);
|
|
70
79
|
this.metrics = deps.metrics;
|
|
@@ -239,20 +248,12 @@ export class SlashingProtectionService {
|
|
|
239
248
|
*/
|
|
240
249
|
/**
|
|
241
250
|
* Start the background cleanup task.
|
|
242
|
-
* Also performs one-time cleanup of duties with outdated rollup addresses.
|
|
243
251
|
*/
|
|
244
|
-
|
|
245
|
-
//
|
|
246
|
-
const numOutdatedRollupDuties = await this.db.cleanupOutdatedRollupDuties(this.config.rollupAddress);
|
|
247
|
-
if (numOutdatedRollupDuties > 0) {
|
|
248
|
-
this.log.info(`Cleaned up ${numOutdatedRollupDuties} duties with outdated rollup address at startup`, {
|
|
249
|
-
currentRollupAddress: this.config.rollupAddress.toString(),
|
|
250
|
-
});
|
|
251
|
-
this.metrics.recordCleanup('outdated_rollup', numOutdatedRollupDuties);
|
|
252
|
-
}
|
|
253
|
-
|
|
252
|
+
start(): Promise<void> {
|
|
253
|
+
// Other replicas may still serve a different rollup, whose signing history must survive our startup.
|
|
254
254
|
this.cleanupRunningPromise.start();
|
|
255
255
|
this.log.info('Slashing protection service started', { nodeId: this.config.nodeId });
|
|
256
|
+
return Promise.resolve();
|
|
256
257
|
}
|
|
257
258
|
|
|
258
259
|
/**
|
|
@@ -273,7 +274,7 @@ export class SlashingProtectionService {
|
|
|
273
274
|
}
|
|
274
275
|
|
|
275
276
|
/**
|
|
276
|
-
* Periodic cleanup of stuck duties and
|
|
277
|
+
* Periodic cleanup of stuck duties and old duties across all rollups.
|
|
277
278
|
* Runs in the background via RunningPromise.
|
|
278
279
|
*/
|
|
279
280
|
private async cleanup() {
|
|
@@ -290,23 +291,13 @@ export class SlashingProtectionService {
|
|
|
290
291
|
this.metrics.recordCleanup('stuck', numStuckDuties);
|
|
291
292
|
}
|
|
292
293
|
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
this.
|
|
300
|
-
if (shouldRun) {
|
|
301
|
-
const numOldDuties = await this.db.cleanupOldDuties(maxAgeMs);
|
|
302
|
-
this.lastOldDutiesCleanupAtMs = nowMs;
|
|
303
|
-
if (numOldDuties > 0) {
|
|
304
|
-
this.log.verbose(`Cleaned up ${numOldDuties} old signed duties`, {
|
|
305
|
-
cleanupOldDutiesAfterHours: this.config.cleanupOldDutiesAfterHours,
|
|
306
|
-
maxAgeMs,
|
|
307
|
-
});
|
|
308
|
-
this.metrics.recordCleanup('old', numOldDuties);
|
|
309
|
-
}
|
|
294
|
+
const nowMs = this.dateProvider.now();
|
|
295
|
+
if (this.lastOldDutiesCleanupAtMs === undefined || nowMs - this.lastOldDutiesCleanupAtMs >= 60 * 60 * 1000) {
|
|
296
|
+
const numOldDuties = await this.db.cleanupOldDuties(this.maxOldDutiesAgeMs);
|
|
297
|
+
this.lastOldDutiesCleanupAtMs = nowMs;
|
|
298
|
+
if (numOldDuties > 0) {
|
|
299
|
+
this.log.verbose(`Cleaned up ${numOldDuties} old duties`, { maxAgeMs: this.maxOldDutiesAgeMs });
|
|
300
|
+
this.metrics.recordCleanup('old', numOldDuties);
|
|
310
301
|
}
|
|
311
302
|
}
|
|
312
303
|
}
|
package/src/types.ts
CHANGED
|
@@ -137,16 +137,7 @@ export interface SlashingProtectionDatabase {
|
|
|
137
137
|
cleanupOwnStuckDuties(nodeId: string, maxAgeMs: number): Promise<number>;
|
|
138
138
|
|
|
139
139
|
/**
|
|
140
|
-
* Cleanup duties
|
|
141
|
-
* Removes all duties where the rollup address doesn't match the current one.
|
|
142
|
-
* Used after a rollup upgrade to clean up duties for the old rollup.
|
|
143
|
-
* @returns the number of duties cleaned up
|
|
144
|
-
*/
|
|
145
|
-
cleanupOutdatedRollupDuties(currentRollupAddress: EthAddress): Promise<number>;
|
|
146
|
-
|
|
147
|
-
/**
|
|
148
|
-
* Cleanup old signed duties.
|
|
149
|
-
* Removes only signed duties older than the specified age.
|
|
140
|
+
* Cleanup duties across all rollups whose signing started more than maxAgeMs ago, regardless of status.
|
|
150
141
|
* @returns the number of duties cleaned up
|
|
151
142
|
*/
|
|
152
143
|
cleanupOldDuties(maxAgeMs: number): Promise<number>;
|