@aztec/validator-client 5.0.0-nightly.20260601 → 5.0.0-nightly.20260611
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 +9 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +9 -1
- package/dest/factory.d.ts +1 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +10 -3
- package/dest/proposal_handler.d.ts +13 -6
- package/dest/proposal_handler.d.ts.map +1 -1
- package/dest/proposal_handler.js +56 -86
- package/dest/validator.d.ts +1 -1
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +11 -4
- package/package.json +19 -19
- package/src/config.ts +16 -3
- package/src/factory.ts +9 -1
- package/src/proposal_handler.ts +49 -96
- package/src/validator.ts +10 -2
package/dest/config.d.ts
CHANGED
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
2
|
+
import { type SequencerConfig } from '@aztec/stdlib/config';
|
|
2
3
|
import type { ValidatorClientConfig } from '@aztec/stdlib/interfaces/server';
|
|
3
4
|
export type { ValidatorClientConfig };
|
|
4
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Default clock-disparity tolerance (ms) for proposal/attestation receive windows, mirroring the p2p config
|
|
7
|
+
* default. Used by the validator-client validators when the merged node config does not carry the value.
|
|
8
|
+
*/
|
|
9
|
+
export declare const DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS = 500;
|
|
10
|
+
export declare const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>>;
|
|
5
11
|
/**
|
|
6
12
|
* Returns the prover configuration from the environment variables.
|
|
7
13
|
* Note: If an environment variable is not set, the default value is used.
|
|
8
14
|
* @returns The validator configuration.
|
|
9
15
|
*/
|
|
10
|
-
export declare function getProverEnvVars(): ValidatorClientConfig
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
export declare function getProverEnvVars(): ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>;
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQU94QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBaUMsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRTdFLFlBQVksRUFBRSxxQkFBcUIsRUFBRSxDQUFDO0FBRXRDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxxQ0FBcUMsTUFBTSxDQUFDO0FBRXpELGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FDNUQscUJBQXFCLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsQ0FBQyxDQStGakUsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBZ0IsZ0JBQWdCLElBQUkscUJBQXFCLEdBQUcsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsQ0FBQyxDQUluRyJ9
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAOxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,eAAe,EAAiC,MAAM,sBAAsB,CAAC;AAE3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAE7E,YAAY,EAAE,qBAAqB,EAAE,CAAC;AAEtC;;;GAGG;AACH,eAAO,MAAM,qCAAqC,MAAM,CAAC;AAEzD,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAC5D,qBAAqB,GAAG,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CA+FjE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,GAAG,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAInG"}
|
package/dest/config.js
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
|
-
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, secretValueConfigHelper } from '@aztec/foundation/config';
|
|
1
|
+
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings, secretValueConfigHelper } from '@aztec/foundation/config';
|
|
2
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import { sharedSequencerConfigMappings } from '@aztec/stdlib/config';
|
|
3
4
|
import { localSignerConfigMappings, validatorHASignerConfigMappings } from '@aztec/stdlib/ha-signing';
|
|
5
|
+
/**
|
|
6
|
+
* Default clock-disparity tolerance (ms) for proposal/attestation receive windows, mirroring the p2p config
|
|
7
|
+
* default. Used by the validator-client validators when the merged node config does not carry the value.
|
|
8
|
+
*/ export const DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS = 500;
|
|
4
9
|
export const validatorClientConfigMappings = {
|
|
10
|
+
...pickConfigMappings(sharedSequencerConfigMappings, [
|
|
11
|
+
'blockDurationMs'
|
|
12
|
+
]),
|
|
5
13
|
validatorPrivateKeys: {
|
|
6
14
|
env: 'VALIDATOR_PRIVATE_KEYS',
|
|
7
15
|
description: 'List of private keys of the validators participating in attestation duties',
|
package/dest/factory.d.ts
CHANGED
|
@@ -38,4 +38,4 @@ export declare function createValidatorClient(config: ValidatorClientFullConfig,
|
|
|
38
38
|
reexecutionTracker: CheckpointReexecutionTracker;
|
|
39
39
|
slashingProtectionDb?: SlashingProtectionDatabase;
|
|
40
40
|
}): Promise<ValidatorClient> | undefined;
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEVBQTBCLEtBQUssU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3BFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzdFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDekcsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRW5GLE9BQU8sS0FBSyxFQUFFLDBCQUEwQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHMUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRCx3QkFBZ0IscUJBQXFCLENBQ25DLE1BQU0sRUFBRSx5QkFBeUIsRUFDakMsSUFBSSxFQUFFO0lBQ0osa0JBQWtCLEVBQUUsMEJBQTBCLENBQUM7SUFDL0MsVUFBVSxFQUFFLHNCQUFzQixDQUFDO0lBQ25DLFdBQVcsRUFBRSxhQUFhLEdBQUcsV0FBVyxDQUFDO0lBQ3pDLG1CQUFtQixFQUFFLG1CQUFtQixDQUFDO0lBQ3pDLFNBQVMsRUFBRSxTQUFTLENBQUM7SUFDckIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLGtCQUFrQixFQUFFLDRCQUE0QixDQUFDO0NBQ2xELG1CQWtDRjtBQUVELHdCQUFnQixxQkFBcUIsQ0FDbkMsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxJQUFJLEVBQUU7SUFDSixrQkFBa0IsRUFBRSwwQkFBMEIsQ0FBQztJQUMvQyxVQUFVLEVBQUUsc0JBQXNCLENBQUM7SUFDbkMsU0FBUyxFQUFFLFNBQVMsQ0FBQztJQUNyQixXQUFXLEVBQUUsYUFBYSxHQUFHLFdBQVcsQ0FBQztJQUN6QyxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztJQUN6QyxTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLFlBQVksRUFBRSxZQUFZLENBQUM7SUFDM0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixlQUFlLEVBQUUsZUFBZSxHQUFHLFNBQVMsQ0FBQztJQUM3QyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDaEMsa0JBQWtCLEVBQUUsNEJBQTRCLENBQUM7SUFDakQsb0JBQW9CLENBQUMsRUFBRSwwQkFBMEIsQ0FBQztDQUNuRCx3Q0F1QkYifQ==
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,KAAK,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAEnF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAG1E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,yBAAyB,EACjC,IAAI,EAAE;IACJ,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,UAAU,EAAE,sBAAsB,CAAC;IACnC,WAAW,EAAE,aAAa,GAAG,WAAW,CAAC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,eAAe,CAAC;IAC3B,kBAAkB,EAAE,4BAA4B,CAAC;CAClD,mBAkCF;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,yBAAyB,EACjC,IAAI,EAAE;IACJ,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,UAAU,EAAE,sBAAsB,CAAC;IACnC,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,aAAa,GAAG,WAAW,CAAC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,4BAA4B,CAAC;IACjD,oBAAoB,CAAC,EAAE,0BAA0B,CAAC;CACnD,wCAuBF"}
|
package/dest/factory.js
CHANGED
|
@@ -1,19 +1,26 @@
|
|
|
1
1
|
import { BlockProposalValidator } from '@aztec/p2p';
|
|
2
|
+
import { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
3
|
+
import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
|
|
2
4
|
import { ValidatorMetrics } from './metrics.js';
|
|
3
5
|
import { ProposalHandler } from './proposal_handler.js';
|
|
4
6
|
import { ValidatorClient } from './validator.js';
|
|
5
7
|
export function createProposalHandler(config, deps) {
|
|
6
8
|
const metrics = new ValidatorMetrics(deps.telemetry);
|
|
7
|
-
const
|
|
9
|
+
const consensusTimetable = new ConsensusTimetable({
|
|
10
|
+
l1Constants: deps.epochCache.getL1Constants(),
|
|
11
|
+
blockDuration: config.blockDurationMs !== undefined ? config.blockDurationMs / 1000 : undefined
|
|
12
|
+
});
|
|
13
|
+
const blockProposalValidator = new BlockProposalValidator(deps.epochCache, consensusTimetable, {
|
|
8
14
|
txsPermitted: !config.disableTransactions,
|
|
9
15
|
maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
|
|
10
16
|
maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
|
|
11
17
|
signatureContext: {
|
|
12
18
|
chainId: config.l1ChainId,
|
|
13
19
|
rollupAddress: config.rollupAddress
|
|
14
|
-
}
|
|
20
|
+
},
|
|
21
|
+
clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS
|
|
15
22
|
});
|
|
16
|
-
return new ProposalHandler(deps.checkpointsBuilder, deps.worldState, deps.blockSource, deps.l1ToL2MessageSource, deps.p2pClient.getTxProvider(), blockProposalValidator, deps.epochCache, config, deps.blobClient, deps.reexecutionTracker, metrics, deps.dateProvider, deps.telemetry, undefined);
|
|
23
|
+
return new ProposalHandler(deps.checkpointsBuilder, deps.worldState, deps.blockSource, deps.l1ToL2MessageSource, deps.p2pClient.getTxProvider(), blockProposalValidator, deps.epochCache, consensusTimetable, config, deps.blobClient, deps.reexecutionTracker, metrics, deps.dateProvider, deps.telemetry, undefined);
|
|
17
24
|
}
|
|
18
25
|
export function createValidatorClient(config, deps) {
|
|
19
26
|
if (config.disableValidator || !deps.keyStoreManager) {
|
|
@@ -12,11 +12,12 @@ import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
|
|
|
12
12
|
import type { ITxProvider, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
13
13
|
import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
14
14
|
import type { BlockProposal, CheckpointProposalCore } from '@aztec/stdlib/p2p';
|
|
15
|
+
import type { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
15
16
|
import type { FailedTx, Tx } from '@aztec/stdlib/tx';
|
|
16
17
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
17
18
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
18
19
|
import type { ValidatorMetrics } from './metrics.js';
|
|
19
|
-
export type BlockProposalValidationFailureReason = 'invalid_signature' | 'invalid_proposal' | 'parent_block_not_found' | '
|
|
20
|
+
export type BlockProposalValidationFailureReason = 'invalid_signature' | 'invalid_proposal' | 'parent_block_not_found' | 'parent_block_wrong_slot' | 'in_hash_mismatch' | 'global_variables_mismatch' | 'block_number_already_exists' | 'txs_not_available' | 'state_mismatch' | 'failed_txs' | 'initial_state_mismatch' | 'timeout' | 'block_proposal_beyond_checkpoint' | 'checkpoint_proposal_equivocation' | 'unknown_error';
|
|
20
21
|
type ReexecuteTransactionsResult = {
|
|
21
22
|
block: L2Block;
|
|
22
23
|
failedTxs: FailedTx[];
|
|
@@ -56,6 +57,7 @@ export declare class ProposalHandler {
|
|
|
56
57
|
private txProvider;
|
|
57
58
|
private blockProposalValidator;
|
|
58
59
|
private epochCache;
|
|
60
|
+
private timetable;
|
|
59
61
|
private config;
|
|
60
62
|
private blobClient;
|
|
61
63
|
private reexecutionTracker;
|
|
@@ -74,7 +76,7 @@ export declare class ProposalHandler {
|
|
|
74
76
|
/** P2P proposal pool access for deciding when retained proposals should block archiver processing. */
|
|
75
77
|
private p2pClient?;
|
|
76
78
|
private checkpointProposalValidationFailureCallback?;
|
|
77
|
-
constructor(checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, blockProposalValidator: BlockProposalValidator, epochCache: EpochCache, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, reexecutionTracker: CheckpointReexecutionTracker, metrics?: ValidatorMetrics | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
|
|
79
|
+
constructor(checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, blockProposalValidator: BlockProposalValidator, epochCache: EpochCache, timetable: ConsensusTimetable, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, reexecutionTracker: CheckpointReexecutionTracker, metrics?: ValidatorMetrics | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
|
|
78
80
|
updateConfig(config: Partial<ValidatorClientFullConfig>): void;
|
|
79
81
|
setCheckpointProposalValidationFailureCallback(callback?: CheckpointProposalValidationFailureCallback): void;
|
|
80
82
|
/**
|
|
@@ -97,7 +99,7 @@ export declare class ProposalHandler {
|
|
|
97
99
|
* @param archiver - Archiver reference for setting proposed checkpoints (pipelining)
|
|
98
100
|
* @param getOwnValidatorAddresses - Returns current validator addresses for own-proposal detection
|
|
99
101
|
*/
|
|
100
|
-
register(p2pClient: P2P, shouldReexecute: boolean, archiver?: Pick<Archiver, 'addProposedCheckpoint'>, getOwnValidatorAddresses?: () => string[]): ProposalHandler;
|
|
102
|
+
register(p2pClient: P2P, shouldReexecute: boolean, archiver?: Pick<Archiver, 'addProposedCheckpoint' | 'getProposedCheckpointData'>, getOwnValidatorAddresses?: () => string[]): ProposalHandler;
|
|
101
103
|
handleBlockProposal(proposal: BlockProposal, proposalSender: PeerId, shouldReexecute: boolean): Promise<BlockProposalValidationResult>;
|
|
102
104
|
private validateNewBlockInSlot;
|
|
103
105
|
private getParentBlock;
|
|
@@ -108,8 +110,13 @@ export declare class ProposalHandler {
|
|
|
108
110
|
* @returns A failure result if validation fails, undefined if validation passes
|
|
109
111
|
*/
|
|
110
112
|
private validateNonFirstBlockInCheckpoint;
|
|
113
|
+
/**
|
|
114
|
+
* Hard re-execution/validation deadline for any block or checkpoint proposal targeting `slotNumber`:
|
|
115
|
+
* the single consensus `attestation_deadline` (`target_slot_start + S - 2E`). This is the latest the
|
|
116
|
+
* checkpoint can land on L1 in the target slot; all nodes agree on it. Loosened from the previous
|
|
117
|
+
* next-wall-clock-slot-boundary bound (see the timetable spec / refactor notes).
|
|
118
|
+
*/
|
|
111
119
|
private getReexecutionDeadline;
|
|
112
|
-
private waitForBlockSourceSync;
|
|
113
120
|
private getReexecuteFailureReason;
|
|
114
121
|
reexecuteTransactions(proposal: BlockProposal, blockNumber: BlockNumber, checkpointNumber: CheckpointNumber, txs: Tx[], l1ToL2Messages: Fr[], previousCheckpointOutHashes: Fr[]): Promise<ReexecuteTransactionsResult>;
|
|
115
122
|
/**
|
|
@@ -129,7 +136,7 @@ export declare class ProposalHandler {
|
|
|
129
136
|
protected tryUploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): void;
|
|
130
137
|
/** Uploads blobs for a checkpoint to the filestore. */
|
|
131
138
|
protected uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void>;
|
|
132
|
-
private
|
|
139
|
+
private setProposedCheckpoint;
|
|
133
140
|
}
|
|
134
141
|
export {};
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfaGFuZGxlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Byb3Bvc2FsX2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDaEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUdyRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVyRCxPQUFPLEVBQ0wsV0FBVyxFQUNYLGdCQUFnQixFQUVoQixVQUFVLEVBQ1gsTUFBTSxpQ0FBaUMsQ0FBQztBQUV6QyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHckQsT0FBTyxFQUFFLFlBQVksRUFBUyxNQUFNLHlCQUF5QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDOUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQWEsT0FBTyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBc0IsTUFBTSwwQkFBMEIsQ0FBQztBQUlqRyxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUseUJBQXlCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0SCxPQUFPLEVBQ0wsS0FBSyxtQkFBbUIsRUFHekIsTUFBTSx5QkFBeUIsQ0FBQztBQUNqQyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQXlCLHNCQUFzQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDdEcsT0FBTyxLQUFLLEVBQUUsa0JBQWtC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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal_handler.d.ts","sourceRoot":"","sources":["../src/proposal_handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EACL,WAAW,EACX,gBAAgB,EAEhB,UAAU,EACX,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAE,YAAY,EAAS,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAa,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,EAAE,4BAA4B,EAAsB,MAAM,0BAA0B,CAAC;AAIjG,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACtH,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAyB,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"proposal_handler.d.ts","sourceRoot":"","sources":["../src/proposal_handler.ts"],"names":[],"mappings":"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"}
|
package/dest/proposal_handler.js
CHANGED
|
@@ -66,7 +66,7 @@ function _ts_dispose_resources(env) {
|
|
|
66
66
|
import { encodeCheckpointBlobDataFromBlocks, getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
67
67
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
|
|
68
68
|
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
69
|
-
import { BlockNumber, CheckpointNumber
|
|
69
|
+
import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
|
|
70
70
|
import { pick } from '@aztec/foundation/collection';
|
|
71
71
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
72
72
|
import { TimeoutError } from '@aztec/foundation/error';
|
|
@@ -74,7 +74,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
74
74
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
75
75
|
import { DateProvider, Timer } from '@aztec/foundation/timer';
|
|
76
76
|
import { getPreviousCheckpointOutHashes, validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
77
|
-
import { getEpochAtSlot
|
|
77
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
78
78
|
import { Gas } from '@aztec/stdlib/gas';
|
|
79
79
|
import { accumulateCheckpointOutHashes, computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
|
|
80
80
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
@@ -106,6 +106,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
106
106
|
txProvider;
|
|
107
107
|
blockProposalValidator;
|
|
108
108
|
epochCache;
|
|
109
|
+
timetable;
|
|
109
110
|
config;
|
|
110
111
|
blobClient;
|
|
111
112
|
reexecutionTracker;
|
|
@@ -120,7 +121,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
120
121
|
/** Returns current validator addresses for own-proposal detection. Set via register(). */ getOwnValidatorAddresses;
|
|
121
122
|
/** P2P proposal pool access for deciding when retained proposals should block archiver processing. */ p2pClient;
|
|
122
123
|
checkpointProposalValidationFailureCallback;
|
|
123
|
-
constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, reexecutionTracker, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:proposal-handler')){
|
|
124
|
+
constructor(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, timetable, config, blobClient, reexecutionTracker, metrics, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator:proposal-handler')){
|
|
124
125
|
this.checkpointsBuilder = checkpointsBuilder;
|
|
125
126
|
this.worldState = worldState;
|
|
126
127
|
this.blockSource = blockSource;
|
|
@@ -128,6 +129,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
128
129
|
this.txProvider = txProvider;
|
|
129
130
|
this.blockProposalValidator = blockProposalValidator;
|
|
130
131
|
this.epochCache = epochCache;
|
|
132
|
+
this.timetable = timetable;
|
|
131
133
|
this.config = config;
|
|
132
134
|
this.blobClient = blobClient;
|
|
133
135
|
this.reexecutionTracker = reexecutionTracker;
|
|
@@ -221,23 +223,29 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
221
223
|
this.log.warn(`Escape hatch open for slot ${proposal.slotNumber}, skipping checkpoint proposal validation`, proposalInfo);
|
|
222
224
|
return undefined;
|
|
223
225
|
}
|
|
224
|
-
//
|
|
225
|
-
//
|
|
226
|
-
//
|
|
227
|
-
//
|
|
228
|
-
//
|
|
226
|
+
// A proposal is "own" when it was signed by a validator key this node also owns. The true local
|
|
227
|
+
// proposer already built, validated, and stored this checkpoint before broadcasting, so a matching
|
|
228
|
+
// proposed checkpoint is already in its archiver — skip the redundant re-validation. An HA peer that
|
|
229
|
+
// shares the proposer's keys sees the same "own" proposal over gossip but never built it, so it has
|
|
230
|
+
// nothing stored; it falls through to the normal validate-and-persist path below to hydrate the
|
|
231
|
+
// proposed-checkpoint metadata it needs to build the next slot on top of this checkpoint.
|
|
229
232
|
const proposer = proposal.getSender();
|
|
230
233
|
const ownAddresses = this.getOwnValidatorAddresses?.();
|
|
231
234
|
const isOwnProposal = proposer && ownAddresses?.some((addr)=>addr === proposer.toString());
|
|
232
235
|
if (isOwnProposal) {
|
|
233
|
-
|
|
234
|
-
|
|
236
|
+
const existing = await this.archiver?.getProposedCheckpointData({
|
|
237
|
+
slot: proposal.slotNumber
|
|
238
|
+
});
|
|
239
|
+
if (existing?.archive.root.equals(proposal.archive)) {
|
|
240
|
+
this.log.debug(`Skipping sync for existing own checkpoint proposal at slot ${proposal.slotNumber}`);
|
|
241
|
+
return undefined;
|
|
242
|
+
}
|
|
235
243
|
}
|
|
236
244
|
const result = await this.handleCheckpointProposal(proposal, proposalInfo);
|
|
237
245
|
if (!result.isValid) {
|
|
238
246
|
await this.checkpointProposalValidationFailureCallback?.(proposal, result, proposalInfo);
|
|
239
|
-
} else if (this.archiver
|
|
240
|
-
const set = await this.
|
|
247
|
+
} else if (this.archiver) {
|
|
248
|
+
const set = await this.setProposedCheckpoint(proposal);
|
|
241
249
|
if (set) {
|
|
242
250
|
this.metrics?.recordCheckpointProposalToPipelinedStateDuration(pipeliningTimer.ms());
|
|
243
251
|
}
|
|
@@ -255,7 +263,6 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
255
263
|
async handleBlockProposal(proposal, proposalSender, shouldReexecute) {
|
|
256
264
|
const slotNumber = proposal.slotNumber;
|
|
257
265
|
const proposer = proposal.getSender();
|
|
258
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
259
266
|
// Reject proposals with invalid signatures
|
|
260
267
|
if (!proposer) {
|
|
261
268
|
this.log.warn(`Received proposal with invalid signature for slot ${slotNumber}`);
|
|
@@ -297,23 +304,9 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
297
304
|
reason: retainedSlotValidation.reason
|
|
298
305
|
};
|
|
299
306
|
}
|
|
300
|
-
//
|
|
301
|
-
//
|
|
302
|
-
//
|
|
303
|
-
// checkpoint prune could remove a block that would conflict with this proposal.
|
|
304
|
-
// When pipelining is enabled, the proposer builds ahead of L1 submission, so the
|
|
305
|
-
// block source won't have synced to the proposed slot yet. Skip the sync wait to
|
|
306
|
-
// avoid eating into the attestation window.
|
|
307
|
-
if (!this.epochCache.isProposerPipeliningEnabled()) {
|
|
308
|
-
const blockSourceSync = await this.waitForBlockSourceSync(slotNumber);
|
|
309
|
-
if (!blockSourceSync) {
|
|
310
|
-
this.log.warn(`Block source is not synced, skipping processing`, proposalInfo);
|
|
311
|
-
return {
|
|
312
|
-
isValid: false,
|
|
313
|
-
reason: 'block_source_not_synced'
|
|
314
|
-
};
|
|
315
|
-
}
|
|
316
|
-
}
|
|
307
|
+
// The proposer builds ahead of L1 submission under pipelining, so the block source won't have
|
|
308
|
+
// synced to the proposed slot yet. We deliberately do not wait for it to sync here, to avoid
|
|
309
|
+
// eating into the attestation window.
|
|
317
310
|
// Check that the parent proposal is a block we know, otherwise reexecution would fail.
|
|
318
311
|
// If we don't find it immediately, we keep retrying for a while; it may be we still
|
|
319
312
|
// need to process other block proposals to get to it.
|
|
@@ -356,7 +349,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
356
349
|
// and we do it even if we don't plan to re-execute the txs, so that we have them if another node needs them.
|
|
357
350
|
const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
|
|
358
351
|
pinnedPeer: proposalSender,
|
|
359
|
-
deadline: this.getReexecutionDeadline(slotNumber
|
|
352
|
+
deadline: this.getReexecutionDeadline(slotNumber)
|
|
360
353
|
});
|
|
361
354
|
// Record the tx-collection outcome on the re-execution tracker
|
|
362
355
|
this.reexecutionTracker.recordTxsCollected(slotNumber, proposal.indexWithinCheckpoint, missingTxs.length === 0);
|
|
@@ -416,7 +409,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
416
409
|
epoch,
|
|
417
410
|
checkpointNumber,
|
|
418
411
|
l1Constants: this.epochCache.getL1Constants(),
|
|
419
|
-
pipeliningEnabled:
|
|
412
|
+
pipeliningEnabled: true,
|
|
420
413
|
log: this.log
|
|
421
414
|
});
|
|
422
415
|
// Try re-executing the transactions in the proposal if needed
|
|
@@ -477,20 +470,21 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
477
470
|
}
|
|
478
471
|
async getParentBlock(proposal) {
|
|
479
472
|
const parentArchive = proposal.blockHeader.lastArchive.root;
|
|
480
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
481
473
|
const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
|
|
482
474
|
if (parentArchive.equals(genesisArchiveRoot)) {
|
|
483
475
|
return 'genesis';
|
|
484
476
|
}
|
|
485
|
-
const deadline = this.getReexecutionDeadline(proposal.slotNumber
|
|
486
|
-
const
|
|
487
|
-
const timeoutDurationMs = deadline.getTime() - currentTime;
|
|
477
|
+
const deadline = this.getReexecutionDeadline(proposal.slotNumber);
|
|
478
|
+
const timeoutDurationMs = deadline.getTime() - this.dateProvider.now();
|
|
488
479
|
try {
|
|
489
480
|
return await this.blockSource.getBlockData({
|
|
490
481
|
archive: parentArchive
|
|
491
482
|
}) ?? (timeoutDurationMs <= 0 ? undefined : await retryUntil(()=>this.blockSource.syncImmediate().then(()=>this.blockSource.getBlockData({
|
|
492
483
|
archive: parentArchive
|
|
493
|
-
})), 'force archiver sync',
|
|
484
|
+
})), 'force archiver sync', {
|
|
485
|
+
deadline,
|
|
486
|
+
dateProvider: this.dateProvider
|
|
487
|
+
}, 0.5));
|
|
494
488
|
} catch (err) {
|
|
495
489
|
if (err instanceof TimeoutError) {
|
|
496
490
|
this.log.debug(`Timed out getting parent block by archive root`, {
|
|
@@ -632,40 +626,13 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
632
626
|
}
|
|
633
627
|
return undefined;
|
|
634
628
|
}
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
/** Waits for the block source to sync L1 data up to at least the slot before the given one. */ async waitForBlockSourceSync(slot) {
|
|
643
|
-
const deadline = this.getReexecutionDeadline(slot, this.checkpointsBuilder.getConfig());
|
|
644
|
-
const timeoutMs = deadline.getTime() - this.dateProvider.now();
|
|
645
|
-
if (slot === 0) {
|
|
646
|
-
return true;
|
|
647
|
-
}
|
|
648
|
-
// Make a quick check before triggering an archiver sync
|
|
649
|
-
// If we are pipelining and have a pending checkpoint number stored, we will allow the block proposal to be for a slot further
|
|
650
|
-
const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
|
|
651
|
-
if (syncedSlot !== undefined && syncedSlot + 1 + this.epochCache.pipeliningOffset() >= slot) {
|
|
652
|
-
return true;
|
|
653
|
-
}
|
|
654
|
-
try {
|
|
655
|
-
// Trigger an immediate sync of the block source, and wait until it reports being synced to the required slot
|
|
656
|
-
return await retryUntil(async ()=>{
|
|
657
|
-
await this.blockSource.syncImmediate();
|
|
658
|
-
const updatedSyncedSlot = await this.blockSource.getSyncedL2SlotNumber();
|
|
659
|
-
return updatedSyncedSlot !== undefined && updatedSyncedSlot + 1 >= slot;
|
|
660
|
-
}, 'wait for block source sync', timeoutMs / 1000, 0.5);
|
|
661
|
-
} catch (err) {
|
|
662
|
-
if (err instanceof TimeoutError) {
|
|
663
|
-
this.log.warn(`Timed out waiting for block source to sync to slot ${slot}`);
|
|
664
|
-
return false;
|
|
665
|
-
} else {
|
|
666
|
-
throw err;
|
|
667
|
-
}
|
|
668
|
-
}
|
|
629
|
+
/**
|
|
630
|
+
* Hard re-execution/validation deadline for any block or checkpoint proposal targeting `slotNumber`:
|
|
631
|
+
* the single consensus `attestation_deadline` (`target_slot_start + S - 2E`). This is the latest the
|
|
632
|
+
* checkpoint can land on L1 in the target slot; all nodes agree on it. Loosened from the previous
|
|
633
|
+
* next-wall-clock-slot-boundary bound (see the timetable spec / refactor notes).
|
|
634
|
+
*/ getReexecutionDeadline(slotNumber) {
|
|
635
|
+
return new Date(this.timetable.getAttestationDeadline(slotNumber) * 1000);
|
|
669
636
|
}
|
|
670
637
|
getReexecuteFailureReason(err) {
|
|
671
638
|
if (err instanceof TransactionsNotAvailableError) {
|
|
@@ -725,7 +692,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
725
692
|
// Create checkpoint builder with prior blocks
|
|
726
693
|
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, 0n, l1ToL2Messages, previousCheckpointOutHashes, fork, priorBlocks, this.log.getBindings());
|
|
727
694
|
// Build the new block
|
|
728
|
-
const deadline = this.getReexecutionDeadline(slot
|
|
695
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
729
696
|
const maxBlockGas = this.config.validateMaxL2BlockGas !== undefined || this.config.validateMaxDABlockGas !== undefined ? new Gas(this.config.validateMaxDABlockGas ?? Infinity, this.config.validateMaxL2BlockGas ?? Infinity) : undefined;
|
|
730
697
|
const result = await checkpointBuilder.buildBlock(txs, blockNumber, blockHeader.globalVariables.timestamp, {
|
|
731
698
|
isBuildingProposal: false,
|
|
@@ -848,14 +815,14 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
848
815
|
};
|
|
849
816
|
try {
|
|
850
817
|
const slot = proposal.slotNumber;
|
|
851
|
-
// Block-sync deadline = the
|
|
852
|
-
//
|
|
853
|
-
//
|
|
854
|
-
//
|
|
855
|
-
const
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
//
|
|
818
|
+
// Block-sync/validation deadline = the single consensus attestation_deadline (target_slot_start + S
|
|
819
|
+
// - 2E): the latest moment the proposer can submit this checkpoint and still have it land on L1 in
|
|
820
|
+
// the target slot. Keeping validation/attestation alive until then lets validators keep attesting
|
|
821
|
+
// right up to the proposer's real publish cutoff.
|
|
822
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
823
|
+
// Wait for last block to sync by archive. The deadline is passed to retryUntil as an absolute date so
|
|
824
|
+
// the remaining budget is derived from the date provider; a deadline already in the past times out
|
|
825
|
+
// after a single attempt instead of looping (the immediate-timeout semantics of the deadline overload).
|
|
859
826
|
let lastBlockData;
|
|
860
827
|
try {
|
|
861
828
|
lastBlockData = await retryUntil(async ()=>{
|
|
@@ -863,7 +830,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
863
830
|
return await this.blockSource.getBlockData({
|
|
864
831
|
archive: proposal.archive
|
|
865
832
|
});
|
|
866
|
-
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
|
|
833
|
+
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, {
|
|
834
|
+
deadline,
|
|
835
|
+
dateProvider: this.dateProvider
|
|
836
|
+
}, 0.5);
|
|
867
837
|
} catch (err) {
|
|
868
838
|
if (err instanceof TimeoutError) {
|
|
869
839
|
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
@@ -950,7 +920,7 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
950
920
|
epoch,
|
|
951
921
|
checkpointNumber,
|
|
952
922
|
l1Constants: this.epochCache.getL1Constants(),
|
|
953
|
-
pipeliningEnabled:
|
|
923
|
+
pipeliningEnabled: true,
|
|
954
924
|
log: this.log
|
|
955
925
|
});
|
|
956
926
|
// Fork world state at the block before the first block
|
|
@@ -1082,10 +1052,10 @@ import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
|
1082
1052
|
}
|
|
1083
1053
|
}
|
|
1084
1054
|
/**
|
|
1085
|
-
* Derives proposed checkpoint data from validated blocks and sets it on the archiver
|
|
1086
|
-
*
|
|
1087
|
-
*
|
|
1088
|
-
*/ async
|
|
1055
|
+
* Derives proposed checkpoint data from validated blocks and sets it on the archiver, so this node can
|
|
1056
|
+
* pipeline building on top of the checkpoint. Does not retry, since validation already waited for the
|
|
1057
|
+
* last block to sync.
|
|
1058
|
+
*/ async setProposedCheckpoint(proposal) {
|
|
1089
1059
|
if (!this.archiver) {
|
|
1090
1060
|
return false;
|
|
1091
1061
|
}
|
package/dest/validator.d.ts
CHANGED
|
@@ -128,4 +128,4 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
128
128
|
private handleAuthRequest;
|
|
129
129
|
}
|
|
130
130
|
export {};
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUFFLGdCQUFnQixFQUFlLHFCQUFxQixFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25ILE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRSxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHaEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFtRCxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRS9GLE9BQU8sRUFJTCxLQUFLLE9BQU8sRUFDWixLQUFLLGNBQWMsRUFFcEIsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4QixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkcsT0FBTyxLQUFLLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RSxPQUFPLEtBQUssRUFDVixXQUFXLEVBQ1gsU0FBUyxFQUNULHlCQUF5QixFQUN6QixzQkFBc0IsRUFDdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ25FLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxvQkFBb0IsRUFDekIsS0FBSyxxQkFBcUIsRUFDMUIsa0JBQWtCLEVBQ2xCLEtBQUssc0JBQXNCLEVBQzNCLEtBQUsseUJBQXlCLEVBRS9CLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFeEQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLEtBQUssTUFBTSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBTWhHLE9BQU8sRUFBWSxLQUFLLGNBQWMsRUFBRSxLQUFLLDBCQUEwQixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDbEgsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxnREFBZ0QsQ0FBQztBQUd4RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBSTFFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHMUUsT0FBTyxFQUlMLGVBQWUsRUFDaEIsTUFBTSx1QkFBdUIsQ0FBQzs7QUF1Qy9COztHQUVHO0FBQ0gscUJBQWEsZUFBZ0IsU0FBUSxvQkFBMkMsWUFBVyxTQUFTLEVBQUUsT0FBTztJQTZCekcsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLFNBQVM7SUFDakIsT0FBTyxDQUFDLGVBQWU7SUFDdkIsT0FBTyxDQUFDLFdBQVc7SUFDbkIsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsVUFBVTtJQUNsQixPQUFPLENBQUMsbUJBQW1CO0lBQzNCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLHdCQUF3QjtJQUNoQyxPQUFPLENBQUMsWUFBWTtJQXZDdEIsU0FBZ0IsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUMvQixPQUFPLENBQUMsaUJBQWlCLENBQW9CO0lBQzdDLE9BQU8sQ0FBQyxPQUFPLENBQW1CO0lBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFFcEIsT0FBTyxDQUFDLHFCQUFxQixDQUFTO0lBRXRDLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0FBZ0I7SUFFMUMsc0RBQXNEO0lBQ3RELE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxDQUFxQjtJQUVwRCxPQUFPLENBQUMsK0JBQStCLENBQTBCO0lBQ2pFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBaUI7SUFDN0Msb0dBQW9HO0lBQ3BHLE9BQU8sQ0FBQywyQkFBMkIsQ0FBdUM7SUFFMUUsT0FBTyxDQUFDLHdCQUF3QixDQUE4RDtJQUM5RixPQUFPLENBQUMseUJBQXlCLENBQXFFO0lBQ3RHLE9BQU8sQ0FBQyxvQ0FBb0MsQ0FBdUU7SUFDbkgsT0FBTyxDQUFDLHlCQUF5QixDQUEyRDtJQUM1RixPQUFPLENBQUMsNkJBQTZCLENBQXFFO0lBRTFHLG1GQUFtRjtJQUNuRixPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBeUI7SUFFdEQsU0FBUyxhQUNDLFFBQVEsRUFBRSx5QkFBeUIsRUFDbkMsVUFBVSxFQUFFLFVBQVUsRUFDdEIsU0FBUyxFQUFFLEdBQUcsRUFDZCxlQUFlLEVBQUUsZUFBZSxFQUNoQyxXQUFXLEVBQUUsYUFBYSxFQUMxQixrQkFBa0IsRUFBRSwwQkFBMEIsRUFDOUMsVUFBVSxFQUFFLHNCQUFzQixFQUNsQyxtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLHdCQUF3QixFQUFFLGlCQUFpQixFQUMzQyxZQUFZLEdBQUUsWUFBaUMsRUFDdkQsU0FBUyxHQUFFLGVBQXNDLEVBQ2pELEdBQUcsU0FBNEIsRUF1QmhDO0lBRUQsT0FBYyw2QkFBNkIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLE1BQU0sQ0FBQyxFQUFFLE1BQU0sUUF1QjVGO1lBRWEsMEJBQTBCO0lBNEJ4QyxPQUFhLEdBQUcsQ0FDZCxNQUFNLEVBQUUseUJBQXlCLEVBQ2pDLGtCQUFrQixFQUFFLDBCQUEwQixFQUM5QyxVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFNBQVMsRUFBRSxHQUFHLEVBQ2QsV0FBVyxFQUFFLGFBQWEsR0FBRyxXQUFXLEVBQ3hDLG1CQUFtQixFQUFFLG1CQUFtQixFQUN4QyxVQUFVLEVBQUUsV0FBVyxFQUN2QixlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsbUJBQW1CLEVBQy9CLGtCQUFrQixFQUFFLDRCQUE0QixFQUNoRCxZQUFZLEdBQUUsWUFBaUMsRUFDL0MsU0FBUyxHQUFFLGVBQXNDLEVBQ2pELG9CQUFvQixDQUFDLEVBQUUsMEJBQTBCLDRCQWtGbEQ7SUFFTSxxQkFBcUIsaUJBSTNCO0lBRU0sa0JBQWtCLG9CQUV4QjtJQUVNLGVBQWUsQ0FBQyxJQUFJLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxtQkFBbUIsRUFBRSxPQUFPLEVBQUUsY0FBYyxzQkFFekY7SUFFRCxPQUFPLENBQUMsbUJBQW1CO0lBT3BCLHNCQUFzQixDQUFDLFFBQVEsRUFBRSxVQUFVLEdBQUcsVUFBVSxDQUU5RDtJQUVNLDBCQUEwQixDQUFDLFFBQVEsRUFBRSxVQUFVLEdBQUcsWUFBWSxDQUVwRTtJQUVNLFNBQVMsSUFBSSx5QkFBeUIsQ0FFNUM7SUFFTSx1QkFBdUIsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FFOUQ7SUFFTSxtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FFMUQ7SUFFTSxZQUFZLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxRQUc3RDtJQUVNLGNBQWMsQ0FBQyxVQUFVLEVBQUUsZUFBZSxHQUFHLElBQUksQ0FRdkQ7SUFFWSxLQUFLLGtCQW1CakI7SUFFWSxJQUFJLGtCQUdoQjtJQUVELDBDQUEwQztJQUM3QixnQkFBZ0Isa0JBc0M1QjtJQUVEOzs7O09BSUc7SUFDRyxxQkFBcUIsQ0FBQyxRQUFRLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXVGN0Y7SUFFRDs7Ozs7T0FLRztJQUNHLDBCQUEwQixDQUM5QixRQUFRLEVBQUUsc0JBQXNCLEVBQ2hDLGVBQWUsRUFBRSxNQUFNLEdBQ3RCLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQTZHOUM7SUFFRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsa0JBQWtCO1lBaUJaLHdDQUF3QztJQW1CdEQ7O09BRUc7SUFDSCxVQUFnQix3QkFBd0IsQ0FBQyxRQUFRLEVBQUUsc0JBQXNCLEVBQUUsWUFBWSxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBd0IvRztJQUVELE9BQU8sQ0FBQyxpQkFBaUI7SUFxQnpCLE9BQU8sQ0FBQywrQkFBK0I7SUFxQnZDLE9BQU8sQ0FBQyw4QkFBOEI7SUEyQnRDLE9BQU8sQ0FBQyx1QkFBdUI7SUFJL0IsT0FBTyxDQUFDLDJCQUEyQjtJQWtCbkMsT0FBTyxDQUFDLHdDQUF3QztJQXVCaEQ7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLHVCQUF1QjtJQTZCL0I7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLDBCQUEwQjtJQW9CNUIsbUJBQW1CLENBQ3ZCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxxQkFBcUIsRUFBRSxxQkFBcUIsRUFDNUMsTUFBTSxFQUFFLEVBQUUsRUFDVixPQUFPLEVBQUUsRUFBRSxFQUNYLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFDVCxlQUFlLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDdkMsT0FBTyxHQUFFLG9CQUF5QixHQUNqQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBa0N4QjtJQUVLLHdCQUF3QixDQUM1QixnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsT0FBTyxFQUFFLEVBQUUsRUFDWCxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMscUJBQXFCLEVBQUUsTUFBTSxFQUM3QixpQkFBaUIsRUFBRSxhQUFhLEdBQUcsU0FBUyxFQUM1QyxlQUFlLEVBQUUsVUFBVSxHQUFHLFNBQVMsRUFDdkMsT0FBTyxHQUFFLHlCQUE4QixHQUN0QyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FpQzdCO0lBRUssc0JBQXNCLENBQUMsUUFBUSxFQUFFLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRW5FO0lBRUssMEJBQTBCLENBQzlCLHNCQUFzQixFQUFFLCtCQUErQixFQUN2RCxRQUFRLEVBQUUsVUFBVSxFQUNwQixJQUFJLEVBQUUsVUFBVSxFQUNoQixnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FDakMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQU9wQjtJQUVLLHNCQUFzQixDQUMxQixRQUFRLEVBQUUsa0JBQWtCLEVBQzVCLGdCQUFnQixFQUFFLGdCQUFnQixHQUNqQyxPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQWlCbEM7SUFFSyxtQkFBbUIsQ0FDdkIsUUFBUSxFQUFFLGtCQUFrQixFQUM1QixRQUFRLEVBQUUsTUFBTSxFQUNoQixRQUFRLEVBQUUsSUFBSSxFQUNkLGdCQUFnQixFQUFFLGdCQUFnQixHQUNqQyxPQUFPLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQXVEbEM7WUFFYSxpQkFBaUI7Q0F3QmhDIn0=
|
package/dest/validator.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAe,qBAAqB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACnH,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGhF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAmD,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAE/F,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,cAAc,EAEpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,+BAA+B,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACvG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAE7E,OAAO,KAAK,EACV,WAAW,EACX,SAAS,EACT,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,kBAAkB,EAClB,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAE/B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/dest/validator.js
CHANGED
|
@@ -8,11 +8,13 @@ import { DateProvider } from '@aztec/foundation/timer';
|
|
|
8
8
|
import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
|
|
9
9
|
import { OffenseType, WANT_TO_CLEAR_SLASH_EVENT, WANT_TO_SLASH_EVENT, getOffenseTypeName } from '@aztec/slasher';
|
|
10
10
|
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
11
|
+
import { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
11
12
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
12
13
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
13
14
|
import { createHASigner, createLocalSignerWithProtection, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
|
|
14
15
|
import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
15
16
|
import { EventEmitter } from 'events';
|
|
17
|
+
import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
|
|
16
18
|
import { ValidationService } from './duties/validation_service.js';
|
|
17
19
|
import { HAKeyStore } from './key_store/ha_key_store.js';
|
|
18
20
|
import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
|
|
@@ -142,7 +144,11 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
|
|
|
142
144
|
}
|
|
143
145
|
static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, reexecutionTracker, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), slashingProtectionDb) {
|
|
144
146
|
const metrics = new ValidatorMetrics(telemetry);
|
|
145
|
-
const
|
|
147
|
+
const consensusTimetable = new ConsensusTimetable({
|
|
148
|
+
l1Constants: epochCache.getL1Constants(),
|
|
149
|
+
blockDuration: config.blockDurationMs !== undefined ? config.blockDurationMs / 1000 : undefined
|
|
150
|
+
});
|
|
151
|
+
const blockProposalValidator = new BlockProposalValidator(epochCache, consensusTimetable, {
|
|
146
152
|
txsPermitted: !config.disableTransactions,
|
|
147
153
|
maxTxsPerBlock: config.validateMaxTxsPerBlock,
|
|
148
154
|
maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
|
|
@@ -150,9 +156,10 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
|
|
|
150
156
|
signatureContext: {
|
|
151
157
|
chainId: config.l1ChainId,
|
|
152
158
|
rollupAddress: config.rollupAddress
|
|
153
|
-
}
|
|
159
|
+
},
|
|
160
|
+
clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS
|
|
154
161
|
});
|
|
155
|
-
const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
|
|
162
|
+
const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, consensusTimetable, config, blobClient, reexecutionTracker, metrics, dateProvider, telemetry, undefined);
|
|
156
163
|
const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
|
|
157
164
|
let slashingProtectionSigner;
|
|
158
165
|
if (slashingProtectionDb) {
|
|
@@ -369,7 +376,7 @@ const SLASHABLE_CHECKPOINT_PROPOSAL_VALIDATION_RESULT = {
|
|
|
369
376
|
}
|
|
370
377
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
371
378
|
if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
372
|
-
this.log.debug(`
|
|
379
|
+
this.log.debug(`Not attesting to block proposal from self for slot ${proposalSlotNumber}`, {
|
|
373
380
|
proposer: proposer.toString(),
|
|
374
381
|
proposalSlotNumber
|
|
375
382
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/validator-client",
|
|
3
|
-
"version": "5.0.0-nightly.
|
|
3
|
+
"version": "5.0.0-nightly.20260611",
|
|
4
4
|
"main": "dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -64,30 +64,30 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/blob-client": "5.0.0-nightly.
|
|
68
|
-
"@aztec/blob-lib": "5.0.0-nightly.
|
|
69
|
-
"@aztec/constants": "5.0.0-nightly.
|
|
70
|
-
"@aztec/epoch-cache": "5.0.0-nightly.
|
|
71
|
-
"@aztec/ethereum": "5.0.0-nightly.
|
|
72
|
-
"@aztec/foundation": "5.0.0-nightly.
|
|
73
|
-
"@aztec/node-keystore": "5.0.0-nightly.
|
|
74
|
-
"@aztec/noir-protocol-circuits-types": "5.0.0-nightly.
|
|
75
|
-
"@aztec/p2p": "5.0.0-nightly.
|
|
76
|
-
"@aztec/protocol-contracts": "5.0.0-nightly.
|
|
77
|
-
"@aztec/prover-client": "5.0.0-nightly.
|
|
78
|
-
"@aztec/simulator": "5.0.0-nightly.
|
|
79
|
-
"@aztec/slasher": "5.0.0-nightly.
|
|
80
|
-
"@aztec/stdlib": "5.0.0-nightly.
|
|
81
|
-
"@aztec/telemetry-client": "5.0.0-nightly.
|
|
82
|
-
"@aztec/validator-ha-signer": "5.0.0-nightly.
|
|
67
|
+
"@aztec/blob-client": "5.0.0-nightly.20260611",
|
|
68
|
+
"@aztec/blob-lib": "5.0.0-nightly.20260611",
|
|
69
|
+
"@aztec/constants": "5.0.0-nightly.20260611",
|
|
70
|
+
"@aztec/epoch-cache": "5.0.0-nightly.20260611",
|
|
71
|
+
"@aztec/ethereum": "5.0.0-nightly.20260611",
|
|
72
|
+
"@aztec/foundation": "5.0.0-nightly.20260611",
|
|
73
|
+
"@aztec/node-keystore": "5.0.0-nightly.20260611",
|
|
74
|
+
"@aztec/noir-protocol-circuits-types": "5.0.0-nightly.20260611",
|
|
75
|
+
"@aztec/p2p": "5.0.0-nightly.20260611",
|
|
76
|
+
"@aztec/protocol-contracts": "5.0.0-nightly.20260611",
|
|
77
|
+
"@aztec/prover-client": "5.0.0-nightly.20260611",
|
|
78
|
+
"@aztec/simulator": "5.0.0-nightly.20260611",
|
|
79
|
+
"@aztec/slasher": "5.0.0-nightly.20260611",
|
|
80
|
+
"@aztec/stdlib": "5.0.0-nightly.20260611",
|
|
81
|
+
"@aztec/telemetry-client": "5.0.0-nightly.20260611",
|
|
82
|
+
"@aztec/validator-ha-signer": "5.0.0-nightly.20260611",
|
|
83
83
|
"koa": "^2.16.1",
|
|
84
84
|
"koa-router": "^13.1.1",
|
|
85
85
|
"tslib": "^2.4.0",
|
|
86
86
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
87
87
|
},
|
|
88
88
|
"devDependencies": {
|
|
89
|
-
"@aztec/archiver": "5.0.0-nightly.
|
|
90
|
-
"@aztec/world-state": "5.0.0-nightly.
|
|
89
|
+
"@aztec/archiver": "5.0.0-nightly.20260611",
|
|
90
|
+
"@aztec/world-state": "5.0.0-nightly.20260611",
|
|
91
91
|
"@electric-sql/pglite": "^0.3.14",
|
|
92
92
|
"@jest/globals": "^30.0.0",
|
|
93
93
|
"@types/jest": "^30.0.0",
|
package/src/config.ts
CHANGED
|
@@ -4,15 +4,26 @@ import {
|
|
|
4
4
|
getConfigFromMappings,
|
|
5
5
|
numberConfigHelper,
|
|
6
6
|
optionalNumberConfigHelper,
|
|
7
|
+
pickConfigMappings,
|
|
7
8
|
secretValueConfigHelper,
|
|
8
9
|
} from '@aztec/foundation/config';
|
|
9
10
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
11
|
+
import { type SequencerConfig, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
|
|
10
12
|
import { localSignerConfigMappings, validatorHASignerConfigMappings } from '@aztec/stdlib/ha-signing';
|
|
11
13
|
import type { ValidatorClientConfig } from '@aztec/stdlib/interfaces/server';
|
|
12
14
|
|
|
13
15
|
export type { ValidatorClientConfig };
|
|
14
16
|
|
|
15
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Default clock-disparity tolerance (ms) for proposal/attestation receive windows, mirroring the p2p config
|
|
19
|
+
* default. Used by the validator-client validators when the merged node config does not carry the value.
|
|
20
|
+
*/
|
|
21
|
+
export const DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS = 500;
|
|
22
|
+
|
|
23
|
+
export const validatorClientConfigMappings: ConfigMappingsType<
|
|
24
|
+
ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>
|
|
25
|
+
> = {
|
|
26
|
+
...pickConfigMappings(sharedSequencerConfigMappings, ['blockDurationMs']),
|
|
16
27
|
validatorPrivateKeys: {
|
|
17
28
|
env: 'VALIDATOR_PRIVATE_KEYS',
|
|
18
29
|
description: 'List of private keys of the validators participating in attestation duties',
|
|
@@ -112,6 +123,8 @@ export const validatorClientConfigMappings: ConfigMappingsType<ValidatorClientCo
|
|
|
112
123
|
* Note: If an environment variable is not set, the default value is used.
|
|
113
124
|
* @returns The validator configuration.
|
|
114
125
|
*/
|
|
115
|
-
export function getProverEnvVars(): ValidatorClientConfig {
|
|
116
|
-
return getConfigFromMappings<ValidatorClientConfig
|
|
126
|
+
export function getProverEnvVars(): ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'> {
|
|
127
|
+
return getConfigFromMappings<ValidatorClientConfig & Pick<SequencerConfig, 'blockDurationMs'>>(
|
|
128
|
+
validatorClientConfigMappings,
|
|
129
|
+
);
|
|
117
130
|
}
|
package/src/factory.ts
CHANGED
|
@@ -7,10 +7,12 @@ import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
|
7
7
|
import type { CheckpointReexecutionTracker } from '@aztec/stdlib/checkpoint';
|
|
8
8
|
import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
9
9
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
10
|
+
import { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
10
11
|
import type { TelemetryClient } from '@aztec/telemetry-client';
|
|
11
12
|
import type { SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
12
13
|
|
|
13
14
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
15
|
+
import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
|
|
14
16
|
import { ValidatorMetrics } from './metrics.js';
|
|
15
17
|
import { ProposalHandler } from './proposal_handler.js';
|
|
16
18
|
import { ValidatorClient } from './validator.js';
|
|
@@ -31,7 +33,11 @@ export function createProposalHandler(
|
|
|
31
33
|
},
|
|
32
34
|
) {
|
|
33
35
|
const metrics = new ValidatorMetrics(deps.telemetry);
|
|
34
|
-
const
|
|
36
|
+
const consensusTimetable = new ConsensusTimetable({
|
|
37
|
+
l1Constants: deps.epochCache.getL1Constants(),
|
|
38
|
+
blockDuration: config.blockDurationMs !== undefined ? config.blockDurationMs / 1000 : undefined,
|
|
39
|
+
});
|
|
40
|
+
const blockProposalValidator = new BlockProposalValidator(deps.epochCache, consensusTimetable, {
|
|
35
41
|
txsPermitted: !config.disableTransactions,
|
|
36
42
|
maxTxsPerBlock: config.validateMaxTxsPerBlock ?? config.validateMaxTxsPerCheckpoint,
|
|
37
43
|
maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
|
|
@@ -39,6 +45,7 @@ export function createProposalHandler(
|
|
|
39
45
|
chainId: config.l1ChainId,
|
|
40
46
|
rollupAddress: config.rollupAddress,
|
|
41
47
|
},
|
|
48
|
+
clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS,
|
|
42
49
|
});
|
|
43
50
|
return new ProposalHandler(
|
|
44
51
|
deps.checkpointsBuilder,
|
|
@@ -48,6 +55,7 @@ export function createProposalHandler(
|
|
|
48
55
|
deps.p2pClient.getTxProvider(),
|
|
49
56
|
blockProposalValidator,
|
|
50
57
|
deps.epochCache,
|
|
58
|
+
consensusTimetable,
|
|
51
59
|
config,
|
|
52
60
|
deps.blobClient,
|
|
53
61
|
deps.reexecutionTracker,
|
package/src/proposal_handler.ts
CHANGED
|
@@ -22,7 +22,7 @@ import { BlockProposalValidator } from '@aztec/p2p/msg_validators';
|
|
|
22
22
|
import type { BlockData, L2Block, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
23
23
|
import type { CheckpointReexecutionTracker, ReexecutionOutcome } from '@aztec/stdlib/checkpoint';
|
|
24
24
|
import { getPreviousCheckpointOutHashes, validateCheckpoint } from '@aztec/stdlib/checkpoint';
|
|
25
|
-
import { getEpochAtSlot
|
|
25
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
26
26
|
import { Gas } from '@aztec/stdlib/gas';
|
|
27
27
|
import type { ITxProvider, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
28
28
|
import {
|
|
@@ -31,6 +31,7 @@ import {
|
|
|
31
31
|
computeInHashFromL1ToL2Messages,
|
|
32
32
|
} from '@aztec/stdlib/messaging';
|
|
33
33
|
import type { BlockProposal, CheckpointAttestation, CheckpointProposalCore } from '@aztec/stdlib/p2p';
|
|
34
|
+
import type { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
34
35
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
35
36
|
import type { CheckpointGlobalVariables, FailedTx, Tx } from '@aztec/stdlib/tx';
|
|
36
37
|
import {
|
|
@@ -49,7 +50,6 @@ export type BlockProposalValidationFailureReason =
|
|
|
49
50
|
| 'invalid_signature'
|
|
50
51
|
| 'invalid_proposal'
|
|
51
52
|
| 'parent_block_not_found'
|
|
52
|
-
| 'block_source_not_synced'
|
|
53
53
|
| 'parent_block_wrong_slot'
|
|
54
54
|
| 'in_hash_mismatch'
|
|
55
55
|
| 'global_variables_mismatch'
|
|
@@ -165,7 +165,7 @@ export class ProposalHandler {
|
|
|
165
165
|
};
|
|
166
166
|
|
|
167
167
|
/** Archiver reference for setting proposed checkpoints (pipelining). Set via register(). */
|
|
168
|
-
private archiver?: Pick<Archiver, 'addProposedCheckpoint'>;
|
|
168
|
+
private archiver?: Pick<Archiver, 'addProposedCheckpoint' | 'getProposedCheckpointData'>;
|
|
169
169
|
|
|
170
170
|
/** Returns current validator addresses for own-proposal detection. Set via register(). */
|
|
171
171
|
private getOwnValidatorAddresses?: () => string[];
|
|
@@ -183,6 +183,7 @@ export class ProposalHandler {
|
|
|
183
183
|
private txProvider: ITxProvider,
|
|
184
184
|
private blockProposalValidator: BlockProposalValidator,
|
|
185
185
|
private epochCache: EpochCache,
|
|
186
|
+
private timetable: ConsensusTimetable,
|
|
186
187
|
private config: ValidatorClientFullConfig,
|
|
187
188
|
private blobClient: BlobClientInterface,
|
|
188
189
|
private reexecutionTracker: CheckpointReexecutionTracker,
|
|
@@ -231,7 +232,7 @@ export class ProposalHandler {
|
|
|
231
232
|
register(
|
|
232
233
|
p2pClient: P2P,
|
|
233
234
|
shouldReexecute: boolean,
|
|
234
|
-
archiver?: Pick<Archiver, 'addProposedCheckpoint'>,
|
|
235
|
+
archiver?: Pick<Archiver, 'addProposedCheckpoint' | 'getProposedCheckpointData'>,
|
|
235
236
|
getOwnValidatorAddresses?: () => string[],
|
|
236
237
|
): ProposalHandler {
|
|
237
238
|
this.p2pClient = p2pClient;
|
|
@@ -297,25 +298,29 @@ export class ProposalHandler {
|
|
|
297
298
|
return undefined;
|
|
298
299
|
}
|
|
299
300
|
|
|
300
|
-
//
|
|
301
|
-
//
|
|
302
|
-
//
|
|
303
|
-
//
|
|
304
|
-
//
|
|
301
|
+
// A proposal is "own" when it was signed by a validator key this node also owns. The true local
|
|
302
|
+
// proposer already built, validated, and stored this checkpoint before broadcasting, so a matching
|
|
303
|
+
// proposed checkpoint is already in its archiver — skip the redundant re-validation. An HA peer that
|
|
304
|
+
// shares the proposer's keys sees the same "own" proposal over gossip but never built it, so it has
|
|
305
|
+
// nothing stored; it falls through to the normal validate-and-persist path below to hydrate the
|
|
306
|
+
// proposed-checkpoint metadata it needs to build the next slot on top of this checkpoint.
|
|
305
307
|
const proposer = proposal.getSender();
|
|
306
308
|
const ownAddresses = this.getOwnValidatorAddresses?.();
|
|
307
309
|
const isOwnProposal = proposer && ownAddresses?.some(addr => addr === proposer.toString());
|
|
308
310
|
|
|
309
311
|
if (isOwnProposal) {
|
|
310
|
-
|
|
311
|
-
|
|
312
|
+
const existing = await this.archiver?.getProposedCheckpointData({ slot: proposal.slotNumber });
|
|
313
|
+
if (existing?.archive.root.equals(proposal.archive)) {
|
|
314
|
+
this.log.debug(`Skipping sync for existing own checkpoint proposal at slot ${proposal.slotNumber}`);
|
|
315
|
+
return undefined;
|
|
316
|
+
}
|
|
312
317
|
}
|
|
313
318
|
|
|
314
319
|
const result = await this.handleCheckpointProposal(proposal, proposalInfo);
|
|
315
320
|
if (!result.isValid) {
|
|
316
321
|
await this.checkpointProposalValidationFailureCallback?.(proposal, result, proposalInfo);
|
|
317
|
-
} else if (this.archiver
|
|
318
|
-
const set = await this.
|
|
322
|
+
} else if (this.archiver) {
|
|
323
|
+
const set = await this.setProposedCheckpoint(proposal);
|
|
319
324
|
if (set) {
|
|
320
325
|
this.metrics?.recordCheckpointProposalToPipelinedStateDuration(pipeliningTimer.ms());
|
|
321
326
|
}
|
|
@@ -338,7 +343,6 @@ export class ProposalHandler {
|
|
|
338
343
|
): Promise<BlockProposalValidationResult> {
|
|
339
344
|
const slotNumber = proposal.slotNumber;
|
|
340
345
|
const proposer = proposal.getSender();
|
|
341
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
342
346
|
|
|
343
347
|
// Reject proposals with invalid signatures
|
|
344
348
|
if (!proposer) {
|
|
@@ -376,20 +380,9 @@ export class ProposalHandler {
|
|
|
376
380
|
return { isValid: false, blockNumber: proposal.blockNumber, reason: retainedSlotValidation.reason };
|
|
377
381
|
}
|
|
378
382
|
|
|
379
|
-
//
|
|
380
|
-
//
|
|
381
|
-
//
|
|
382
|
-
// checkpoint prune could remove a block that would conflict with this proposal.
|
|
383
|
-
// When pipelining is enabled, the proposer builds ahead of L1 submission, so the
|
|
384
|
-
// block source won't have synced to the proposed slot yet. Skip the sync wait to
|
|
385
|
-
// avoid eating into the attestation window.
|
|
386
|
-
if (!this.epochCache.isProposerPipeliningEnabled()) {
|
|
387
|
-
const blockSourceSync = await this.waitForBlockSourceSync(slotNumber);
|
|
388
|
-
if (!blockSourceSync) {
|
|
389
|
-
this.log.warn(`Block source is not synced, skipping processing`, proposalInfo);
|
|
390
|
-
return { isValid: false, reason: 'block_source_not_synced' };
|
|
391
|
-
}
|
|
392
|
-
}
|
|
383
|
+
// The proposer builds ahead of L1 submission under pipelining, so the block source won't have
|
|
384
|
+
// synced to the proposed slot yet. We deliberately do not wait for it to sync here, to avoid
|
|
385
|
+
// eating into the attestation window.
|
|
393
386
|
|
|
394
387
|
// Check that the parent proposal is a block we know, otherwise reexecution would fail.
|
|
395
388
|
// If we don't find it immediately, we keep retrying for a while; it may be we still
|
|
@@ -428,7 +421,7 @@ export class ProposalHandler {
|
|
|
428
421
|
// and we do it even if we don't plan to re-execute the txs, so that we have them if another node needs them.
|
|
429
422
|
const { txs, missingTxs } = await this.txProvider.getTxsForBlockProposal(proposal, blockNumber, {
|
|
430
423
|
pinnedPeer: proposalSender,
|
|
431
|
-
deadline: this.getReexecutionDeadline(slotNumber
|
|
424
|
+
deadline: this.getReexecutionDeadline(slotNumber),
|
|
432
425
|
});
|
|
433
426
|
|
|
434
427
|
// Record the tx-collection outcome on the re-execution tracker
|
|
@@ -479,7 +472,7 @@ export class ProposalHandler {
|
|
|
479
472
|
epoch,
|
|
480
473
|
checkpointNumber,
|
|
481
474
|
l1Constants: this.epochCache.getL1Constants(),
|
|
482
|
-
pipeliningEnabled:
|
|
475
|
+
pipeliningEnabled: true,
|
|
483
476
|
log: this.log,
|
|
484
477
|
});
|
|
485
478
|
|
|
@@ -536,16 +529,14 @@ export class ProposalHandler {
|
|
|
536
529
|
|
|
537
530
|
private async getParentBlock(proposal: BlockProposal): Promise<'genesis' | BlockData | undefined> {
|
|
538
531
|
const parentArchive = proposal.blockHeader.lastArchive.root;
|
|
539
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
540
532
|
const { genesisArchiveRoot } = await this.blockSource.getGenesisValues();
|
|
541
533
|
|
|
542
534
|
if (parentArchive.equals(genesisArchiveRoot)) {
|
|
543
535
|
return 'genesis';
|
|
544
536
|
}
|
|
545
537
|
|
|
546
|
-
const deadline = this.getReexecutionDeadline(proposal.slotNumber
|
|
547
|
-
const
|
|
548
|
-
const timeoutDurationMs = deadline.getTime() - currentTime;
|
|
538
|
+
const deadline = this.getReexecutionDeadline(proposal.slotNumber);
|
|
539
|
+
const timeoutDurationMs = deadline.getTime() - this.dateProvider.now();
|
|
549
540
|
|
|
550
541
|
try {
|
|
551
542
|
return (
|
|
@@ -556,7 +547,7 @@ export class ProposalHandler {
|
|
|
556
547
|
() =>
|
|
557
548
|
this.blockSource.syncImmediate().then(() => this.blockSource.getBlockData({ archive: parentArchive })),
|
|
558
549
|
'force archiver sync',
|
|
559
|
-
|
|
550
|
+
{ deadline, dateProvider: this.dateProvider },
|
|
560
551
|
0.5,
|
|
561
552
|
))
|
|
562
553
|
);
|
|
@@ -693,52 +684,14 @@ export class ProposalHandler {
|
|
|
693
684
|
return undefined;
|
|
694
685
|
}
|
|
695
686
|
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
return new Date(nextSlotTimestampSeconds * 1000);
|
|
705
|
-
}
|
|
706
|
-
|
|
707
|
-
/** Waits for the block source to sync L1 data up to at least the slot before the given one. */
|
|
708
|
-
private async waitForBlockSourceSync(slot: SlotNumber): Promise<boolean> {
|
|
709
|
-
const deadline = this.getReexecutionDeadline(slot, this.checkpointsBuilder.getConfig());
|
|
710
|
-
const timeoutMs = deadline.getTime() - this.dateProvider.now();
|
|
711
|
-
if (slot === 0) {
|
|
712
|
-
return true;
|
|
713
|
-
}
|
|
714
|
-
|
|
715
|
-
// Make a quick check before triggering an archiver sync
|
|
716
|
-
// If we are pipelining and have a pending checkpoint number stored, we will allow the block proposal to be for a slot further
|
|
717
|
-
const syncedSlot = await this.blockSource.getSyncedL2SlotNumber();
|
|
718
|
-
if (syncedSlot !== undefined && syncedSlot + 1 + this.epochCache.pipeliningOffset() >= slot) {
|
|
719
|
-
return true;
|
|
720
|
-
}
|
|
721
|
-
|
|
722
|
-
try {
|
|
723
|
-
// Trigger an immediate sync of the block source, and wait until it reports being synced to the required slot
|
|
724
|
-
return await retryUntil(
|
|
725
|
-
async () => {
|
|
726
|
-
await this.blockSource.syncImmediate();
|
|
727
|
-
const updatedSyncedSlot = await this.blockSource.getSyncedL2SlotNumber();
|
|
728
|
-
return updatedSyncedSlot !== undefined && updatedSyncedSlot + 1 >= slot;
|
|
729
|
-
},
|
|
730
|
-
'wait for block source sync',
|
|
731
|
-
timeoutMs / 1000,
|
|
732
|
-
0.5,
|
|
733
|
-
);
|
|
734
|
-
} catch (err) {
|
|
735
|
-
if (err instanceof TimeoutError) {
|
|
736
|
-
this.log.warn(`Timed out waiting for block source to sync to slot ${slot}`);
|
|
737
|
-
return false;
|
|
738
|
-
} else {
|
|
739
|
-
throw err;
|
|
740
|
-
}
|
|
741
|
-
}
|
|
687
|
+
/**
|
|
688
|
+
* Hard re-execution/validation deadline for any block or checkpoint proposal targeting `slotNumber`:
|
|
689
|
+
* the single consensus `attestation_deadline` (`target_slot_start + S - 2E`). This is the latest the
|
|
690
|
+
* checkpoint can land on L1 in the target slot; all nodes agree on it. Loosened from the previous
|
|
691
|
+
* next-wall-clock-slot-boundary bound (see the timetable spec / refactor notes).
|
|
692
|
+
*/
|
|
693
|
+
private getReexecutionDeadline(slotNumber: SlotNumber): Date {
|
|
694
|
+
return new Date(this.timetable.getAttestationDeadline(slotNumber) * 1000);
|
|
742
695
|
}
|
|
743
696
|
|
|
744
697
|
private getReexecuteFailureReason(err: any): BlockProposalValidationFailureReason {
|
|
@@ -818,7 +771,7 @@ export class ProposalHandler {
|
|
|
818
771
|
);
|
|
819
772
|
|
|
820
773
|
// Build the new block
|
|
821
|
-
const deadline = this.getReexecutionDeadline(slot
|
|
774
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
822
775
|
const maxBlockGas =
|
|
823
776
|
this.config.validateMaxL2BlockGas !== undefined || this.config.validateMaxDABlockGas !== undefined
|
|
824
777
|
? new Gas(this.config.validateMaxDABlockGas ?? Infinity, this.config.validateMaxL2BlockGas ?? Infinity)
|
|
@@ -950,15 +903,15 @@ export class ProposalHandler {
|
|
|
950
903
|
): Promise<CheckpointProposalValidationResult> {
|
|
951
904
|
const slot = proposal.slotNumber;
|
|
952
905
|
|
|
953
|
-
// Block-sync deadline = the
|
|
954
|
-
//
|
|
955
|
-
//
|
|
956
|
-
//
|
|
957
|
-
const
|
|
958
|
-
const deadline = this.getReexecutionDeadline(slot, config);
|
|
959
|
-
const timeoutSeconds = Math.max(1, Math.floor((deadline.getTime() - this.dateProvider.now()) / 1000));
|
|
906
|
+
// Block-sync/validation deadline = the single consensus attestation_deadline (target_slot_start + S
|
|
907
|
+
// - 2E): the latest moment the proposer can submit this checkpoint and still have it land on L1 in
|
|
908
|
+
// the target slot. Keeping validation/attestation alive until then lets validators keep attesting
|
|
909
|
+
// right up to the proposer's real publish cutoff.
|
|
910
|
+
const deadline = this.getReexecutionDeadline(slot);
|
|
960
911
|
|
|
961
|
-
// Wait for last block to sync by archive
|
|
912
|
+
// Wait for last block to sync by archive. The deadline is passed to retryUntil as an absolute date so
|
|
913
|
+
// the remaining budget is derived from the date provider; a deadline already in the past times out
|
|
914
|
+
// after a single attempt instead of looping (the immediate-timeout semantics of the deadline overload).
|
|
962
915
|
let lastBlockData;
|
|
963
916
|
try {
|
|
964
917
|
lastBlockData = await retryUntil(
|
|
@@ -967,7 +920,7 @@ export class ProposalHandler {
|
|
|
967
920
|
return await this.blockSource.getBlockData({ archive: proposal.archive });
|
|
968
921
|
},
|
|
969
922
|
`waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`,
|
|
970
|
-
|
|
923
|
+
{ deadline, dateProvider: this.dateProvider },
|
|
971
924
|
0.5,
|
|
972
925
|
);
|
|
973
926
|
} catch (err) {
|
|
@@ -1050,7 +1003,7 @@ export class ProposalHandler {
|
|
|
1050
1003
|
epoch,
|
|
1051
1004
|
checkpointNumber,
|
|
1052
1005
|
l1Constants: this.epochCache.getL1Constants(),
|
|
1053
|
-
pipeliningEnabled:
|
|
1006
|
+
pipeliningEnabled: true,
|
|
1054
1007
|
log: this.log,
|
|
1055
1008
|
});
|
|
1056
1009
|
|
|
@@ -1178,11 +1131,11 @@ export class ProposalHandler {
|
|
|
1178
1131
|
}
|
|
1179
1132
|
|
|
1180
1133
|
/**
|
|
1181
|
-
* Derives proposed checkpoint data from validated blocks and sets it on the archiver
|
|
1182
|
-
*
|
|
1183
|
-
*
|
|
1134
|
+
* Derives proposed checkpoint data from validated blocks and sets it on the archiver, so this node can
|
|
1135
|
+
* pipeline building on top of the checkpoint. Does not retry, since validation already waited for the
|
|
1136
|
+
* last block to sync.
|
|
1184
1137
|
*/
|
|
1185
|
-
private async
|
|
1138
|
+
private async setProposedCheckpoint(proposal: CheckpointProposalCore): Promise<boolean> {
|
|
1186
1139
|
if (!this.archiver) {
|
|
1187
1140
|
return false;
|
|
1188
1141
|
}
|
package/src/validator.ts
CHANGED
|
@@ -42,6 +42,7 @@ import {
|
|
|
42
42
|
type CoordinationSignatureContext,
|
|
43
43
|
} from '@aztec/stdlib/p2p';
|
|
44
44
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
45
|
+
import { ConsensusTimetable } from '@aztec/stdlib/timetable';
|
|
45
46
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
46
47
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
47
48
|
import { type TelemetryClient, type Tracer, getTelemetryClient } from '@aztec/telemetry-client';
|
|
@@ -57,6 +58,7 @@ import { EventEmitter } from 'events';
|
|
|
57
58
|
import type { TypedDataDefinition } from 'viem';
|
|
58
59
|
|
|
59
60
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
61
|
+
import { DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS } from './config.js';
|
|
60
62
|
import { ValidationService } from './duties/validation_service.js';
|
|
61
63
|
import { HAKeyStore } from './key_store/ha_key_store.js';
|
|
62
64
|
import type { ExtendedValidatorKeyStore } from './key_store/interface.js';
|
|
@@ -246,7 +248,11 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
246
248
|
slashingProtectionDb?: SlashingProtectionDatabase,
|
|
247
249
|
) {
|
|
248
250
|
const metrics = new ValidatorMetrics(telemetry);
|
|
249
|
-
const
|
|
251
|
+
const consensusTimetable = new ConsensusTimetable({
|
|
252
|
+
l1Constants: epochCache.getL1Constants(),
|
|
253
|
+
blockDuration: config.blockDurationMs !== undefined ? config.blockDurationMs / 1000 : undefined,
|
|
254
|
+
});
|
|
255
|
+
const blockProposalValidator = new BlockProposalValidator(epochCache, consensusTimetable, {
|
|
250
256
|
txsPermitted: !config.disableTransactions,
|
|
251
257
|
maxTxsPerBlock: config.validateMaxTxsPerBlock,
|
|
252
258
|
maxBlocksPerCheckpoint: config.maxBlocksPerCheckpoint,
|
|
@@ -255,6 +261,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
255
261
|
chainId: config.l1ChainId,
|
|
256
262
|
rollupAddress: config.rollupAddress,
|
|
257
263
|
},
|
|
264
|
+
clockDisparityMs: config.maxGossipClockDisparityMs ?? DEFAULT_MAX_GOSSIP_CLOCK_DISPARITY_MS,
|
|
258
265
|
});
|
|
259
266
|
const proposalHandler = new ProposalHandler(
|
|
260
267
|
checkpointsBuilder,
|
|
@@ -264,6 +271,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
264
271
|
txProvider,
|
|
265
272
|
blockProposalValidator,
|
|
266
273
|
epochCache,
|
|
274
|
+
consensusTimetable,
|
|
267
275
|
config,
|
|
268
276
|
blobClient,
|
|
269
277
|
reexecutionTracker,
|
|
@@ -564,7 +572,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
|
|
|
564
572
|
|
|
565
573
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
566
574
|
if (proposer && this.getValidatorAddresses().some(addr => addr.equals(proposer))) {
|
|
567
|
-
this.log.debug(`
|
|
575
|
+
this.log.debug(`Not attesting to block proposal from self for slot ${proposalSlotNumber}`, {
|
|
568
576
|
proposer: proposer.toString(),
|
|
569
577
|
proposalSlotNumber,
|
|
570
578
|
});
|