@lodestar/beacon-node 1.50.0-dev.8ba9d1dd30 → 1.50.0-dev.90ea92ca6e
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/blocks/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/blocks/index.js +6 -1
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- 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 +1 -0
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +23 -1
- 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 +14 -24
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js +5 -7
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/types.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/types.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js.map +1 -1
- package/lib/chain/archiveStore/interface.d.ts +1 -1
- package/lib/chain/archiveStore/interface.d.ts.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/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +7 -3
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts +2 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.js +1 -1
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts +2 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +5 -4
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
- package/lib/chain/chain.d.ts +9 -5
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +53 -18
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +7 -1
- package/lib/chain/emitter.d.ts.map +1 -1
- package/lib/chain/emitter.js +5 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/errors/envelopeReconstructionError.d.ts +5 -0
- package/lib/chain/errors/envelopeReconstructionError.d.ts.map +1 -1
- package/lib/chain/errors/envelopeReconstructionError.js +2 -0
- package/lib/chain/errors/envelopeReconstructionError.js.map +1 -1
- package/lib/chain/errors/gossipValidation.d.ts +1 -0
- package/lib/chain/errors/gossipValidation.d.ts.map +1 -1
- package/lib/chain/errors/gossipValidation.js +1 -0
- package/lib/chain/errors/gossipValidation.js.map +1 -1
- package/lib/chain/forkChoice/index.d.ts.map +1 -1
- package/lib/chain/forkChoice/index.js +2 -0
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/interface.d.ts +3 -2
- 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 +2 -1
- package/lib/chain/options.d.ts.map +1 -1
- package/lib/chain/options.js +1 -1
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
- package/lib/chain/regen/regen.d.ts +2 -0
- package/lib/chain/regen/regen.d.ts.map +1 -1
- package/lib/chain/regen/regen.js +10 -4
- package/lib/chain/regen/regen.js.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/seenCache/seenPayloadEnvelopeInput.d.ts +9 -2
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.js +23 -13
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.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/chain/validatorMonitor.d.ts +5 -1
- package/lib/chain/validatorMonitor.d.ts.map +1 -1
- package/lib/chain/validatorMonitor.js +64 -54
- package/lib/chain/validatorMonitor.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/execution/engine/disabled.d.ts +0 -2
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +0 -6
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +1 -3
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +2 -17
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +2 -4
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/mock.d.ts +0 -2
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +0 -8
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/types.d.ts +0 -8
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js.map +1 -1
- 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/metrics/metrics.d.ts +7 -3
- package/lib/metrics/metrics.d.ts.map +1 -1
- package/lib/metrics/metrics.js +4 -4
- package/lib/metrics/metrics.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +62 -63
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts +4 -2
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +6 -2
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +8 -0
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +49 -2
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.js +1 -1
- package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.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 +27 -4
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/range/batch.d.ts +11 -5
- package/lib/sync/range/batch.d.ts.map +1 -1
- package/lib/sync/range/batch.js +21 -17
- package/lib/sync/range/batch.js.map +1 -1
- package/lib/sync/range/chain.d.ts +4 -4
- package/lib/sync/range/chain.d.ts.map +1 -1
- package/lib/sync/range/chain.js +12 -6
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.d.ts.map +1 -1
- package/lib/sync/range/range.js +75 -29
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +5 -2
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +49 -24
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/sync/utils/downloadByRange.d.ts +38 -14
- package/lib/sync/utils/downloadByRange.d.ts.map +1 -1
- package/lib/sync/utils/downloadByRange.js +84 -39
- package/lib/sync/utils/downloadByRange.js.map +1 -1
- package/lib/util/execution.d.ts +9 -11
- package/lib/util/execution.d.ts.map +1 -1
- package/lib/util/execution.js +5 -1
- package/lib/util/execution.js.map +1 -1
- package/package.json +17 -17
- package/src/api/impl/beacon/blocks/index.ts +7 -4
- 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 +24 -2
- package/src/chain/archiveStore/archiveStore.ts +19 -25
- package/src/chain/archiveStore/historicalState/getHistoricalState.ts +5 -7
- package/src/chain/archiveStore/historicalState/historicalStateRegen.ts +1 -1
- package/src/chain/archiveStore/historicalState/types.ts +2 -2
- package/src/chain/archiveStore/historicalState/worker.ts +1 -2
- package/src/chain/archiveStore/interface.ts +1 -1
- package/src/chain/archiveStore/utils/pruneHistory.ts +4 -1
- package/src/chain/blocks/importBlock.ts +9 -3
- package/src/chain/blocks/payloadEnvelopeInput/types.ts +2 -1
- package/src/chain/blocks/verifyBlock.ts +1 -0
- package/src/chain/blocks/verifyBlocksStateTransitionOnly.ts +6 -3
- package/src/chain/chain.ts +73 -20
- package/src/chain/emitter.ts +7 -1
- package/src/chain/errors/envelopeReconstructionError.ts +3 -0
- package/src/chain/errors/gossipValidation.ts +1 -0
- package/src/chain/forkChoice/index.ts +2 -0
- package/src/chain/interface.ts +3 -2
- package/src/chain/opPools/aggregatedAttestationPool.ts +34 -10
- package/src/chain/opPools/proposerPreferencesPool.ts +14 -10
- package/src/chain/options.ts +3 -3
- package/src/chain/produceBlock/computeNewStateRoot.ts +1 -1
- package/src/chain/regen/regen.ts +12 -4
- package/src/chain/seenCache/seenGossipBlockInput.ts +23 -0
- package/src/chain/seenCache/seenPayloadEnvelopeInput.ts +31 -13
- package/src/chain/shufflingCache.ts +5 -0
- package/src/chain/validatorMonitor.ts +75 -57
- 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/execution/engine/disabled.ts +0 -8
- package/src/execution/engine/http.ts +1 -30
- package/src/execution/engine/interface.ts +2 -6
- package/src/execution/engine/mock.ts +1 -19
- package/src/execution/engine/types.ts +0 -10
- package/src/metrics/metrics/lodestar.ts +4 -0
- package/src/metrics/metrics.ts +21 -6
- package/src/network/processor/gossipHandlers.ts +93 -76
- package/src/network/processor/gossipValidatorFn.ts +12 -2
- package/src/network/processor/index.ts +55 -2
- package/src/network/reqresp/handlers/executionPayloadEnvelopesByRoot.ts +1 -1
- package/src/node/nodejs.ts +35 -3
- package/src/sync/range/batch.ts +25 -19
- package/src/sync/range/chain.ts +15 -8
- package/src/sync/range/range.ts +76 -30
- package/src/sync/unknownBlock.ts +62 -25
- package/src/sync/utils/downloadByRange.ts +123 -58
- package/src/util/execution.ts +16 -8
package/src/chain/chain.ts
CHANGED
|
@@ -71,7 +71,7 @@ import {BufferPool} from "../util/bufferPool.js";
|
|
|
71
71
|
import {Clock, ClockEvent, IClock} from "../util/clock.js";
|
|
72
72
|
import {CustodyConfig, getValidatorsCustodyRequirement} from "../util/dataColumns.js";
|
|
73
73
|
import {callInNextEventLoop} from "../util/eventLoop.js";
|
|
74
|
-
import {
|
|
74
|
+
import {ReconstructMissPolicy, isRebuildMiss, reconstructExecutionPayloadEnvelopes} from "../util/execution.js";
|
|
75
75
|
import {ensureDir, writeIfNotExist} from "../util/file.js";
|
|
76
76
|
import {isOptimisticBlock} from "../util/forkChoice.js";
|
|
77
77
|
import {JobItemQueue} from "../util/queue/itemQueue.js";
|
|
@@ -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
|
{
|
|
@@ -432,6 +435,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
432
435
|
blockStateCache,
|
|
433
436
|
checkpointStateCache,
|
|
434
437
|
seenBlockInputCache: this.seenBlockInputCache,
|
|
438
|
+
serializedCache: this.serializedCache,
|
|
435
439
|
db,
|
|
436
440
|
metrics,
|
|
437
441
|
validatorMonitor,
|
|
@@ -572,7 +576,11 @@ export class BeaconChain implements IBeaconChain {
|
|
|
572
576
|
}
|
|
573
577
|
|
|
574
578
|
seenBlock(blockRoot: RootHex): boolean {
|
|
575
|
-
return
|
|
579
|
+
return (
|
|
580
|
+
this.seenBlockInputCache.hasBlock(blockRoot) ||
|
|
581
|
+
this.seenBlockInputCache.isValidatingBlock(blockRoot) ||
|
|
582
|
+
this.forkChoice.hasBlockHexUnsafe(blockRoot)
|
|
583
|
+
);
|
|
576
584
|
}
|
|
577
585
|
|
|
578
586
|
seenPayloadEnvelope(blockRoot: RootHex): boolean {
|
|
@@ -702,6 +710,37 @@ export class BeaconChain implements IBeaconChain {
|
|
|
702
710
|
stateRoot: RootHex,
|
|
703
711
|
opts?: StateGetOpts
|
|
704
712
|
): Promise<{state: IBeaconStateView | Uint8Array; executionOptimistic: boolean; finalized: boolean} | null> {
|
|
713
|
+
const finalizedBlock = this.forkChoice.getFinalizedBlock();
|
|
714
|
+
const finalizedCheckpoint = this.forkChoice.getFinalizedCheckpoint();
|
|
715
|
+
// Checkpoint state only equals the block post-state if the block is at the epoch start slot
|
|
716
|
+
if (
|
|
717
|
+
finalizedBlock.stateRoot === stateRoot &&
|
|
718
|
+
finalizedBlock.slot === computeStartSlotAtEpoch(finalizedCheckpoint.epoch)
|
|
719
|
+
) {
|
|
720
|
+
const state = this.regen.getCheckpointStateSync({
|
|
721
|
+
epoch: finalizedCheckpoint.epoch,
|
|
722
|
+
rootHex: finalizedCheckpoint.rootHex,
|
|
723
|
+
});
|
|
724
|
+
if (state) {
|
|
725
|
+
return {
|
|
726
|
+
state,
|
|
727
|
+
executionOptimistic: isOptimisticBlock(finalizedBlock),
|
|
728
|
+
finalized: finalizedCheckpoint.epoch !== GENESIS_EPOCH,
|
|
729
|
+
};
|
|
730
|
+
}
|
|
731
|
+
}
|
|
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
|
+
|
|
705
744
|
if (opts?.allowRegen) {
|
|
706
745
|
const state = await this.regen.getState(stateRoot, RegenCaller.restApi);
|
|
707
746
|
const block = this.forkChoice.getBlockDefaultStatus(
|
|
@@ -934,12 +973,13 @@ export class BeaconChain implements IBeaconChain {
|
|
|
934
973
|
|
|
935
974
|
/**
|
|
936
975
|
* Batch variant: archived header envelopes are rebuilt 32 per EL round-trip. Aligned with `requests`.
|
|
937
|
-
*
|
|
938
|
-
* returns null for that entry, for
|
|
976
|
+
* An archived envelope that cannot be rebuilt (EL-unavailable body or body root mismatch) is not the
|
|
977
|
+
* same as an unknown one: `"throw"` surfaces it, `"omit"` returns null for that entry, for
|
|
978
|
+
* peer-facing paths where the spec allows omission.
|
|
939
979
|
*/
|
|
940
980
|
async getSerializedExecutionPayloadEnvelopes(
|
|
941
981
|
requests: {blockSlot: Slot; blockRootHex: RootHex}[],
|
|
942
|
-
|
|
982
|
+
onMiss: ReconstructMissPolicy = "throw"
|
|
943
983
|
): Promise<(Uint8Array | null)[]> {
|
|
944
984
|
const out: (Uint8Array | null)[] = new Array(requests.length).fill(null);
|
|
945
985
|
const headerEnvelopes: gloas.SignedExecutionPayloadHeaderEnvelope[] = [];
|
|
@@ -978,14 +1018,14 @@ export class BeaconChain implements IBeaconChain {
|
|
|
978
1018
|
for (let j = 0; j < rebuilt.length; j++) {
|
|
979
1019
|
const result = rebuilt[j];
|
|
980
1020
|
if (isRebuildMiss(result)) {
|
|
981
|
-
if (
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
"Archived envelope failed body root check against EL bodies"
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
1021
|
+
if (onMiss === "throw") throw result.error;
|
|
1022
|
+
this.logger.debug(
|
|
1023
|
+
result.reason === "mismatch"
|
|
1024
|
+
? "Archived envelope failed body root check against EL bodies"
|
|
1025
|
+
: "EL cannot serve bodies for archived envelope, omitting",
|
|
1026
|
+
{slot: result.slot},
|
|
1027
|
+
result.error
|
|
1028
|
+
);
|
|
989
1029
|
continue;
|
|
990
1030
|
}
|
|
991
1031
|
out[headerEnvelopeIdxs[j]] = ssz.gloas.SignedExecutionPayloadEnvelope.serialize(result);
|
|
@@ -1016,10 +1056,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1016
1056
|
const [result] = await reconstructExecutionPayloadEnvelopes(this.executionEngine, this.metrics, [
|
|
1017
1057
|
archived.headerEnvelope,
|
|
1018
1058
|
]);
|
|
1019
|
-
if (isRebuildMiss(result))
|
|
1020
|
-
if (result.reason === "mismatch") throw result.error;
|
|
1021
|
-
return null;
|
|
1022
|
-
}
|
|
1059
|
+
if (isRebuildMiss(result)) throw result.error;
|
|
1023
1060
|
return result;
|
|
1024
1061
|
}
|
|
1025
1062
|
|
|
@@ -1505,6 +1542,22 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1505
1542
|
}
|
|
1506
1543
|
}
|
|
1507
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
|
+
|
|
1508
1561
|
/**
|
|
1509
1562
|
* Invalid state root error is critical and it causes the node to stale most of the time so we want to always
|
|
1510
1563
|
* persist preState, postState and block for further investigation.
|
|
@@ -1700,7 +1753,7 @@ export class BeaconChain implements IBeaconChain {
|
|
|
1700
1753
|
// remove date suffixes in file name, and check duplicate to avoid redundant persistence
|
|
1701
1754
|
await writeIfNotExist(filepath, bytes);
|
|
1702
1755
|
|
|
1703
|
-
this.logger.debug("Persisted
|
|
1756
|
+
this.logger.debug("Persisted SSZ object", {id: logStr, filepath});
|
|
1704
1757
|
}
|
|
1705
1758
|
|
|
1706
1759
|
private onScrapeMetrics(metrics: Metrics): void {
|
package/src/chain/emitter.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {EventEmitter} from "node:events";
|
|
2
2
|
import {StrictEventEmitter} from "strict-event-emitter-types";
|
|
3
3
|
import {routes} from "@lodestar/api";
|
|
4
|
-
import {CheckpointWithHex} from "@lodestar/fork-choice";
|
|
4
|
+
import {CheckpointWithHex, PtcQuorumEvent} from "@lodestar/fork-choice";
|
|
5
5
|
import {IBeaconStateView} from "@lodestar/state-transition";
|
|
6
6
|
import {DataColumnSidecar, RootHex, Slot, deneb, phase0} from "@lodestar/types";
|
|
7
7
|
import {PeerIdStr} from "../util/peerId.js";
|
|
@@ -36,6 +36,11 @@ export enum ChainEvent {
|
|
|
36
36
|
* This event is guaranteed to be triggered whenever the fork choice finalized checkpoint is updated. This is either in response to a newly processed block or a new clock tick.
|
|
37
37
|
*/
|
|
38
38
|
forkChoiceFinalized = "forkChoice:finalized",
|
|
39
|
+
/**
|
|
40
|
+
* This event signals that the PTC verdict on a block was decided: a majority against payload presence or blob data
|
|
41
|
+
* availability, or a majority for both.
|
|
42
|
+
*/
|
|
43
|
+
forkChoicePtcQuorum = "forkChoice:ptcQuorum",
|
|
39
44
|
/**
|
|
40
45
|
* This event signals that dependent services (e.g. custody sampling) should update to account for the new target group count.
|
|
41
46
|
*/
|
|
@@ -112,6 +117,7 @@ export type IChainEvents = ApiEvents & {
|
|
|
112
117
|
|
|
113
118
|
[ChainEvent.forkChoiceJustified]: (checkpoint: CheckpointWithHex) => void;
|
|
114
119
|
[ChainEvent.forkChoiceFinalized]: (checkpoint: CheckpointWithHex) => void;
|
|
120
|
+
[ChainEvent.forkChoicePtcQuorum]: (data: PtcQuorumEvent) => void;
|
|
115
121
|
|
|
116
122
|
[ChainEvent.updateTargetCustodyGroupCount]: (targetGroupCount: number) => void;
|
|
117
123
|
|
|
@@ -4,6 +4,8 @@ import {LodestarError} from "@lodestar/utils";
|
|
|
4
4
|
export enum EnvelopeReconstructionErrorCode {
|
|
5
5
|
/** The EL failed to answer engine_getPayloadBodiesByHashV2 (transport / EL down). Transient. */
|
|
6
6
|
ENGINE_UNAVAILABLE = "ENVELOPE_RECONSTRUCTION_ERROR_ENGINE_UNAVAILABLE",
|
|
7
|
+
/** The EL does not have the block or its block access list (pruned, or not yet re-indexed after a restart). May recover. */
|
|
8
|
+
BODY_UNAVAILABLE = "ENVELOPE_RECONSTRUCTION_ERROR_BODY_UNAVAILABLE",
|
|
7
9
|
/** A body returned by the EL does not hash to the root stored in the header envelope. Local DB/EL inconsistency. */
|
|
8
10
|
BODY_ROOT_MISMATCH = "ENVELOPE_RECONSTRUCTION_ERROR_BODY_ROOT_MISMATCH",
|
|
9
11
|
/** A by-range stream stopped short at a slot that cannot be served; the response so far is still valid */
|
|
@@ -12,6 +14,7 @@ export enum EnvelopeReconstructionErrorCode {
|
|
|
12
14
|
|
|
13
15
|
export type EnvelopeReconstructionErrorType =
|
|
14
16
|
| {code: EnvelopeReconstructionErrorCode.ENGINE_UNAVAILABLE}
|
|
17
|
+
| {code: EnvelopeReconstructionErrorCode.BODY_UNAVAILABLE; slot: Slot}
|
|
15
18
|
| {
|
|
16
19
|
code: EnvelopeReconstructionErrorCode.BODY_ROOT_MISMATCH;
|
|
17
20
|
slot: Slot;
|
|
@@ -9,6 +9,7 @@ export enum GossipErrorCode {
|
|
|
9
9
|
INVALID_SERIALIZED_BYTES_ERROR_CODE = "GOSSIP_ERROR_INVALID_SERIALIZED_BYTES",
|
|
10
10
|
PAST_SLOT = "GOSSIP_ERROR_PAST_SLOT",
|
|
11
11
|
FUTURE_SLOT = "GOSSIP_ERROR_FUTURE_SLOT",
|
|
12
|
+
FATAL_PEER = "GOSSIP_ERROR_FATAL_PEER",
|
|
12
13
|
INVALID_SLOT = "GOSSIP_ERROR_INVALID_SLOT",
|
|
13
14
|
}
|
|
14
15
|
|
|
@@ -124,6 +124,7 @@ export function initializeForkChoiceFromFinalizedState(
|
|
|
124
124
|
onFinalized: (cp) => emitter.emit(ChainEvent.forkChoiceFinalized, cp),
|
|
125
125
|
onFastConfirmation: ({block, slot, currentSlot}) =>
|
|
126
126
|
emitter.emit(routes.events.EventType.fastConfirmation, {block, slot, currentSlot}),
|
|
127
|
+
onPtcQuorum: (data) => emitter.emit(ChainEvent.forkChoicePtcQuorum, data),
|
|
127
128
|
}
|
|
128
129
|
),
|
|
129
130
|
|
|
@@ -222,6 +223,7 @@ export function initializeForkChoiceFromUnfinalizedState(
|
|
|
222
223
|
onFinalized: (cp) => emitter.emit(ChainEvent.forkChoiceFinalized, cp),
|
|
223
224
|
onFastConfirmation: ({block, slot, currentSlot}) =>
|
|
224
225
|
emitter.emit(routes.events.EventType.fastConfirmation, {block, slot, currentSlot}),
|
|
226
|
+
onPtcQuorum: (data) => emitter.emit(ChainEvent.forkChoicePtcQuorum, data),
|
|
225
227
|
}
|
|
226
228
|
);
|
|
227
229
|
|
package/src/chain/interface.ts
CHANGED
|
@@ -30,7 +30,7 @@ import {Metrics} from "../metrics/metrics.js";
|
|
|
30
30
|
import {BufferPool} from "../util/bufferPool.js";
|
|
31
31
|
import {IClock} from "../util/clock.js";
|
|
32
32
|
import {CustodyConfig} from "../util/dataColumns.js";
|
|
33
|
-
import {
|
|
33
|
+
import {ReconstructMissPolicy} from "../util/execution.js";
|
|
34
34
|
import {SerializedCache} from "../util/serializedCache.js";
|
|
35
35
|
import {IArchiveStore} from "./archiveStore/interface.js";
|
|
36
36
|
import {CheckpointBalancesCache} from "./balancesCache.js";
|
|
@@ -239,7 +239,7 @@ export interface IBeaconChain {
|
|
|
239
239
|
getSerializedExecutionPayloadEnvelope(blockSlot: Slot, blockRootHex: string): Promise<Uint8Array | null>;
|
|
240
240
|
getSerializedExecutionPayloadEnvelopes(
|
|
241
241
|
requests: {blockSlot: Slot; blockRootHex: RootHex}[],
|
|
242
|
-
|
|
242
|
+
onMiss?: ReconstructMissPolicy
|
|
243
243
|
): Promise<(Uint8Array | null)[]>;
|
|
244
244
|
getExecutionPayloadEnvelope(
|
|
245
245
|
blockSlot: Slot,
|
|
@@ -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;
|
|
@@ -52,7 +52,7 @@ export type IChainOptions = BlockProcessOpts &
|
|
|
52
52
|
minSameMessageSignatureSetsToBatch: number;
|
|
53
53
|
archiveDateEpochs?: number;
|
|
54
54
|
nHistoricalStatesFileDataStore?: boolean;
|
|
55
|
-
|
|
55
|
+
nativeStateTransition?: boolean;
|
|
56
56
|
/** Builder circuit breaker fault inspection window in slots */
|
|
57
57
|
faultInspectionWindow?: number;
|
|
58
58
|
/** Canonical EMPTY blocks allowed per `faultInspectionWindow` observed blocks */
|
|
@@ -131,7 +131,7 @@ export const defaultChainOptions: IChainOptions = {
|
|
|
131
131
|
// - users can prune the persisted checkpoint state files manually to save disc space
|
|
132
132
|
// - it helps debug easier when network is unfinalized
|
|
133
133
|
nHistoricalStatesFileDataStore: true,
|
|
134
|
-
|
|
134
|
+
nativeStateTransition: false,
|
|
135
135
|
maxBlockStates: DEFAULT_MAX_BLOCK_STATES,
|
|
136
136
|
maxCPStateEpochsInMemory: DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY,
|
|
137
137
|
maxCPStateEpochsOnDisk: DEFAULT_MAX_CP_STATE_ON_DISK,
|
|
@@ -16,7 +16,7 @@ export function computeNewStateRoot(
|
|
|
16
16
|
const signedBlock = {message: block, signature: EMPTY_SIGNATURE};
|
|
17
17
|
const {newStateRoot, proposerReward, postState, hashTreeRootTime} = state.computeNewStateRoot(
|
|
18
18
|
{block: signedBlock},
|
|
19
|
-
{metrics}
|
|
19
|
+
{metrics: metrics?.stateTransition}
|
|
20
20
|
);
|
|
21
21
|
|
|
22
22
|
metrics?.stateHashTreeRootTime.observe({source: StateHashTreeRootSource.computeNewStateRoot}, hashTreeRootTime);
|
package/src/chain/regen/regen.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {Logger, fromHex, toRootHex} from "@lodestar/utils";
|
|
|
14
14
|
import {IBeaconDb} from "../../db/index.js";
|
|
15
15
|
import {Metrics} from "../../metrics/index.js";
|
|
16
16
|
import {nextEventLoop} from "../../util/eventLoop.js";
|
|
17
|
+
import {SerializedCache} from "../../util/serializedCache.js";
|
|
17
18
|
import {getCheckpointFromState} from "../blocks/utils/checkpoint.js";
|
|
18
19
|
import {ChainEvent, ChainEventEmitter} from "../emitter.js";
|
|
19
20
|
import {SeenBlockInput} from "../seenCache/seenGossipBlockInput.js";
|
|
@@ -28,6 +29,7 @@ export type RegenModules = {
|
|
|
28
29
|
blockStateCache: BlockStateCache;
|
|
29
30
|
checkpointStateCache: CheckpointStateCache;
|
|
30
31
|
seenBlockInputCache: SeenBlockInput;
|
|
32
|
+
serializedCache: SerializedCache;
|
|
31
33
|
config: ChainForkConfig;
|
|
32
34
|
emitter: ChainEventEmitter;
|
|
33
35
|
logger: Logger;
|
|
@@ -235,7 +237,7 @@ export class StateRegenerator implements IStateRegeneratorInternal {
|
|
|
235
237
|
// We are only running the state transition to get a specific state's data.
|
|
236
238
|
// stateTransition() does the clone() inside, transfer cache to make the regen faster
|
|
237
239
|
state = state.stateTransition(
|
|
238
|
-
block,
|
|
240
|
+
{block, ssz: this.modules.serializedCache.get(block)},
|
|
239
241
|
{
|
|
240
242
|
// Replay previously imported blocks, assume valid and available
|
|
241
243
|
executionPayloadStatus: ExecutionPayloadStatus.valid,
|
|
@@ -245,7 +247,7 @@ export class StateRegenerator implements IStateRegeneratorInternal {
|
|
|
245
247
|
verifySignatures: false,
|
|
246
248
|
dontTransferCache: false,
|
|
247
249
|
},
|
|
248
|
-
this.modules
|
|
250
|
+
{metrics: this.modules.metrics?.stateTransition, validatorMonitor: this.modules.validatorMonitor}
|
|
249
251
|
);
|
|
250
252
|
|
|
251
253
|
const hashTreeRootTimer = this.modules.metrics?.stateHashTreeRootTime.startTimer({
|
|
@@ -316,7 +318,10 @@ async function processSlotsByCheckpoint(
|
|
|
316
318
|
): Promise<IBeaconStateView> {
|
|
317
319
|
let postState = await processSlotsToNearestCheckpoint(modules, preState, slot, regenCaller, opts);
|
|
318
320
|
if (postState.slot < slot) {
|
|
319
|
-
postState = postState.processSlots(slot, opts,
|
|
321
|
+
postState = postState.processSlots(slot, opts, {
|
|
322
|
+
metrics: modules.metrics?.stateTransition,
|
|
323
|
+
validatorMonitor: modules.validatorMonitor,
|
|
324
|
+
});
|
|
320
325
|
}
|
|
321
326
|
return postState;
|
|
322
327
|
}
|
|
@@ -361,7 +366,10 @@ export async function processSlotsToNearestCheckpoint(
|
|
|
361
366
|
caller: regenCaller,
|
|
362
367
|
});
|
|
363
368
|
// processSlots calls .clone() before mutating
|
|
364
|
-
postState = postState.processSlots(nextEpochSlot, opts,
|
|
369
|
+
postState = postState.processSlots(nextEpochSlot, opts, {
|
|
370
|
+
metrics: metrics?.stateTransition,
|
|
371
|
+
validatorMonitor: modules.validatorMonitor,
|
|
372
|
+
});
|
|
365
373
|
metrics?.epochTransitionByCaller.inc({caller: regenCaller});
|
|
366
374
|
|
|
367
375
|
// this is usually added when we prepare for next slot or validate gossip block
|
|
@@ -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
|
}
|
|
@@ -47,8 +47,9 @@ export type SeenPayloadEnvelopeInputModules = {
|
|
|
47
47
|
* Created whenever we have a block because it needs block bid.
|
|
48
48
|
* Steady state (linear chain, healthy progression): the cache holds ~2 entries — the head
|
|
49
49
|
* (parent for next-slot production) and its parent (proposer-boost-reorg fallback). It can
|
|
50
|
-
*
|
|
51
|
-
*
|
|
50
|
+
* hold more during forks and range sync, or while an entry's payload is not FULL on the head's
|
|
51
|
+
* branch or its columns are still being gathered. Such entries are evicted on a later block
|
|
52
|
+
* import, on finalization or by the size cap.
|
|
52
53
|
*/
|
|
53
54
|
export class SeenPayloadEnvelopeInput {
|
|
54
55
|
private readonly config: ChainForkConfig;
|
|
@@ -264,18 +265,35 @@ export class SeenPayloadEnvelopeInput {
|
|
|
264
265
|
}
|
|
265
266
|
}
|
|
266
267
|
|
|
268
|
+
/**
|
|
269
|
+
* Removes a PayloadEnvelopeInput whose envelope failed import with a definitive invalid verdict. The envelope
|
|
270
|
+
* cannot be replaced in place, sync recreates the entry via `getOrReload()` or `add()` to fetch another one.
|
|
271
|
+
* No-op if the cached entry is a different object, it may already be the recreated one.
|
|
272
|
+
*/
|
|
273
|
+
removeInvalid(payloadInput: PayloadEnvelopeInput): void {
|
|
274
|
+
if (this.payloadInputs.get(payloadInput.blockRootHex) === payloadInput) {
|
|
275
|
+
this.evictPayloadInput(payloadInput, "invalid");
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
|
|
267
279
|
pruneBelowParent(parentBlock: ProtoBlock): void {
|
|
268
|
-
for (const
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
//
|
|
275
|
-
//
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
280
|
+
for (const input of this.payloadInputs.values()) {
|
|
281
|
+
if (
|
|
282
|
+
input.slot < parentBlock.slot &&
|
|
283
|
+
// Don't evict while columns are still being gathered: writeDataColumnsToDb awaits the same
|
|
284
|
+
// hasComputedAllData() before persisting. Such entries are pruned by a later call.
|
|
285
|
+
input.hasComputedAllData() &&
|
|
286
|
+
// Only evict once the payload is FULL (revealed/imported) on the parent's branch. On an EMPTY/PENDING
|
|
287
|
+
// branch we may still need to download the FULL envelope (see #9475), and without the entry gossip
|
|
288
|
+
// for the block is ignored until by-root sync reloads it.
|
|
289
|
+
this.forkChoice.isDescendant(
|
|
290
|
+
input.blockRootHex,
|
|
291
|
+
PayloadStatus.FULL,
|
|
292
|
+
parentBlock.blockRoot,
|
|
293
|
+
parentBlock.payloadStatus
|
|
294
|
+
)
|
|
295
|
+
) {
|
|
296
|
+
this.evictPayloadInput(input, "belowParent");
|
|
279
297
|
}
|
|
280
298
|
}
|
|
281
299
|
}
|
|
@@ -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);
|