@aztec/validator-client 0.0.1-commit.f295ac2 → 0.0.1-commit.f504929
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 +22 -19
- package/dest/block_proposal_handler.d.ts +6 -8
- package/dest/block_proposal_handler.d.ts.map +1 -1
- package/dest/block_proposal_handler.js +28 -57
- package/dest/checkpoint_builder.d.ts +15 -13
- package/dest/checkpoint_builder.d.ts.map +1 -1
- package/dest/checkpoint_builder.js +55 -32
- package/dest/config.d.ts +1 -1
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +9 -7
- package/dest/duties/validation_service.d.ts +2 -2
- package/dest/duties/validation_service.d.ts.map +1 -1
- package/dest/duties/validation_service.js +3 -3
- package/dest/factory.d.ts +1 -1
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +2 -1
- package/dest/index.d.ts +1 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +0 -1
- package/dest/key_store/ha_key_store.d.ts +1 -1
- package/dest/key_store/ha_key_store.d.ts.map +1 -1
- package/dest/key_store/ha_key_store.js +2 -2
- package/dest/metrics.d.ts +12 -3
- package/dest/metrics.d.ts.map +1 -1
- package/dest/metrics.js +46 -5
- package/dest/validator.d.ts +40 -14
- package/dest/validator.d.ts.map +1 -1
- package/dest/validator.js +196 -52
- package/package.json +19 -17
- package/src/block_proposal_handler.ts +40 -81
- package/src/checkpoint_builder.ts +80 -33
- package/src/config.ts +9 -7
- package/src/duties/validation_service.ts +9 -2
- package/src/factory.ts +1 -0
- package/src/index.ts +0 -1
- package/src/key_store/ha_key_store.ts +2 -2
- package/src/metrics.ts +63 -6
- package/src/validator.ts +253 -65
- 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 -18
- package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
- package/dest/tx_validator/tx_validator_factory.js +0 -53
- 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 -133
package/dest/validator.d.ts
CHANGED
|
@@ -4,21 +4,21 @@ import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint, SlotNumber } from
|
|
|
4
4
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
5
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import type { Signature } from '@aztec/foundation/eth-signature';
|
|
7
|
-
import { type Logger } from '@aztec/foundation/log';
|
|
7
|
+
import { type LogData, type Logger } from '@aztec/foundation/log';
|
|
8
8
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
9
|
import type { KeystoreManager } from '@aztec/node-keystore';
|
|
10
|
-
import type { P2P, PeerId
|
|
10
|
+
import type { P2P, PeerId } from '@aztec/p2p';
|
|
11
11
|
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
|
-
import type { CreateCheckpointProposalLastBlockData, Validator, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
15
|
-
import type
|
|
16
|
-
import type
|
|
17
|
-
import { CheckpointProposal } from '@aztec/stdlib/p2p';
|
|
14
|
+
import type { CreateCheckpointProposalLastBlockData, ITxProvider, Validator, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
15
|
+
import { type L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
16
|
+
import { type BlockProposal, type BlockProposalOptions, type CheckpointAttestation, CheckpointProposal, type CheckpointProposalCore, type CheckpointProposalOptions } from '@aztec/stdlib/p2p';
|
|
18
17
|
import type { CheckpointHeader } from '@aztec/stdlib/rollup';
|
|
19
18
|
import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
|
|
20
19
|
import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
21
20
|
import { type SigningContext } from '@aztec/validator-ha-signer/types';
|
|
21
|
+
import type { ValidatorHASigner } from '@aztec/validator-ha-signer/validator-ha-signer';
|
|
22
22
|
import type { TypedDataDefinition } from 'viem';
|
|
23
23
|
import { BlockProposalHandler } from './block_proposal_handler.js';
|
|
24
24
|
import type { FullNodeCheckpointsBuilder } from './checkpoint_builder.js';
|
|
@@ -38,21 +38,28 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
38
38
|
private l1ToL2MessageSource;
|
|
39
39
|
private config;
|
|
40
40
|
private blobClient;
|
|
41
|
+
private haSigner;
|
|
41
42
|
private dateProvider;
|
|
42
43
|
readonly tracer: Tracer;
|
|
43
44
|
private validationService;
|
|
44
45
|
private metrics;
|
|
45
46
|
private log;
|
|
46
47
|
private hasRegisteredHandlers;
|
|
47
|
-
|
|
48
|
+
/** Tracks the last block proposal we created, to detect duplicate proposal attempts. */
|
|
49
|
+
private lastProposedBlock?;
|
|
50
|
+
/** Tracks the last checkpoint proposal we created. */
|
|
51
|
+
private lastProposedCheckpoint?;
|
|
48
52
|
private lastEpochForCommitteeUpdateLoop;
|
|
49
53
|
private epochCacheUpdateLoop;
|
|
54
|
+
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */
|
|
55
|
+
private lastAttestedEpochByAttester;
|
|
50
56
|
private proposersOfInvalidBlocks;
|
|
51
|
-
|
|
52
|
-
|
|
57
|
+
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */
|
|
58
|
+
private lastAttestedProposal?;
|
|
59
|
+
protected constructor(keyStore: ExtendedValidatorKeyStore, epochCache: EpochCache, p2pClient: P2P, blockProposalHandler: BlockProposalHandler, blockSource: L2BlockSource, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, l1ToL2MessageSource: L1ToL2MessageSource, config: ValidatorClientFullConfig, blobClient: BlobClientInterface, haSigner: ValidatorHASigner | undefined, dateProvider?: DateProvider, telemetry?: TelemetryClient, log?: Logger);
|
|
53
60
|
static validateKeyStoreConfiguration(keyStoreManager: KeystoreManager, logger?: Logger): void;
|
|
54
61
|
private handleEpochCommitteeUpdate;
|
|
55
|
-
static new(config: ValidatorClientFullConfig, checkpointsBuilder: FullNodeCheckpointsBuilder, worldState: WorldStateSynchronizer, epochCache: EpochCache, p2pClient: P2P, blockSource: L2BlockSource & L2BlockSink, l1ToL2MessageSource: L1ToL2MessageSource, txProvider:
|
|
62
|
+
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>;
|
|
56
63
|
getValidatorAddresses(): EthAddress[];
|
|
57
64
|
getBlockProposalHandler(): BlockProposalHandler;
|
|
58
65
|
signWithAddress(addr: EthAddress, msg: TypedDataDefinition, context: SigningContext): Promise<Signature>;
|
|
@@ -60,6 +67,7 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
60
67
|
getFeeRecipientForAttestor(attestor: EthAddress): AztecAddress;
|
|
61
68
|
getConfig(): ValidatorClientFullConfig;
|
|
62
69
|
updateConfig(config: Partial<ValidatorClientFullConfig>): void;
|
|
70
|
+
reloadKeystore(newManager: KeystoreManager): void;
|
|
63
71
|
start(): Promise<void>;
|
|
64
72
|
stop(): Promise<void>;
|
|
65
73
|
/** Register handlers on the p2p client */
|
|
@@ -77,16 +85,34 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
77
85
|
* @returns Checkpoint attestations if valid, undefined otherwise
|
|
78
86
|
*/
|
|
79
87
|
attestToCheckpointProposal(proposal: CheckpointProposalCore, _proposalSender: PeerId): Promise<CheckpointAttestation[] | undefined>;
|
|
88
|
+
/**
|
|
89
|
+
* Checks if we should attest to a slot based on equivocation prevention rules.
|
|
90
|
+
* @returns true if we should attest, false if we should skip
|
|
91
|
+
*/
|
|
92
|
+
private shouldAttestToSlot;
|
|
80
93
|
private createCheckpointAttestationsFromProposal;
|
|
81
94
|
private validateCheckpointProposal;
|
|
82
95
|
/**
|
|
83
96
|
* Extract checkpoint global variables from a block.
|
|
84
97
|
*/
|
|
85
98
|
private extractCheckpointConstants;
|
|
86
|
-
|
|
99
|
+
/**
|
|
100
|
+
* Uploads blobs for a checkpoint to the filestore (fire and forget).
|
|
101
|
+
*/
|
|
102
|
+
protected uploadBlobsForCheckpoint(proposal: CheckpointProposalCore, proposalInfo: LogData): Promise<void>;
|
|
87
103
|
private slashInvalidBlock;
|
|
88
|
-
|
|
89
|
-
|
|
104
|
+
/**
|
|
105
|
+
* Handle detection of a duplicate proposal (equivocation).
|
|
106
|
+
* Emits a slash event when a proposer sends multiple proposals for the same position.
|
|
107
|
+
*/
|
|
108
|
+
private handleDuplicateProposal;
|
|
109
|
+
/**
|
|
110
|
+
* Handle detection of a duplicate attestation (equivocation).
|
|
111
|
+
* Emits a slash event when an attester signs attestations for different proposals at the same slot.
|
|
112
|
+
*/
|
|
113
|
+
private handleDuplicateAttestation;
|
|
114
|
+
createBlockProposal(blockHeader: BlockHeader, indexWithinCheckpoint: IndexWithinCheckpoint, inHash: Fr, archive: Fr, txs: Tx[], proposerAddress: EthAddress | undefined, options?: BlockProposalOptions): Promise<BlockProposal>;
|
|
115
|
+
createCheckpointProposal(checkpointHeader: CheckpointHeader, archive: Fr, feeAssetPriceModifier: bigint, lastBlockInfo: CreateCheckpointProposalLastBlockData | undefined, proposerAddress: EthAddress | undefined, options?: CheckpointProposalOptions): Promise<CheckpointProposal>;
|
|
90
116
|
broadcastBlockProposal(proposal: BlockProposal): Promise<void>;
|
|
91
117
|
signAttestationsAndSigners(attestationsAndSigners: CommitteeAttestationsAndSigners, proposer: EthAddress, slot: SlotNumber, blockNumber: BlockNumber | CheckpointNumber): Promise<Signature>;
|
|
92
118
|
collectOwnAttestations(proposal: CheckpointProposal): Promise<CheckpointAttestation[]>;
|
|
@@ -94,4 +120,4 @@ export declare class ValidatorClient extends ValidatorClient_base implements Val
|
|
|
94
120
|
private handleAuthRequest;
|
|
95
121
|
}
|
|
96
122
|
export {};
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxFQUNMLFdBQVcsRUFDWCxnQkFBZ0IsRUFFaEIscUJBQXFCLEVBQ3JCLFVBQVUsRUFDWCxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJaEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFtRCxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRS9GLE9BQU8sRUFBb0MsS0FBSyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSwrQkFBK0IsRUFBVyxXQUFXLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFaEgsT0FBTyxLQUFLLEVBQ1YscUNBQXFDLEVBQ3JDLFdBQVcsRUFDWCxTQUFTLEVBQ1QseUJBQXlCLEVBQ3pCLHNCQUFzQixFQUN2QixN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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;AAErE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/dest/validator.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getBlobsPerL1Block } from '@aztec/blob-lib';
|
|
2
|
-
import {
|
|
2
|
+
import { validateFeeAssetPriceModifier } from '@aztec/ethereum/contracts';
|
|
3
|
+
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
3
4
|
import { TimeoutError } from '@aztec/foundation/error';
|
|
4
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
5
6
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
@@ -8,7 +9,8 @@ import { sleep } from '@aztec/foundation/sleep';
|
|
|
8
9
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
9
10
|
import { AuthRequest, AuthResponse, BlockProposalValidator, ReqRespSubProtocol } from '@aztec/p2p';
|
|
10
11
|
import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
|
|
11
|
-
import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
|
|
12
|
+
import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
13
|
+
import { accumulateCheckpointOutHashes } from '@aztec/stdlib/messaging';
|
|
12
14
|
import { AttestationTimeoutError } from '@aztec/stdlib/validators';
|
|
13
15
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
14
16
|
import { createHASigner } from '@aztec/validator-ha-signer/factory';
|
|
@@ -40,6 +42,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
40
42
|
l1ToL2MessageSource;
|
|
41
43
|
config;
|
|
42
44
|
blobClient;
|
|
45
|
+
haSigner;
|
|
43
46
|
dateProvider;
|
|
44
47
|
tracer;
|
|
45
48
|
validationService;
|
|
@@ -47,17 +50,15 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
47
50
|
log;
|
|
48
51
|
// Whether it has already registered handlers on the p2p client
|
|
49
52
|
hasRegisteredHandlers;
|
|
50
|
-
|
|
51
|
-
|
|
53
|
+
/** Tracks the last block proposal we created, to detect duplicate proposal attempts. */ lastProposedBlock;
|
|
54
|
+
/** Tracks the last checkpoint proposal we created. */ lastProposedCheckpoint;
|
|
52
55
|
lastEpochForCommitteeUpdateLoop;
|
|
53
56
|
epochCacheUpdateLoop;
|
|
57
|
+
/** Tracks the last epoch in which each attester successfully submitted at least one attestation. */ lastAttestedEpochByAttester;
|
|
54
58
|
proposersOfInvalidBlocks;
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
validatedBlockSlots;
|
|
59
|
-
constructor(keyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
|
|
60
|
-
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.proposersOfInvalidBlocks = new Set(), this.validatedBlockSlots = new Set();
|
|
59
|
+
/** Tracks the last checkpoint proposal we attested to, to prevent equivocation. */ lastAttestedProposal;
|
|
60
|
+
constructor(keyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, haSigner, dateProvider = new DateProvider(), telemetry = getTelemetryClient(), log = createLogger('validator')){
|
|
61
|
+
super(), this.keyStore = keyStore, this.epochCache = epochCache, this.p2pClient = p2pClient, this.blockProposalHandler = blockProposalHandler, this.blockSource = blockSource, this.checkpointsBuilder = checkpointsBuilder, this.worldState = worldState, this.l1ToL2MessageSource = l1ToL2MessageSource, this.config = config, this.blobClient = blobClient, this.haSigner = haSigner, this.dateProvider = dateProvider, this.hasRegisteredHandlers = false, this.lastAttestedEpochByAttester = new Map(), this.proposersOfInvalidBlocks = new Set();
|
|
61
62
|
// Create child logger with fisherman prefix if in fisherman mode
|
|
62
63
|
this.log = config.fishermanMode ? log.createChild('[FISHERMAN]') : log;
|
|
63
64
|
this.tracer = telemetry.getTracer('Validator');
|
|
@@ -96,6 +97,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
96
97
|
this.log.trace(`No committee found for slot`);
|
|
97
98
|
return;
|
|
98
99
|
}
|
|
100
|
+
this.metrics.setCurrentEpoch(epoch);
|
|
99
101
|
if (epoch !== this.lastEpochForCommitteeUpdateLoop) {
|
|
100
102
|
const me = this.getValidatorAddresses();
|
|
101
103
|
const committeeSet = new Set(committee.map((v)=>v.toString()));
|
|
@@ -114,20 +116,27 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
114
116
|
static async new(config, checkpointsBuilder, worldState, epochCache, p2pClient, blockSource, l1ToL2MessageSource, txProvider, keyStoreManager, blobClient, dateProvider = new DateProvider(), telemetry = getTelemetryClient()) {
|
|
115
117
|
const metrics = new ValidatorMetrics(telemetry);
|
|
116
118
|
const blockProposalValidator = new BlockProposalValidator(epochCache, {
|
|
117
|
-
txsPermitted: !config.disableTransactions
|
|
119
|
+
txsPermitted: !config.disableTransactions,
|
|
120
|
+
maxTxsPerBlock: config.maxTxsPerBlock
|
|
118
121
|
});
|
|
119
122
|
const blockProposalHandler = new BlockProposalHandler(checkpointsBuilder, worldState, blockSource, l1ToL2MessageSource, txProvider, blockProposalValidator, epochCache, config, metrics, dateProvider, telemetry);
|
|
120
|
-
|
|
123
|
+
const nodeKeystoreAdapter = NodeKeystoreAdapter.fromKeyStoreManager(keyStoreManager);
|
|
124
|
+
let validatorKeyStore = nodeKeystoreAdapter;
|
|
125
|
+
let haSigner;
|
|
121
126
|
if (config.haSigningEnabled) {
|
|
122
127
|
// If maxStuckDutiesAgeMs is not explicitly set, compute it from Aztec slot duration
|
|
123
128
|
const haConfig = {
|
|
124
129
|
...config,
|
|
125
130
|
maxStuckDutiesAgeMs: config.maxStuckDutiesAgeMs ?? epochCache.getL1Constants().slotDuration * 2 * 1000
|
|
126
131
|
};
|
|
127
|
-
const { signer } = await createHASigner(haConfig
|
|
128
|
-
|
|
132
|
+
const { signer } = await createHASigner(haConfig, {
|
|
133
|
+
telemetryClient: telemetry,
|
|
134
|
+
dateProvider
|
|
135
|
+
});
|
|
136
|
+
haSigner = signer;
|
|
137
|
+
validatorKeyStore = new HAKeyStore(nodeKeystoreAdapter, signer);
|
|
129
138
|
}
|
|
130
|
-
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, dateProvider, telemetry);
|
|
139
|
+
const validator = new ValidatorClient(validatorKeyStore, epochCache, p2pClient, blockProposalHandler, blockSource, checkpointsBuilder, worldState, l1ToL2MessageSource, config, blobClient, haSigner, dateProvider, telemetry);
|
|
131
140
|
return validator;
|
|
132
141
|
}
|
|
133
142
|
getValidatorAddresses() {
|
|
@@ -154,6 +163,20 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
154
163
|
...config
|
|
155
164
|
};
|
|
156
165
|
}
|
|
166
|
+
reloadKeystore(newManager) {
|
|
167
|
+
if (this.config.haSigningEnabled && !this.haSigner) {
|
|
168
|
+
this.log.warn('HA signing is enabled in config but was not initialized at startup. ' + 'Restart the node to enable HA signing.');
|
|
169
|
+
} else if (!this.config.haSigningEnabled && this.haSigner) {
|
|
170
|
+
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.');
|
|
171
|
+
}
|
|
172
|
+
const newAdapter = NodeKeystoreAdapter.fromKeyStoreManager(newManager);
|
|
173
|
+
if (this.haSigner) {
|
|
174
|
+
this.keyStore = new HAKeyStore(newAdapter, this.haSigner);
|
|
175
|
+
} else {
|
|
176
|
+
this.keyStore = newAdapter;
|
|
177
|
+
}
|
|
178
|
+
this.validationService = new ValidationService(this.keyStore, this.log.createChild('validation-service'));
|
|
179
|
+
}
|
|
157
180
|
async start() {
|
|
158
181
|
if (this.epochCacheUpdateLoop.isRunning()) {
|
|
159
182
|
this.log.warn(`Validator client already started`);
|
|
@@ -186,6 +209,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
186
209
|
// and processed separately via the block handler above.
|
|
187
210
|
const checkpointHandler = (checkpoint, proposalSender)=>this.attestToCheckpointProposal(checkpoint, proposalSender);
|
|
188
211
|
this.p2pClient.registerCheckpointProposalHandler(checkpointHandler);
|
|
212
|
+
// Duplicate proposal handler - triggers slashing for equivocation
|
|
213
|
+
this.p2pClient.registerDuplicateProposalCallback((info)=>{
|
|
214
|
+
this.handleDuplicateProposal(info);
|
|
215
|
+
});
|
|
216
|
+
// Duplicate attestation handler - triggers slashing for attestation equivocation
|
|
217
|
+
this.p2pClient.registerDuplicateAttestationCallback((info)=>{
|
|
218
|
+
this.handleDuplicateAttestation(info);
|
|
219
|
+
});
|
|
189
220
|
const myAddresses = this.getValidatorAddresses();
|
|
190
221
|
this.p2pClient.registerThisValidatorAddresses(myAddresses);
|
|
191
222
|
await this.p2pClient.addReqRespSubProtocol(ReqRespSubProtocol.AUTH, this.handleAuthRequest.bind(this));
|
|
@@ -206,6 +237,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
206
237
|
this.log.warn(`Received block proposal with invalid signature for slot ${slotNumber}`);
|
|
207
238
|
return false;
|
|
208
239
|
}
|
|
240
|
+
// Ignore proposals from ourselves (may happen in HA setups)
|
|
241
|
+
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
242
|
+
this.log.warn(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
243
|
+
proposer: proposer.toString(),
|
|
244
|
+
slotNumber
|
|
245
|
+
});
|
|
246
|
+
return false;
|
|
247
|
+
}
|
|
209
248
|
// Check if we're in the committee (for metrics purposes)
|
|
210
249
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
211
250
|
const partOfCommittee = inCommittee.length > 0;
|
|
@@ -257,9 +296,6 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
257
296
|
this.log.warn(`Escape hatch open for slot ${slotNumber}, rejecting block proposal`, proposalInfo);
|
|
258
297
|
return false;
|
|
259
298
|
}
|
|
260
|
-
// TODO(palla/mbps): Remove this once checkpoint validation is stable.
|
|
261
|
-
// Track that we successfully validated a block for this slot, so we can attest to checkpoint proposals for it.
|
|
262
|
-
this.validatedBlockSlots.add(slotNumber);
|
|
263
299
|
return true;
|
|
264
300
|
}
|
|
265
301
|
/**
|
|
@@ -280,6 +316,19 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
280
316
|
this.log.warn(`Received checkpoint proposal with invalid signature for slot ${slotNumber}`);
|
|
281
317
|
return undefined;
|
|
282
318
|
}
|
|
319
|
+
// Ignore proposals from ourselves (may happen in HA setups)
|
|
320
|
+
if (this.getValidatorAddresses().some((addr)=>addr.equals(proposer))) {
|
|
321
|
+
this.log.warn(`Ignoring block proposal from self for slot ${slotNumber}`, {
|
|
322
|
+
proposer: proposer.toString(),
|
|
323
|
+
slotNumber
|
|
324
|
+
});
|
|
325
|
+
return undefined;
|
|
326
|
+
}
|
|
327
|
+
// Validate fee asset price modifier is within allowed range
|
|
328
|
+
if (!validateFeeAssetPriceModifier(proposal.feeAssetPriceModifier)) {
|
|
329
|
+
this.log.warn(`Received checkpoint proposal with invalid feeAssetPriceModifier ${proposal.feeAssetPriceModifier} for slot ${slotNumber}`);
|
|
330
|
+
return undefined;
|
|
331
|
+
}
|
|
283
332
|
// Check that I have any address in current committee before attesting
|
|
284
333
|
const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
|
|
285
334
|
const partOfCommittee = inCommittee.length > 0;
|
|
@@ -294,16 +343,9 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
294
343
|
txHashes: proposal.txHashes.map((t)=>t.toString()),
|
|
295
344
|
fishermanMode: this.config.fishermanMode || false
|
|
296
345
|
});
|
|
297
|
-
// TODO(palla/mbps): Remove this once checkpoint validation is stable.
|
|
298
|
-
// Check that we have successfully validated a block for this slot before attesting to the checkpoint.
|
|
299
|
-
if (!this.validatedBlockSlots.has(slotNumber)) {
|
|
300
|
-
this.log.warn(`No validated block found for slot ${slotNumber}, refusing to attest to checkpoint`, proposalInfo);
|
|
301
|
-
return undefined;
|
|
302
|
-
}
|
|
303
346
|
// Validate the checkpoint proposal before attesting (unless skipCheckpointProposalValidation is set)
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
this.log.verbose(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
347
|
+
if (this.config.skipCheckpointProposalValidation) {
|
|
348
|
+
this.log.warn(`Skipping checkpoint proposal validation for slot ${slotNumber}`, proposalInfo);
|
|
307
349
|
} else {
|
|
308
350
|
const validationResult = await this.validateCheckpointProposal(proposal, proposalInfo);
|
|
309
351
|
if (!validationResult.isValid) {
|
|
@@ -328,6 +370,16 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
328
370
|
fishermanMode: this.config.fishermanMode || false
|
|
329
371
|
});
|
|
330
372
|
this.metrics.incSuccessfulAttestations(inCommittee.length);
|
|
373
|
+
// Track epoch participation per attester: count each (attester, epoch) pair at most once
|
|
374
|
+
const proposalEpoch = getEpochAtSlot(slotNumber, this.epochCache.getL1Constants());
|
|
375
|
+
for (const attester of inCommittee){
|
|
376
|
+
const key = attester.toString();
|
|
377
|
+
const lastEpoch = this.lastAttestedEpochByAttester.get(key);
|
|
378
|
+
if (lastEpoch === undefined || proposalEpoch > lastEpoch) {
|
|
379
|
+
this.lastAttestedEpochByAttester.set(key, proposalEpoch);
|
|
380
|
+
this.metrics.incAttestedEpochCount(attester);
|
|
381
|
+
}
|
|
382
|
+
}
|
|
331
383
|
// Determine which validators should attest
|
|
332
384
|
let attestors;
|
|
333
385
|
if (partOfCommittee) {
|
|
@@ -350,11 +402,32 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
350
402
|
});
|
|
351
403
|
return undefined;
|
|
352
404
|
}
|
|
353
|
-
return this.createCheckpointAttestationsFromProposal(proposal, attestors);
|
|
405
|
+
return await this.createCheckpointAttestationsFromProposal(proposal, attestors);
|
|
406
|
+
}
|
|
407
|
+
/**
|
|
408
|
+
* Checks if we should attest to a slot based on equivocation prevention rules.
|
|
409
|
+
* @returns true if we should attest, false if we should skip
|
|
410
|
+
*/ shouldAttestToSlot(slotNumber) {
|
|
411
|
+
// If attestToEquivocatedProposals is true, always allow
|
|
412
|
+
if (this.config.attestToEquivocatedProposals) {
|
|
413
|
+
return true;
|
|
414
|
+
}
|
|
415
|
+
// Check if incoming slot is strictly greater than last attested
|
|
416
|
+
if (this.lastAttestedProposal && slotNumber <= this.lastAttestedProposal.slotNumber) {
|
|
417
|
+
this.log.warn(`Refusing to process a proposal for slot ${slotNumber} given we already attested to a proposal for slot ${this.lastAttestedProposal.slotNumber}`);
|
|
418
|
+
return false;
|
|
419
|
+
}
|
|
420
|
+
return true;
|
|
354
421
|
}
|
|
355
422
|
async createCheckpointAttestationsFromProposal(proposal, attestors = []) {
|
|
423
|
+
// Equivocation check: must happen right before signing to minimize the race window
|
|
424
|
+
if (!this.shouldAttestToSlot(proposal.slotNumber)) {
|
|
425
|
+
return undefined;
|
|
426
|
+
}
|
|
356
427
|
const attestations = await this.validationService.attestToCheckpointProposal(proposal, attestors);
|
|
357
|
-
|
|
428
|
+
// Track the proposal we attested to (to prevent equivocation)
|
|
429
|
+
this.lastAttestedProposal = proposal;
|
|
430
|
+
await this.p2pClient.addOwnCheckpointAttestations(attestations);
|
|
358
431
|
return attestations;
|
|
359
432
|
}
|
|
360
433
|
/**
|
|
@@ -362,7 +435,10 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
362
435
|
* @returns Validation result with isValid flag and reason if invalid.
|
|
363
436
|
*/ async validateCheckpointProposal(proposal, proposalInfo) {
|
|
364
437
|
const slot = proposal.slotNumber;
|
|
365
|
-
|
|
438
|
+
// Timeout block syncing at the start of the next slot
|
|
439
|
+
const config = this.checkpointsBuilder.getConfig();
|
|
440
|
+
const nextSlotTimestampSeconds = Number(getTimestampForSlot(SlotNumber(slot + 1), config));
|
|
441
|
+
const timeoutSeconds = Math.max(1, nextSlotTimestampSeconds - Math.floor(this.dateProvider.now() / 1000));
|
|
366
442
|
// Wait for last block to sync by archive
|
|
367
443
|
let lastBlockHeader;
|
|
368
444
|
try {
|
|
@@ -400,6 +476,14 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
400
476
|
reason: 'no_blocks_for_slot'
|
|
401
477
|
};
|
|
402
478
|
}
|
|
479
|
+
// Ensure the last block for this slot matches the archive in the checkpoint proposal
|
|
480
|
+
if (!blocks.at(-1)?.archive.root.equals(proposal.archive)) {
|
|
481
|
+
this.log.warn(`Last block archive mismatch for checkpoint proposal`, proposalInfo);
|
|
482
|
+
return {
|
|
483
|
+
isValid: false,
|
|
484
|
+
reason: 'last_block_archive_mismatch'
|
|
485
|
+
};
|
|
486
|
+
}
|
|
403
487
|
this.log.debug(`Found ${blocks.length} blocks for slot ${slot}`, {
|
|
404
488
|
...proposalInfo,
|
|
405
489
|
blockNumbers: blocks.map((b)=>b.number)
|
|
@@ -410,18 +494,15 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
410
494
|
const checkpointNumber = firstBlock.checkpointNumber;
|
|
411
495
|
// Get L1-to-L2 messages for this checkpoint
|
|
412
496
|
const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(checkpointNumber);
|
|
413
|
-
//
|
|
414
|
-
// TODO: There can be a more efficient way to get the previous checkpoint out hashes without having to fetch the
|
|
415
|
-
// actual checkpoints and the blocks/txs in them.
|
|
497
|
+
// Collect the out hashes of all the checkpoints before this one in the same epoch
|
|
416
498
|
const epoch = getEpochAtSlot(slot, this.epochCache.getL1Constants());
|
|
417
|
-
const
|
|
418
|
-
const previousCheckpointOutHashes = previousCheckpoints.map((c)=>c.getCheckpointOutHash());
|
|
499
|
+
const previousCheckpointOutHashes = (await this.blockSource.getCheckpointsDataForEpoch(epoch)).filter((c)=>c.checkpointNumber < checkpointNumber).map((c)=>c.checkpointOutHash);
|
|
419
500
|
// Fork world state at the block before the first block
|
|
420
501
|
const parentBlockNumber = BlockNumber(firstBlock.number - 1);
|
|
421
502
|
const fork = await this.worldState.fork(parentBlockNumber);
|
|
422
503
|
try {
|
|
423
504
|
// Create checkpoint builder with all existing blocks
|
|
424
|
-
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks);
|
|
505
|
+
const checkpointBuilder = await this.checkpointsBuilder.openCheckpoint(checkpointNumber, constants, proposal.feeAssetPriceModifier, l1ToL2Messages, previousCheckpointOutHashes, fork, blocks, this.log.getBindings());
|
|
425
506
|
// Complete the checkpoint to get computed values
|
|
426
507
|
const computedCheckpoint = await checkpointBuilder.completeCheckpoint();
|
|
427
508
|
// Compare checkpoint header with proposal
|
|
@@ -448,13 +529,20 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
448
529
|
reason: 'archive_mismatch'
|
|
449
530
|
};
|
|
450
531
|
}
|
|
451
|
-
// Check that the accumulated out hash matches the value in the proposal.
|
|
452
|
-
|
|
453
|
-
const
|
|
454
|
-
|
|
532
|
+
// Check that the accumulated epoch out hash matches the value in the proposal.
|
|
533
|
+
// The epoch out hash is the accumulated hash of all checkpoint out hashes in the epoch.
|
|
534
|
+
const checkpointOutHash = computedCheckpoint.getCheckpointOutHash();
|
|
535
|
+
const computedEpochOutHash = accumulateCheckpointOutHashes([
|
|
536
|
+
...previousCheckpointOutHashes,
|
|
537
|
+
checkpointOutHash
|
|
538
|
+
]);
|
|
539
|
+
const proposalEpochOutHash = proposal.checkpointHeader.epochOutHash;
|
|
540
|
+
if (!computedEpochOutHash.equals(proposalEpochOutHash)) {
|
|
455
541
|
this.log.warn(`Epoch out hash mismatch`, {
|
|
456
|
-
|
|
457
|
-
|
|
542
|
+
proposalEpochOutHash: proposalEpochOutHash.toString(),
|
|
543
|
+
computedEpochOutHash: computedEpochOutHash.toString(),
|
|
544
|
+
checkpointOutHash: checkpointOutHash.toString(),
|
|
545
|
+
previousCheckpointOutHashes: previousCheckpointOutHashes.map((h)=>h.toString()),
|
|
458
546
|
...proposalInfo
|
|
459
547
|
});
|
|
460
548
|
return {
|
|
@@ -478,6 +566,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
478
566
|
chainId: gv.chainId,
|
|
479
567
|
version: gv.version,
|
|
480
568
|
slotNumber: gv.slotNumber,
|
|
569
|
+
timestamp: gv.timestamp,
|
|
481
570
|
coinbase: gv.coinbase,
|
|
482
571
|
feeRecipient: gv.feeRecipient,
|
|
483
572
|
gasFees: gv.gasFees
|
|
@@ -498,7 +587,7 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
498
587
|
return;
|
|
499
588
|
}
|
|
500
589
|
const blobFields = blocks.flatMap((b)=>b.toBlobFields());
|
|
501
|
-
const blobs = getBlobsPerL1Block(blobFields);
|
|
590
|
+
const blobs = await getBlobsPerL1Block(blobFields);
|
|
502
591
|
await this.blobClient.sendBlobsToFilestore(blobs);
|
|
503
592
|
this.log.debug(`Uploaded ${blobs.length} blobs to filestore for checkpoint at slot ${proposal.slotNumber}`, {
|
|
504
593
|
...proposalInfo,
|
|
@@ -530,23 +619,75 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
530
619
|
}
|
|
531
620
|
]);
|
|
532
621
|
}
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
622
|
+
/**
|
|
623
|
+
* Handle detection of a duplicate proposal (equivocation).
|
|
624
|
+
* Emits a slash event when a proposer sends multiple proposals for the same position.
|
|
625
|
+
*/ handleDuplicateProposal(info) {
|
|
626
|
+
const { slot, proposer, type } = info;
|
|
627
|
+
this.log.warn(`Triggering slash event for duplicate ${type} proposal from ${proposer.toString()} at slot ${slot}`, {
|
|
628
|
+
proposer: proposer.toString(),
|
|
629
|
+
slot,
|
|
630
|
+
type
|
|
631
|
+
});
|
|
632
|
+
// Emit slash event
|
|
633
|
+
this.emit(WANT_TO_SLASH_EVENT, [
|
|
634
|
+
{
|
|
635
|
+
validator: proposer,
|
|
636
|
+
amount: this.config.slashDuplicateProposalPenalty,
|
|
637
|
+
offenseType: OffenseType.DUPLICATE_PROPOSAL,
|
|
638
|
+
epochOrSlot: BigInt(slot)
|
|
639
|
+
}
|
|
640
|
+
]);
|
|
641
|
+
}
|
|
642
|
+
/**
|
|
643
|
+
* Handle detection of a duplicate attestation (equivocation).
|
|
644
|
+
* Emits a slash event when an attester signs attestations for different proposals at the same slot.
|
|
645
|
+
*/ handleDuplicateAttestation(info) {
|
|
646
|
+
const { slot, attester } = info;
|
|
647
|
+
this.log.warn(`Triggering slash event for duplicate attestation from ${attester.toString()} at slot ${slot}`, {
|
|
648
|
+
attester: attester.toString(),
|
|
649
|
+
slot
|
|
650
|
+
});
|
|
651
|
+
this.emit(WANT_TO_SLASH_EVENT, [
|
|
652
|
+
{
|
|
653
|
+
validator: attester,
|
|
654
|
+
amount: this.config.slashDuplicateAttestationPenalty,
|
|
655
|
+
offenseType: OffenseType.DUPLICATE_ATTESTATION,
|
|
656
|
+
epochOrSlot: BigInt(slot)
|
|
657
|
+
}
|
|
658
|
+
]);
|
|
659
|
+
}
|
|
660
|
+
async createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, options = {}) {
|
|
661
|
+
// Validate that we're not creating a proposal for an older or equal position
|
|
662
|
+
if (this.lastProposedBlock) {
|
|
663
|
+
const lastSlot = this.lastProposedBlock.slotNumber;
|
|
664
|
+
const lastIndex = this.lastProposedBlock.indexWithinCheckpoint;
|
|
665
|
+
const newSlot = blockHeader.globalVariables.slotNumber;
|
|
666
|
+
if (newSlot < lastSlot || newSlot === lastSlot && indexWithinCheckpoint <= lastIndex) {
|
|
667
|
+
throw new Error(`Cannot create block proposal for slot ${newSlot} index ${indexWithinCheckpoint}: ` + `already proposed block for slot ${lastSlot} index ${lastIndex}`);
|
|
668
|
+
}
|
|
669
|
+
}
|
|
539
670
|
this.log.info(`Assembling block proposal for block ${blockHeader.globalVariables.blockNumber} slot ${blockHeader.globalVariables.slotNumber}`);
|
|
540
671
|
const newProposal = await this.validationService.createBlockProposal(blockHeader, indexWithinCheckpoint, inHash, archive, txs, proposerAddress, {
|
|
541
672
|
...options,
|
|
542
673
|
broadcastInvalidBlockProposal: this.config.broadcastInvalidBlockProposal
|
|
543
674
|
});
|
|
544
|
-
this.
|
|
675
|
+
this.lastProposedBlock = newProposal;
|
|
545
676
|
return newProposal;
|
|
546
677
|
}
|
|
547
|
-
async createCheckpointProposal(checkpointHeader, archive, lastBlockInfo, proposerAddress, options) {
|
|
678
|
+
async createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options = {}) {
|
|
679
|
+
// Validate that we're not creating a proposal for an older or equal slot
|
|
680
|
+
if (this.lastProposedCheckpoint) {
|
|
681
|
+
const lastSlot = this.lastProposedCheckpoint.slotNumber;
|
|
682
|
+
const newSlot = checkpointHeader.slotNumber;
|
|
683
|
+
if (newSlot <= lastSlot) {
|
|
684
|
+
throw new Error(`Cannot create checkpoint proposal for slot ${newSlot}: ` + `already proposed checkpoint for slot ${lastSlot}`);
|
|
685
|
+
}
|
|
686
|
+
}
|
|
548
687
|
this.log.info(`Assembling checkpoint proposal for slot ${checkpointHeader.slotNumber}`);
|
|
549
|
-
|
|
688
|
+
const newProposal = await this.validationService.createCheckpointProposal(checkpointHeader, archive, feeAssetPriceModifier, lastBlockInfo, proposerAddress, options);
|
|
689
|
+
this.lastProposedCheckpoint = newProposal;
|
|
690
|
+
return newProposal;
|
|
550
691
|
}
|
|
551
692
|
async broadcastBlockProposal(proposal) {
|
|
552
693
|
await this.p2pClient.broadcastProposal(proposal);
|
|
@@ -561,6 +702,9 @@ const SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT = [
|
|
|
561
702
|
inCommittee
|
|
562
703
|
});
|
|
563
704
|
const attestations = await this.createCheckpointAttestationsFromProposal(proposal, inCommittee);
|
|
705
|
+
if (!attestations) {
|
|
706
|
+
return [];
|
|
707
|
+
}
|
|
564
708
|
// We broadcast our own attestations to our peers so, in case our block does not get mined on L1,
|
|
565
709
|
// other nodes can see that our validators did attest to this block proposal, and do not slash us
|
|
566
710
|
// due to inactivity for missed attestations.
|