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

package/src/types.ts

@@ -1,27 +1,24 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-import type { EthAddress } from '@aztec/foundation/eth-address';
-import { DateProvider } from '@aztec/foundation/timer';
 import {
-  DutyType,
-  type HAProtectedSigningContext,
-  type SigningContext,
-  type ValidatorHASignerConfig,
-  getBlockNumberFromSigningContext as getBlockNumberFromSigningContextFromStdlib,
-  isHAProtectedContext,
-} from '@aztec/stdlib/ha-signing';
-import type { TelemetryClient } from '@aztec/telemetry-client';
+  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 {
-  BlockProposalDutyIdentifier,
-  CheckAndRecordParams,
-  DeleteDutyParams,
-  DutyIdentifier,
-  DutyRow,
-  OtherDutyIdentifier,
-  RecordSuccessParams,
-  ValidatorDutyRecord,
+import type { ValidatorHASignerConfig } from './config.js';
+import {
+  type BlockProposalDutyIdentifier,
+  type CheckAndRecordParams,
+  type DeleteDutyParams,
+  type DutyIdentifier,
+  type DutyRow,
+  DutyType,
+  type OtherDutyIdentifier,
+  type RecordSuccessParams,
+  type ValidatorDutyRecord,
 } from './db/types.js';
 
 export type {
@@ -30,16 +27,12 @@ export type {
   DeleteDutyParams,
   DutyIdentifier,
   DutyRow,
-  HAProtectedSigningContext,
   OtherDutyIdentifier,
   RecordSuccessParams,
-  SigningContext,
   ValidatorDutyRecord,
   ValidatorHASignerConfig,
 };
 export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
-export { isHAProtectedContext };
-export { getBlockNumberFromSigningContextFromStdlib as getBlockNumberFromSigningContext };
 
 /**
  * Result of tryInsertOrGetExisting operation
@@ -60,16 +53,100 @@ export interface CreateHASignerDeps {
    * If provided, databaseUrl and poolConfig are ignored
    */
   pool?: Pool;
+}
+
+/**
+ * Base context for signing operations
+ */
+interface BaseSigningContext {
+  /** Slot number for this duty */
+  slot: SlotNumber;
   /**
-   * Optional telemetry client for metrics
-   */
-  telemetryClient?: TelemetryClient;
-  /**
-   * Optional date provider for timestamps
+   * Block or checkpoint number for this duty.
+   * For block proposals, this is the block number.
+   * For checkpoint proposals, this is the checkpoint number.
    */
-  dateProvider?: DateProvider;
+  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 function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext {
+  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: HAProtectedSigningContext): BlockNumber | CheckpointNumber {
+  // 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);
+}
+
+/**
+ * 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.)

package/src/validator_ha_signer.ts

@@ -9,23 +9,15 @@ import type { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import type { DateProvider } from '@aztec/foundation/timer';
+
+import type { ValidatorHASignerConfig } from './config.js';
+import { type DutyIdentifier, DutyType } from './db/types.js';
+import { SlashingProtectionService } from './slashing_protection_service.js';
 import {
-  DutyType,
   type HAProtectedSigningContext,
-  type ValidatorHASignerConfig,
+  type SlashingProtectionDatabase,
   getBlockNumberFromSigningContext,
-} from '@aztec/stdlib/ha-signing';
-
-import type { DutyIdentifier } from './db/types.js';
-import type { HASignerMetrics } from './metrics.js';
-import { SlashingProtectionService } from './slashing_protection_service.js';
-import type { SlashingProtectionDatabase } from './types.js';
-
-export interface ValidatorHASignerDeps {
-  metrics: HASignerMetrics;
-  dateProvider: DateProvider;
-}
+} from './types.js';
 
 /**
  * Validator High Availability Signer
@@ -51,19 +43,12 @@ export class ValidatorHASigner {
   private readonly slashingProtection: SlashingProtectionService;
   private readonly rollupAddress: EthAddress;
 
-  private readonly dateProvider: DateProvider;
-  private readonly metrics: HASignerMetrics;
-
   constructor(
     db: SlashingProtectionDatabase,
     private readonly config: ValidatorHASignerConfig,
-    deps: ValidatorHASignerDeps,
   ) {
     this.log = createLogger('validator-ha-signer');
 
-    this.metrics = deps.metrics;
-    this.dateProvider = deps.dateProvider;
-
     if (!config.haSigningEnabled) {
       // this shouldn't happen, the validator should use different signer for non-HA setups
       throw new Error('Validator HA Signer is not enabled in config');
@@ -73,10 +58,7 @@ export class ValidatorHASigner {
       throw new Error('NODE_ID is required for high-availability setups');
     }
     this.rollupAddress = config.l1Contracts.rollupAddress;
-    this.slashingProtection = new SlashingProtectionService(db, config, {
-      metrics: deps.metrics,
-      dateProvider: deps.dateProvider,
-    });
+    this.slashingProtection = new SlashingProtectionService(db, config);
     this.log.info('Validator HA Signer initialized with slashing protection', {
       nodeId: config.nodeId,
       rollupAddress: this.rollupAddress.toString(),
@@ -106,9 +88,6 @@ export class ValidatorHASigner {
     context: HAProtectedSigningContext,
     signFn: (messageHash: Buffer32) => Promise<Signature>,
   ): Promise<Signature> {
-    const startTime = this.dateProvider.now();
-    const dutyType = context.dutyType;
-
     let dutyIdentifier: DutyIdentifier;
     if (context.dutyType === DutyType.BLOCK_PROPOSAL) {
       dutyIdentifier = {
@@ -128,7 +107,6 @@ export class ValidatorHASigner {
     }
 
     // Acquire lock and get the token for ownership verification
-    // DutyAlreadySignedError and SlashingProtectionError may be thrown here and are recorded in the service
     const blockNumber = getBlockNumberFromSigningContext(context);
     const lockToken = await this.slashingProtection.checkAndRecord({
       ...dutyIdentifier,
@@ -144,7 +122,6 @@ export class ValidatorHASigner {
     } catch (error: any) {
       // Delete duty to allow retry (only succeeds if we own the lock)
       await this.slashingProtection.deleteDuty({ ...dutyIdentifier, lockToken });
-      this.metrics.recordSigningError(dutyType);
       throw error;
     }
 
@@ -156,9 +133,6 @@ export class ValidatorHASigner {
       lockToken,
     });
 
-    const duration = this.dateProvider.now() - startTime;
-    this.metrics.recordSigningSuccess(dutyType, duration);
-
     return signature;
   }
 

package/dest/metrics.d.ts

@@ -1,51 +0,0 @@
-import { type TelemetryClient } from '@aztec/telemetry-client';
-export type HACleanupType = 'stuck' | 'old' | 'outdated_rollup';
-/**
- * Metrics for HA signer tracking signing operations, lock acquisition, and cleanup.
- */
-export declare class HASignerMetrics {
-    private nodeId;
-    private signingDuration;
-    private signingSuccessCount;
-    private dutyAlreadySignedCount;
-    private slashingProtectionCount;
-    private signingErrorCount;
-    private lockAcquiredCount;
-    private cleanupStuckDutiesCount;
-    private cleanupOldDutiesCount;
-    private cleanupOutdatedRollupDutiesCount;
-    constructor(client: TelemetryClient, nodeId: string, name?: string);
-    /**
-     * Record a successful signing operation.
-     * @param dutyType - The type of duty signed
-     * @param durationMs - Duration from start of signWithProtection to completion
-     */
-    recordSigningSuccess(dutyType: string, durationMs: number): void;
-    /**
-     * Record a DutyAlreadySignedError (expected in HA; another node signed first).
-     * @param dutyType - The type of duty
-     */
-    recordDutyAlreadySigned(dutyType: string): void;
-    /**
-     * Record a SlashingProtectionError (attempted to sign different data for same duty).
-     * @param dutyType - The type of duty
-     */
-    recordSlashingProtection(dutyType: string): void;
-    /**
-     * Record a signing function failure (lock will be deleted for retry).
-     * @param dutyType - The type of duty
-     */
-    recordSigningError(dutyType: string): void;
-    /**
-     * Record lock acquisition.
-     * @param acquired - Whether a new lock was acquired (true) or existing record found (false)
-     */
-    recordLockAcquire(acquired: boolean): void;
-    /**
-     * Record cleanup metrics.
-     * @param type - Type of cleanup
-     * @param count - Number of duties cleaned up
-     */
-    recordCleanup(type: HACleanupType, count: number): void;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21ldHJpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUlMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE1BQU0sTUFBTSxhQUFhLEdBQUcsT0FBTyxHQUFHLEtBQUssR0FBRyxpQkFBaUIsQ0FBQztBQUVoRTs7R0FFRztBQUNILHFCQUFhLGVBQWU7SUFrQnhCLE9BQU8sQ0FBQyxNQUFNO0lBaEJoQixPQUFPLENBQUMsZUFBZSxDQUFZO0lBQ25DLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBZ0I7SUFDM0MsT0FBTyxDQUFDLHNCQUFzQixDQUFnQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQWdCO0lBQy9DLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBZ0I7SUFHekMsT0FBTyxDQUFDLGlCQUFpQixDQUFnQjtJQUd6QyxPQUFPLENBQUMsdUJBQXVCLENBQWdCO0lBQy9DLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBZ0I7SUFDN0MsT0FBTyxDQUFDLGdDQUFnQyxDQUFnQjtJQUV4RCxZQUNFLE1BQU0sRUFBRSxlQUFlLEVBQ2YsTUFBTSxFQUFFLE1BQU0sRUFDdEIsSUFBSSxTQUFvQixFQXFCekI7SUFFRDs7OztPQUlHO0lBQ0ksb0JBQW9CLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FPdEU7SUFFRDs7O09BR0c7SUFDSSx1QkFBdUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNckQ7SUFFRDs7O09BR0c7SUFDSSx3QkFBd0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNdEQ7SUFFRDs7O09BR0c7SUFDSSxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FNaEQ7SUFFRDs7O09BR0c7SUFDSSxpQkFBaUIsQ0FBQyxRQUFRLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FPaEQ7SUFFRDs7OztPQUlHO0lBQ0ksYUFBYSxDQUFDLElBQUksRUFBRSxhQUFhLEVBQUUsS0FBSyxFQUFFLE1BQU0sR0FBRyxJQUFJLENBWTdEO0NBQ0YifQ==

package/dest/metrics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../src/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,KAAK,GAAG,iBAAiB,CAAC;AAEhE;;GAEG;AACH,qBAAa,eAAe;IAkBxB,OAAO,CAAC,MAAM;IAhBhB,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;IAC7C,OAAO,CAAC,gCAAgC,CAAgB;IAExD,YACE,MAAM,EAAE,eAAe,EACf,MAAM,EAAE,MAAM,EACtB,IAAI,SAAoB,EAqBzB;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,CAY7D;CACF"}

package/dest/metrics.js

@@ -1,103 +0,0 @@
-import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
-/**
- * Metrics for HA signer tracking signing operations, lock acquisition, and cleanup.
- */ export class HASignerMetrics {
-    nodeId;
-    // Signing lifecycle metrics
-    signingDuration;
-    signingSuccessCount;
-    dutyAlreadySignedCount;
-    slashingProtectionCount;
-    signingErrorCount;
-    // Lock acquisition metrics
-    lockAcquiredCount;
-    // Cleanup metrics
-    cleanupStuckDutiesCount;
-    cleanupOldDutiesCount;
-    cleanupOutdatedRollupDutiesCount;
-    constructor(client, nodeId, name = 'HASignerMetrics'){
-        this.nodeId = nodeId;
-        const meter = client.getMeter(name);
-        // Signing lifecycle
-        this.signingDuration = meter.createHistogram(Metrics.HA_SIGNER_SIGNING_DURATION);
-        this.signingSuccessCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SIGNING_SUCCESS_COUNT);
-        this.dutyAlreadySignedCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_DUTY_ALREADY_SIGNED_COUNT);
-        this.slashingProtectionCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SLASHING_PROTECTION_COUNT);
-        this.signingErrorCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SIGNING_ERROR_COUNT);
-        // Lock acquisition
-        this.lockAcquiredCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_LOCK_ACQUIRED_COUNT);
-        // Cleanup
-        this.cleanupStuckDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_STUCK_DUTIES_COUNT);
-        this.cleanupOldDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OLD_DUTIES_COUNT);
-        this.cleanupOutdatedRollupDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OUTDATED_ROLLUP_DUTIES_COUNT);
-    }
-    /**
-   * Record a successful signing operation.
-   * @param dutyType - The type of duty signed
-   * @param durationMs - Duration from start of signWithProtection to completion
-   */ recordSigningSuccess(dutyType, durationMs) {
-        const attributes = {
-            [Attributes.HA_DUTY_TYPE]: dutyType,
-            [Attributes.HA_NODE_ID]: this.nodeId
-        };
-        this.signingSuccessCount.add(1, attributes);
-        this.signingDuration.record(durationMs, attributes);
-    }
-    /**
-   * Record a DutyAlreadySignedError (expected in HA; another node signed first).
-   * @param dutyType - The type of duty
-   */ recordDutyAlreadySigned(dutyType) {
-        const attributes = {
-            [Attributes.HA_DUTY_TYPE]: dutyType,
-            [Attributes.HA_NODE_ID]: this.nodeId
-        };
-        this.dutyAlreadySignedCount.add(1, attributes);
-    }
-    /**
-   * Record a SlashingProtectionError (attempted to sign different data for same duty).
-   * @param dutyType - The type of duty
-   */ recordSlashingProtection(dutyType) {
-        const attributes = {
-            [Attributes.HA_DUTY_TYPE]: dutyType,
-            [Attributes.HA_NODE_ID]: this.nodeId
-        };
-        this.slashingProtectionCount.add(1, attributes);
-    }
-    /**
-   * Record a signing function failure (lock will be deleted for retry).
-   * @param dutyType - The type of duty
-   */ recordSigningError(dutyType) {
-        const attributes = {
-            [Attributes.HA_DUTY_TYPE]: dutyType,
-            [Attributes.HA_NODE_ID]: this.nodeId
-        };
-        this.signingErrorCount.add(1, attributes);
-    }
-    /**
-   * Record lock acquisition.
-   * @param acquired - Whether a new lock was acquired (true) or existing record found (false)
-   */ recordLockAcquire(acquired) {
-        if (acquired) {
-            const attributes = {
-                [Attributes.HA_NODE_ID]: this.nodeId
-            };
-            this.lockAcquiredCount.add(1, attributes);
-        }
-    }
-    /**
-   * Record cleanup metrics.
-   * @param type - Type of cleanup
-   * @param count - Number of duties cleaned up
-   */ recordCleanup(type, count) {
-        const attributes = {
-            [Attributes.HA_NODE_ID]: this.nodeId
-        };
-        if (type === 'stuck') {
-            this.cleanupStuckDutiesCount.add(count, attributes);
-        } else if (type === 'old') {
-            this.cleanupOldDutiesCount.add(count, attributes);
-        } else if (type === 'outdated_rollup') {
-            this.cleanupOutdatedRollupDutiesCount.add(count, attributes);
-        }
-    }
-}

