@aztec/validator-ha-signer 0.0.1-commit.96bb3f7 → 0.0.1-commit.993d52e

package/dest/factory.js

@@ -18,7 +18,7 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
  * ```typescript
  * const { signer, db } = await createHASigner({
  *   databaseUrl: process.env.DATABASE_URL,
- *   enabled: true,
+ *   haSigningEnabled: true,
  *   nodeId: 'validator-node-1',
  *   pollingIntervalMs: 100,
  *   signingTimeoutMs: 3000,
@@ -30,22 +30,17 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
  * await signer.stop(); // On shutdown
  * ```
  *
- * Example with automatic migrations (simpler for dev/testing):
- * ```typescript
- * const { signer, db } = await createHASigner({
- *   databaseUrl: process.env.DATABASE_URL,
- *   enabled: true,
- *   nodeId: 'validator-node-1',
- *   runMigrations: true, // Auto-run migrations on startup
- * });
- * signer.start();
- * ```
+ * Note: Migrations must be run separately using `aztec migrate-ha-db up` before
+ * creating the signer. The factory will verify the schema is initialized via `db.initialize()`.
  *
  * @param config - Configuration for the HA signer
  * @param deps - Optional dependencies (e.g., for testing)
  * @returns An object containing the signer and database instances
  */ export async function createHASigner(config, deps) {
     const { databaseUrl, poolMaxCount, poolMinCount, poolIdleTimeoutMs, poolConnectionTimeoutMs, ...signerConfig } = config;
+    if (!databaseUrl) {
+        throw new Error('databaseUrl is required for createHASigner');
+    }
     // Create connection pool (or use provided pool)
     let pool;
     if (!deps?.pool) {

package/dest/migrations.d.ts

@@ -12,4 +12,4 @@ export interface RunMigrationsOptions {
  * @returns Array of applied migration names
  */
 export declare function runMigrations(databaseUrl: string, options?: RunMigrationsOptions): Promise<string[]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21pZ3JhdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBWUEsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxpRkFBaUY7SUFDakYsU0FBUyxDQUFDLEVBQUUsSUFBSSxHQUFHLE1BQU0sQ0FBQztJQUMxQixnREFBZ0Q7SUFDaEQsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGFBQWEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxvQkFBeUIsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FnQzlHIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlncmF0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21pZ3JhdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBYUEsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQyxpRkFBaUY7SUFDakYsU0FBUyxDQUFDLEVBQUUsSUFBSSxHQUFHLE1BQU0sQ0FBQztJQUMxQixnREFBZ0Q7SUFDaEQsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGFBQWEsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxvQkFBeUIsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0ErQzlHIn0=

package/dest/migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;IAC1B,gDAAgD;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAgC9G"}
+{"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

@@ -1,6 +1,7 @@
 /**
  * Programmatic migration runner
  */ import { createLogger } from '@aztec/foundation/log';
+import { readdirSync } from 'fs';
 import { runner } from 'node-pg-migrate';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
@@ -16,16 +17,26 @@ const __dirname = dirname(__filename);
     const direction = options.direction ?? 'up';
     const verbose = options.verbose ?? false;
     const log = createLogger('validator-ha-signer:migrations');
+    const migrationsDir = join(__dirname, 'db', 'migrations');
     try {
         log.info(`Running migrations ${direction}...`);
+        // Filter out .d.ts and .d.ts.map files - node-pg-migrate only needs .js files
+        const migrationFiles = readdirSync(migrationsDir);
+        const jsMigrationFiles = migrationFiles.filter((file)=>file.endsWith('.js') && !file.endsWith('.d.ts') && !file.endsWith('.d.ts.map'));
+        if (jsMigrationFiles.length === 0) {
+            log.info('No migration files found');
+            return [];
+        }
         const appliedMigrations = await runner({
             databaseUrl,
-            dir: join(__dirname, 'db', 'migrations'),
+            dir: migrationsDir,
             direction,
             migrationsTable: 'pgmigrations',
             count: direction === 'down' ? 1 : Infinity,
             verbose,
-            log: (msg)=>verbose ? log.info(msg) : log.debug(msg)
+            log: (msg)=>verbose ? log.info(msg) : log.debug(msg),
+            // Ignore TypeScript declaration files - node-pg-migrate will try to import them otherwise
+            ignorePattern: '.*\\.d\\.(ts|js)$|.*\\.d\\.ts\\.map$'
         });
         if (appliedMigrations.length === 0) {
             log.info('No migrations to apply - schema is up to date');

package/dest/slashing_protection_service.d.ts

@@ -1,5 +1,5 @@
 import { type CheckAndRecordParams, type DeleteDutyParams, type RecordSuccessParams } from './db/types.js';
-import type { SlashingProtectionConfig, SlashingProtectionDatabase } from './types.js';
+import type { SlashingProtectionDatabase, ValidatorHASignerConfig } from './types.js';
 /**
  * Slashing Protection Service
  *
@@ -21,8 +21,10 @@ export declare class SlashingProtectionService {
     private readonly log;
     private readonly pollingIntervalMs;
     private readonly signingTimeoutMs;
+    private readonly maxStuckDutiesAgeMs;
     private cleanupRunningPromise;
-    constructor(db: SlashingProtectionDatabase, config: SlashingProtectionConfig);
+    private lastOldDutiesCleanupAtMs?;
+    constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig);
     /**
      * Check if a duty can be performed and acquire the lock if so.
      *
@@ -32,7 +34,6 @@ export declare class SlashingProtectionService {
      * 2. If insert succeeds, we acquired the lock - return the lockToken
      * 3. If a record exists, handle based on status:
      *    - SIGNED: Throw appropriate error (already signed or slashing protection)
-     *    - FAILED: Delete the failed record
      *    - SIGNING: Wait and poll until status changes, then handle result
      *
      * @returns The lockToken that must be used for recordSuccess/deleteDuty
@@ -64,11 +65,20 @@ export declare class SlashingProtectionService {
      * Start running tasks.
      * Cleanup runs immediately on start to recover from any previous crashes.
      */
-    start(): void;
+    /**
+     * Start the background cleanup task.
+     * Also performs one-time cleanup of duties with outdated rollup addresses.
+     */
+    start(): Promise<void>;
     /**
      * Stop the background cleanup task.
      */
     stop(): Promise<void>;
-    private cleanupStuckDuties;
+    /**
+     * Close the database connection.
+     * Should be called after stop() during graceful shutdown.
+     */
+    close(): Promise<void>;
+    private cleanup;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFFLEtBQUssZ0JBQWdCLEVBQWMsS0FBSyxtQkFBbUIsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV2SCxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSwwQkFBMEIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV2Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVFsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBUnpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUUxQyxPQUFPLENBQUMscUJBQXFCLENBQWlCO0lBRTlDLFlBQ21CLEVBQUUsRUFBRSwwQkFBMEIsRUFDOUIsTUFBTSxFQUFFLHdCQUF3QixFQVdsRDtJQUVEOzs7Ozs7Ozs7Ozs7Ozs7T0FlRztJQUNHLGNBQWMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBEbEU7SUFFRDs7Ozs7O09BTUc7SUFDRyxhQUFhLENBQUMsTUFBTSxFQUFFLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FrQmpFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csVUFBVSxDQUFDLE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBZ0IzRDtJQUVEOztPQUVHO0lBQ0gsSUFBSSxNQUFNLElBQUksTUFBTSxDQUVuQjtJQUVEOzs7T0FHRztJQUNILEtBQUssU0FHSjtJQUVEOztPQUVHO0lBQ0csSUFBSSxrQkFHVDtZQUthLGtCQUFrQjtDQVNqQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLGdCQUFnQixFQUVyQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVVsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBVnpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFTO0lBRTdDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBaUI7SUFDOUMsT0FBTyxDQUFDLHdCQUF3QixDQUFDLENBQVM7SUFFMUMsWUFDbUIsRUFBRSxFQUFFLDBCQUEwQixFQUM5QixNQUFNLEVBQUUsdUJBQXVCLEVBU2pEO0lBRUQ7Ozs7Ozs7Ozs7Ozs7O09BY0c7SUFDRyxjQUFjLENBQUMsTUFBTSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FpRWxFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csYUFBYSxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBMkJqRTtJQUVEOzs7Ozs7T0FNRztJQUNHLFVBQVUsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXdCM0Q7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRDs7O09BR0c7SUFDSDs7O09BR0c7SUFDRyxLQUFLLGtCQVdWO0lBRUQ7O09BRUc7SUFDRyxJQUFJLGtCQUdUO0lBRUQ7OztPQUdHO0lBQ0csS0FBSyxrQkFHVjtZQU1hLE9BQU87Q0E2QnRCIn0=

package/dest/slashing_protection_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAc,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEvH,OAAO,KAAK,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAEvF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,yBAAyB;IAQlC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAE1C,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,YACmB,EAAE,EAAE,0BAA0B,EAC9B,MAAM,EAAE,wBAAwB,EAWlD;IAED;;;;;;;;;;;;;;;OAeG;IACG,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0DlE;IAED;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBjE;IAED;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAgB3D;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,KAAK,SAGJ;IAED;;OAEG;IACG,IAAI,kBAGT;YAKa,kBAAkB;CASjC"}
+{"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;IAUlC,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,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;IAC9C,OAAO,CAAC,wBAAwB,CAAC,CAAS;IAE1C,YACmB,EAAE,EAAE,0BAA0B,EAC9B,MAAM,EAAE,uBAAuB,EASjD;IAED;;;;;;;;;;;;;;OAcG;IACG,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiElE;IAED;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CA2BjE;IAED;;;;;;OAMG;IACG,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAwB3D;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH;;;OAGG;IACG,KAAK,kBAWV;IAED;;OAEG;IACG,IAAI,kBAGT;IAED;;;OAGG;IACG,KAAK,kBAGV;YAMa,OAAO;CA6BtB"}

package/dest/slashing_protection_service.js

@@ -6,7 +6,7 @@
  */ import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/promise';
 import { sleep } from '@aztec/foundation/sleep';
-import { DutyStatus } from './db/types.js';
+import { DutyStatus, getBlockIndexFromDutyIdentifier } from './db/types.js';
 import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
 /**
  * Slashing Protection Service
@@ -28,14 +28,18 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
     log;
     pollingIntervalMs;
     signingTimeoutMs;
+    maxStuckDutiesAgeMs;
     cleanupRunningPromise;
+    lastOldDutiesCleanupAtMs;
     constructor(db, config){
         this.db = db;
         this.config = config;
         this.log = createLogger('slashing-protection');
         this.pollingIntervalMs = config.pollingIntervalMs;
         this.signingTimeoutMs = config.signingTimeoutMs;
-        this.cleanupRunningPromise = new RunningPromise(this.cleanupStuckDuties.bind(this), this.log, this.config.maxStuckDutiesAgeMs);
+        // Default to 144s (2x 72s Aztec slot duration) if not explicitly configured
+        this.maxStuckDutiesAgeMs = config.maxStuckDutiesAgeMs ?? 144_000;
+        this.cleanupRunningPromise = new RunningPromise(this.cleanup.bind(this), this.log, this.maxStuckDutiesAgeMs);
     }
     /**
    * Check if a duty can be performed and acquire the lock if so.
@@ -46,7 +50,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
    * 2. If insert succeeds, we acquired the lock - return the lockToken
    * 3. If a record exists, handle based on status:
    *    - SIGNED: Throw appropriate error (already signed or slashing protection)
-   *    - FAILED: Delete the failed record
    *    - SIGNING: Wait and poll until status changes, then handle result
    *
    * @returns The lockToken that must be used for recordSuccess/deleteDuty
@@ -81,9 +84,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
                         existingNodeId: record.nodeId,
                         attemptingNodeId: nodeId
                     });
-                    throw new SlashingProtectionError(slot, dutyType, record.messageHash, messageHash);
+                    throw new SlashingProtectionError(slot, dutyType, record.blockIndexWithinCheckpoint, record.messageHash, messageHash, record.nodeId);
                 }
-                throw new DutyAlreadySignedError(slot, dutyType, record.nodeId);
+                throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, record.nodeId);
             } else if (record.status === DutyStatus.SIGNING) {
                 // Another node is currently signing - check for timeout
                 if (Date.now() - startTime > this.signingTimeoutMs) {
@@ -92,7 +95,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
                         timeoutMs: this.signingTimeoutMs,
                         signingNodeId: record.nodeId
                     });
-                    throw new DutyAlreadySignedError(slot, dutyType, 'unknown (timeout)');
+                    throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, 'unknown (timeout)');
                 }
                 // Wait and poll
                 this.log.debug(`Waiting for signing to complete for duty ${dutyType} at slot ${slot}`, {
@@ -113,8 +116,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
    *
    * @returns true if the update succeeded, false if token didn't match
    */ async recordSuccess(params) {
-        const { validatorAddress, slot, dutyType, signature, nodeId, lockToken } = params;
-        const success = await this.db.updateDutySigned(validatorAddress, slot, dutyType, signature.toString(), lockToken);
+        const { rollupAddress, validatorAddress, slot, dutyType, signature, nodeId, lockToken } = params;
+        const blockIndexWithinCheckpoint = getBlockIndexFromDutyIdentifier(params);
+        const success = await this.db.updateDutySigned(rollupAddress, validatorAddress, slot, dutyType, signature.toString(), lockToken, blockIndexWithinCheckpoint);
         if (success) {
             this.log.info(`Recorded successful signing for duty ${dutyType} at slot ${slot}`, {
                 validatorAddress: validatorAddress.toString(),
@@ -135,8 +139,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
    *
    * @returns true if the delete succeeded, false if token didn't match
    */ async deleteDuty(params) {
-        const { validatorAddress, slot, dutyType, lockToken } = params;
-        const success = await this.db.deleteDuty(validatorAddress, slot, dutyType, lockToken);
+        const { rollupAddress, validatorAddress, slot, dutyType, lockToken } = params;
+        const blockIndexWithinCheckpoint = getBlockIndexFromDutyIdentifier(params);
+        const success = await this.db.deleteDuty(rollupAddress, validatorAddress, slot, dutyType, lockToken, blockIndexWithinCheckpoint);
         if (success) {
             this.log.info(`Deleted duty ${dutyType} at slot ${slot} to allow retry`, {
                 validatorAddress: validatorAddress.toString()
@@ -156,7 +161,17 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
     /**
    * Start running tasks.
    * Cleanup runs immediately on start to recover from any previous crashes.
-   */ start() {
+   */ /**
+   * Start the background cleanup task.
+   * Also performs one-time cleanup of duties with outdated rollup addresses.
+   */ async start() {
+        // One-time cleanup at startup: remove duties from previous rollup versions
+        const numOutdatedRollupDuties = await this.db.cleanupOutdatedRollupDuties(this.config.l1Contracts.rollupAddress);
+        if (numOutdatedRollupDuties > 0) {
+            this.log.info(`Cleaned up ${numOutdatedRollupDuties} duties with outdated rollup address at startup`, {
+                currentRollupAddress: this.config.l1Contracts.rollupAddress.toString()
+            });
+        }
         this.cleanupRunningPromise.start();
         this.log.info('Slashing protection service started', {
             nodeId: this.config.nodeId
@@ -171,14 +186,40 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
         });
     }
     /**
-   * Cleanup own stuck duties
-   */ async cleanupStuckDuties() {
-        const numDuties = await this.db.cleanupOwnStuckDuties(this.config.nodeId, this.config.maxStuckDutiesAgeMs);
-        if (numDuties > 0) {
-            this.log.info(`Cleaned up ${numDuties} stuck duties`, {
+   * Close the database connection.
+   * Should be called after stop() during graceful shutdown.
+   */ async close() {
+        await this.db.close();
+        this.log.info('Slashing protection database connection closed');
+    }
+    /**
+   * Periodic cleanup of stuck duties and optionally old signed duties.
+   * Runs in the background via RunningPromise.
+   */ async cleanup() {
+        // 1. Clean up stuck duties (our own node's duties that got stuck in 'signing' status)
+        const numStuckDuties = await this.db.cleanupOwnStuckDuties(this.config.nodeId, this.maxStuckDutiesAgeMs);
+        if (numStuckDuties > 0) {
+            this.log.verbose(`Cleaned up ${numStuckDuties} stuck duties`, {
                 nodeId: this.config.nodeId,
-                maxStuckDutiesAgeMs: this.config.maxStuckDutiesAgeMs
+                maxStuckDutiesAgeMs: this.maxStuckDutiesAgeMs
             });
         }
+        // 2. Clean up old signed duties if configured
+        // we shouldn't run this as often as stuck duty cleanup.
+        if (this.config.cleanupOldDutiesAfterHours !== undefined) {
+            const maxAgeMs = this.config.cleanupOldDutiesAfterHours * 60 * 60 * 1000;
+            const nowMs = Date.now();
+            const shouldRun = this.lastOldDutiesCleanupAtMs === undefined || nowMs - this.lastOldDutiesCleanupAtMs >= maxAgeMs;
+            if (shouldRun) {
+                const numOldDuties = await this.db.cleanupOldDuties(maxAgeMs);
+                this.lastOldDutiesCleanupAtMs = nowMs;
+                if (numOldDuties > 0) {
+                    this.log.verbose(`Cleaned up ${numOldDuties} old signed duties`, {
+                        cleanupOldDutiesAfterHours: this.config.cleanupOldDutiesAfterHours,
+                        maxAgeMs
+                    });
+                }
+            }
+        }
     }
 }

package/dest/test/pglite_pool.d.ts

@@ -0,0 +1,92 @@
+/**
+ * Vendored pg-compatible Pool/Client wrapper for PGlite.
+ *
+ * Copied from @middle-management/pglite-pg-adapter v0.0.3
+ * https://www.npmjs.com/package/@middle-management/pglite-pg-adapter
+ *
+ * Modifications:
+ * - Converted to ESM and TypeScript
+ * - Uses PGliteInterface instead of PGlite class to avoid TypeScript
+ *   type mismatches from ESM/CJS dual package resolution with private fields
+ * - Simplified rowCount calculation to handle CTEs properly
+ */
+import type { PGliteInterface } from '@electric-sql/pglite';
+import { EventEmitter } from 'events';
+import type { QueryResult, QueryResultRow } from 'pg';
+import { Readable, Writable } from 'stream';
+export interface PoolConfig {
+    pglite: PGliteInterface;
+    max?: number;
+    min?: number;
+}
+interface ClientConfig {
+    pglite: PGliteInterface;
+    host?: string;
+    port?: number;
+    ssl?: boolean;
+}
+export declare class Client extends EventEmitter {
+    protected pglite: PGliteInterface;
+    protected _connected: boolean;
+    readonly host: string;
+    readonly port: number;
+    readonly ssl: boolean;
+    readonly connection: object;
+    readonly copyFrom: () => Writable;
+    readonly copyTo: () => Readable;
+    readonly pauseDrain: () => void;
+    readonly resumeDrain: () => void;
+    readonly escapeLiteral: (str: string) => string;
+    readonly escapeIdentifier: (str: string) => string;
+    readonly setTypeParser: () => void;
+    readonly getTypeParser: () => (value: string) => unknown;
+    constructor(config: ClientConfig);
+    connect(): Promise<void>;
+    end(): Promise<void>;
+    query<R extends QueryResultRow = any>(text: string, values?: any[]): Promise<QueryResult<R>>;
+    protected convertPGliteResult<R extends QueryResultRow>(result: {
+        rows: R[];
+        fields: Array<{
+            name: string;
+            dataTypeID: number;
+        }>;
+        affectedRows?: number;
+    }): QueryResult<R>;
+    get connected(): boolean;
+}
+export declare class Pool extends EventEmitter {
+    private clients;
+    private availableClients;
+    private waitingQueue;
+    private _ended;
+    private pglite;
+    private _config;
+    readonly expiredCount = 0;
+    readonly options: PoolConfig;
+    constructor(config: PoolConfig);
+    get totalCount(): number;
+    get idleCount(): number;
+    get waitingCount(): number;
+    get ending(): boolean;
+    get ended(): boolean;
+    connect(): Promise<PoolClient>;
+    query<R extends QueryResultRow = any>(text: string, values?: any[]): Promise<QueryResult<R>>;
+    releaseClient(client: PoolClient): void;
+    end(): Promise<void>;
+}
+export declare class PoolClient extends Client {
+    private pool;
+    private _released;
+    private _inUse;
+    private _userReleased;
+    constructor(pglite: PGliteInterface, pool: Pool);
+    query<R extends QueryResultRow = any>(text: string, values?: any[]): Promise<QueryResult<R>>;
+    release(): void;
+    end(): Promise<void>;
+    _markInUse(): void;
+    _markAvailable(): void;
+    _markReleased(): void;
+    get connected(): boolean;
+}
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGdsaXRlX3Bvb2wuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3BnbGl0ZV9wb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztHQVdHO0FBQ0gsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUN0QyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBRTVDLE1BQU0sV0FBVyxVQUFVO0lBQ3pCLE1BQU0sRUFBRSxlQUFlLENBQUM7SUFDeEIsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2IsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2Q7QUFFRCxVQUFVLFlBQVk7SUFDcEIsTUFBTSxFQUFFLGVBQWUsQ0FBQztJQUN4QixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxHQUFHLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDZjtBQUVELHFCQUFhLE1BQU8sU0FBUSxZQUFZO0lBQ3RDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsZUFBZSxDQUFDO0lBQ2xDLFNBQVMsQ0FBQyxVQUFVLFVBQVM7SUFDN0IsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDdEIsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDdEIsUUFBUSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUM7SUFDdEIsUUFBUSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFHNUIsUUFBUSxDQUFDLFFBQVEsaUJBQWtDO0lBQ25ELFFBQVEsQ0FBQyxNQUFNLGlCQUFrQztJQUNqRCxRQUFRLENBQUMsVUFBVSxhQUFr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

package/dest/test/pglite_pool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pglite_pool.d.ts","sourceRoot":"","sources":["../../src/test/pglite_pool.ts"],"names":[],"mappings":"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"}

package/dest/test/pglite_pool.js

@@ -0,0 +1,210 @@
+/**
+ * Vendored pg-compatible Pool/Client wrapper for PGlite.
+ *
+ * Copied from @middle-management/pglite-pg-adapter v0.0.3
+ * https://www.npmjs.com/package/@middle-management/pglite-pg-adapter
+ *
+ * Modifications:
+ * - Converted to ESM and TypeScript
+ * - Uses PGliteInterface instead of PGlite class to avoid TypeScript
+ *   type mismatches from ESM/CJS dual package resolution with private fields
+ * - Simplified rowCount calculation to handle CTEs properly
+ */ import { EventEmitter } from 'events';
+import { Readable, Writable } from 'stream';
+export class Client extends EventEmitter {
+    pglite;
+    _connected = false;
+    host;
+    port;
+    ssl;
+    connection;
+    // Stub implementations for pg compatibility
+    copyFrom = ()=>new Writable();
+    copyTo = ()=>new Readable();
+    pauseDrain = ()=>{};
+    resumeDrain = ()=>{};
+    escapeLiteral = (str)=>`'${str.replace(/'/g, "''")}'`;
+    escapeIdentifier = (str)=>`"${str.replace(/"/g, '""')}"`;
+    setTypeParser = ()=>{};
+    getTypeParser = ()=>(value)=>value;
+    constructor(config){
+        super();
+        this.pglite = config.pglite;
+        this.host = config.host || 'localhost';
+        this.port = config.port || 5432;
+        this.ssl = typeof config.ssl === 'boolean' ? config.ssl : !!config.ssl;
+        this.connection = {};
+    }
+    connect() {
+        if (this._connected) {
+            return Promise.resolve();
+        }
+        this._connected = true;
+        this.emit('connect');
+        return Promise.resolve();
+    }
+    end() {
+        if (!this._connected) {
+            return Promise.resolve();
+        }
+        this._connected = false;
+        this.emit('end');
+        return Promise.resolve();
+    }
+    async query(text, values) {
+        if (!this._connected) {
+            throw new Error('Client is not connected');
+        }
+        const result = await this.pglite.query(text, values);
+        return this.convertPGliteResult(result);
+    }
+    convertPGliteResult(result) {
+        return {
+            command: '',
+            rowCount: 'affectedRows' in result ? result.affectedRows ?? 0 : result.rows.length,
+            oid: 0,
+            fields: result.fields.map((field)=>({
+                    name: field.name,
+                    tableID: 0,
+                    columnID: 0,
+                    dataTypeID: field.dataTypeID,
+                    dataTypeSize: -1,
+                    dataTypeModifier: -1,
+                    format: 'text'
+                })),
+            rows: result.rows
+        };
+    }
+    get connected() {
+        return this._connected;
+    }
+}
+export class Pool extends EventEmitter {
+    clients = [];
+    availableClients = [];
+    waitingQueue = [];
+    _ended = false;
+    pglite;
+    _config;
+    expiredCount = 0;
+    options;
+    constructor(config){
+        super();
+        this._config = {
+            max: 10,
+            min: 0,
+            ...config
+        };
+        this.pglite = config.pglite;
+        this.options = config;
+    }
+    get totalCount() {
+        return this.clients.length;
+    }
+    get idleCount() {
+        return this.availableClients.length;
+    }
+    get waitingCount() {
+        return this.waitingQueue.length;
+    }
+    get ending() {
+        return this._ended;
+    }
+    get ended() {
+        return this._ended;
+    }
+    connect() {
+        if (this._ended) {
+            return Promise.reject(new Error('Pool is ended'));
+        }
+        if (this.availableClients.length > 0) {
+            const client = this.availableClients.pop();
+            client._markInUse();
+            return Promise.resolve(client);
+        }
+        if (this.clients.length < (this._config.max || 10)) {
+            const client = new PoolClient(this.pglite, this);
+            this.clients.push(client);
+            return Promise.resolve(client);
+        }
+        return new Promise((resolve)=>{
+            this.waitingQueue.push(resolve);
+        });
+    }
+    async query(text, values) {
+        const client = await this.connect();
+        try {
+            return await client.query(text, values);
+        } finally{
+            client.release();
+        }
+    }
+    releaseClient(client) {
+        const index = this.clients.indexOf(client);
+        if (index !== -1) {
+            client._markAvailable();
+            if (this.waitingQueue.length > 0) {
+                const resolve = this.waitingQueue.shift();
+                client._markInUse();
+                resolve(client);
+            } else {
+                this.availableClients.push(client);
+            }
+        }
+    }
+    end() {
+        this._ended = true;
+        this.clients.forEach((client)=>client._markReleased());
+        this.clients = [];
+        this.availableClients = [];
+        this.emit('end');
+        return Promise.resolve();
+    }
+}
+export class PoolClient extends Client {
+    pool;
+    _released = false;
+    _inUse = true;
+    _userReleased = false;
+    constructor(pglite, pool){
+        super({
+            pglite
+        });
+        this.pool = pool;
+        this._connected = true;
+    }
+    async query(text, values) {
+        if (this._userReleased && !this._inUse) {
+            throw new Error('Client has been released back to the pool');
+        }
+        const result = await this.pglite.query(text, values);
+        return this.convertPGliteResult(result);
+    }
+    release() {
+        if (this._released || this._userReleased) {
+            return;
+        }
+        this._userReleased = true;
+        this.pool.releaseClient(this);
+    }
+    end() {
+        this.release();
+        return Promise.resolve();
+    }
+    _markInUse() {
+        this._inUse = true;
+        this._userReleased = false;
+    }
+    _markAvailable() {
+        this._inUse = false;
+        this._userReleased = false;
+    }
+    _markReleased() {
+        this._released = true;
+        this._inUse = false;
+        this._userReleased = true;
+    }
+    get connected() {
+        return this._connected && !this._released;
+    }
+}