@aztec/validator-ha-signer 0.0.2-commit.217f559981 → 0.0.6-commit.a2d1860fe9
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/dest/config.d.ts +101 -0
- package/dest/config.d.ts.map +1 -0
- package/dest/config.js +92 -0
- package/dest/db/types.d.ts +15 -3
- package/dest/db/types.d.ts.map +1 -1
- package/dest/db/types.js +15 -5
- package/dest/factory.d.ts +2 -2
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +1 -11
- package/dest/slashing_protection_service.d.ts +3 -12
- package/dest/slashing_protection_service.d.ts.map +1 -1
- package/dest/slashing_protection_service.js +4 -15
- package/dest/types.d.ts +72 -15
- package/dest/types.d.ts.map +1 -1
- package/dest/types.js +20 -3
- package/dest/validator_ha_signer.d.ts +4 -12
- package/dest/validator_ha_signer.d.ts.map +1 -1
- package/dest/validator_ha_signer.js +4 -16
- package/package.json +5 -7
- package/src/config.ts +149 -0
- package/src/db/types.ts +14 -4
- package/src/factory.ts +2 -13
- package/src/slashing_protection_service.ts +4 -25
- package/src/types.ts +107 -30
- package/src/validator_ha_signer.ts +7 -33
- package/dest/metrics.d.ts +0 -51
- package/dest/metrics.d.ts.map +0 -1
- package/dest/metrics.js +0 -103
- package/src/metrics.ts +0 -138
package/dest/config.d.ts
ADDED
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
|
+
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
3
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
/**
|
|
6
|
+
* Configuration for the Validator HA Signer
|
|
7
|
+
*
|
|
8
|
+
* This config is used for distributed locking and slashing protection
|
|
9
|
+
* when running multiple validator nodes in a high-availability setup.
|
|
10
|
+
*/
|
|
11
|
+
export interface ValidatorHASignerConfig {
|
|
12
|
+
/** Whether HA signing / slashing protection is enabled */
|
|
13
|
+
haSigningEnabled: boolean;
|
|
14
|
+
/** L1 contract addresses (rollup address required) */
|
|
15
|
+
l1Contracts: Pick<L1ContractAddresses, 'rollupAddress'>;
|
|
16
|
+
/** Unique identifier for this node */
|
|
17
|
+
nodeId: string;
|
|
18
|
+
/** How long to wait between polls when a duty is being signed (ms) */
|
|
19
|
+
pollingIntervalMs: number;
|
|
20
|
+
/** Maximum time to wait for a duty being signed to complete (ms) */
|
|
21
|
+
signingTimeoutMs: number;
|
|
22
|
+
/** Maximum age of a stuck duty in ms (defaults to 2x hardcoded Aztec slot duration if not set) */
|
|
23
|
+
maxStuckDutiesAgeMs?: number;
|
|
24
|
+
/** Optional: clean up old duties after this many hours (disabled if not set) */
|
|
25
|
+
cleanupOldDutiesAfterHours?: number;
|
|
26
|
+
/**
|
|
27
|
+
* PostgreSQL connection string
|
|
28
|
+
* Format: postgresql://user:password@host:port/database
|
|
29
|
+
*/
|
|
30
|
+
databaseUrl?: string;
|
|
31
|
+
/**
|
|
32
|
+
* PostgreSQL connection pool configuration
|
|
33
|
+
*/
|
|
34
|
+
/** Maximum number of clients in the pool (default: 10) */
|
|
35
|
+
poolMaxCount?: number;
|
|
36
|
+
/** Minimum number of clients in the pool (default: 0) */
|
|
37
|
+
poolMinCount?: number;
|
|
38
|
+
/** Idle timeout in milliseconds (default: 10000) */
|
|
39
|
+
poolIdleTimeoutMs?: number;
|
|
40
|
+
/** Connection timeout in milliseconds (default: 0, no timeout) */
|
|
41
|
+
poolConnectionTimeoutMs?: number;
|
|
42
|
+
}
|
|
43
|
+
export declare const validatorHASignerConfigMappings: ConfigMappingsType<ValidatorHASignerConfig>;
|
|
44
|
+
export declare const defaultValidatorHASignerConfig: ValidatorHASignerConfig;
|
|
45
|
+
/**
|
|
46
|
+
* Returns the validator HA signer configuration from environment variables.
|
|
47
|
+
* Note: If an environment variable is not set, the default value is used.
|
|
48
|
+
* @returns The validator HA signer configuration.
|
|
49
|
+
*/
|
|
50
|
+
export declare function getConfigEnvVars(): ValidatorHASignerConfig;
|
|
51
|
+
export declare const ValidatorHASignerConfigSchema: z.ZodObject<{
|
|
52
|
+
haSigningEnabled: z.ZodBoolean;
|
|
53
|
+
l1Contracts: z.ZodObject<{
|
|
54
|
+
rollupAddress: z.ZodType<EthAddress, z.ZodTypeDef, EthAddress>;
|
|
55
|
+
}, "strip", z.ZodTypeAny, {
|
|
56
|
+
rollupAddress: EthAddress;
|
|
57
|
+
}, {
|
|
58
|
+
rollupAddress: EthAddress;
|
|
59
|
+
}>;
|
|
60
|
+
nodeId: z.ZodString;
|
|
61
|
+
pollingIntervalMs: z.ZodNumber;
|
|
62
|
+
signingTimeoutMs: z.ZodNumber;
|
|
63
|
+
maxStuckDutiesAgeMs: z.ZodOptional<z.ZodNumber>;
|
|
64
|
+
cleanupOldDutiesAfterHours: z.ZodOptional<z.ZodNumber>;
|
|
65
|
+
databaseUrl: z.ZodOptional<z.ZodString>;
|
|
66
|
+
poolMaxCount: z.ZodOptional<z.ZodNumber>;
|
|
67
|
+
poolMinCount: z.ZodOptional<z.ZodNumber>;
|
|
68
|
+
poolIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
69
|
+
poolConnectionTimeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
70
|
+
}, "strip", z.ZodTypeAny, {
|
|
71
|
+
haSigningEnabled: boolean;
|
|
72
|
+
l1Contracts: {
|
|
73
|
+
rollupAddress: EthAddress;
|
|
74
|
+
};
|
|
75
|
+
nodeId: string;
|
|
76
|
+
pollingIntervalMs: number;
|
|
77
|
+
signingTimeoutMs: number;
|
|
78
|
+
maxStuckDutiesAgeMs?: number | undefined;
|
|
79
|
+
cleanupOldDutiesAfterHours?: number | undefined;
|
|
80
|
+
databaseUrl?: string | undefined;
|
|
81
|
+
poolMaxCount?: number | undefined;
|
|
82
|
+
poolMinCount?: number | undefined;
|
|
83
|
+
poolIdleTimeoutMs?: number | undefined;
|
|
84
|
+
poolConnectionTimeoutMs?: number | undefined;
|
|
85
|
+
}, {
|
|
86
|
+
haSigningEnabled: boolean;
|
|
87
|
+
l1Contracts: {
|
|
88
|
+
rollupAddress: EthAddress;
|
|
89
|
+
};
|
|
90
|
+
nodeId: string;
|
|
91
|
+
pollingIntervalMs: number;
|
|
92
|
+
signingTimeoutMs: number;
|
|
93
|
+
maxStuckDutiesAgeMs?: number | undefined;
|
|
94
|
+
cleanupOldDutiesAfterHours?: number | undefined;
|
|
95
|
+
databaseUrl?: string | undefined;
|
|
96
|
+
poolMaxCount?: number | undefined;
|
|
97
|
+
poolMinCount?: number | undefined;
|
|
98
|
+
poolIdleTimeoutMs?: number | undefined;
|
|
99
|
+
poolConnectionTimeoutMs?: number | undefined;
|
|
100
|
+
}>;
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDakYsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBTXhCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7Ozs7O0dBS0c7QUFDSCxNQUFNLFdBQVcsdUJBQXVCO0lBQ3RDLDBEQUEwRDtJQUMxRCxnQkFBZ0IsRUFBRSxPQUFPLENBQUM7SUFDMUIsc0RBQXNEO0lBQ3RELFdBQVcsRUFBRSxJQUFJLENBQUMsbUJBQW1CLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDeEQsc0NBQXNDO0lBQ3RDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixzRUFBc0U7SUFDdEUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLG9FQUFvRTtJQUNwRSxnQkFBZ0IsRUFBRSxNQUFNLENBQUM7SUFDekIsa0dBQWtHO0lBQ2xHLG1CQUFtQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzdCLGdGQUFnRjtJQUNoRiwwQkFBMEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNwQzs7O09BR0c7SUFDSCxXQUFXLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDckI7O09BRUc7SUFDSCwwREFBMEQ7SUFDMUQsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHlEQUF5RDtJQUN6RCxZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsb0RBQW9EO0lBQ3BELGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzNCLGtFQUFrRTtJQUNsRSx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQztBQUVELGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxrQkFBa0IsQ0FBQyx1QkFBdUIsQ0FpRXZGLENBQUM7QUFFRixlQUFPLE1BQU0sOEJBQThCLEVBQUUsdUJBRTVDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHVCQUF1QixDQUUxRDtBQUVELGVBQU8sTUFBTSw2QkFBNkI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFlRSxDQUFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,0DAA0D;IAC1D,gBAAgB,EAAE,OAAO,CAAC;IAC1B,sDAAsD;IACtD,WAAW,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACxD,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oEAAoE;IACpE,gBAAgB,EAAE,MAAM,CAAC;IACzB,kGAAkG;IAClG,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gFAAgF;IAChF,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kEAAkE;IAClE,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,eAAO,MAAM,+BAA+B,EAAE,kBAAkB,CAAC,uBAAuB,CAiEvF,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,uBAE5C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,uBAAuB,CAE1D;AAED,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAeE,CAAC"}
|
package/dest/config.js
ADDED
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
export const validatorHASignerConfigMappings = {
|
|
5
|
+
haSigningEnabled: {
|
|
6
|
+
env: 'VALIDATOR_HA_SIGNING_ENABLED',
|
|
7
|
+
description: 'Whether HA signing / slashing protection is enabled',
|
|
8
|
+
...booleanConfigHelper(false)
|
|
9
|
+
},
|
|
10
|
+
l1Contracts: {
|
|
11
|
+
description: 'L1 contract addresses (rollup address required)',
|
|
12
|
+
nested: {
|
|
13
|
+
rollupAddress: {
|
|
14
|
+
description: 'The Ethereum address of the rollup contract (must be set programmatically)',
|
|
15
|
+
parseEnv: (val)=>EthAddress.fromString(val)
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
nodeId: {
|
|
20
|
+
env: 'VALIDATOR_HA_NODE_ID',
|
|
21
|
+
description: 'The unique identifier for this node',
|
|
22
|
+
defaultValue: ''
|
|
23
|
+
},
|
|
24
|
+
pollingIntervalMs: {
|
|
25
|
+
env: 'VALIDATOR_HA_POLLING_INTERVAL_MS',
|
|
26
|
+
description: 'The number of ms to wait between polls when a duty is being signed',
|
|
27
|
+
...numberConfigHelper(100)
|
|
28
|
+
},
|
|
29
|
+
signingTimeoutMs: {
|
|
30
|
+
env: 'VALIDATOR_HA_SIGNING_TIMEOUT_MS',
|
|
31
|
+
description: 'The maximum time to wait for a duty being signed to complete',
|
|
32
|
+
...numberConfigHelper(3_000)
|
|
33
|
+
},
|
|
34
|
+
maxStuckDutiesAgeMs: {
|
|
35
|
+
env: 'VALIDATOR_HA_MAX_STUCK_DUTIES_AGE_MS',
|
|
36
|
+
description: 'The maximum age of a stuck duty in ms (defaults to 2x Aztec slot duration)',
|
|
37
|
+
...optionalNumberConfigHelper()
|
|
38
|
+
},
|
|
39
|
+
cleanupOldDutiesAfterHours: {
|
|
40
|
+
env: 'VALIDATOR_HA_OLD_DUTIES_MAX_AGE_H',
|
|
41
|
+
description: 'Optional: clean up old duties after this many hours (disabled if not set)',
|
|
42
|
+
...optionalNumberConfigHelper()
|
|
43
|
+
},
|
|
44
|
+
databaseUrl: {
|
|
45
|
+
env: 'VALIDATOR_HA_DATABASE_URL',
|
|
46
|
+
description: 'PostgreSQL connection string for validator HA signer (format: postgresql://user:password@host:port/database)'
|
|
47
|
+
},
|
|
48
|
+
poolMaxCount: {
|
|
49
|
+
env: 'VALIDATOR_HA_POOL_MAX',
|
|
50
|
+
description: 'Maximum number of clients in the pool',
|
|
51
|
+
...numberConfigHelper(10)
|
|
52
|
+
},
|
|
53
|
+
poolMinCount: {
|
|
54
|
+
env: 'VALIDATOR_HA_POOL_MIN',
|
|
55
|
+
description: 'Minimum number of clients in the pool',
|
|
56
|
+
...numberConfigHelper(0)
|
|
57
|
+
},
|
|
58
|
+
poolIdleTimeoutMs: {
|
|
59
|
+
env: 'VALIDATOR_HA_POOL_IDLE_TIMEOUT_MS',
|
|
60
|
+
description: 'Idle timeout in milliseconds',
|
|
61
|
+
...numberConfigHelper(10_000)
|
|
62
|
+
},
|
|
63
|
+
poolConnectionTimeoutMs: {
|
|
64
|
+
env: 'VALIDATOR_HA_POOL_CONNECTION_TIMEOUT_MS',
|
|
65
|
+
description: 'Connection timeout in milliseconds (0 means no timeout)',
|
|
66
|
+
...numberConfigHelper(0)
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
export const defaultValidatorHASignerConfig = getDefaultConfig(validatorHASignerConfigMappings);
|
|
70
|
+
/**
|
|
71
|
+
* Returns the validator HA signer configuration from environment variables.
|
|
72
|
+
* Note: If an environment variable is not set, the default value is used.
|
|
73
|
+
* @returns The validator HA signer configuration.
|
|
74
|
+
*/ export function getConfigEnvVars() {
|
|
75
|
+
return getConfigFromMappings(validatorHASignerConfigMappings);
|
|
76
|
+
}
|
|
77
|
+
export const ValidatorHASignerConfigSchema = z.object({
|
|
78
|
+
haSigningEnabled: z.boolean(),
|
|
79
|
+
l1Contracts: z.object({
|
|
80
|
+
rollupAddress: z.instanceof(EthAddress)
|
|
81
|
+
}),
|
|
82
|
+
nodeId: z.string(),
|
|
83
|
+
pollingIntervalMs: z.number().min(0),
|
|
84
|
+
signingTimeoutMs: z.number().min(0),
|
|
85
|
+
maxStuckDutiesAgeMs: z.number().min(0).optional(),
|
|
86
|
+
cleanupOldDutiesAfterHours: z.number().min(0).optional(),
|
|
87
|
+
databaseUrl: z.string().optional(),
|
|
88
|
+
poolMaxCount: z.number().min(0).optional(),
|
|
89
|
+
poolMinCount: z.number().min(0).optional(),
|
|
90
|
+
poolIdleTimeoutMs: z.number().min(0).optional(),
|
|
91
|
+
poolConnectionTimeoutMs: z.number().min(0).optional()
|
|
92
|
+
});
|
package/dest/db/types.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
4
|
-
import { DutyType } from '@aztec/stdlib/ha-signing';
|
|
5
4
|
/**
|
|
6
5
|
* Row type from PostgreSQL query
|
|
7
6
|
*/
|
|
@@ -27,6 +26,19 @@ export interface DutyRow {
|
|
|
27
26
|
export interface InsertOrGetRow extends DutyRow {
|
|
28
27
|
is_new: boolean;
|
|
29
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* Type of validator duty being performed
|
|
31
|
+
*/
|
|
32
|
+
export declare enum DutyType {
|
|
33
|
+
BLOCK_PROPOSAL = "BLOCK_PROPOSAL",
|
|
34
|
+
CHECKPOINT_PROPOSAL = "CHECKPOINT_PROPOSAL",
|
|
35
|
+
ATTESTATION = "ATTESTATION",
|
|
36
|
+
ATTESTATIONS_AND_SIGNERS = "ATTESTATIONS_AND_SIGNERS",
|
|
37
|
+
GOVERNANCE_VOTE = "GOVERNANCE_VOTE",
|
|
38
|
+
SLASHING_VOTE = "SLASHING_VOTE",
|
|
39
|
+
AUTH_REQUEST = "AUTH_REQUEST",
|
|
40
|
+
TXS = "TXS"
|
|
41
|
+
}
|
|
30
42
|
/**
|
|
31
43
|
* Status of a duty in the database
|
|
32
44
|
*/
|
|
@@ -34,7 +46,6 @@ export declare enum DutyStatus {
|
|
|
34
46
|
SIGNING = "signing",
|
|
35
47
|
SIGNED = "signed"
|
|
36
48
|
}
|
|
37
|
-
export { DutyType };
|
|
38
49
|
/**
|
|
39
50
|
* Record of a validator duty in the database
|
|
40
51
|
*/
|
|
@@ -151,4 +162,5 @@ interface DeleteDutyExtra {
|
|
|
151
162
|
* Uses intersection with DutyIdentifier to preserve the discriminated union.
|
|
152
163
|
*/
|
|
153
164
|
export type DeleteDutyParams = DutyIdentifier & DeleteDutyExtra;
|
|
154
|
-
|
|
165
|
+
export {};
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kYi90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDeEgsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakU7O0dBRUc7QUFDSCxNQUFNLFdBQVcsT0FBTztJQUN0QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQiw2QkFBNkIsRUFBRSxNQUFNLENBQUM7SUFDdEMsU0FBUyxFQUFFLFFBQVEsQ0FBQztJQUNwQixNQUFNLEVBQUUsVUFBVSxDQUFDO0lBQ25CLFlBQVksRUFBRSxNQUFNLENBQUM7SUFDckIsU0FBUyxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDekIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLFVBQVUsRUFBRSxJQUFJLENBQUM7SUFDakIsWUFBWSxFQUFFLElBQUksR0FBRyxJQUFJLENBQUM7SUFDMUIsYUFBYSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUM7Q0FDOUI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxjQUFlLFNBQVEsT0FBTztJQUM3QyxNQUFNLEVBQUUsT0FBTyxDQUFDO0NBQ2pCO0FBRUQ7O0dBRUc7QUFDSCxvQkFBWSxRQUFRO0lBQ2xCLGNBQWMsbUJBQW1CO0lBQ2pDLG1CQUFtQix3QkFBd0I7SUFDM0MsV0FBVyxnQkFBZ0I7SUFDM0Isd0JBQXdCLDZCQUE2QjtJQUNy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
|
package/dest/db/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/db/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACxH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/db/types.ts"],"names":[],"mappings":"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"}
|
package/dest/db/types.js
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Type of validator duty being performed
|
|
3
|
+
*/ export var DutyType = /*#__PURE__*/ function(DutyType) {
|
|
4
|
+
DutyType["BLOCK_PROPOSAL"] = "BLOCK_PROPOSAL";
|
|
5
|
+
DutyType["CHECKPOINT_PROPOSAL"] = "CHECKPOINT_PROPOSAL";
|
|
6
|
+
DutyType["ATTESTATION"] = "ATTESTATION";
|
|
7
|
+
DutyType["ATTESTATIONS_AND_SIGNERS"] = "ATTESTATIONS_AND_SIGNERS";
|
|
8
|
+
DutyType["GOVERNANCE_VOTE"] = "GOVERNANCE_VOTE";
|
|
9
|
+
DutyType["SLASHING_VOTE"] = "SLASHING_VOTE";
|
|
10
|
+
DutyType["AUTH_REQUEST"] = "AUTH_REQUEST";
|
|
11
|
+
DutyType["TXS"] = "TXS";
|
|
12
|
+
return DutyType;
|
|
13
|
+
}({});
|
|
2
14
|
/**
|
|
3
15
|
* Status of a duty in the database
|
|
4
16
|
*/ export var DutyStatus = /*#__PURE__*/ function(DutyStatus) {
|
|
@@ -6,8 +18,6 @@ import { DutyType } from '@aztec/stdlib/ha-signing';
|
|
|
6
18
|
DutyStatus["SIGNED"] = "signed";
|
|
7
19
|
return DutyStatus;
|
|
8
20
|
}({});
|
|
9
|
-
// Re-export DutyType from stdlib
|
|
10
|
-
export { DutyType };
|
|
11
21
|
/**
|
|
12
22
|
* Validates and normalizes the block index for a duty.
|
|
13
23
|
* - BLOCK_PROPOSAL: validates blockIndexWithinCheckpoint is provided and >= 0
|
|
@@ -15,7 +25,7 @@ export { DutyType };
|
|
|
15
25
|
*
|
|
16
26
|
* @throws Error if BLOCK_PROPOSAL is missing blockIndexWithinCheckpoint or has invalid value
|
|
17
27
|
*/ export function normalizeBlockIndex(dutyType, blockIndexWithinCheckpoint) {
|
|
18
|
-
if (dutyType ===
|
|
28
|
+
if (dutyType === "BLOCK_PROPOSAL") {
|
|
19
29
|
if (blockIndexWithinCheckpoint === undefined) {
|
|
20
30
|
throw new Error('BLOCK_PROPOSAL duties require blockIndexWithinCheckpoint to be specified');
|
|
21
31
|
}
|
|
@@ -32,7 +42,7 @@ export { DutyType };
|
|
|
32
42
|
* - BLOCK_PROPOSAL: returns the blockIndexWithinCheckpoint
|
|
33
43
|
* - Other duty types: returns -1
|
|
34
44
|
*/ export function getBlockIndexFromDutyIdentifier(duty) {
|
|
35
|
-
if (duty.dutyType ===
|
|
45
|
+
if (duty.dutyType === "BLOCK_PROPOSAL") {
|
|
36
46
|
return duty.blockIndexWithinCheckpoint;
|
|
37
47
|
}
|
|
38
48
|
return -1;
|
package/dest/factory.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ValidatorHASignerConfig } from '
|
|
1
|
+
import type { ValidatorHASignerConfig } from './config.js';
|
|
2
2
|
import type { CreateHASignerDeps, SlashingProtectionDatabase } from './types.js';
|
|
3
3
|
import { ValidatorHASigner } from './validator_ha_signer.js';
|
|
4
4
|
/**
|
|
@@ -39,4 +39,4 @@ export declare function createHASigner(config: ValidatorHASignerConfig, deps?: C
|
|
|
39
39
|
signer: ValidatorHASigner;
|
|
40
40
|
db: SlashingProtectionDatabase;
|
|
41
41
|
}>;
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDakYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0Q7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWlDRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSx1QkFBdUIsRUFDL0IsSUFBSSxDQUFDLEVBQUUsa0JBQWtCLEdBQ3hCLE9BQU8sQ0FBQztJQUNULE1BQU0sRUFBRSxpQkFBaUIsQ0FBQztJQUMxQixFQUFFLEVBQUUsMEJBQTBCLENBQUM7Q0FDaEMsQ0FBQyxDQStCRCJ9
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,uBAAuB,EAC/B,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC;IACT,MAAM,EAAE,iBAAiB,CAAC;IAC1B,EAAE,EAAE,0BAA0B,CAAC;CAChC,CAAC,CA+BD"}
|
package/dest/factory.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Factory functions for creating validator HA signers
|
|
3
|
-
*/ import {
|
|
4
|
-
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
5
|
-
import { Pool } from 'pg';
|
|
3
|
+
*/ import { Pool } from 'pg';
|
|
6
4
|
import { PostgresSlashingProtectionDatabase } from './db/postgres.js';
|
|
7
|
-
import { HASignerMetrics } from './metrics.js';
|
|
8
5
|
import { ValidatorHASigner } from './validator_ha_signer.js';
|
|
9
6
|
/**
|
|
10
7
|
* Create a validator HA signer with PostgreSQL backend
|
|
@@ -44,8 +41,6 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
|
|
|
44
41
|
if (!databaseUrl) {
|
|
45
42
|
throw new Error('databaseUrl is required for createHASigner');
|
|
46
43
|
}
|
|
47
|
-
const telemetryClient = deps?.telemetryClient ?? getTelemetryClient();
|
|
48
|
-
const dateProvider = deps?.dateProvider ?? new DateProvider();
|
|
49
44
|
// Create connection pool (or use provided pool)
|
|
50
45
|
let pool;
|
|
51
46
|
if (!deps?.pool) {
|
|
@@ -63,15 +58,10 @@ import { ValidatorHASigner } from './validator_ha_signer.js';
|
|
|
63
58
|
const db = new PostgresSlashingProtectionDatabase(pool);
|
|
64
59
|
// Verify database schema is initialized and version matches
|
|
65
60
|
await db.initialize();
|
|
66
|
-
// Create metrics
|
|
67
|
-
const metrics = new HASignerMetrics(telemetryClient, signerConfig.nodeId);
|
|
68
61
|
// Create signer
|
|
69
62
|
const signer = new ValidatorHASigner(db, {
|
|
70
63
|
...signerConfig,
|
|
71
64
|
databaseUrl
|
|
72
|
-
}, {
|
|
73
|
-
metrics,
|
|
74
|
-
dateProvider
|
|
75
65
|
});
|
|
76
66
|
return {
|
|
77
67
|
signer,
|
|
@@ -1,12 +1,5 @@
|
|
|
1
|
-
import type { DateProvider } from '@aztec/foundation/timer';
|
|
2
|
-
import type { ValidatorHASignerConfig } from '@aztec/stdlib/ha-signing';
|
|
3
1
|
import { type CheckAndRecordParams, type DeleteDutyParams, type RecordSuccessParams } from './db/types.js';
|
|
4
|
-
import type {
|
|
5
|
-
import type { SlashingProtectionDatabase } from './types.js';
|
|
6
|
-
export interface SlashingProtectionServiceDeps {
|
|
7
|
-
metrics: HASignerMetrics;
|
|
8
|
-
dateProvider: DateProvider;
|
|
9
|
-
}
|
|
2
|
+
import type { SlashingProtectionDatabase, ValidatorHASignerConfig } from './types.js';
|
|
10
3
|
/**
|
|
11
4
|
* Slashing Protection Service
|
|
12
5
|
*
|
|
@@ -29,11 +22,9 @@ export declare class SlashingProtectionService {
|
|
|
29
22
|
private readonly pollingIntervalMs;
|
|
30
23
|
private readonly signingTimeoutMs;
|
|
31
24
|
private readonly maxStuckDutiesAgeMs;
|
|
32
|
-
private readonly metrics;
|
|
33
|
-
private readonly dateProvider;
|
|
34
25
|
private cleanupRunningPromise;
|
|
35
26
|
private lastOldDutiesCleanupAtMs?;
|
|
36
|
-
constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig
|
|
27
|
+
constructor(db: SlashingProtectionDatabase, config: ValidatorHASignerConfig);
|
|
37
28
|
/**
|
|
38
29
|
* Check if a duty can be performed and acquire the lock if so.
|
|
39
30
|
*
|
|
@@ -90,4 +81,4 @@ export declare class SlashingProtectionService {
|
|
|
90
81
|
close(): Promise<void>;
|
|
91
82
|
private cleanup;
|
|
92
83
|
}
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2xhc2hpbmdfcHJvdGVjdGlvbl9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVVBLE9BQU8sRUFDTCxLQUFLLG9CQUFvQixFQUN6QixLQUFLLGdCQUFnQixFQUVyQixLQUFLLG1CQUFtQixFQUV6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUV0Rjs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLHlCQUF5QjtJQVVsQyxPQUFPLENBQUMsUUFBUSxDQUFDLEVBQUU7SUFDbkIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBVnpCLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFTO0lBQzdCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQVM7SUFDM0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBUztJQUMxQyxPQUFPLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFTO0lBRTdDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBaUI7SUFDOUMsT0FBTyxDQUFDLHdCQUF3QixDQUFDLENBQVM7SUFFMUMsWUFDbUIsRUFBRSxFQUFFLDBCQUEwQixFQUM5QixNQUFNLEVBQUUsdUJBQXVCLEVBU2pEO0lBRUQ7Ozs7Ozs7Ozs7Ozs7O09BY0c7SUFDRyxjQUFjLENBQUMsTUFBTSxFQUFFLG9CQUFvQixHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FpRWxFO0lBRUQ7Ozs7OztPQU1HO0lBQ0csYUFBYSxDQUFDLE1BQU0sRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBMkJqRTtJQUVEOzs7Ozs7T0FNRztJQUNHLFVBQVUsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXdCM0Q7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRDs7O09BR0c7SUFDSDs7O09BR0c7SUFDRyxLQUFLLGtCQVdWO0lBRUQ7O09BRUc7SUFDRyxJQUFJLGtCQUdUO0lBRUQ7OztPQUdHO0lBQ0csS0FBSyxrQkFHVjtZQU1hLE9BQU87Q0E2QnRCIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"slashing_protection_service.d.ts","sourceRoot":"","sources":["../src/slashing_protection_service.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAEtF;;;;;;;;;;;;;;GAcG;AACH,qBAAa,yBAAyB;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"}
|
|
@@ -29,11 +29,9 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
29
29
|
pollingIntervalMs;
|
|
30
30
|
signingTimeoutMs;
|
|
31
31
|
maxStuckDutiesAgeMs;
|
|
32
|
-
metrics;
|
|
33
|
-
dateProvider;
|
|
34
32
|
cleanupRunningPromise;
|
|
35
33
|
lastOldDutiesCleanupAtMs;
|
|
36
|
-
constructor(db, config
|
|
34
|
+
constructor(db, config){
|
|
37
35
|
this.db = db;
|
|
38
36
|
this.config = config;
|
|
39
37
|
this.log = createLogger('slashing-protection');
|
|
@@ -42,8 +40,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
42
40
|
// Default to 144s (2x 72s Aztec slot duration) if not explicitly configured
|
|
43
41
|
this.maxStuckDutiesAgeMs = config.maxStuckDutiesAgeMs ?? 144_000;
|
|
44
42
|
this.cleanupRunningPromise = new RunningPromise(this.cleanup.bind(this), this.log, this.maxStuckDutiesAgeMs);
|
|
45
|
-
this.metrics = deps.metrics;
|
|
46
|
-
this.dateProvider = deps.dateProvider;
|
|
47
43
|
}
|
|
48
44
|
/**
|
|
49
45
|
* Check if a duty can be performed and acquire the lock if so.
|
|
@@ -61,7 +57,7 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
61
57
|
* @throws SlashingProtectionError if attempting to sign different data for same slot/duty
|
|
62
58
|
*/ async checkAndRecord(params) {
|
|
63
59
|
const { validatorAddress, slot, dutyType, messageHash, nodeId } = params;
|
|
64
|
-
const startTime =
|
|
60
|
+
const startTime = Date.now();
|
|
65
61
|
this.log.debug(`Checking duty: ${dutyType} for slot ${slot}`, {
|
|
66
62
|
validatorAddress: validatorAddress.toString(),
|
|
67
63
|
nodeId
|
|
@@ -75,7 +71,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
75
71
|
validatorAddress: validatorAddress.toString(),
|
|
76
72
|
nodeId
|
|
77
73
|
});
|
|
78
|
-
this.metrics.recordLockAcquire(true);
|
|
79
74
|
return record.lockToken;
|
|
80
75
|
}
|
|
81
76
|
// Record already exists - handle based on status
|
|
@@ -89,20 +84,17 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
89
84
|
existingNodeId: record.nodeId,
|
|
90
85
|
attemptingNodeId: nodeId
|
|
91
86
|
});
|
|
92
|
-
this.metrics.recordSlashingProtection(dutyType);
|
|
93
87
|
throw new SlashingProtectionError(slot, dutyType, record.blockIndexWithinCheckpoint, record.messageHash, messageHash, record.nodeId);
|
|
94
88
|
}
|
|
95
|
-
this.metrics.recordDutyAlreadySigned(dutyType);
|
|
96
89
|
throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, record.nodeId);
|
|
97
90
|
} else if (record.status === DutyStatus.SIGNING) {
|
|
98
91
|
// Another node is currently signing - check for timeout
|
|
99
|
-
if (
|
|
92
|
+
if (Date.now() - startTime > this.signingTimeoutMs) {
|
|
100
93
|
this.log.warn(`Timeout waiting for signing to complete for duty ${dutyType} at slot ${slot}`, {
|
|
101
94
|
validatorAddress: validatorAddress.toString(),
|
|
102
95
|
timeoutMs: this.signingTimeoutMs,
|
|
103
96
|
signingNodeId: record.nodeId
|
|
104
97
|
});
|
|
105
|
-
this.metrics.recordDutyAlreadySigned(dutyType);
|
|
106
98
|
throw new DutyAlreadySignedError(slot, dutyType, record.blockIndexWithinCheckpoint, 'unknown (timeout)');
|
|
107
99
|
}
|
|
108
100
|
// Wait and poll
|
|
@@ -179,7 +171,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
179
171
|
this.log.info(`Cleaned up ${numOutdatedRollupDuties} duties with outdated rollup address at startup`, {
|
|
180
172
|
currentRollupAddress: this.config.l1Contracts.rollupAddress.toString()
|
|
181
173
|
});
|
|
182
|
-
this.metrics.recordCleanup('outdated_rollup', numOutdatedRollupDuties);
|
|
183
174
|
}
|
|
184
175
|
this.cleanupRunningPromise.start();
|
|
185
176
|
this.log.info('Slashing protection service started', {
|
|
@@ -212,13 +203,12 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
212
203
|
nodeId: this.config.nodeId,
|
|
213
204
|
maxStuckDutiesAgeMs: this.maxStuckDutiesAgeMs
|
|
214
205
|
});
|
|
215
|
-
this.metrics.recordCleanup('stuck', numStuckDuties);
|
|
216
206
|
}
|
|
217
207
|
// 2. Clean up old signed duties if configured
|
|
218
208
|
// we shouldn't run this as often as stuck duty cleanup.
|
|
219
209
|
if (this.config.cleanupOldDutiesAfterHours !== undefined) {
|
|
220
210
|
const maxAgeMs = this.config.cleanupOldDutiesAfterHours * 60 * 60 * 1000;
|
|
221
|
-
const nowMs =
|
|
211
|
+
const nowMs = Date.now();
|
|
222
212
|
const shouldRun = this.lastOldDutiesCleanupAtMs === undefined || nowMs - this.lastOldDutiesCleanupAtMs >= maxAgeMs;
|
|
223
213
|
if (shouldRun) {
|
|
224
214
|
const numOldDuties = await this.db.cleanupOldDuties(maxAgeMs);
|
|
@@ -228,7 +218,6 @@ import { DutyAlreadySignedError, SlashingProtectionError } from './errors.js';
|
|
|
228
218
|
cleanupOldDutiesAfterHours: this.config.cleanupOldDutiesAfterHours,
|
|
229
219
|
maxAgeMs
|
|
230
220
|
});
|
|
231
|
-
this.metrics.recordCleanup('old', numOldDuties);
|
|
232
221
|
}
|
|
233
222
|
}
|
|
234
223
|
}
|
package/dest/types.d.ts
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
1
|
+
import { BlockNumber, type CheckpointNumber, type IndexWithinCheckpoint, type SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
-
import { DateProvider } from '@aztec/foundation/timer';
|
|
4
|
-
import { DutyType, type HAProtectedSigningContext, type SigningContext, type ValidatorHASignerConfig, getBlockNumberFromSigningContext as getBlockNumberFromSigningContextFromStdlib, isHAProtectedContext } from '@aztec/stdlib/ha-signing';
|
|
5
|
-
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
6
3
|
import type { Pool } from 'pg';
|
|
7
|
-
import type {
|
|
8
|
-
|
|
4
|
+
import type { ValidatorHASignerConfig } from './config.js';
|
|
5
|
+
import { type BlockProposalDutyIdentifier, type CheckAndRecordParams, type DeleteDutyParams, type DutyIdentifier, type DutyRow, DutyType, type OtherDutyIdentifier, type RecordSuccessParams, type ValidatorDutyRecord } from './db/types.js';
|
|
6
|
+
export type { BlockProposalDutyIdentifier, CheckAndRecordParams, DeleteDutyParams, DutyIdentifier, DutyRow, OtherDutyIdentifier, RecordSuccessParams, ValidatorDutyRecord, ValidatorHASignerConfig, };
|
|
9
7
|
export { DutyStatus, DutyType, getBlockIndexFromDutyIdentifier, normalizeBlockIndex } from './db/types.js';
|
|
10
|
-
export { isHAProtectedContext };
|
|
11
|
-
export { getBlockNumberFromSigningContextFromStdlib as getBlockNumberFromSigningContext };
|
|
12
8
|
/**
|
|
13
9
|
* Result of tryInsertOrGetExisting operation
|
|
14
10
|
*/
|
|
@@ -27,15 +23,76 @@ export interface CreateHASignerDeps {
|
|
|
27
23
|
* If provided, databaseUrl and poolConfig are ignored
|
|
28
24
|
*/
|
|
29
25
|
pool?: Pool;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Base context for signing operations
|
|
29
|
+
*/
|
|
30
|
+
interface BaseSigningContext {
|
|
31
|
+
/** Slot number for this duty */
|
|
32
|
+
slot: SlotNumber;
|
|
30
33
|
/**
|
|
31
|
-
*
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
/**
|
|
35
|
-
* Optional date provider for timestamps
|
|
34
|
+
* Block or checkpoint number for this duty.
|
|
35
|
+
* For block proposals, this is the block number.
|
|
36
|
+
* For checkpoint proposals, this is the checkpoint number.
|
|
36
37
|
*/
|
|
37
|
-
|
|
38
|
+
blockNumber: BlockNumber | CheckpointNumber;
|
|
38
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Signing context for block proposals.
|
|
42
|
+
* blockIndexWithinCheckpoint is REQUIRED and must be >= 0.
|
|
43
|
+
*/
|
|
44
|
+
export interface BlockProposalSigningContext extends BaseSigningContext {
|
|
45
|
+
/** Block index within checkpoint (0, 1, 2...). Required for block proposals. */
|
|
46
|
+
blockIndexWithinCheckpoint: IndexWithinCheckpoint;
|
|
47
|
+
dutyType: DutyType.BLOCK_PROPOSAL;
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Signing context for non-block-proposal duties that require HA protection.
|
|
51
|
+
* blockIndexWithinCheckpoint is not applicable (internally always -1).
|
|
52
|
+
*/
|
|
53
|
+
export interface OtherSigningContext extends BaseSigningContext {
|
|
54
|
+
dutyType: DutyType.CHECKPOINT_PROPOSAL | DutyType.ATTESTATION | DutyType.ATTESTATIONS_AND_SIGNERS;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Signing context for governance/slashing votes which only need slot for HA protection.
|
|
58
|
+
* blockNumber is not applicable (internally always 0).
|
|
59
|
+
*/
|
|
60
|
+
export interface VoteSigningContext {
|
|
61
|
+
slot: SlotNumber;
|
|
62
|
+
dutyType: DutyType.GOVERNANCE_VOTE | DutyType.SLASHING_VOTE;
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Signing context for duties which don't require slot/blockNumber
|
|
66
|
+
* as they don't need HA protection (AUTH_REQUEST, TXS).
|
|
67
|
+
*/
|
|
68
|
+
export interface NoHAProtectionSigningContext {
|
|
69
|
+
dutyType: DutyType.AUTH_REQUEST | DutyType.TXS;
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Signing contexts that require HA protection (excludes AUTH_REQUEST).
|
|
73
|
+
* Used by the HA signer's signWithProtection method.
|
|
74
|
+
*/
|
|
75
|
+
export type HAProtectedSigningContext = BlockProposalSigningContext | OtherSigningContext | VoteSigningContext;
|
|
76
|
+
/**
|
|
77
|
+
* Type guard to check if a SigningContext requires HA protection.
|
|
78
|
+
* Returns true for contexts that need HA protection, false for AUTH_REQUEST and TXS.
|
|
79
|
+
*/
|
|
80
|
+
export declare function isHAProtectedContext(context: SigningContext): context is HAProtectedSigningContext;
|
|
81
|
+
/**
|
|
82
|
+
* Gets the block number from a signing context.
|
|
83
|
+
* - Vote duties (GOVERNANCE_VOTE, SLASHING_VOTE): returns BlockNumber(0)
|
|
84
|
+
* - Other duties: returns the blockNumber from the context
|
|
85
|
+
*/
|
|
86
|
+
export declare function getBlockNumberFromSigningContext(context: HAProtectedSigningContext): BlockNumber | CheckpointNumber;
|
|
87
|
+
/**
|
|
88
|
+
* Context required for slashing protection during signing operations.
|
|
89
|
+
* Uses discriminated union to enforce type safety:
|
|
90
|
+
* - BLOCK_PROPOSAL duties MUST have blockIndexWithinCheckpoint >= 0
|
|
91
|
+
* - Other duty types do NOT have blockIndexWithinCheckpoint (internally -1)
|
|
92
|
+
* - Vote duties only need slot (blockNumber is internally 0)
|
|
93
|
+
* - AUTH_REQUEST and TXS duties don't need slot/blockNumber (no HA protection needed)
|
|
94
|
+
*/
|
|
95
|
+
export type SigningContext = HAProtectedSigningContext | NoHAProtectionSigningContext;
|
|
39
96
|
/**
|
|
40
97
|
* Database interface for slashing protection operations
|
|
41
98
|
* This abstraction allows for different database implementations (PostgreSQL, SQLite, etc.)
|
|
@@ -92,4 +149,4 @@ export interface SlashingProtectionDatabase {
|
|
|
92
149
|
*/
|
|
93
150
|
close(): Promise<void>;
|
|
94
151
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsV0FBVyxFQUNYLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssVUFBVSxFQUNoQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLElBQUksQ0FBQztBQUUvQixPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxjQUFjLEVBQ25CLEtBQUssT0FBTyxFQUNaLFFBQVEsRUFDUixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN4QixLQUFLLG1CQUFtQixFQUN6QixNQUFNLGVBQWUsQ0FBQztBQUV2QixZQUFZLEVBQ1YsMkJBQTJCLEVBQzNCLG9CQUFvQixFQUNwQixnQkFBZ0IsRUFDaEIsY0FBYyxFQUNkLE9BQU8sRUFDUCxtQkFBbUIsRUFDbkIsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQix1QkFBdUIsR0FDeEIsQ0FBQztBQUNGLE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLCtCQUErQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNHOztHQUVHO0FBQ0gsTUFBTSxXQUFXLG9CQUFvQjtJQUNuQywyRUFBMkU7SUFDM0UsS0FBSyxFQUFFLE9BQU8sQ0FBQztJQUNmLHFEQUFxRDtJQUNyRCxNQUFNLEVBQUUsbUJBQW1CLENBQUM7Q0FDN0I7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakM7OztPQUdHO0lBQ0gsSUFBSSxD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
|