package/src/metrics.ts

@@ -1,138 +0,0 @@
-import {
-  Attributes,
-  type Histogram,
-  Metrics,
-  type TelemetryClient,
-  type UpDownCounter,
-  createUpDownCounterWithDefault,
-} from '@aztec/telemetry-client';
-
-export type HACleanupType = 'stuck' | 'old' | 'outdated_rollup';
-
-/**
- * Metrics for HA signer tracking signing operations, lock acquisition, and cleanup.
- */
-export class HASignerMetrics {
-  // Signing lifecycle metrics
-  private signingDuration: Histogram;
-  private signingSuccessCount: UpDownCounter;
-  private dutyAlreadySignedCount: UpDownCounter;
-  private slashingProtectionCount: UpDownCounter;
-  private signingErrorCount: UpDownCounter;
-
-  // Lock acquisition metrics
-  private lockAcquiredCount: UpDownCounter;
-
-  // Cleanup metrics
-  private cleanupStuckDutiesCount: UpDownCounter;
-  private cleanupOldDutiesCount: UpDownCounter;
-  private cleanupOutdatedRollupDutiesCount: UpDownCounter;
-
-  constructor(
-    client: TelemetryClient,
-    private nodeId: string,
-    name = 'HASignerMetrics',
-  ) {
-    const meter = client.getMeter(name);
-
-    // Signing lifecycle
-    this.signingDuration = meter.createHistogram(Metrics.HA_SIGNER_SIGNING_DURATION);
-    this.signingSuccessCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SIGNING_SUCCESS_COUNT);
-    this.dutyAlreadySignedCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_DUTY_ALREADY_SIGNED_COUNT);
-    this.slashingProtectionCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SLASHING_PROTECTION_COUNT);
-    this.signingErrorCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_SIGNING_ERROR_COUNT);
-
-    // Lock acquisition
-    this.lockAcquiredCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_LOCK_ACQUIRED_COUNT);
-
-    // Cleanup
-    this.cleanupStuckDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_STUCK_DUTIES_COUNT);
-    this.cleanupOldDutiesCount = createUpDownCounterWithDefault(meter, Metrics.HA_SIGNER_CLEANUP_OLD_DUTIES_COUNT);
-    this.cleanupOutdatedRollupDutiesCount = createUpDownCounterWithDefault(
-      meter,
-      Metrics.HA_SIGNER_CLEANUP_OUTDATED_ROLLUP_DUTIES_COUNT,
-    );
-  }
-
-  /**
-   * Record a successful signing operation.
-   * @param dutyType - The type of duty signed
-   * @param durationMs - Duration from start of signWithProtection to completion
-   */
-  public recordSigningSuccess(dutyType: string, durationMs: number): void {
-    const attributes = {
-      [Attributes.HA_DUTY_TYPE]: dutyType,
-      [Attributes.HA_NODE_ID]: this.nodeId,
-    };
-    this.signingSuccessCount.add(1, attributes);
-    this.signingDuration.record(durationMs, attributes);
-  }
-
-  /**
-   * Record a DutyAlreadySignedError (expected in HA; another node signed first).
-   * @param dutyType - The type of duty
-   */
-  public recordDutyAlreadySigned(dutyType: string): void {
-    const attributes = {
-      [Attributes.HA_DUTY_TYPE]: dutyType,
-      [Attributes.HA_NODE_ID]: this.nodeId,
-    };
-    this.dutyAlreadySignedCount.add(1, attributes);
-  }
-
-  /**
-   * Record a SlashingProtectionError (attempted to sign different data for same duty).
-   * @param dutyType - The type of duty
-   */
-  public recordSlashingProtection(dutyType: string): void {
-    const attributes = {
-      [Attributes.HA_DUTY_TYPE]: dutyType,
-      [Attributes.HA_NODE_ID]: this.nodeId,
-    };
-    this.slashingProtectionCount.add(1, attributes);
-  }
-
-  /**
-   * Record a signing function failure (lock will be deleted for retry).
-   * @param dutyType - The type of duty
-   */
-  public recordSigningError(dutyType: string): void {
-    const attributes = {
-      [Attributes.HA_DUTY_TYPE]: dutyType,
-      [Attributes.HA_NODE_ID]: this.nodeId,
-    };
-    this.signingErrorCount.add(1, attributes);
-  }
-
-  /**
-   * Record lock acquisition.
-   * @param acquired - Whether a new lock was acquired (true) or existing record found (false)
-   */
-  public recordLockAcquire(acquired: boolean): void {
-    if (acquired) {
-      const attributes = {
-        [Attributes.HA_NODE_ID]: this.nodeId,
-      };
-      this.lockAcquiredCount.add(1, attributes);
-    }
-  }
-
-  /**
-   * Record cleanup metrics.
-   * @param type - Type of cleanup
-   * @param count - Number of duties cleaned up
-   */
-  public recordCleanup(type: HACleanupType, count: number): void {
-    const attributes = {
-      [Attributes.HA_NODE_ID]: this.nodeId,
-    };
-
-    if (type === 'stuck') {
-      this.cleanupStuckDutiesCount.add(count, attributes);
-    } else if (type === 'old') {
-      this.cleanupOldDutiesCount.add(count, attributes);
-    } else if (type === 'outdated_rollup') {
-      this.cleanupOutdatedRollupDutiesCount.add(count, attributes);
-    }
-  }
-}