@aztec/validator-client 0.0.1-commit.21ecf947b → 0.0.1-commit.2448fdb
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/README.md +41 -0
- package/dest/checkpoint_builder.d.ts +19 -6
- package/dest/checkpoint_builder.d.ts.map +1 -1
- package/dest/checkpoint_builder.js +115 -39
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +20 -0
- package/dest/duties/validation_service.d.ts +1 -1
- package/dest/duties/validation_service.d.ts.map +1 -1
- package/dest/duties/validation_service.js +3 -9
- package/dest/factory.d.ts +7 -4
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +6 -5
- package/dest/index.d.ts +2 -3
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -2
- package/dest/key_store/ha_key_store.js +1 -1
- package/dest/metrics.d.ts +10 -2
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +12 -0
- package/dest/proposal_handler.d.ts +94 -0
- package/dest/proposal_handler.d.ts.map +1 -0
- package/dest/{block_proposal_handler.js → proposal_handler.js} +372 -66
- package/dest/validator.d.ts +13 -18
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +61 -213
- package/package.json +19 -19
- package/src/checkpoint_builder.ts +135 -39
- package/src/config.ts +20 -0
- package/src/duties/validation_service.ts +3 -9
- package/src/factory.ts +9 -3
- package/src/index.ts +1 -2
- package/src/key_store/ha_key_store.ts +1 -1
- package/src/metrics.ts +19 -1
- package/src/proposal_handler.ts +903 -0
- package/src/validator.ts +78 -239
- package/dest/block_proposal_handler.d.ts +0 -63
- package/dest/block_proposal_handler.d.ts.map +0 -1
- package/dest/tx_validator/index.d.ts +0 -3
- package/dest/tx_validator/index.d.ts.map +0 -1
- package/dest/tx_validator/index.js +0 -2
- package/dest/tx_validator/nullifier_cache.d.ts +0 -14
- package/dest/tx_validator/nullifier_cache.d.ts.map +0 -1
- package/dest/tx_validator/nullifier_cache.js +0 -24
- package/dest/tx_validator/tx_validator_factory.d.ts +0 -19
- package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
- package/dest/tx_validator/tx_validator_factory.js +0 -54
- package/src/block_proposal_handler.ts +0 -556
- package/src/tx_validator/index.ts +0 -2
- package/src/tx_validator/nullifier_cache.ts +0 -30
- package/src/tx_validator/tx_validator_factory.ts +0 -154
package/dest/validator.d.ts
CHANGED
|
@@ -12,16 +12,17 @@ import { type Watcher, type WatcherEmitter } from '@aztec/slasher';
|
|
|
12
12
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
13
13
|
import type { CommitteeAttestationsAndSigners, L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
14
14
|
import type { CreateCheckpointProposalLastBlockData, ITxProvider, Validator, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
15
|
-
import {
|
|
15
|
+
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
16
16
|
import { type BlockProposal, type BlockProposalOptions, type CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore, type CheckpointProposalOptions } from '@aztec/stdlib/p2p';
|
|
17
17
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
18
18
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
19
19
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
20
|
-
import { type SigningContext } from '@aztec/validator-ha-signer/types';
|
|
20
|
+
import { type SigningContext, type SlashingProtectionDatabase } from '@aztec/validator-ha-signer/types';
|
|
21
|
+
import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
|
|
21
22
|
import type { TypedDataDefinition } from 'viem';
|
|
22
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
23
23
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
24
24
|
import type { ExtendedValidatorKeyStore } from './key_store/interface.js';
|
|
25
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
25
26
|
declare const ValidatorClient_base: new () => WatcherEmitter;
|
|
26
27
|
/**
|
|
27
28
|
* Validator Client
|
|
@@ -30,13 +31,10 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
30
31
|
private keyStore;
|
|
31
32
|
private epochCache;
|
|
32
33
|
private p2pClient;
|
|
33
|
-
private
|
|
34
|
-
private blockSource;
|
|
35
|
-
private checkpointsBuilder;
|
|
36
|
-
private worldState;
|
|
37
|
-
private l1ToL2MessageSource;
|
|
34
|
+
private proposalHandler;
|
|
38
35
|
private config;
|
|
39
36
|
private blobClient;
|
|
37
|
+
private haSigner;
|
|
40
38
|
private dateProvider;
|
|
41
39
|
readonly tracer: Tracer;
|
|
42
40
|
private validationService;
|
|
@@ -49,20 +47,23 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
49
47
|
private lastProposedCheckpoint?;
|
|
50
48
|
private lastEpochForCommitteeUpdateLoop;
|
|
51
49
|
private epochCacheUpdateLoop;
|
|
50
|
+
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */
|
|
51
|
+
private lastAttestedEpochByAttester;
|
|
52
52
|
private proposersOfInvalidBlocks;
|
|
53
53
|
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */
|
|
54
54
|
private lastAttestedProposal?;
|
|
55
|
-
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P,
|
|
55
|
+
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, proposalHandler: ProposalHandler, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, haSigner: ValidatorHASigner | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: Logger);
|
|
56
56
|
static validateKeyStoreConfiguration(keyStoreManager: KeystoreManager, logger?: Logger): void;
|
|
57
57
|
private handleEpochCommitteeUpdate;
|
|
58
|
-
static new(config: ValidatorClientFullConfig, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, keyStoreManager: KeystoreManager, blobClient: BlobClientInterface, dateProvider?: DateProvider, telemetry?: TelemetryClient): Promise<ValidatorClient>;
|
|
58
|
+
static new(config: ValidatorClientFullConfig, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider: ITxProvider, keyStoreManager: KeystoreManager, blobClient: BlobClientInterface, dateProvider?: DateProvider, telemetry?: TelemetryClient, slashingProtectionDb?: SlashingProtectionDatabase): Promise<ValidatorClient>;
|
|
59
59
|
getValidatorAddresses(): EthAddress[];
|
|
60
|
-
|
|
60
|
+
getProposalHandler(): ProposalHandler;
|
|
61
61
|
signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext): Promise<Signature>;
|
|
62
62
|
getCoinbaseForAttestor(attestor: EthAddress): EthAddress;
|
|
63
63
|
getFeeRecipientForAttestor(attestor: EthAddress): AztecAddress;
|
|
64
64
|
getConfig(): ValidatorClientFullConfig;
|
|
65
65
|
updateConfig(config: Partial<ValidatorClientFullConfig>): void;
|
|
66
|
+
reloadKeystore(newManager: KeystoreManager): void;
|
|
66
67
|
start(): Promise<void>;
|
|
67
68
|
stop(): Promise<void>;
|
|
68
69
|
/** Register handlers on the p2p client */
|
|
@@ -86,12 +87,6 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
86
87
|
*/
|
|
87
88
|
private shouldAttestToSlot;
|
|
88
89
|
private createCheckpointAttestationsFromProposal;
|
|
89
|
-
private validateCheckpointProposal;
|
|
90
|
-
/**
|
|
91
|
-
* Extract checkpoint global variables from a block.
|
|
92
|
-
*/
|
|
93
|
-
private extractCheckpointConstants;
|
|
94
|
-
private uploadBlobsForCheckpoint;
|
|
95
90
|
private slashInvalidBlock;
|
|
96
91
|
/**
|
|
97
92
|
* Handle detection of a duplicate proposal (equivocation).
|
|
@@ -112,4 +107,4 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
112
107
|
private handleAuthRequest;
|
|
113
108
|
}
|
|
114
109
|
export {};
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxFQUNMLFdBQVcsRUFDWCxnQkFBZ0IsRUFFaEIscUJBQXFCLEVBQ3JCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFtRCxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRS9GLE9BQU8sRUFBb0MsS0FBSyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBRSxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFdkcsT0FBTyxLQUFLLEVBQ1YscUNBQXFDLEVBQ3JDLFdBQVcsRUFDWCxTQUFTLEVBQ1QseUJBQXlCLEVBQ3pCLHNCQUFzQixFQUN2QixNQUFNLGlDQUFpQyxDQUFD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
|
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;
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,WAAW,EACX,gBAAgB,EAEhB,qBAAqB,EACrB,UAAU,EACX,MAAM,iCAAiC,CAAC;AACzC,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;AACjE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,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,EAAoC,KAAK,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,+BAA+B,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEvG,OAAO,KAAK,EACV,qCAAqC,EACrC,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,EAC/B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAsB,MAAM,yBAAyB,CAAC;AAEhG,OAAO,EAAY,KAAK,cAAc,EAAE,KAAK,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAClH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAGxF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAEhD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAG1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAG1E,OAAO,EAA6C,eAAe,EAAE,MAAM,uBAAuB,CAAC;;AAYnG;;GAEG;AACH,qBAAa,eAAgB,SAAQ,oBAA2C,YAAW,SAAS,EAAE,OAAO;IAyBzG,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,YAAY;IA/BtB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,qBAAqB,CAAS;IAEtC,wFAAwF;IACxF,OAAO,CAAC,iBAAiB,CAAC,CAAgB;IAE1C,sDAAsD;IACtD,OAAO,CAAC,sBAAsB,CAAC,CAAqB;IAEpD,OAAO,CAAC,+BAA+B,CAA0B;IACjE,OAAO,CAAC,oBAAoB,CAAiB;IAC7C,oGAAoG;IACpG,OAAO,CAAC,2BAA2B,CAAuC;IAE1E,OAAO,CAAC,wBAAwB,CAA0B;IAE1D,mFAAmF;IACnF,OAAO,CAAC,oBAAoB,CAAC,CAAyB;IAEtD,SAAS,aACC,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,EACd,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,yBAAyB,EACjC,UAAU,EAAE,mBAAmB,EAC/B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,EACvC,YAAY,GAAE,YAAiC,EACvD,SAAS,GAAE,eAAsC,EACjD,GAAG,SAA4B,EAiBhC;IAED,OAAc,6BAA6B,CAAC,eAAe,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,QAuB5F;YAEa,0BAA0B;IA4BxC,OAAa,GAAG,CACd,MAAM,EAAE,yBAAyB,EACjC,kBAAkB,EAAE,0BAA0B,EAC9C,UAAU,EAAE,sBAAsB,EAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,GAAG,EACd,WAAW,EAAE,aAAa,GAAG,WAAW,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,WAAW,EACvB,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,mBAAmB,EAC/B,YAAY,GAAE,YAAiC,EAC/C,SAAS,GAAE,eAAsC,EACjD,oBAAoB,CAAC,EAAE,0BAA0B,4BAsDlD;IAEM,qBAAqB,iBAI3B;IAEM,kBAAkB,oBAExB;IAEM,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,sBAEzF;IAEM,sBAAsB,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU,CAE9D;IAEM,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY,CAEpE;IAEM,SAAS,IAAI,yBAAyB,CAE5C;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,yBAAyB,CAAC,QAE7D;IAEM,cAAc,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,CAoBvD;IAEY,KAAK,kBAmBjB;IAEY,IAAI,kBAGhB;IAED,0CAA0C;IAC7B,gBAAgB,kBAkC5B;IAED;;;;OAIG;IACG,qBAAqB,CAAC,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkG7F;IAED;;;;;OAKG;IACG,0BAA0B,CAC9B,QAAQ,EAAE,sBAAsB,EAChC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,qBAAqB,EAAE,GAAG,SAAS,CAAC,CAiG9C;IAED;;;OAGG;IACH,OAAO,CAAC,kBAAkB;YAiBZ,wCAAwC;IAkBtD,OAAO,CAAC,iBAAiB;IA2BzB;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAoB/B;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAkB5B,mBAAmB,CACvB,WAAW,EAAE,WAAW,EACxB,qBAAqB,EAAE,qBAAqB,EAC5C,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,aAAa,CAAC,CAgCxB;IAEK,wBAAwB,CAC5B,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,EAAE,EACX,qBAAqB,EAAE,MAAM,EAC7B,aAAa,EAAE,qCAAqC,GAAG,SAAS,EAChE,eAAe,EAAE,UAAU,GAAG,SAAS,EACvC,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAyB7B;IAEK,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;IAEK,0BAA0B,CAC9B,sBAAsB,EAAE,+BAA+B,EACvD,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAC1C,OAAO,CAAC,SAAS,CAAC,CAEpB;IAEK,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAiB3F;IAEK,mBAAmB,CACvB,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,IAAI,GACb,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAiElC;YAEa,iBAAiB;CAwBhC"}
|
package/dest/validator.js
CHANGED
|
@@ -1,26 +1,20 @@
|
|
|
1
|
-
import { getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
2
|
-
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
3
|
-
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
4
|
-
import { TimeoutError } from '@aztec/foundation/error';
|
|
5
1
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { retryUntil } from '@aztec/foundation/retry';
|
|
7
2
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
8
3
|
import { sleep } from '@aztec/foundation/sleep';
|
|
9
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
10
5
|
import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
|
|
11
6
|
import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
|
|
12
|
-
import { getEpochAtSlot
|
|
13
|
-
import { accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
|
|
7
|
+
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
14
8
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
15
9
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
16
|
-
import { createHASigner } from '@aztec/validator-ha-signer/factory';
|
|
10
|
+
import { createHASigner, createSignerFromSharedDb } from '@aztec/validator-ha-signer/factory';
|
|
17
11
|
import { DutyType } from '@aztec/validator-ha-signer/types';
|
|
18
12
|
import { EventEmitter } from 'events';
|
|
19
|
-
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
20
13
|
import { ValidationService } from './duties/validation_service.js';
|
|
21
14
|
import { HAKeyStore } from './key_store/ha_key_store.js';
|
|
22
15
|
import { NodeKeystoreAdapter } from './key_store/node_keystore_adapter.js';
|
|
23
16
|
import { ValidatorMetrics } from './metrics.js';
|
|
17
|
+
import { ProposalHandler } from './proposal_handler.js';
|
|
24
18
|
// We maintain a set of proposers who have proposed invalid blocks.
|
|
25
19
|
// Just cap the set to avoid unbounded growth.
|
|
26
20
|
const MAX_PROPOSERS_OF_INVALID_BLOCKS = 1000;
|
|
@@ -35,13 +29,10 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
35
29
|
keyStore;
|
|
36
30
|
epochCache;
|
|
37
31
|
p2pClient;
|
|
38
|
-
|
|
39
|
-
blockSource;
|
|
40
|
-
checkpointsBuilder;
|
|
41
|
-
worldState;
|
|
42
|
-
l1ToL2MessageSource;
|
|
32
|
+
proposalHandler;
|
|
43
33
|
config;
|
|
44
34
|
blobClient;
|
|
35
|
+
haSigner;
|
|
45
36
|
dateProvider;
|
|
46
37
|
tracer;
|
|
47
38
|
validationService;
|
|
@@ -53,10 +44,11 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
53
44
|
/** Tracks the last checkpoint proposal we created. */ lastProposedCheckpoint;
|
|
54
45
|
lastEpochForCommitteeUpdateLoop;
|
|
55
46
|
epochCacheUpdateLoop;
|
|
47
|
+
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
|
|
56
48
|
proposersOfInvalidBlocks;
|
|
57
49
|
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
|
|
58
|
-
constructor(keyStore, epochCache, p2pClient,
|
|
59
|
-
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.
|
|
50
|
+
constructor(keyStore, epochCache, p2pClient, proposalHandler, config, blobClient, haSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
|
|
51
|
+
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.proposalHandler = proposalHandler, this.config = config, this.blobClient = blobClient, this.haSigner = haSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = new Set();
|
|
60
52
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
61
53
|
this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
|
|
62
54
|
this.tracer = telemetry.getTracer('Validator');
|
|
@@ -95,6 +87,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
95
87
|
this.log.trace(`No committee found for slot`);
|
|
96
88
|
return;
|
|
97
89
|
}
|
|
90
|
+
this.metrics.setCurrentEpoch(epoch);
|
|
98
91
|
if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
|
|
99
92
|
const me = this.getValidatorAddresses();
|
|
100
93
|
const committeeSet = new Set(committee.map((v)=>v.toString()));
|
|
@@ -110,30 +103,39 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
110
103
|
this.log.error(`Error updating epoch committee`, err);
|
|
111
104
|
}
|
|
112
105
|
}
|
|
113
|
-
static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
|
|
106
|
+
static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), slashingProtectionDb) {
|
|
114
107
|
const metrics = new ValidatorMetrics(telemetry);
|
|
115
108
|
const blockProposalValidator = new BlockProposalValidator(epochCache, {
|
|
116
|
-
txsPermitted: !config.disableTransactions
|
|
109
|
+
txsPermitted: !config.disableTransactions,
|
|
110
|
+
maxTxsPerBlock: config.validateMaxTxsPerBlock
|
|
117
111
|
});
|
|
118
|
-
const
|
|
119
|
-
|
|
120
|
-
|
|
112
|
+
const proposalHandler = new ProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, blobClient, metrics, dateProvider, telemetry);
|
|
113
|
+
const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
|
|
114
|
+
let validatorKeyStore = nodeKeystoreAdapter;
|
|
115
|
+
let haSigner;
|
|
116
|
+
if (slashingProtectionDb) {
|
|
117
|
+
// Shared database mode: use a pre-existing database (e.g. for testing HA setups).
|
|
118
|
+
const { signer } = createSignerFromSharedDb(slashingProtectionDb, config);
|
|
119
|
+
haSigner = signer;
|
|
120
|
+
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
121
|
+
} else if (config.haSigningEnabled) {
|
|
121
122
|
// If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
|
|
122
123
|
const haConfig = {
|
|
123
124
|
...config,
|
|
124
125
|
maxStuckDutiesAgeMs: config.maxStuckDutiesAgeMs ?? epochCache.getL1Constants().slotDuration * 2 * 1000
|
|
125
126
|
};
|
|
126
127
|
const { signer } = await createHASigner(haConfig);
|
|
127
|
-
|
|
128
|
+
haSigner = signer;
|
|
129
|
+
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
128
130
|
}
|
|
129
|
-
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient,
|
|
131
|
+
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, proposalHandler, config, blobClient, haSigner, dateProvider, telemetry);
|
|
130
132
|
return validator;
|
|
131
133
|
}
|
|
132
134
|
getValidatorAddresses() {
|
|
133
135
|
return this.keyStore.getAddresses().filter((addr)=>!this.config.disabledValidators.some((disabled)=>disabled.equals(addr)));
|
|
134
136
|
}
|
|
135
|
-
|
|
136
|
-
return this.
|
|
137
|
+
getProposalHandler() {
|
|
138
|
+
return this.proposalHandler;
|
|
137
139
|
}
|
|
138
140
|
signWithAddress(addr, msg, context) {
|
|
139
141
|
return this.keyStore.signTypedDataWithAddress(addr, msg, context);
|
|
@@ -153,6 +155,20 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
153
155
|
...config
|
|
154
156
|
};
|
|
155
157
|
}
|
|
158
|
+
reloadKeystore(newManager) {
|
|
159
|
+
if (this.config.haSigningEnabled && !this.haSigner) {
|
|
160
|
+
this.log.warn('HA signing is enabled in config but was not initialized at startup. ' + 'Restart the node to enable HA signing.');
|
|
161
|
+
} else if (!this.config.haSigningEnabled && this.haSigner) {
|
|
162
|
+
this.log.warn('HA signing was disabled via config update but the HA signer is still active. ' + 'Restart the node to fully disable HA signing.');
|
|
163
|
+
}
|
|
164
|
+
const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
|
|
165
|
+
if (this.haSigner) {
|
|
166
|
+
this.keyStore = new HAKeyStore(newAdapter, this.haSigner);
|
|
167
|
+
} else {
|
|
168
|
+
this.keyStore = newAdapter;
|
|
169
|
+
}
|
|
170
|
+
this.validationService = new ValidationService(this.keyStore, this.log.createChild('validation-service'));
|
|
171
|
+
}
|
|
156
172
|
async start() {
|
|
157
173
|
if (this.epochCacheUpdateLoop.isRunning()) {
|
|
158
174
|
this.log.warn(`Validator client already started`);
|
|
@@ -213,13 +229,12 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
213
229
|
this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
|
|
214
230
|
return false;
|
|
215
231
|
}
|
|
216
|
-
//
|
|
232
|
+
// Log self-proposals from HA peers (same validator key on different nodes)
|
|
217
233
|
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
218
|
-
this.log.
|
|
234
|
+
this.log.verbose(`Processing block proposal from HA peer for slot ${slotNumber}`, {
|
|
219
235
|
proposer: proposer.toString(),
|
|
220
236
|
slotNumber
|
|
221
237
|
});
|
|
222
|
-
return false;
|
|
223
238
|
}
|
|
224
239
|
// Check if we're in the committee (for metrics purposes)
|
|
225
240
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
@@ -237,10 +252,10 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
237
252
|
// In fisherman mode, we always reexecute to validate proposals.
|
|
238
253
|
const { validatorReexecute, slashBroadcastedInvalidBlockPenalty, alwaysReexecuteBlockProposals, fishermanMode } = this.config;
|
|
239
254
|
const shouldReexecute = fishermanMode || slashBroadcastedInvalidBlockPenalty > 0n && validatorReexecute || partOfCommittee && validatorReexecute || alwaysReexecuteBlockProposals || this.blobClient.canUpload();
|
|
240
|
-
const validationResult = await this.
|
|
255
|
+
const validationResult = await this.proposalHandler.handleBlockProposal(proposal, proposalSender, !!shouldReexecute && !escapeHatchOpen);
|
|
241
256
|
if (!validationResult.isValid) {
|
|
242
|
-
this.log.warn(`Block proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
243
257
|
const reason = validationResult.reason || 'unknown';
|
|
258
|
+
this.log.warn(`Block proposal validation failed: ${reason}`, proposalInfo);
|
|
244
259
|
// Classify failure reason: bad proposal vs node issue
|
|
245
260
|
const badProposalReasons = [
|
|
246
261
|
'invalid_proposal',
|
|
@@ -287,52 +302,36 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
287
302
|
this.log.warn(`Escape hatch open for slot ${slotNumber}, skipping checkpoint attestation handling`);
|
|
288
303
|
return undefined;
|
|
289
304
|
}
|
|
290
|
-
// Reject proposals with invalid signatures
|
|
291
|
-
if (!proposer) {
|
|
292
|
-
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
293
|
-
return undefined;
|
|
294
|
-
}
|
|
295
305
|
// Ignore proposals from ourselves (may happen in HA setups)
|
|
296
|
-
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
297
|
-
this.log.
|
|
306
|
+
if (proposer && this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
307
|
+
this.log.debug(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
298
308
|
proposer: proposer.toString(),
|
|
299
309
|
slotNumber
|
|
300
310
|
});
|
|
301
311
|
return undefined;
|
|
302
312
|
}
|
|
303
|
-
//
|
|
304
|
-
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
305
|
-
this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`);
|
|
306
|
-
return undefined;
|
|
307
|
-
}
|
|
308
|
-
// Check that I have any address in current committee before attesting
|
|
313
|
+
// Check that I have any address in the committee where this checkpoint will land before attesting
|
|
309
314
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
310
315
|
const partOfCommittee = inCommittee.length > 0;
|
|
311
316
|
const proposalInfo = {
|
|
312
317
|
slotNumber,
|
|
313
318
|
archive: proposal.archive.toString(),
|
|
314
|
-
proposer: proposer
|
|
315
|
-
txCount: proposal.txHashes.length
|
|
319
|
+
proposer: proposer?.toString()
|
|
316
320
|
};
|
|
317
321
|
this.log.info(`Received checkpoint proposal for slot ${slotNumber}`, {
|
|
318
322
|
...proposalInfo,
|
|
319
|
-
txHashes: proposal.txHashes.map((t)=>t.toString()),
|
|
320
323
|
fishermanMode: this.config.fishermanMode || false
|
|
321
324
|
});
|
|
322
|
-
// Validate the checkpoint proposal
|
|
325
|
+
// Validate the checkpoint proposal and upload blobs (unless skipCheckpointProposalValidation is set)
|
|
323
326
|
if (this.config.skipCheckpointProposalValidation) {
|
|
324
327
|
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
325
328
|
} else {
|
|
326
|
-
const validationResult = await this.
|
|
329
|
+
const validationResult = await this.proposalHandler.handleCheckpointProposal(proposal, proposalInfo);
|
|
327
330
|
if (!validationResult.isValid) {
|
|
328
331
|
this.log.warn(`Checkpoint proposal validation failed: ${validationResult.reason}`, proposalInfo);
|
|
329
332
|
return undefined;
|
|
330
333
|
}
|
|
331
334
|
}
|
|
332
|
-
// Upload blobs to filestore if we can (fire and forget)
|
|
333
|
-
if (this.blobClient.canUpload()) {
|
|
334
|
-
void this.uploadBlobsForCheckpoint(proposal, proposalInfo);
|
|
335
|
-
}
|
|
336
335
|
// Check that I have any address in current committee before attesting
|
|
337
336
|
// In fisherman mode, we still create attestations for validation even if not in committee
|
|
338
337
|
if (!partOfCommittee && !this.config.fishermanMode) {
|
|
@@ -346,6 +345,16 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
346
345
|
fishermanMode: this.config.fishermanMode || false
|
|
347
346
|
});
|
|
348
347
|
this.metrics.incSuccessfulAttestations(inCommittee.length);
|
|
348
|
+
// Track epoch participation per attester: count each (attester, epoch) pair at most once
|
|
349
|
+
const proposalEpoch = getEpochAtSlot(slotNumber, this.epochCache.getL1Constants());
|
|
350
|
+
for (const attester of inCommittee){
|
|
351
|
+
const key = attester.toString();
|
|
352
|
+
const lastEpoch = this.lastAttestedEpochByAttester.get(key);
|
|
353
|
+
if (lastEpoch === undefined || proposalEpoch > lastEpoch) {
|
|
354
|
+
this.lastAttestedEpochByAttester.set(key, proposalEpoch);
|
|
355
|
+
this.metrics.incAttestedEpochCount(attester);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
349
358
|
// Determine which validators should attest
|
|
350
359
|
let attestors;
|
|
351
360
|
if (partOfCommittee) {
|
|
@@ -396,167 +405,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
396
405
|
await this.p2pClient.addOwnCheckpointAttestations(attestations);
|
|
397
406
|
return attestations;
|
|
398
407
|
}
|
|
399
|
-
/**
|
|
400
|
-
* Validates a checkpoint proposal by building the full checkpoint and comparing it with the proposal.
|
|
401
|
-
* @returns Validation result with isValid flag and reason if invalid.
|
|
402
|
-
*/ async validateCheckpointProposal(proposal, proposalInfo) {
|
|
403
|
-
const slot = proposal.slotNumber;
|
|
404
|
-
// Timeout block syncing at the start of the next slot
|
|
405
|
-
const config = this.checkpointsBuilder.getConfig();
|
|
406
|
-
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
407
|
-
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
408
|
-
// Wait for last block to sync by archive
|
|
409
|
-
let lastBlockHeader;
|
|
410
|
-
try {
|
|
411
|
-
lastBlockHeader = await retryUntil(async ()=>{
|
|
412
|
-
await this.blockSource.syncImmediate();
|
|
413
|
-
return this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
414
|
-
}, `waiting for block with archive ${proposal.archive.toString()} for slot ${slot}`, timeoutSeconds, 0.5);
|
|
415
|
-
} catch (err) {
|
|
416
|
-
if (err instanceof TimeoutError) {
|
|
417
|
-
this.log.warn(`Timed out waiting for block with archive matching checkpoint proposal`, proposalInfo);
|
|
418
|
-
return {
|
|
419
|
-
isValid: false,
|
|
420
|
-
reason: 'last_block_not_found'
|
|
421
|
-
};
|
|
422
|
-
}
|
|
423
|
-
this.log.error(`Error fetching last block for checkpoint proposal`, err, proposalInfo);
|
|
424
|
-
return {
|
|
425
|
-
isValid: false,
|
|
426
|
-
reason: 'block_fetch_error'
|
|
427
|
-
};
|
|
428
|
-
}
|
|
429
|
-
if (!lastBlockHeader) {
|
|
430
|
-
this.log.warn(`Last block not found for checkpoint proposal`, proposalInfo);
|
|
431
|
-
return {
|
|
432
|
-
isValid: false,
|
|
433
|
-
reason: 'last_block_not_found'
|
|
434
|
-
};
|
|
435
|
-
}
|
|
436
|
-
// Get all full blocks for the slot and checkpoint
|
|
437
|
-
const blocks = await this.blockSource.getBlocksForSlot(slot);
|
|
438
|
-
if (blocks.length === 0) {
|
|
439
|
-
this.log.warn(`No blocks found for slot ${slot}`, proposalInfo);
|
|
440
|
-
return {
|
|
441
|
-
isValid: false,
|
|
442
|
-
reason: 'no_blocks_for_slot'
|
|
443
|
-
};
|
|
444
|
-
}
|
|
445
|
-
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
446
|
-
...proposalInfo,
|
|
447
|
-
blockNumbers: blocks.map((b)=>b.number)
|
|
448
|
-
});
|
|
449
|
-
// Get checkpoint constants from first block
|
|
450
|
-
const firstBlock = blocks[0];
|
|
451
|
-
const constants = this.extractCheckpointConstants(firstBlock);
|
|
452
|
-
const checkpointNumber = firstBlock.checkpointNumber;
|
|
453
|
-
// Get L1-to-L2 messages for this checkpoint
|
|
454
|
-
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
455
|
-
// Compute the previous checkpoint out hashes for the epoch.
|
|
456
|
-
// TODO: There can be a more efficient way to get the previous checkpoint out hashes without having to fetch the
|
|
457
|
-
// actual checkpoints and the blocks/txs in them.
|
|
458
|
-
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
459
|
-
const previousCheckpoints = (await this.blockSource.getCheckpointsForEpoch(epoch)).filter((b)=>b.number < checkpointNumber).sort((a, b)=>a.number - b.number);
|
|
460
|
-
const previousCheckpointOutHashes = previousCheckpoints.map((c)=>c.getCheckpointOutHash());
|
|
461
|
-
// Fork world state at the block before the first block
|
|
462
|
-
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
463
|
-
const fork = await this.worldState.fork(parentBlockNumber);
|
|
464
|
-
try {
|
|
465
|
-
// Create checkpoint builder with all existing blocks
|
|
466
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
|
|
467
|
-
// Complete the checkpoint to get computed values
|
|
468
|
-
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
469
|
-
// Compare checkpoint header with proposal
|
|
470
|
-
if (!computedCheckpoint.header.equals(proposal.checkpointHeader)) {
|
|
471
|
-
this.log.warn(`Checkpoint header mismatch`, {
|
|
472
|
-
...proposalInfo,
|
|
473
|
-
computed: computedCheckpoint.header.toInspect(),
|
|
474
|
-
proposal: proposal.checkpointHeader.toInspect()
|
|
475
|
-
});
|
|
476
|
-
return {
|
|
477
|
-
isValid: false,
|
|
478
|
-
reason: 'checkpoint_header_mismatch'
|
|
479
|
-
};
|
|
480
|
-
}
|
|
481
|
-
// Compare archive root with proposal
|
|
482
|
-
if (!computedCheckpoint.archive.root.equals(proposal.archive)) {
|
|
483
|
-
this.log.warn(`Archive root mismatch`, {
|
|
484
|
-
...proposalInfo,
|
|
485
|
-
computed: computedCheckpoint.archive.root.toString(),
|
|
486
|
-
proposal: proposal.archive.toString()
|
|
487
|
-
});
|
|
488
|
-
return {
|
|
489
|
-
isValid: false,
|
|
490
|
-
reason: 'archive_mismatch'
|
|
491
|
-
};
|
|
492
|
-
}
|
|
493
|
-
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
494
|
-
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
495
|
-
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
496
|
-
const computedEpochOutHash = accumulateCheckpointOutHashes([
|
|
497
|
-
...previousCheckpointOutHashes,
|
|
498
|
-
checkpointOutHash
|
|
499
|
-
]);
|
|
500
|
-
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
501
|
-
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
502
|
-
this.log.warn(`Epoch out hash mismatch`, {
|
|
503
|
-
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
504
|
-
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
505
|
-
checkpointOutHash: checkpointOutHash.toString(),
|
|
506
|
-
previousCheckpointOutHashes: previousCheckpointOutHashes.map((h)=>h.toString()),
|
|
507
|
-
...proposalInfo
|
|
508
|
-
});
|
|
509
|
-
return {
|
|
510
|
-
isValid: false,
|
|
511
|
-
reason: 'out_hash_mismatch'
|
|
512
|
-
};
|
|
513
|
-
}
|
|
514
|
-
this.log.verbose(`Checkpoint proposal validation successful for slot ${slot}`, proposalInfo);
|
|
515
|
-
return {
|
|
516
|
-
isValid: true
|
|
517
|
-
};
|
|
518
|
-
} finally{
|
|
519
|
-
await fork.close();
|
|
520
|
-
}
|
|
521
|
-
}
|
|
522
|
-
/**
|
|
523
|
-
* Extract checkpoint global variables from a block.
|
|
524
|
-
*/ extractCheckpointConstants(block) {
|
|
525
|
-
const gv = block.header.globalVariables;
|
|
526
|
-
return {
|
|
527
|
-
chainId: gv.chainId,
|
|
528
|
-
version: gv.version,
|
|
529
|
-
slotNumber: gv.slotNumber,
|
|
530
|
-
coinbase: gv.coinbase,
|
|
531
|
-
feeRecipient: gv.feeRecipient,
|
|
532
|
-
gasFees: gv.gasFees
|
|
533
|
-
};
|
|
534
|
-
}
|
|
535
|
-
/**
|
|
536
|
-
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
537
|
-
*/ async uploadBlobsForCheckpoint(proposal, proposalInfo) {
|
|
538
|
-
try {
|
|
539
|
-
const lastBlockHeader = await this.blockSource.getBlockHeaderByArchive(proposal.archive);
|
|
540
|
-
if (!lastBlockHeader) {
|
|
541
|
-
this.log.warn(`Failed to get last block header for blob upload`, proposalInfo);
|
|
542
|
-
return;
|
|
543
|
-
}
|
|
544
|
-
const blocks = await this.blockSource.getBlocksForSlot(proposal.slotNumber);
|
|
545
|
-
if (blocks.length === 0) {
|
|
546
|
-
this.log.warn(`No blocks found for blob upload`, proposalInfo);
|
|
547
|
-
return;
|
|
548
|
-
}
|
|
549
|
-
const blobFields = blocks.flatMap((b)=>b.toBlobFields());
|
|
550
|
-
const blobs = getBlobsPerL1Block(blobFields);
|
|
551
|
-
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
552
|
-
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
553
|
-
...proposalInfo,
|
|
554
|
-
numBlobs: blobs.length
|
|
555
|
-
});
|
|
556
|
-
} catch (err) {
|
|
557
|
-
this.log.warn(`Failed to upload blobs for checkpoint: ${err}`, proposalInfo);
|
|
558
|
-
}
|
|
559
|
-
}
|
|
560
408
|
slashInvalidBlock(proposal) {
|
|
561
409
|
const proposer = proposal.getSender();
|
|
562
410
|
// Skip if signature is invalid (shouldn't happen since we validate earlier)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/validator-client",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.2448fdb",
|
|
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": "0.0.1-commit.
|
|
68
|
-
"@aztec/blob-lib": "0.0.1-commit.
|
|
69
|
-
"@aztec/constants": "0.0.1-commit.
|
|
70
|
-
"@aztec/epoch-cache": "0.0.1-commit.
|
|
71
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
72
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
73
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
74
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
75
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
76
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
77
|
-
"@aztec/prover-client": "0.0.1-commit.
|
|
78
|
-
"@aztec/simulator": "0.0.1-commit.
|
|
79
|
-
"@aztec/slasher": "0.0.1-commit.
|
|
80
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
81
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
82
|
-
"@aztec/validator-ha-signer": "0.0.1-commit.
|
|
67
|
+
"@aztec/blob-client": "0.0.1-commit.2448fdb",
|
|
68
|
+
"@aztec/blob-lib": "0.0.1-commit.2448fdb",
|
|
69
|
+
"@aztec/constants": "0.0.1-commit.2448fdb",
|
|
70
|
+
"@aztec/epoch-cache": "0.0.1-commit.2448fdb",
|
|
71
|
+
"@aztec/ethereum": "0.0.1-commit.2448fdb",
|
|
72
|
+
"@aztec/foundation": "0.0.1-commit.2448fdb",
|
|
73
|
+
"@aztec/node-keystore": "0.0.1-commit.2448fdb",
|
|
74
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.2448fdb",
|
|
75
|
+
"@aztec/p2p": "0.0.1-commit.2448fdb",
|
|
76
|
+
"@aztec/protocol-contracts": "0.0.1-commit.2448fdb",
|
|
77
|
+
"@aztec/prover-client": "0.0.1-commit.2448fdb",
|
|
78
|
+
"@aztec/simulator": "0.0.1-commit.2448fdb",
|
|
79
|
+
"@aztec/slasher": "0.0.1-commit.2448fdb",
|
|
80
|
+
"@aztec/stdlib": "0.0.1-commit.2448fdb",
|
|
81
|
+
"@aztec/telemetry-client": "0.0.1-commit.2448fdb",
|
|
82
|
+
"@aztec/validator-ha-signer": "0.0.1-commit.2448fdb",
|
|
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": "0.0.1-commit.
|
|
90
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
89
|
+
"@aztec/archiver": "0.0.1-commit.2448fdb",
|
|
90
|
+
"@aztec/world-state": "0.0.1-commit.2448fdb",
|
|
91
91
|
"@electric-sql/pglite": "^0.3.14",
|
|
92
92
|
"@jest/globals": "^30.0.0",
|
|
93
93
|
"@types/jest": "^30.0.0",
|