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

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,6 +28,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
     log;
     pollingIntervalMs;
     signingTimeoutMs;
+    maxStuckDutiesAgeMs;
     cleanupRunningPromise;
     constructor(db, config){
         this.db = db;
@@ -35,7 +36,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
         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.cleanupStuckDuties.bind(this), this.log, this.maxStuckDutiesAgeMs);
     }
     /**
    * Check if a duty can be performed and acquire the lock if so.
@@ -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}`, {
@@ -114,7 +117,8 @@ 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 blockIndexWithinCheckpoint = getBlockIndexFromDutyIdentifier(params);
+        const success = await this.db.updateDutySigned(validatorAddress, slot, dutyType, signature.toString(), lockToken, blockIndexWithinCheckpoint);
         if (success) {
             this.log.info(`Recorded successful signing for duty ${dutyType} at slot ${slot}`, {
                 validatorAddress: validatorAddress.toString(),
@@ -136,7 +140,8 @@ 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 blockIndexWithinCheckpoint = getBlockIndexFromDutyIdentifier(params);
+        const success = await this.db.deleteDuty(validatorAddress, slot, dutyType, lockToken, blockIndexWithinCheckpoint);
         if (success) {
             this.log.info(`Deleted duty ${dutyType} at slot ${slot} to allow retry`, {
                 validatorAddress: validatorAddress.toString()
@@ -171,13 +176,20 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
         });
     }
     /**
+   * 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');
+    }
+    /**
    * Cleanup own stuck duties
    */ async cleanupStuckDuties() {
-        const numDuties = await this.db.cleanupOwnStuckDuties(this.config.nodeId, this.config.maxStuckDutiesAgeMs);
+        const numDuties = await this.db.cleanupOwnStuckDuties(this.config.nodeId, this.maxStuckDutiesAgeMs);
         if (numDuties > 0) {
             this.log.info(`Cleaned up ${numDuties} stuck duties`, {
                 nodeId: this.config.nodeId,
-                maxStuckDutiesAgeMs: this.config.maxStuckDutiesAgeMs
+                maxStuckDutiesAgeMs: this.maxStuckDutiesAgeMs
             });
         }
     }

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;
+    }
+}

package/dest/types.d.ts

@@ -1,9 +1,10 @@
+import { BlockNumber, type CheckpointNumber, type IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Pool } from 'pg';
-import type { CreateHASignerConfig, SlashingProtectionConfig } from './config.js';
-import type { CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, DutyType, RecordSuccessParams, ValidatorDutyRecord } from './db/types.js';
-export type { CheckAndRecordParams, CreateHASignerConfig, DeleteDutyParams, DutyIdentifier, RecordSuccessParams, SlashingProtectionConfig, ValidatorDutyRecord, };
-export { DutyStatus, DutyType } from './db/types.js';
+import type { ValidatorHASignerConfig } from './config.js';
+import { type BlockProposalDutyIdentifier, type CheckAndRecordParams, type DeleteDutyParams, type DutyIdentifier, DutyType, type OtherDutyIdentifier, type RecordSuccessParams, type ValidatorDutyRecord } from './db/types.js';
+export type { BlockProposalDutyIdentifier, CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, OtherDutyIdentifier, RecordSuccessParams, ValidatorDutyRecord, ValidatorHASignerConfig, };
+export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
 /**
  * Result of tryInsertOrGetExisting operation
  */
@@ -24,16 +25,74 @@ export interface CreateHASignerDeps {
     pool?: Pool;
 }
 /**
- * Context required for slashing protection during signing operations
+ * Base context for signing operations
  */
