@lodestar/beacon-node 1.50.0-dev.c04a499311 → 1.50.0-dev.c3aaeedc3b
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/lib/api/impl/beacon/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/index.js +13 -0
- package/lib/api/impl/beacon/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/index.js +23 -3
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +26 -18
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +6 -0
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts +5 -0
- package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js +13 -23
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js +2 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
- package/lib/chain/chain.d.ts +4 -1
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +24 -5
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/interface.d.ts +1 -0
- package/lib/chain/interface.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +4 -2
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js +30 -8
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.d.ts +4 -4
- package/lib/chain/opPools/proposerPreferencesPool.d.ts.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.js +14 -11
- package/lib/chain/opPools/proposerPreferencesPool.js.map +1 -1
- package/lib/chain/options.d.ts +1 -0
- package/lib/chain/options.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +7 -0
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +21 -0
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/shufflingCache.d.ts +1 -0
- package/lib/chain/shufflingCache.d.ts.map +1 -1
- package/lib/chain/shufflingCache.js +4 -0
- package/lib/chain/shufflingCache.js.map +1 -1
- package/lib/db/beacon.d.ts +2 -0
- package/lib/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +3 -0
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +2 -1
- package/lib/db/buckets.d.ts.map +1 -1
- package/lib/db/buckets.js +1 -0
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +2 -0
- package/lib/db/interface.d.ts.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts +2 -2
- package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
- package/lib/db/repositories/earliestAvailableSlot.d.ts +11 -0
- package/lib/db/repositories/earliestAvailableSlot.d.ts.map +1 -0
- package/lib/db/repositories/earliestAvailableSlot.js +19 -0
- package/lib/db/repositories/earliestAvailableSlot.js.map +1 -0
- package/lib/metrics/metrics/lodestar.d.ts +1 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +4 -0
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +59 -63
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/node/nodejs.d.ts +3 -1
- package/lib/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +2 -1
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/range/chain.d.ts.map +1 -1
- package/lib/sync/range/chain.js +2 -0
- package/lib/sync/range/chain.js.map +1 -1
- package/package.json +16 -16
- package/src/api/impl/beacon/index.ts +15 -0
- package/src/api/impl/beacon/state/index.ts +31 -3
- package/src/api/impl/debug/index.ts +28 -19
- package/src/api/impl/validator/index.ts +8 -0
- package/src/chain/archiveStore/archiveStore.ts +18 -24
- package/src/chain/archiveStore/utils/pruneHistory.ts +4 -1
- package/src/chain/chain.ts +38 -4
- package/src/chain/interface.ts +1 -0
- package/src/chain/opPools/aggregatedAttestationPool.ts +34 -10
- package/src/chain/opPools/proposerPreferencesPool.ts +14 -10
- package/src/chain/options.ts +1 -1
- package/src/chain/seenCache/seenGossipBlockInput.ts +23 -0
- package/src/chain/shufflingCache.ts +5 -0
- package/src/db/beacon.ts +3 -0
- package/src/db/buckets.ts +1 -0
- package/src/db/interface.ts +2 -0
- package/src/db/repositories/earliestAvailableSlot.ts +19 -0
- package/src/metrics/metrics/lodestar.ts +4 -0
- package/src/network/processor/gossipHandlers.ts +90 -76
- package/src/node/nodejs.ts +4 -0
- package/src/sync/range/chain.ts +3 -0
|
@@ -4,7 +4,7 @@ import {ExecutionStatus, PayloadStatus} from "@lodestar/fork-choice";
|
|
|
4
4
|
import {ForkPostDeneb, ZERO_HASH_HEX, isForkPostDeneb, isForkPostFulu} from "@lodestar/params";
|
|
5
5
|
import {computeTimeAtSlot} from "@lodestar/state-transition";
|
|
6
6
|
import {BeaconState, DataColumnSidecar, DataColumnSidecars, type SignedBeaconBlock, sszTypesFor} from "@lodestar/types";
|
|
7
|
-
import {toRootHex} from "@lodestar/utils";
|
|
7
|
+
import {fromHex, toRootHex} from "@lodestar/utils";
|
|
8
8
|
import {getBlobKzgCommitments} from "../../../util/dataColumns.js";
|
|
9
9
|
import {isOptimisticBlock} from "../../../util/forkChoice.js";
|
|
10
10
|
import {getStateSlotFromBytes} from "../../../util/multifork.js";
|
|
@@ -74,46 +74,55 @@ export function getDebugApi({
|
|
|
74
74
|
|
|
75
75
|
async getDebugForkChoiceV2() {
|
|
76
76
|
const {forkChoice} = chain;
|
|
77
|
+
const nodes = forkChoice.getAllNodes();
|
|
78
|
+
const head = forkChoice.getHead();
|
|
77
79
|
return {
|
|
78
80
|
data: {
|
|
79
81
|
justifiedCheckpoint: forkChoice.getJustifiedCheckpoint(),
|
|
80
82
|
finalizedCheckpoint: forkChoice.getFinalizedCheckpoint(),
|
|
81
|
-
forkChoiceNodes:
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
const ptc = node.payloadStatus === PayloadStatus.FULL ? forkChoice.getPTCVoteCounts(node.blockRoot) : null;
|
|
83
|
+
forkChoiceNodes: nodes.map((node) => {
|
|
84
|
+
const parent = node.parent === undefined ? undefined : nodes[node.parent];
|
|
85
|
+
const ptc = forkChoice.getPTCVoteCounts(node.blockRoot);
|
|
85
86
|
return {
|
|
86
|
-
payloadStatus: toPayloadStatusName(node.payloadStatus),
|
|
87
87
|
slot: node.slot,
|
|
88
88
|
blockRoot: node.blockRoot,
|
|
89
|
-
|
|
89
|
+
payloadStatus: toPayloadStatusName(node.payloadStatus),
|
|
90
|
+
parentRoot:
|
|
91
|
+
node.parentBlockHash !== null && node.payloadStatus !== PayloadStatus.PENDING
|
|
92
|
+
? node.blockRoot
|
|
93
|
+
: node.parentRoot,
|
|
94
|
+
parentPayloadStatus: parent === undefined ? null : toPayloadStatusName(parent.payloadStatus),
|
|
95
|
+
justifiedCheckpoint: {epoch: node.justifiedEpoch, root: fromHex(node.justifiedRoot)},
|
|
96
|
+
finalizedCheckpoint: {epoch: node.finalizedEpoch, root: fromHex(node.finalizedRoot)},
|
|
90
97
|
weight: node.weight,
|
|
91
98
|
validity: toForkChoiceValidity(node.executionStatus),
|
|
92
99
|
executionBlockHash: node.executionPayloadBlockHash ?? ZERO_HASH_HEX,
|
|
100
|
+
payloadAttesterCount: ptc?.attesterCount ?? 0,
|
|
101
|
+
payloadAvailabilityYesCount: ptc?.payloadPresentCount ?? 0,
|
|
102
|
+
payloadDataAvailabilityYesCount: ptc?.dataAvailableCount ?? 0,
|
|
93
103
|
extraData: {
|
|
104
|
+
attestationScore: node.attestationScore,
|
|
94
105
|
executionOptimistic: isOptimisticBlock(node),
|
|
106
|
+
gasLimit:
|
|
107
|
+
node.payloadStatus === PayloadStatus.FULL && node.executionStatus !== ExecutionStatus.PreMerge
|
|
108
|
+
? node.executionPayloadGasLimit
|
|
109
|
+
: null,
|
|
95
110
|
timestamp: computeTimeAtSlot(config, node.slot, chain.genesisTime),
|
|
111
|
+
stateRoot: node.stateRoot,
|
|
96
112
|
target: node.targetRoot,
|
|
97
|
-
justifiedEpoch: node.justifiedEpoch,
|
|
98
|
-
finalizedEpoch: node.finalizedEpoch,
|
|
99
113
|
unrealizedJustifiedEpoch: node.unrealizedJustifiedEpoch,
|
|
114
|
+
unrealizedJustifiedRoot: node.unrealizedJustifiedRoot,
|
|
100
115
|
unrealizedFinalizedEpoch: node.unrealizedFinalizedEpoch,
|
|
101
|
-
|
|
102
|
-
payloadAvailabilityYesCount: ptc?.payloadPresentCount ?? null,
|
|
103
|
-
payloadDataAvailabilityYesCount: ptc?.dataAvailableCount ?? null,
|
|
104
|
-
gasLimit:
|
|
105
|
-
node.payloadStatus === PayloadStatus.FULL && "executionPayloadGasLimit" in node
|
|
106
|
-
? node.executionPayloadGasLimit
|
|
107
|
-
: null,
|
|
116
|
+
unrealizedFinalizedRoot: node.unrealizedFinalizedRoot,
|
|
108
117
|
},
|
|
109
118
|
};
|
|
110
119
|
}),
|
|
111
120
|
extraData: {
|
|
112
|
-
|
|
113
|
-
unrealizedFinalizedCheckpoint: forkChoice.getUnrealizedFinalizedCheckpoint(),
|
|
121
|
+
head: {blockRoot: head.blockRoot, payloadStatus: toPayloadStatusName(head.payloadStatus)},
|
|
114
122
|
proposerBoostRoot: forkChoice.getProposerBoostRoot(),
|
|
115
123
|
previousProposerBoostRoot: forkChoice.getPreviousProposerBoostRoot(),
|
|
116
|
-
|
|
124
|
+
unrealizedJustifiedCheckpoint: forkChoice.getUnrealizedJustifiedCheckpoint(),
|
|
125
|
+
unrealizedFinalizedCheckpoint: forkChoice.getUnrealizedFinalizedCheckpoint(),
|
|
117
126
|
},
|
|
118
127
|
},
|
|
119
128
|
};
|
|
@@ -1300,6 +1300,10 @@ export function getValidatorApi(
|
|
|
1300
1300
|
blobs: blobsBundle.blobs,
|
|
1301
1301
|
};
|
|
1302
1302
|
|
|
1303
|
+
if (chain.opts.persistProducedPayloadEnvelopes) {
|
|
1304
|
+
chain.persistExecutionPayloadEnvelope(blockContents.executionPayloadEnvelope);
|
|
1305
|
+
}
|
|
1306
|
+
|
|
1303
1307
|
return {
|
|
1304
1308
|
data: blockContents,
|
|
1305
1309
|
meta: {version: fork, consensusBlockValue, executionPayloadValue, executionPayloadIncluded: true},
|
|
@@ -2187,6 +2191,10 @@ export function getValidatorApi(
|
|
|
2187
2191
|
blockHash: toRootHex(executionPayload.blockHash),
|
|
2188
2192
|
});
|
|
2189
2193
|
|
|
2194
|
+
if (chain.opts.persistProducedPayloadEnvelopes) {
|
|
2195
|
+
chain.persistExecutionPayloadEnvelope(envelope);
|
|
2196
|
+
}
|
|
2197
|
+
|
|
2190
2198
|
return {
|
|
2191
2199
|
data: envelope,
|
|
2192
2200
|
meta: {
|
|
@@ -113,7 +113,9 @@ export class ArchiveStore {
|
|
|
113
113
|
this.logger,
|
|
114
114
|
this.metrics,
|
|
115
115
|
this.opts.anchorState.finalizedCheckpoint.epoch,
|
|
116
|
-
this.chain.clock.currentEpoch
|
|
116
|
+
this.chain.clock.currentEpoch,
|
|
117
|
+
this.statePruneFromSlot,
|
|
118
|
+
this.advanceEarliestAvailableSlot
|
|
117
119
|
),
|
|
118
120
|
() => this.logger.info("Still pruning historical data, please wait..."),
|
|
119
121
|
30_000,
|
|
@@ -122,26 +124,6 @@ export class ArchiveStore {
|
|
|
122
124
|
this.statePruneFromSlot = stateCutoffSlot;
|
|
123
125
|
}
|
|
124
126
|
|
|
125
|
-
// Initialize earliestAvailableSlot from the earliest block actually retained (after any pruning
|
|
126
|
-
// above), rather than the anchor state slot set in the constructor. On an in-place restart the DB
|
|
127
|
-
// still holds finalized history below the anchor; leaving the value at the anchor makes the node
|
|
128
|
-
// reject by_range requests (beacon_blocks, execution_payload_envelopes and data_column_sidecars
|
|
129
|
-
// all gate on this slot) for data it still retains. An empty archive (e.g. a fresh checkpoint
|
|
130
|
-
// sync with nothing below the anchor) leaves the constructor's anchor slot in place.
|
|
131
|
-
const earliestArchivedBlockSlot = await this.db.blockArchive.firstKey();
|
|
132
|
-
if (earliestArchivedBlockSlot != null) {
|
|
133
|
-
const oldEarliestAvailableSlot = this.chain.earliestAvailableSlot;
|
|
134
|
-
this.chain.earliestAvailableSlot = earliestArchivedBlockSlot;
|
|
135
|
-
this.logger.verbose("Initialized earliestAvailableSlot from retained block archive", {
|
|
136
|
-
oldEarliestAvailableSlot,
|
|
137
|
-
newEarliestAvailableSlot: earliestArchivedBlockSlot,
|
|
138
|
-
});
|
|
139
|
-
} else {
|
|
140
|
-
this.logger.verbose("Empty block archive on init, keeping anchor earliestAvailableSlot", {
|
|
141
|
-
earliestAvailableSlot: this.chain.earliestAvailableSlot,
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
|
|
145
127
|
if (this.opts.serveHistoricalState) {
|
|
146
128
|
this.historicalStateRegen = await HistoricalStateRegen.init({
|
|
147
129
|
opts: {
|
|
@@ -158,6 +140,18 @@ export class ArchiveStore {
|
|
|
158
140
|
}
|
|
159
141
|
}
|
|
160
142
|
|
|
143
|
+
/**
|
|
144
|
+
* The CLI owns the initial value; this only advances it during pruneHistory.
|
|
145
|
+
* Persisted before any deletion so a crash mid-prune never leaves the floor below deleted data.
|
|
146
|
+
*/
|
|
147
|
+
private advanceEarliestAvailableSlot = async (blockCutoffSlot: Slot): Promise<void> => {
|
|
148
|
+
const earliestAvailableSlot = Math.max(this.chain.earliestAvailableSlot, blockCutoffSlot);
|
|
149
|
+
if (earliestAvailableSlot !== this.chain.earliestAvailableSlot) {
|
|
150
|
+
await this.db.earliestAvailableSlot.set(earliestAvailableSlot);
|
|
151
|
+
this.chain.earliestAvailableSlot = earliestAvailableSlot;
|
|
152
|
+
}
|
|
153
|
+
};
|
|
154
|
+
|
|
161
155
|
async close(): Promise<void> {
|
|
162
156
|
await this.historicalStateRegen?.close();
|
|
163
157
|
}
|
|
@@ -259,17 +253,17 @@ export class ArchiveStore {
|
|
|
259
253
|
|
|
260
254
|
if (this.opts.pruneHistory) {
|
|
261
255
|
timer = this.metrics?.processFinalizedCheckpoint.durationByTask.startTimer();
|
|
262
|
-
const {
|
|
256
|
+
const {stateCutoffSlot} = await pruneHistory(
|
|
263
257
|
this.chain.config,
|
|
264
258
|
this.db,
|
|
265
259
|
this.logger,
|
|
266
260
|
this.metrics,
|
|
267
261
|
finalizedEpoch,
|
|
268
262
|
this.chain.clock.currentEpoch,
|
|
269
|
-
this.statePruneFromSlot
|
|
263
|
+
this.statePruneFromSlot,
|
|
264
|
+
this.advanceEarliestAvailableSlot
|
|
270
265
|
);
|
|
271
266
|
this.statePruneFromSlot = stateCutoffSlot;
|
|
272
|
-
this.chain.earliestAvailableSlot = Math.max(this.chain.earliestAvailableSlot, blockCutoffSlot);
|
|
273
267
|
timer?.({source: ArchiveStoreTask.PruneHistory});
|
|
274
268
|
}
|
|
275
269
|
|
|
@@ -12,7 +12,8 @@ export async function pruneHistory(
|
|
|
12
12
|
metrics: Metrics | null | undefined,
|
|
13
13
|
finalizedEpoch: Epoch,
|
|
14
14
|
currentEpoch: Epoch,
|
|
15
|
-
statePruneFromSlot: Slot
|
|
15
|
+
statePruneFromSlot: Slot,
|
|
16
|
+
beforePrune: (blockCutoffSlot: Slot) => Promise<void>
|
|
16
17
|
): Promise<{blockCutoffSlot: Slot; stateCutoffSlot: Slot}> {
|
|
17
18
|
const blockCutoffEpoch = Math.min(
|
|
18
19
|
// set by config, with underflow protection
|
|
@@ -51,6 +52,8 @@ export async function pruneHistory(
|
|
|
51
52
|
stateSlots: prettyPrintIndices(states),
|
|
52
53
|
});
|
|
53
54
|
|
|
55
|
+
await beforePrune(blockCutoffSlot);
|
|
56
|
+
|
|
54
57
|
const step1 = metrics?.pruneHistory.pruneKeys.startTimer();
|
|
55
58
|
await Promise.all([
|
|
56
59
|
// ->
|
package/src/chain/chain.ts
CHANGED
|
@@ -244,6 +244,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
244
244
|
protected readonly blockProcessor: BlockProcessor;
|
|
245
245
|
protected readonly payloadEnvelopeProcessor: PayloadEnvelopeProcessor;
|
|
246
246
|
protected readonly db: IBeaconDb;
|
|
247
|
+
private genesisStateRoot?: RootHex | null;
|
|
247
248
|
// this is only available if nHistoricalStates is enabled
|
|
248
249
|
private readonly cpStateDatastore?: CPStateDatastore;
|
|
249
250
|
private abortController = new AbortController();
|
|
@@ -278,6 +279,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
278
279
|
validatorMonitor,
|
|
279
280
|
anchorState,
|
|
280
281
|
isAnchorStateFinalized,
|
|
282
|
+
earliestAvailableSlot,
|
|
281
283
|
executionEngine,
|
|
282
284
|
executionBuilder,
|
|
283
285
|
builderApiClientOpts,
|
|
@@ -297,6 +299,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
297
299
|
validatorMonitor: ValidatorMonitor | null;
|
|
298
300
|
anchorState: IBeaconStateView;
|
|
299
301
|
isAnchorStateFinalized: boolean;
|
|
302
|
+
earliestAvailableSlot: Slot;
|
|
300
303
|
executionEngine: IExecutionEngine;
|
|
301
304
|
executionBuilder?: IExecutionBuilder;
|
|
302
305
|
builderApiClientOpts?: BuilderApiClientOpts;
|
|
@@ -325,7 +328,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
325
328
|
|
|
326
329
|
this.blacklistedBlocks = new Map((opts.blacklistedBlocks ?? []).map((hex) => [hex, null]));
|
|
327
330
|
this.attestationPool = new AttestationPool(config, clock, this.opts?.preaggregateSlotDistance, metrics);
|
|
328
|
-
this.aggregatedAttestationPool = new AggregatedAttestationPool(this.config, metrics);
|
|
331
|
+
this.aggregatedAttestationPool = new AggregatedAttestationPool(this.config, metrics, logger);
|
|
329
332
|
this.syncCommitteeMessagePool = new SyncCommitteeMessagePool(config, clock, this.opts?.preaggregateSlotDistance);
|
|
330
333
|
this.syncContributionAndProofPool = new SyncContributionAndProofPool(config, clock, metrics, logger);
|
|
331
334
|
this.executionPayloadBidPool = new ExecutionPayloadBidPool();
|
|
@@ -362,7 +365,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
362
365
|
logger,
|
|
363
366
|
});
|
|
364
367
|
|
|
365
|
-
this._earliestAvailableSlot =
|
|
368
|
+
this._earliestAvailableSlot = earliestAvailableSlot;
|
|
366
369
|
|
|
367
370
|
this.shufflingCache = new ShufflingCache(metrics, logger, this.opts, [
|
|
368
371
|
{
|
|
@@ -573,7 +576,11 @@ export class BeaconChain implements IBeaconChain {
|
|
|
573
576
|
}
|
|
574
577
|
|
|
575
578
|
seenBlock(blockRoot: RootHex): boolean {
|
|
576
|
-
return
|
|
579
|
+
return (
|
|
580
|
+
this.seenBlockInputCache.hasBlock(blockRoot) ||
|
|
581
|
+
this.seenBlockInputCache.isValidatingBlock(blockRoot) ||
|
|
582
|
+
this.forkChoice.hasBlockHexUnsafe(blockRoot)
|
|
583
|
+
);
|
|
577
584
|
}
|
|
578
585
|
|
|
579
586
|
seenPayloadEnvelope(blockRoot: RootHex): boolean {
|
|
@@ -723,6 +730,17 @@ export class BeaconChain implements IBeaconChain {
|
|
|
723
730
|
}
|
|
724
731
|
}
|
|
725
732
|
|
|
733
|
+
if (this.genesisStateRoot === undefined) {
|
|
734
|
+
const genesisBlock = await this.db.blockArchive.get(GENESIS_SLOT);
|
|
735
|
+
this.genesisStateRoot = genesisBlock ? toRootHex(genesisBlock.message.stateRoot) : null;
|
|
736
|
+
}
|
|
737
|
+
if (this.genesisStateRoot === stateRoot) {
|
|
738
|
+
const state = await this.db.stateArchive.getBinary(GENESIS_SLOT);
|
|
739
|
+
if (state) {
|
|
740
|
+
return {state, executionOptimistic: false, finalized: finalizedCheckpoint.epoch !== GENESIS_EPOCH};
|
|
741
|
+
}
|
|
742
|
+
}
|
|
743
|
+
|
|
726
744
|
if (opts?.allowRegen) {
|
|
727
745
|
const state = await this.regen.getState(stateRoot, RegenCaller.restApi);
|
|
728
746
|
const block = this.forkChoice.getBlockDefaultStatus(
|
|
@@ -1524,6 +1542,22 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1524
1542
|
}
|
|
1525
1543
|
}
|
|
1526
1544
|
|
|
1545
|
+
persistExecutionPayloadEnvelope(envelope: gloas.ExecutionPayloadEnvelope): void {
|
|
1546
|
+
const blockRoot = toRootHex(envelope.beaconBlockRoot);
|
|
1547
|
+
void this.persistSszObject(
|
|
1548
|
+
"ExecutionPayloadEnvelope",
|
|
1549
|
+
ssz.gloas.ExecutionPayloadEnvelope.serialize(envelope),
|
|
1550
|
+
blockRoot,
|
|
1551
|
+
"produced_execution_payload_envelope"
|
|
1552
|
+
).catch((e) => {
|
|
1553
|
+
this.logger.error(
|
|
1554
|
+
"Error persisting produced execution payload envelope",
|
|
1555
|
+
{slot: envelope.payload.slotNumber, blockRoot},
|
|
1556
|
+
e as Error
|
|
1557
|
+
);
|
|
1558
|
+
});
|
|
1559
|
+
}
|
|
1560
|
+
|
|
1527
1561
|
/**
|
|
1528
1562
|
* Invalid state root error is critical and it causes the node to stale most of the time so we want to always
|
|
1529
1563
|
* persist preState, postState and block for further investigation.
|
|
@@ -1719,7 +1753,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1719
1753
|
// remove date suffixes in file name, and check duplicate to avoid redundant persistence
|
|
1720
1754
|
await writeIfNotExist(filepath, bytes);
|
|
1721
1755
|
|
|
1722
|
-
this.logger.debug("Persisted
|
|
1756
|
+
this.logger.debug("Persisted SSZ object", {id: logStr, filepath});
|
|
1723
1757
|
}
|
|
1724
1758
|
|
|
1725
1759
|
private onScrapeMetrics(metrics: Metrics): void {
|
package/src/chain/interface.ts
CHANGED
|
@@ -290,6 +290,7 @@ export interface IBeaconChain {
|
|
|
290
290
|
updateBeaconProposerData(epoch: Epoch, proposers: ProposerPreparationData[]): Promise<void>;
|
|
291
291
|
|
|
292
292
|
persistBlock(data: BeaconBlock | BlindedBeaconBlock, suffix?: string): void;
|
|
293
|
+
persistExecutionPayloadEnvelope(envelope: gloas.ExecutionPayloadEnvelope): void;
|
|
293
294
|
persistInvalidStateRoot(
|
|
294
295
|
preState: IBeaconStateView,
|
|
295
296
|
postState: IBeaconStateView,
|
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
isStatePostGloas,
|
|
31
31
|
} from "@lodestar/state-transition";
|
|
32
32
|
import {Attestation, Epoch, RootHex, Slot, electra, isElectraAttestation, phase0, ssz} from "@lodestar/types";
|
|
33
|
-
import {MapDef, assert, toRootHex} from "@lodestar/utils";
|
|
33
|
+
import {Logger, MapDef, assert, toRootHex} from "@lodestar/utils";
|
|
34
34
|
import {Metrics} from "../../metrics/metrics.js";
|
|
35
35
|
import {IntersectResult, intersectUint8Arrays} from "../../util/bitArray.js";
|
|
36
36
|
import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
|
|
@@ -58,7 +58,7 @@ export type AttestationsConsolidation = {
|
|
|
58
58
|
|
|
59
59
|
/**
|
|
60
60
|
* This function returns not seen participation for a given epoch and slot and committee index.
|
|
61
|
-
* Return
|
|
61
|
+
* Return an empty set if all validators are seen, or null if the committee cannot be computed (e.g. missing shuffling).
|
|
62
62
|
*/
|
|
63
63
|
type GetNotSeenValidatorsFn = (epoch: Epoch, slot: Slot, committeeIndex: number) => Set<number> | null;
|
|
64
64
|
|
|
@@ -140,7 +140,8 @@ export class AggregatedAttestationPool {
|
|
|
140
140
|
|
|
141
141
|
constructor(
|
|
142
142
|
private readonly config: BeaconConfig,
|
|
143
|
-
private readonly metrics: Metrics | null = null
|
|
143
|
+
private readonly metrics: Metrics | null = null,
|
|
144
|
+
private readonly logger: Logger | null = null
|
|
144
145
|
) {
|
|
145
146
|
metrics?.opPool.aggregatedAttestationPool.attDataPerSlot.addCollect(() => this.onScrapeMetrics(metrics));
|
|
146
147
|
}
|
|
@@ -244,6 +245,7 @@ export class AggregatedAttestationPool {
|
|
|
244
245
|
const consolidations = new Map<AttestationsConsolidation, number>();
|
|
245
246
|
let scannedSlots = 0;
|
|
246
247
|
let stopReason: ScannedSlotsTerminationReason | null = null;
|
|
248
|
+
const missingShufflingCommitteesByEpoch = new Map<Epoch, number>();
|
|
247
249
|
slot: for (const slot of slots) {
|
|
248
250
|
const attestationGroupByIndexByDataHash = this.attestationGroupByIndexByDataHexBySlot.get(slot);
|
|
249
251
|
// should not happen
|
|
@@ -295,7 +297,12 @@ export class AggregatedAttestationPool {
|
|
|
295
297
|
|
|
296
298
|
for (const [committeeIndex, attestationGroup] of attestationGroupByIndex.entries()) {
|
|
297
299
|
const notSeenCommitteeMembers = notSeenValidatorsFn(epoch, slot, committeeIndex);
|
|
298
|
-
if (notSeenCommitteeMembers === null
|
|
300
|
+
if (notSeenCommitteeMembers === null) {
|
|
301
|
+
// skip this committee instead of failing the whole block production, other epochs may still have shuffling
|
|
302
|
+
missingShufflingCommitteesByEpoch.set(epoch, (missingShufflingCommitteesByEpoch.get(epoch) ?? 0) + 1);
|
|
303
|
+
continue;
|
|
304
|
+
}
|
|
305
|
+
if (notSeenCommitteeMembers.size === 0) {
|
|
299
306
|
this.metrics?.opPool.aggregatedAttestationPool.packedAttestations.seenCommittees.inc();
|
|
300
307
|
continue;
|
|
301
308
|
}
|
|
@@ -386,6 +393,18 @@ export class AggregatedAttestationPool {
|
|
|
386
393
|
scannedSlots++;
|
|
387
394
|
}
|
|
388
395
|
|
|
396
|
+
for (const [epoch, missingCommittees] of missingShufflingCommitteesByEpoch) {
|
|
397
|
+
this.metrics?.opPool.aggregatedAttestationPool.packedAttestations.missingShufflingCommittees.inc(
|
|
398
|
+
missingCommittees
|
|
399
|
+
);
|
|
400
|
+
this.logger?.debug("Missing shuffling when packing attestations, skipped committees", {
|
|
401
|
+
slot: stateSlot,
|
|
402
|
+
epoch,
|
|
403
|
+
decisionRoot: state.getShufflingDecisionRoot(epoch),
|
|
404
|
+
missingCommittees,
|
|
405
|
+
});
|
|
406
|
+
}
|
|
407
|
+
|
|
389
408
|
this.metrics?.opPool.aggregatedAttestationPool.packedAttestations.totalConsolidations.set(consolidations.size);
|
|
390
409
|
|
|
391
410
|
const sortedConsolidationsByScore = Array.from(consolidations.entries())
|
|
@@ -770,13 +789,18 @@ export function getNotSeenValidatorsFn(
|
|
|
770
789
|
}
|
|
771
790
|
const cacheKey = slot + "_" + committeeIndex;
|
|
772
791
|
let notSeenCommitteeMembers = cachedNotSeenValidators.get(cacheKey);
|
|
773
|
-
if (notSeenCommitteeMembers
|
|
774
|
-
|
|
775
|
-
return notSeenCommitteeMembers.size === 0 ? null : notSeenCommitteeMembers;
|
|
792
|
+
if (notSeenCommitteeMembers !== undefined) {
|
|
793
|
+
return notSeenCommitteeMembers;
|
|
776
794
|
}
|
|
777
795
|
|
|
778
796
|
const decisionRoot = state.getShufflingDecisionRoot(computeEpochAtSlot(slot));
|
|
779
|
-
const committee = shufflingCache.
|
|
797
|
+
const committee = shufflingCache.getBeaconCommitteeOrNull(epoch, decisionRoot, slot, committeeIndex);
|
|
798
|
+
if (committee === null) {
|
|
799
|
+
// attestations in the pool were validated against a cached shuffling of the previous or current epoch,
|
|
800
|
+
// so a miss is a ShufflingCache bug. Return null so the caller tracks it via metrics/logs without failing
|
|
801
|
+
// block production. Don't fall back to the state's shuffling, that would hide the bug
|
|
802
|
+
return null;
|
|
803
|
+
}
|
|
780
804
|
notSeenCommitteeMembers = new Set<number>();
|
|
781
805
|
for (const [i, validatorIndex] of committee.entries()) {
|
|
782
806
|
// no need to check flagIsTimelySource as if validator is not seen, it's participation status is 0
|
|
@@ -786,8 +810,8 @@ export function getNotSeenValidatorsFn(
|
|
|
786
810
|
}
|
|
787
811
|
}
|
|
788
812
|
cachedNotSeenValidators.set(cacheKey, notSeenCommitteeMembers);
|
|
789
|
-
//
|
|
790
|
-
return notSeenCommitteeMembers
|
|
813
|
+
// an empty set means all validators are seen, we don't need to check for any attestations of same committee again
|
|
814
|
+
return notSeenCommitteeMembers;
|
|
791
815
|
};
|
|
792
816
|
}
|
|
793
817
|
|
|
@@ -6,8 +6,8 @@ import {toRootHex} from "@lodestar/utils";
|
|
|
6
6
|
*
|
|
7
7
|
* The primary consumer is `validateExecutionPayloadBid`, which looks up the matching
|
|
8
8
|
* preferences via `get(bid.slot, dependent_root)` to enforce the IGNORE-existence and
|
|
9
|
-
* REJECT-equality rules from the gloas spec. The beacon API
|
|
10
|
-
*
|
|
9
|
+
* REJECT-equality rules from the gloas spec. The beacon API `getProposerPreferences`
|
|
10
|
+
* endpoint reads from the same pool via `getAll`.
|
|
11
11
|
*
|
|
12
12
|
* `validator_index` is intentionally not part of the key: gossip validation enforces
|
|
13
13
|
* `proposers[proposalSlot % SLOTS_PER_EPOCH] === validatorIndex` against the shuffling
|
|
@@ -37,15 +37,19 @@ export class ProposerPreferencesPool {
|
|
|
37
37
|
byRoot.set(rootHex, signed);
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
/** API read-out: flatten across branches, optionally filtered by slot. */
|
|
41
|
-
getAll(slot?: Slot): gloas.SignedProposerPreferences[] {
|
|
42
|
-
if (slot !== undefined) {
|
|
43
|
-
const byRoot = this.bySlot.get(slot);
|
|
44
|
-
return byRoot ? Array.from(byRoot.values()) : [];
|
|
45
|
-
}
|
|
40
|
+
/** API read-out: flatten across branches, optionally filtered by slot and dependent root. */
|
|
41
|
+
getAll(slot?: Slot, dependentRootHex?: RootHex): gloas.SignedProposerPreferences[] {
|
|
46
42
|
const out: gloas.SignedProposerPreferences[] = [];
|
|
47
|
-
for (const byRoot of this.bySlot
|
|
48
|
-
|
|
43
|
+
for (const [s, byRoot] of this.bySlot) {
|
|
44
|
+
if (slot !== undefined && s !== slot) {
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
for (const [root, signed] of byRoot) {
|
|
48
|
+
if (dependentRootHex !== undefined && root !== dependentRootHex) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
out.push(signed);
|
|
52
|
+
}
|
|
49
53
|
}
|
|
50
54
|
return out;
|
|
51
55
|
}
|
package/src/chain/options.ts
CHANGED
|
@@ -27,8 +27,8 @@ export type IChainOptions = BlockProcessOpts &
|
|
|
27
27
|
blsVerifyAllMainThread?: boolean;
|
|
28
28
|
blsVerifyAllMultiThread?: boolean;
|
|
29
29
|
blacklistedBlocks?: string[];
|
|
30
|
-
// TODO GLOAS: add similar option for execution payload envelopes?
|
|
31
30
|
persistProducedBlocks?: boolean;
|
|
31
|
+
persistProducedPayloadEnvelopes?: boolean;
|
|
32
32
|
/** Archive finalized Gloas payload envelopes as headers (bodies reconstructed from the EL on read) */
|
|
33
33
|
dedupePayloads?: boolean;
|
|
34
34
|
persistInvalidSszObjects?: boolean;
|
|
@@ -111,6 +111,9 @@ export class SeenBlockInput {
|
|
|
111
111
|
// there should only 1 block root per slot but we need to always compare against rootHex
|
|
112
112
|
// and the signature to ensure we only skip verification if both match
|
|
113
113
|
private verifiedProposerSignatures = new Map<Slot, Map<RootHex, BLSSignature>>();
|
|
114
|
+
// Roots of gossip blocks under validation, counted because blocks with the same root but different signatures
|
|
115
|
+
// can be validated concurrently
|
|
116
|
+
private validatingBlockRoots = new Map<RootHex, number>();
|
|
114
117
|
|
|
115
118
|
constructor({
|
|
116
119
|
config,
|
|
@@ -153,6 +156,26 @@ export class SeenBlockInput {
|
|
|
153
156
|
return this.blockInputs.get(rootHex)?.hasBlock() ?? false;
|
|
154
157
|
}
|
|
155
158
|
|
|
159
|
+
/**
|
|
160
|
+
* Mark a gossip block root as under validation, every call MUST be paired with `unmarkValidatingBlock()`
|
|
161
|
+
*/
|
|
162
|
+
markValidatingBlock(rootHex: RootHex): void {
|
|
163
|
+
this.validatingBlockRoots.set(rootHex, (this.validatingBlockRoots.get(rootHex) ?? 0) + 1);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
unmarkValidatingBlock(rootHex: RootHex): void {
|
|
167
|
+
const count = this.validatingBlockRoots.get(rootHex) ?? 0;
|
|
168
|
+
if (count <= 1) {
|
|
169
|
+
this.validatingBlockRoots.delete(rootHex);
|
|
170
|
+
} else {
|
|
171
|
+
this.validatingBlockRoots.set(rootHex, count - 1);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
isValidatingBlock(rootHex: RootHex): boolean {
|
|
176
|
+
return this.validatingBlockRoots.has(rootHex);
|
|
177
|
+
}
|
|
178
|
+
|
|
156
179
|
get(rootHex: RootHex): IBlockInput | undefined {
|
|
157
180
|
return this.blockInputs.get(rootHex);
|
|
158
181
|
}
|
|
@@ -205,6 +205,11 @@ export class ShufflingCache {
|
|
|
205
205
|
return this.getBeaconCommittees(epoch, decisionRoot, slot, [index])[0];
|
|
206
206
|
}
|
|
207
207
|
|
|
208
|
+
getBeaconCommitteeOrNull(epoch: number, decisionRoot: string, slot: Slot, index: CommitteeIndex): Uint32Array | null {
|
|
209
|
+
const shuffling = this.getSync(epoch, decisionRoot);
|
|
210
|
+
return shuffling === null ? null : getBeaconCommittees(shuffling, slot, [index])[0];
|
|
211
|
+
}
|
|
212
|
+
|
|
208
213
|
getBeaconCommittees(epoch: number, decisionRoot: string, slot: Slot, indices: CommitteeIndex[]): Uint32Array[] {
|
|
209
214
|
const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
|
|
210
215
|
return getBeaconCommittees(shuffling, slot, indices);
|
package/src/db/beacon.ts
CHANGED
|
@@ -8,6 +8,7 @@ import {FlatFileStore} from "./flatFileStore/flatFileStore.js";
|
|
|
8
8
|
import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
|
|
9
9
|
import {IBeaconDb} from "./interface.js";
|
|
10
10
|
import {CheckpointStateRepository} from "./repositories/checkpointState.js";
|
|
11
|
+
import {EarliestAvailableSlotRepository} from "./repositories/earliestAvailableSlot.js";
|
|
11
12
|
import {
|
|
12
13
|
AttesterSlashingRepository,
|
|
13
14
|
BLSToExecutionChangeRepository,
|
|
@@ -48,6 +49,7 @@ export class BeaconDb implements IBeaconDb {
|
|
|
48
49
|
|
|
49
50
|
stateArchive: StateArchiveRepository;
|
|
50
51
|
checkpointState: CheckpointStateRepository;
|
|
52
|
+
earliestAvailableSlot: EarliestAvailableSlotRepository;
|
|
51
53
|
|
|
52
54
|
voluntaryExit: VoluntaryExitRepository;
|
|
53
55
|
proposerSlashing: ProposerSlashingRepository;
|
|
@@ -83,6 +85,7 @@ export class BeaconDb implements IBeaconDb {
|
|
|
83
85
|
|
|
84
86
|
this.stateArchive = new StateArchiveRepository(config, db);
|
|
85
87
|
this.checkpointState = new CheckpointStateRepository(config, db);
|
|
88
|
+
this.earliestAvailableSlot = new EarliestAvailableSlotRepository(db);
|
|
86
89
|
this.voluntaryExit = new VoluntaryExitRepository(config, db);
|
|
87
90
|
this.blsToExecutionChange = new BLSToExecutionChangeRepository(config, db);
|
|
88
91
|
this.proposerSlashing = new ProposerSlashingRepository(config, db);
|
package/src/db/buckets.ts
CHANGED
|
@@ -72,6 +72,7 @@ export enum Bucket {
|
|
|
72
72
|
|
|
73
73
|
gloas_executionPayloadEnvelope = 59, // GLOAS BeaconBlockRoot -> SignedExecutionPayloadEnvelope
|
|
74
74
|
gloas_executionPayloadEnvelopeArchive = 60, // GLOAS Slot -> SignedExecutionPayloadEnvelope, or 0x00 + SignedExecutionPayloadHeaderEnvelope
|
|
75
|
+
earliestAvailableSlot = 61, // singleton -> Slot
|
|
75
76
|
}
|
|
76
77
|
|
|
77
78
|
export function getBucketNameByValue<T extends Bucket>(enumValue: T): keyof typeof Bucket {
|
package/src/db/interface.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {Slot} from "@lodestar/types";
|
|
|
3
3
|
import type {IDataColumnStore} from "./dataColumnStore.js";
|
|
4
4
|
import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
|
|
5
5
|
import {CheckpointStateRepository} from "./repositories/checkpointState.js";
|
|
6
|
+
import {EarliestAvailableSlotRepository} from "./repositories/earliestAvailableSlot.js";
|
|
6
7
|
import {
|
|
7
8
|
AttesterSlashingRepository,
|
|
8
9
|
BLSToExecutionChangeRepository,
|
|
@@ -46,6 +47,7 @@ export interface IBeaconDb {
|
|
|
46
47
|
stateArchive: StateArchiveRepository;
|
|
47
48
|
// checkpoint states
|
|
48
49
|
checkpointState: CheckpointStateRepository;
|
|
50
|
+
earliestAvailableSlot: EarliestAvailableSlotRepository;
|
|
49
51
|
|
|
50
52
|
// op pool
|
|
51
53
|
voluntaryExit: VoluntaryExitRepository;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import {Db, encodeKey} from "@lodestar/db";
|
|
2
|
+
import {Slot, ssz} from "@lodestar/types";
|
|
3
|
+
import {Bucket, getBucketNameByValue} from "../buckets.js";
|
|
4
|
+
|
|
5
|
+
export class EarliestAvailableSlotRepository {
|
|
6
|
+
private readonly key = encodeKey(Bucket.earliestAvailableSlot, 0);
|
|
7
|
+
private readonly opts = {bucketId: getBucketNameByValue(Bucket.earliestAvailableSlot)};
|
|
8
|
+
|
|
9
|
+
constructor(private readonly db: Db) {}
|
|
10
|
+
|
|
11
|
+
async get(): Promise<Slot | null> {
|
|
12
|
+
const bytes = await this.db.get(this.key, this.opts);
|
|
13
|
+
return bytes === null ? null : ssz.Slot.deserialize(bytes);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
async set(slot: Slot): Promise<void> {
|
|
17
|
+
await this.db.put(this.key, ssz.Slot.serialize(slot), this.opts);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
@@ -1281,6 +1281,10 @@ export function createLodestarMetrics(
|
|
|
1281
1281
|
name: "lodestar_oppool_aggregated_attestation_pool_packed_attestations_seen_committees_total",
|
|
1282
1282
|
help: "Total number of committees for which all members are seen when producing packed attestations",
|
|
1283
1283
|
}),
|
|
1284
|
+
missingShufflingCommittees: register.gauge({
|
|
1285
|
+
name: "lodestar_oppool_aggregated_attestation_pool_packed_attestations_missing_shuffling_committees_total",
|
|
1286
|
+
help: "Total number of committees skipped due to missing shuffling when producing packed attestations",
|
|
1287
|
+
}),
|
|
1284
1288
|
},
|
|
1285
1289
|
},
|
|
1286
1290
|
attestationPool: {
|