-export interface SigningContext {
+interface BaseSigningContext {
     /** Slot number for this duty */
-    slot: bigint;
-    /** Block number for this duty */
-    blockNumber: bigint;
-    /** Type of duty being performed */
-    dutyType: DutyType;
+    slot: SlotNumber;
+    /**
+     * Block or checkpoint number for this duty.
+     * For block proposals, this is the block number.
+     * For checkpoint proposals, this is the checkpoint number.
+     */
+    blockNumber: BlockNumber | CheckpointNumber;
+}
+/**
+ * Signing context for block proposals.
+ * blockIndexWithinCheckpoint is REQUIRED and must be >= 0.
+ */
+export interface BlockProposalSigningContext extends BaseSigningContext {
+    /** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
+    blockIndexWithinCheckpoint: IndexWithinCheckpoint;
+    dutyType: DutyType.BLOCK_PROPOSAL;
+}
+/**
+ * Signing context for non-block-proposal duties that require HA protection.
+ * blockIndexWithinCheckpoint is not applicable (internally always -1).
+ */
+export interface OtherSigningContext extends BaseSigningContext {
+    dutyType: DutyType.CHECKPOINT_PROPOSAL | DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS;
+}
+/**
+ * Signing context for governance/slashing votes which only need slot for HA protection.
+ * blockNumber is not applicable (internally always 0).
+ */
+export interface VoteSigningContext {
+    slot: SlotNumber;
+    dutyType: DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE;
+}
+/**
+ * Signing context for duties which don't require slot/blockNumber
+ * as they don't need HA protection (AUTH_REQUEST, TXS).
+ */
+export interface NoHAProtectionSigningContext {
+    dutyType: DutyType.AUTH_REQUEST | DutyType.TXS;
 }
+/**
+ * Signing contexts that require HA protection (excludes AUTH_REQUEST).
+ * Used by the HA signer's signWithProtection method.
+ */
+export type HAProtectedSigningContext = BlockProposalSigningContext | OtherSigningContext | VoteSigningContext;
+/**
+ * Type guard to check if a SigningContext requires HA protection.
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
+ */
+export declare function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext;
+/**
+ * Gets the block number from a signing context.
+ * - Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE): returns BlockNumber(0)
+ * - Other duties: returns the blockNumber from the context
+ */
+export declare function getBlockNumberFromSigningContext(context: HAProtectedSigningContext): BlockNumber | CheckpointNumber;
+/**
+ * Context required for slashing protection during signing operations.
+ * Uses discriminated union to enforce type safety:
+ * - BLOCK_PROPOSAL duties MUST have blockIndexWithinCheckpoint >= 0
+ * - Other duty types do NOT have blockIndexWithinCheckpoint (internally -1)
+ * - Vote duties only need slot (blockNumber is internally 0)
+ * - AUTH_REQUEST and TXS duties don't need slot/blockNumber (no HA protection needed)
+ */
+export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningContext;
 /**
  * Database interface for slashing protection operations
  * This abstraction allows for different database implementations (PostgreSQL, SQLite, etc.)
@@ -57,7 +116,7 @@ export interface SlashingProtectionDatabase {
      *
      * @returns true if the update succeeded, false if token didn't match or duty not found
      */
-    updateDutySigned(validatorAddress: EthAddress, slot: bigint, dutyType: DutyType, signature: string, lockToken: string): Promise<boolean>;
+    updateDutySigned(validatorAddress: EthAddress, slot: SlotNumber, dutyType: DutyType, signature: string, lockToken: string, blockIndexWithinCheckpoint: number): Promise<boolean>;
     /**
      * Delete a duty record.
      * Only succeeds if the lockToken matches (caller must be the one who created the duty).
@@ -65,11 +124,16 @@ export interface SlashingProtectionDatabase {
      *
      * @returns true if the delete succeeded, false if token didn't match or duty not found
      */
-    deleteDuty(validatorAddress: EthAddress, slot: bigint, dutyType: DutyType, lockToken: string): Promise<boolean>;
+    deleteDuty(validatorAddress: EthAddress, slot: SlotNumber, dutyType: DutyType, lockToken: string, blockIndexWithinCheckpoint: number): Promise<boolean>;
     /**
      * Cleanup own stuck duties
      * @returns the number of duties cleaned up
      */
     cleanupOwnStuckDuties(nodeId: string, maxAgeMs: number): Promise<number>;
+    /**
+     * Close the database connection.
+     * Should be called during graceful shutdown.
+     */
+    close(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFL0IsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDbEYsT0FBTyxLQUFLLEVBQ1Ysb0JBQW9CLEVBQ3BCLGdCQUFnQixFQUNoQixjQUFjLEVBQ2QsUUFBUSxFQUNSLG1CQUFtQixFQUNuQixtQkFBbUIsRUFDcEIsTUFBTSxlQUFlLENBQUM7QUFFdkIsWUFBWSxFQUNWLG9CQUFvQixFQUNwQixvQkFBb0IsRUFDcEIsZ0JBQWdCLEVBQ2hCLGNBQWMsRUFDZCxtQkFBbUIsRUFDbkIsd0JBQXdCLEVBQ3hCLG1CQUFtQixHQUNwQixDQUFDO0FBQ0YsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFckQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLDJFQUEyRTtJQUMzRSxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ2YscURBQXFEO0lBQ3JELE1BQU0sRUFBRSxtQkFBbUIsQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQzs7O09BR0c7SUFDSCxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDYjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGNBQWM7SUFDN0IsZ0NBQWdDO0lBQ2hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixpQ0FBaUM7SUFDakMsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixtQ0FBbUM7SUFDbkMsUUFBUSxFQUFFLFFBQVEsQ0FBQztDQUNwQjtBQUVEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxXQUFXLDBCQUEwQjtJQUN6Qzs7Ozs7T0FLRztJQUNILHNCQUFzQixDQUFDLE1BQU0sRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUVwRjs7Ozs7T0FLRztJQUNILGdCQUFnQixDQUNkLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsSUFBSSxFQUFFLE1BQU0sRUFDWixRQUFRLEVBQUUsUUFBUSxFQUNsQixTQUFTLEVBQUUsTUFBTSxFQUNqQixTQUFTLEVBQUUsTUFBTSxHQUNoQixPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFcEI7Ozs7OztPQU1HO0lBQ0gsVUFBVSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFaEg7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztDQUMxRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssVUFBVSxFQUNoQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQztBQUUvQixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxjQUFjLEVBQ25CLFFBQVEsRUFDUixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixZQUFZLEVBQ1YsMkJBQTJCLEVBQzNCLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLG1CQUFtQixFQUNuQixtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLHVCQUF1QixHQUN4QixDQUFDO0FBQ0YsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsK0JBQStCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0c7O0dBRUc7QUFDSCxNQUFNLFdBQVcsb0JBQW9CO0lBQ25DLDJFQUEyRTtJQUMzRSxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ2YscURBQXFEO0lBQ3JELE1BQU0sRUFBRSxtQkFBbUIsQ0FBQztDQUM3QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQzs7O09BR0c7SUFDSCxJQUFJLENBQUMsRUFBRSxJQUFJLENBQUM7Q0FDYjtB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

package/dest/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B,OAAO,KAAK,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAClF,OAAO,KAAK,EACV,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACxB,mBAAmB,GACpB,CAAC;AACF,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAErD;;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;CACb;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,mCAAmC;IACnC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,0BAA0B;IACzC;;;;;OAKG;IACH,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEpF;;;;;OAKG;IACH,gBAAgB,CACd,gBAAgB,EAAE,UAAU,EAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,UAAU,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhH;;;OAGG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1E"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dest/types.js

@@ -1 +1,21 @@
-export { DutyStatus, DutyType } from './db/types.js';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { DutyType } from './db/types.js';
+export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
+/**
+ * Type guard to check if a SigningContext requires HA protection.
+ * Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
+ */ export function isHAProtectedContext(context) {
+    return context.dutyType !== DutyType.AUTH_REQUEST && context.dutyType !== DutyType.TXS;
+}
+/**
+ * Gets the block number from a signing context.
+ * - Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE): returns BlockNumber(0)
+ * - Other duties: returns the blockNumber from the context
+ */ export function getBlockNumberFromSigningContext(context) {
+    // Check for duty types that have blockNumber
+    if (context.dutyType === DutyType.BLOCK_PROPOSAL || context.dutyType === DutyType.CHECKPOINT_PROPOSAL || context.dutyType === DutyType.ATTESTATION || context.dutyType === DutyType.ATTESTATIONS_AND_SIGNERS) {
+        return context.blockNumber;
+    }
+    // Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE) don't have blockNumber
+    return BlockNumber(0);
+}

package/dest/validator_ha_signer.d.ts

@@ -8,8 +8,8 @@
 import type { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
-import type { CreateHASignerConfig } from './config.js';
-import type { SigningContext, SlashingProtectionDatabase } from './types.js';
+import type { ValidatorHASignerConfig } from './config.js';
+import { type HAProtectedSigningContext, type SlashingProtectionDatabase } from './types.js';
 /**
  * Validator High Availability Signer
  *
@@ -33,7 +33,7 @@ export declare class ValidatorHASigner {
     private readonly config;
     private readonly log;
     private readonly slashingProtection;
-    constructor(db: SlashingProtectionDatabase, config: CreateHASignerConfig);
+    constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig);
     /**
      * Sign a message with slashing protection.
      *
@@ -44,18 +44,14 @@ export declare class ValidatorHASigner {
      *
      * @param validatorAddress - The validator's Ethereum address
      * @param messageHash - The hash to be signed
-     * @param context - The signing context (slot, block number, duty type)
+     * @param context - The signing context (HA-protected duty types only)
      * @param signFn - Function that performs the actual signing
      * @returns The signature
      *
      * @throws DutyAlreadySignedError if the duty was already signed (expected in HA)
      * @throws SlashingProtectionError if attempting to sign different data for same slot (expected in HA)
      */
-    signWithProtection(validatorAddress: EthAddress, messageHash: Buffer32, context: SigningContext, signFn: (messageHash: Buffer32) => Promise<Signature>): Promise<Signature>;
-    /**
-     * Check if slashing protection is enabled
-     */
-    get isEnabled(): boolean;
+    signWithProtection(validatorAddress: EthAddress, messageHash: Buffer32, context: HAProtectedSigningContext, signFn: (messageHash: Buffer32) => Promise<Signature>): Promise<Signature>;
     /**
      * Get the node ID for this signer
      */
@@ -66,9 +62,9 @@ export declare class ValidatorHASigner {
      */
     start(): void;
     /**
-     * Stop the HA signer background tasks.
+     * Stop the HA signer background tasks and close database connection.
      * Should be called during graceful shutdown.
      */
     stop(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yX2hhX3NpZ25lci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZhbGlkYXRvcl9oYV9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHakUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFeEQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRTdFOzs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQkc7QUFDSCxxQkFBYSxpQkFBaUI7SUFNMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBTHpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQXdDO0lBRTNFLFlBQ0UsRUFBRSxFQUFFLDBCQUEwQixFQUNiLE1BQU0sRUFBRSxvQkFBb0IsRUFnQjlDO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7T0FnQkc7SUFDRyxrQkFBa0IsQ0FDdEIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixXQUFXLEVBQUUsUUFBUSxFQUNyQixPQUFPLEVBQUUsY0FBYyxFQUN2QixNQUFNLEVBQUUsQ0FBQyxXQUFXLEVBQUUsUUFBUSxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FDcEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQW1EcEI7SUFFRDs7T0FFRztJQUNILElBQUksU0FBUyxJQUFJLE9BQU8sQ0FFdkI7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRDs7O09BR0c7SUFDSCxLQUFLLFNBRUo7SUFFRDs7O09BR0c7SUFDRyxJQUFJLGtCQUVUO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yX2hhX3NpZ25lci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZhbGlkYXRvcl9oYV9zaWduZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBQ0gsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFHakUsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHM0QsT0FBTyxFQUNMLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssMEJBQTBCLEVBRWhDLE1BQU0sWUFBWSxDQUFDO0FBRXBCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQkc7QUFDSCxxQkFBYSxpQkFBaUI7SUFNMUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBTHpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQTRCO0lBRS9ELFlBQ0UsRUFBRSxFQUFFLDBCQUEwQixFQUNiLE1BQU0sRUFBRSx1QkFBdUIsRUFnQmpEO0lBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7T0FnQkc7SUFDRyxrQkFBa0IsQ0FDdEIsZ0JBQWdCLEVBQUUsVUFBVSxFQUM1QixXQUFXLEVBQUUsUUFBUSxFQUNyQixPQUFPLEVBQUUseUJBQXlCLEVBQ2xDLE1BQU0sRUFBRSxDQUFDLFdBQVcsRUFBRSxRQUFRLEtBQUssT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUNwRCxPQUFPLENBQUMsU0FBUyxDQUFDLENBNkNwQjtJQUVEOztPQUVHO0lBQ0gsSUFBSSxNQUFNLElBQUksTUFBTSxDQUVuQjtJQUVEOzs7T0FHRztJQUNILEtBQUssU0FFSjtJQUVEOzs7T0FHRztJQUNHLElBQUksa0JBR1Q7Q0FDRiJ9

package/dest/validator_ha_signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator_ha_signer.d.ts","sourceRoot":"","sources":["../src/validator_ha_signer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE7E;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwC;IAE3E,YACE,EAAE,EAAE,0BAA0B,EACb,MAAM,EAAE,oBAAoB,EAgB9C;IAED;;;;;;;;;;;;;;;;OAgBG;IACG,kBAAkB,CACtB,gBAAgB,EAAE,UAAU,EAC5B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,SAAS,CAAC,CAmDpB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,KAAK,SAEJ;IAED;;;OAGG;IACG,IAAI,kBAET;CACF"}
+{"version":3,"file":"validator_ha_signer.d.ts","sourceRoot":"","sources":["../src/validator_ha_signer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAG3D,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAEhC,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAE/D,YACE,EAAE,EAAE,0BAA0B,EACb,MAAM,EAAE,uBAAuB,EAgBjD;IAED;;;;;;;;;;;;;;;;OAgBG;IACG,kBAAkB,CACtB,gBAAgB,EAAE,UAAU,EAC5B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,CAAC,WAAW,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,SAAS,CAAC,CA6CpB;IAED;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;OAGG;IACH,KAAK,SAEJ;IAED;;;OAGG;IACG,IAAI,kBAGT;CACF"}