@lodestar/beacon-node 1.49.0-dev.9d1b583d24 → 1.49.0-dev.9ec766d7e0
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.js +2 -2
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/pool/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/pool/index.js +4 -2
- package/lib/api/impl/beacon/pool/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +9 -7
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts +1 -2
- package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js +0 -5
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/metrics.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/metrics.js +4 -6
- package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js +14 -3
- package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
- package/lib/chain/blocks/importExecutionPayload.js +13 -0
- package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
- package/lib/chain/blocks/index.js +2 -2
- package/lib/chain/blocks/index.js.map +1 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts +1 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts.map +1 -1
- package/lib/chain/emitter.d.ts +10 -0
- package/lib/chain/emitter.d.ts.map +1 -1
- package/lib/chain/emitter.js +4 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/errors/attesterSlashingError.d.ts +4 -1
- package/lib/chain/errors/attesterSlashingError.d.ts.map +1 -1
- package/lib/chain/errors/attesterSlashingError.js +1 -0
- package/lib/chain/errors/attesterSlashingError.js.map +1 -1
- package/lib/chain/errors/payloadAttestation.d.ts +4 -0
- package/lib/chain/errors/payloadAttestation.d.ts.map +1 -1
- package/lib/chain/errors/payloadAttestation.js +1 -0
- package/lib/chain/errors/payloadAttestation.js.map +1 -1
- package/lib/chain/errors/proposerSlashingError.d.ts +4 -1
- package/lib/chain/errors/proposerSlashingError.d.ts.map +1 -1
- package/lib/chain/errors/proposerSlashingError.js +1 -0
- package/lib/chain/errors/proposerSlashingError.js.map +1 -1
- package/lib/chain/options.d.ts +0 -4
- package/lib/chain/options.d.ts.map +1 -1
- package/lib/chain/options.js +0 -1
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.d.ts.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js +4 -2
- package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +6 -6
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts +2 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.js +3 -2
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.js.map +1 -1
- package/lib/chain/validation/attesterSlashing.d.ts.map +1 -1
- package/lib/chain/validation/attesterSlashing.js +1 -2
- package/lib/chain/validation/attesterSlashing.js.map +1 -1
- package/lib/chain/validation/payloadAttestationMessage.d.ts.map +1 -1
- package/lib/chain/validation/payloadAttestationMessage.js +8 -1
- package/lib/chain/validation/payloadAttestationMessage.js.map +1 -1
- package/lib/chain/validation/proposerSlashing.js +1 -2
- package/lib/chain/validation/proposerSlashing.js.map +1 -1
- package/lib/chain/validatorMonitor.d.ts.map +1 -1
- package/lib/chain/validatorMonitor.js +2 -2
- package/lib/chain/validatorMonitor.js.map +1 -1
- package/lib/db/beacon.d.ts +1 -2
- package/lib/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +1 -3
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +0 -1
- package/lib/db/buckets.d.ts.map +1 -1
- package/lib/db/buckets.js +1 -1
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +1 -2
- package/lib/db/interface.d.ts.map +1 -1
- package/lib/db/repositories/blockArchive.d.ts +5 -0
- package/lib/db/repositories/blockArchive.d.ts.map +1 -1
- package/lib/db/repositories/blockArchive.js +36 -1
- package/lib/db/repositories/blockArchive.js.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/index.d.ts +0 -1
- package/lib/db/repositories/index.d.ts.map +1 -1
- package/lib/db/repositories/index.js +0 -1
- package/lib/db/repositories/index.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +26 -14
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +53 -24
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/network/gossip/encoding.d.ts +1 -2
- package/lib/network/gossip/encoding.d.ts.map +1 -1
- package/lib/network/gossip/encoding.js +5 -10
- package/lib/network/gossip/encoding.js.map +1 -1
- package/lib/network/gossip/gossipsub.d.ts.map +1 -1
- package/lib/network/gossip/gossipsub.js +16 -1
- package/lib/network/gossip/gossipsub.js.map +1 -1
- package/lib/network/gossip/topic.d.ts +9 -6
- package/lib/network/gossip/topic.d.ts.map +1 -1
- package/lib/network/gossip/topic.js +23 -8
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +16 -5
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts +2 -0
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +88 -7
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +6 -2
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +62 -24
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/protocols.d.ts.map +1 -1
- package/lib/network/reqresp/protocols.js +19 -5
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/node/nodejs.d.ts +2 -7
- package/lib/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +2 -22
- package/lib/node/nodejs.js.map +1 -1
- package/lib/sync/interface.d.ts +1 -2
- package/lib/sync/interface.d.ts.map +1 -1
- package/lib/sync/options.d.ts +0 -6
- package/lib/sync/options.d.ts.map +1 -1
- package/lib/sync/options.js +0 -2
- package/lib/sync/options.js.map +1 -1
- package/lib/sync/types.d.ts +39 -0
- package/lib/sync/types.d.ts.map +1 -1
- package/lib/sync/types.js +42 -0
- package/lib/sync/types.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +20 -0
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +190 -13
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/util/shuffle.d.ts +0 -4
- package/lib/util/shuffle.d.ts.map +1 -1
- package/lib/util/shuffle.js +0 -8
- package/lib/util/shuffle.js.map +1 -1
- package/lib/util/sszBytes.d.ts +5 -0
- package/lib/util/sszBytes.d.ts.map +1 -1
- package/lib/util/sszBytes.js +13 -1
- package/lib/util/sszBytes.js.map +1 -1
- package/package.json +15 -16
- package/src/api/impl/beacon/blocks/index.ts +2 -2
- package/src/api/impl/beacon/pool/index.ts +6 -2
- package/src/api/impl/validator/index.ts +9 -7
- package/src/chain/archiveStore/archiveStore.ts +0 -6
- package/src/chain/archiveStore/historicalState/metrics.ts +4 -7
- package/src/chain/archiveStore/utils/pruneHistory.ts +14 -4
- package/src/chain/blocks/importExecutionPayload.ts +14 -0
- package/src/chain/blocks/index.ts +2 -2
- package/src/chain/blocks/payloadEnvelopeInput/types.ts +1 -1
- package/src/chain/emitter.ts +7 -2
- package/src/chain/errors/attesterSlashingError.ts +3 -1
- package/src/chain/errors/payloadAttestation.ts +2 -0
- package/src/chain/errors/proposerSlashingError.ts +3 -1
- package/src/chain/options.ts +0 -5
- package/src/chain/produceBlock/computeNewStateRoot.ts +9 -2
- package/src/chain/produceBlock/produceBlockBody.ts +17 -6
- package/src/chain/seenCache/seenPayloadEnvelopeInput.ts +3 -2
- package/src/chain/validation/attesterSlashing.ts +1 -2
- package/src/chain/validation/payloadAttestationMessage.ts +9 -0
- package/src/chain/validation/proposerSlashing.ts +1 -2
- package/src/chain/validatorMonitor.ts +12 -2
- package/src/db/beacon.ts +0 -5
- package/src/db/buckets.ts +1 -1
- package/src/db/interface.ts +0 -3
- package/src/db/repositories/blockArchive.ts +38 -1
- package/src/db/repositories/index.ts +0 -1
- package/src/metrics/metrics/lodestar.ts +63 -28
- package/src/network/gossip/encoding.ts +5 -8
- package/src/network/gossip/gossipsub.ts +19 -2
- package/src/network/gossip/topic.ts +25 -7
- package/src/network/processor/gossipHandlers.ts +18 -5
- package/src/network/processor/gossipValidatorFn.ts +111 -7
- package/src/network/processor/index.ts +81 -24
- package/src/network/reqresp/protocols.ts +31 -6
- package/src/node/nodejs.ts +0 -27
- package/src/sync/interface.ts +1 -2
- package/src/sync/options.ts +0 -8
- package/src/sync/types.ts +44 -3
- package/src/sync/unknownBlock.ts +213 -13
- package/src/util/shuffle.ts +0 -9
- package/src/util/sszBytes.ts +18 -0
- package/lib/chain/archiveStore/utils/updateBackfillRange.d.ts +0 -20
- package/lib/chain/archiveStore/utils/updateBackfillRange.d.ts.map +0 -1
- package/lib/chain/archiveStore/utils/updateBackfillRange.js +0 -40
- package/lib/chain/archiveStore/utils/updateBackfillRange.js.map +0 -1
- package/lib/db/repositories/backfilledRanges.d.ts +0 -18
- package/lib/db/repositories/backfilledRanges.d.ts.map +0 -1
- package/lib/db/repositories/backfilledRanges.js +0 -26
- package/lib/db/repositories/backfilledRanges.js.map +0 -1
- package/lib/sync/backfill/backfill.d.ts +0 -169
- package/lib/sync/backfill/backfill.d.ts.map +0 -1
- package/lib/sync/backfill/backfill.js +0 -686
- package/lib/sync/backfill/backfill.js.map +0 -1
- package/lib/sync/backfill/errors.d.ts +0 -30
- package/lib/sync/backfill/errors.d.ts.map +0 -1
- package/lib/sync/backfill/errors.js +0 -15
- package/lib/sync/backfill/errors.js.map +0 -1
- package/lib/sync/backfill/index.d.ts +0 -2
- package/lib/sync/backfill/index.d.ts.map +0 -1
- package/lib/sync/backfill/index.js +0 -2
- package/lib/sync/backfill/index.js.map +0 -1
- package/lib/sync/backfill/verify.d.ts +0 -18
- package/lib/sync/backfill/verify.d.ts.map +0 -1
- package/lib/sync/backfill/verify.js +0 -36
- package/lib/sync/backfill/verify.js.map +0 -1
- package/src/chain/archiveStore/utils/updateBackfillRange.ts +0 -50
- package/src/db/repositories/backfilledRanges.ts +0 -29
- package/src/sync/backfill/backfill.ts +0 -916
- package/src/sync/backfill/errors.ts +0 -23
- package/src/sync/backfill/index.ts +0 -1
- package/src/sync/backfill/verify.ts +0 -58
package/src/sync/unknownBlock.ts
CHANGED
|
@@ -5,7 +5,7 @@ import {ForkSeq, SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
|
|
|
5
5
|
import {RequestError, RequestErrorCode} from "@lodestar/reqresp";
|
|
6
6
|
import {computeTimeAtSlot} from "@lodestar/state-transition";
|
|
7
7
|
import {RootHex, Slot, gloas} from "@lodestar/types";
|
|
8
|
-
import {Logger, fromHex, prettyPrintIndices, pruneSetToMax, sleep, toRootHex} from "@lodestar/utils";
|
|
8
|
+
import {Logger, fromHex, isErrorAborted, prettyPrintIndices, pruneSetToMax, sleep, toRootHex} from "@lodestar/utils";
|
|
9
9
|
import {isBlockInputBlobs, isBlockInputColumns} from "../chain/blocks/blockInput/blockInput.js";
|
|
10
10
|
import {BlockInputSource, IBlockInput} from "../chain/blocks/blockInput/types.js";
|
|
11
11
|
import {PayloadError, PayloadErrorCode} from "../chain/blocks/importExecutionPayload.js";
|
|
@@ -18,6 +18,7 @@ import {Metrics} from "../metrics/index.js";
|
|
|
18
18
|
import {INetwork, NetworkEvent, NetworkEventData, prettyPrintPeerIdStr} from "../network/index.js";
|
|
19
19
|
import {PeerSyncMeta} from "../network/peers/peersData.js";
|
|
20
20
|
import {MAX_PEERS_PER_ROOT} from "../network/processor/constants.js";
|
|
21
|
+
import {ClockEvent} from "../util/clock.js";
|
|
21
22
|
import {PeerIdStr} from "../util/peerId.js";
|
|
22
23
|
import {shuffle} from "../util/shuffle.js";
|
|
23
24
|
import {sortBy} from "../util/sortBy.js";
|
|
@@ -26,7 +27,10 @@ import {MAX_CONCURRENT_REQUESTS} from "./constants.js";
|
|
|
26
27
|
import {SyncOptions} from "./options.js";
|
|
27
28
|
import {
|
|
28
29
|
BlockInputSyncCacheItem,
|
|
30
|
+
DeferredPayloadResult,
|
|
31
|
+
DownloadResult,
|
|
29
32
|
DroppedItemReason,
|
|
33
|
+
FetchResult,
|
|
30
34
|
PayloadSyncCacheItem,
|
|
31
35
|
PendingBlockInput,
|
|
32
36
|
PendingBlockInputStatus,
|
|
@@ -55,6 +59,11 @@ const MAX_PENDING_BLOCKS = 100;
|
|
|
55
59
|
*/
|
|
56
60
|
const PRUNE_UNRESOLVED_SLOT_EPOCHS = 2;
|
|
57
61
|
|
|
62
|
+
/**
|
|
63
|
+
* Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
|
|
64
|
+
*/
|
|
65
|
+
export const PAYLOAD_POLL_INTERVAL_MS = 1_000;
|
|
66
|
+
|
|
58
67
|
type AdvancePendingBlockResult =
|
|
59
68
|
| "ready"
|
|
60
69
|
| "queued_block"
|
|
@@ -63,14 +72,6 @@ type AdvancePendingBlockResult =
|
|
|
63
72
|
| "blocked"
|
|
64
73
|
| "removed";
|
|
65
74
|
|
|
66
|
-
enum FetchResult {
|
|
67
|
-
SuccessResolved = "success_resolved",
|
|
68
|
-
SuccessMissingParent = "success_missing_parent",
|
|
69
|
-
SuccessLate = "success_late",
|
|
70
|
-
FailureTriedAllPeers = "failure_tried_all_peers",
|
|
71
|
-
FailureMaxAttempts = "failure_max_attempts",
|
|
72
|
-
}
|
|
73
|
-
|
|
74
75
|
class UnknownBlockRateLimitedError extends Error {
|
|
75
76
|
constructor(message: string) {
|
|
76
77
|
super(message);
|
|
@@ -122,6 +123,11 @@ export class BlockInputSync {
|
|
|
122
123
|
private subscribedToNetworkEvents = false;
|
|
123
124
|
private peerBalancer: UnknownBlockPeerBalancer;
|
|
124
125
|
private rateLimitBackoffTimeout: NodeJS.Timeout | undefined;
|
|
126
|
+
/**
|
|
127
|
+
* Search unknown payload starting at PAYLOAD_DUE_BPS.
|
|
128
|
+
*/
|
|
129
|
+
private readonly deferredPayloadRoots = new Map<RootHex, {slot: Slot; source: BlockInputSource; peer?: PeerIdStr}>();
|
|
130
|
+
private payloadPollAbortController: AbortController | undefined;
|
|
125
131
|
|
|
126
132
|
constructor(
|
|
127
133
|
private readonly config: ChainForkConfig,
|
|
@@ -158,6 +164,7 @@ export class BlockInputSync {
|
|
|
158
164
|
this.logger.verbose("BlockInputSync enabled.");
|
|
159
165
|
this.chain.emitter.on(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
|
|
160
166
|
this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
|
|
167
|
+
this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
|
|
161
168
|
this.chain.emitter.on(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
|
|
162
169
|
this.chain.emitter.on(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
|
|
163
170
|
this.chain.emitter.on(ChainEvent.blockUnknownParent, this.onUnknownParent);
|
|
@@ -166,6 +173,7 @@ export class BlockInputSync {
|
|
|
166
173
|
this.chain.emitter.on(routes.events.EventType.executionPayload, this.onPayloadImported);
|
|
167
174
|
this.network.events.on(NetworkEvent.peerConnected, this.onPeerConnected);
|
|
168
175
|
this.network.events.on(NetworkEvent.peerDisconnected, this.onPeerDisconnected);
|
|
176
|
+
this.chain.clock.on(ClockEvent.slot, this.startPayloadPollAtSlot);
|
|
169
177
|
|
|
170
178
|
// Seed the balancer with peers that connected before we subscribed
|
|
171
179
|
for (const peerId of this.network.getConnectedPeers()) {
|
|
@@ -177,14 +185,22 @@ export class BlockInputSync {
|
|
|
177
185
|
}
|
|
178
186
|
|
|
179
187
|
this.subscribedToNetworkEvents = true;
|
|
188
|
+
// we subscribe mid-slot, and a root can be deferred at any point in the slot, so start this
|
|
189
|
+
// slot's loop now instead of waiting for the next ClockEvent.slot
|
|
190
|
+
this.startPayloadPollAtSlot(this.chain.clock.currentSlot);
|
|
180
191
|
}
|
|
181
192
|
}
|
|
182
193
|
|
|
183
194
|
unsubscribeFromNetwork(): void {
|
|
184
195
|
this.logger.verbose("BlockInputSync disabled.");
|
|
185
196
|
this.clearRateLimitBackoffTimer();
|
|
197
|
+
this.chain.clock.off(ClockEvent.slot, this.startPayloadPollAtSlot);
|
|
198
|
+
this.payloadPollAbortController?.abort();
|
|
199
|
+
this.payloadPollAbortController = undefined;
|
|
200
|
+
this.deferredPayloadRoots.clear();
|
|
186
201
|
this.chain.emitter.off(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
|
|
187
202
|
this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
|
|
203
|
+
this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
|
|
188
204
|
this.chain.emitter.off(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
|
|
189
205
|
this.chain.emitter.off(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
|
|
190
206
|
this.chain.emitter.off(ChainEvent.blockUnknownParent, this.onUnknownParent);
|
|
@@ -248,6 +264,33 @@ export class BlockInputSync {
|
|
|
248
264
|
}
|
|
249
265
|
};
|
|
250
266
|
|
|
267
|
+
private onUnknownEnvelopeBlockRootSlot = (data: ChainEventData[ChainEvent.unknownEnvelopeBlockRootSlot]): void => {
|
|
268
|
+
try {
|
|
269
|
+
if (data.slot === this.chain.clock.currentSlot) {
|
|
270
|
+
// we receive the optimistic search, the poll loop searches it at PAYLOAD_DUE or on its next
|
|
271
|
+
// tick. If that loop already returned - every root it watched was imported - this root waits
|
|
272
|
+
// for the next slot, where startPayloadPollAtSlot moves it to pendingPayloads. That is not the normal
|
|
273
|
+
// scenario, and in a forking condition it only delays the search of the extra root
|
|
274
|
+
const deferred = this.deferredPayloadRoots.get(data.rootHex);
|
|
275
|
+
if (deferred === undefined) {
|
|
276
|
+
this.deferredPayloadRoots.set(data.rootHex, {slot: data.slot, source: data.source, peer: data.peer});
|
|
277
|
+
} else if (deferred.peer === undefined) {
|
|
278
|
+
deferred.peer = data.peer;
|
|
279
|
+
}
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
const isNewRoot = this.addByPayloadRootHex(data.rootHex, data.peer, data.slot);
|
|
284
|
+
if (isNewRoot) {
|
|
285
|
+
this.triggerUnknownBlockSearch();
|
|
286
|
+
this.metrics?.blockInputSync.requests.inc({type: PendingBlockType.UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT});
|
|
287
|
+
this.metrics?.blockInputSync.payloadSource.inc({source: data.source});
|
|
288
|
+
}
|
|
289
|
+
} catch (e) {
|
|
290
|
+
this.logger.debug("Error handling unknownEnvelopeBlockRootSlot event", {}, e as Error);
|
|
291
|
+
}
|
|
292
|
+
};
|
|
293
|
+
|
|
251
294
|
private onIncompletePayloadEnvelope = (data: ChainEventData[ChainEvent.incompletePayloadEnvelope]): void => {
|
|
252
295
|
try {
|
|
253
296
|
this.addByPayloadInput(data.payloadInput, data.peer);
|
|
@@ -791,6 +834,122 @@ export class BlockInputSync {
|
|
|
791
834
|
}
|
|
792
835
|
}
|
|
793
836
|
|
|
837
|
+
/**
|
|
838
|
+
* Start this slot's payload poll: end the previous slot's loop, move roots it never got to
|
|
839
|
+
* into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
|
|
840
|
+
*/
|
|
841
|
+
private startPayloadPollAtSlot = (slot: Slot): void => {
|
|
842
|
+
if (!isForkPostGloas(this.config.getForkName(slot))) {
|
|
843
|
+
return;
|
|
844
|
+
}
|
|
845
|
+
// end the previous slot's loop, wherever it is: its sleep is bound to this same controller
|
|
846
|
+
this.payloadPollAbortController?.abort();
|
|
847
|
+
this.payloadPollAbortController = new AbortController();
|
|
848
|
+
// entries from an earlier slot is not polled
|
|
849
|
+
for (const [rootHex, {slot: deferredSlot, source, peer}] of this.deferredPayloadRoots) {
|
|
850
|
+
if (deferredSlot < slot) {
|
|
851
|
+
if (!this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
|
|
852
|
+
this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
|
|
853
|
+
}
|
|
854
|
+
this.deferredPayloadRoots.delete(rootHex);
|
|
855
|
+
}
|
|
856
|
+
}
|
|
857
|
+
this.pollPayloadsAtSlot(slot, this.payloadPollAbortController.signal).catch((e) => {
|
|
858
|
+
if (!isErrorAborted(e)) {
|
|
859
|
+
this.logger.debug("Error polling payloads", {slot}, e as Error);
|
|
860
|
+
}
|
|
861
|
+
});
|
|
862
|
+
};
|
|
863
|
+
|
|
864
|
+
/**
|
|
865
|
+
* Poll unknown payloads of the current slot.
|
|
866
|
+
*/
|
|
867
|
+
private async pollPayloadsAtSlot(slot: Slot, signal: AbortSignal): Promise<void> {
|
|
868
|
+
// fixed tick count so the loop cannot outlive its slot: for mainnet, it's 6 ticks
|
|
869
|
+
const tickCount = Math.floor(
|
|
870
|
+
(this.config.SLOT_DURATION_MS - this.config.getPayloadDueMs()) / PAYLOAD_POLL_INTERVAL_MS
|
|
871
|
+
);
|
|
872
|
+
// a root still missing on several ticks is searched on each of them, recorded once
|
|
873
|
+
const searchedRoots = new Set<RootHex>();
|
|
874
|
+
let polls = 0;
|
|
875
|
+
|
|
876
|
+
try {
|
|
877
|
+
await sleep(Math.max(0, this.config.getPayloadDueMs() - this.chain.clock.msFromSlot(slot)), signal);
|
|
878
|
+
|
|
879
|
+
for (polls = 0; polls < tickCount; polls++) {
|
|
880
|
+
let importedCount = 0;
|
|
881
|
+
for (const [rootHex, {slot: deferredSlot, source, peer}] of this.deferredPayloadRoots) {
|
|
882
|
+
if (this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
|
|
883
|
+
importedCount++;
|
|
884
|
+
continue;
|
|
885
|
+
}
|
|
886
|
+
// copy to the regular pendingPayloads so that we can search
|
|
887
|
+
this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
|
|
888
|
+
searchedRoots.add(rootHex);
|
|
889
|
+
}
|
|
890
|
+
|
|
891
|
+
// an empty deferredPayloadRoots means there is no optimistic search comes before PAYLOAD_DUE
|
|
892
|
+
// we have to poll until the payload of current slot is imported or slot end
|
|
893
|
+
if (this.deferredPayloadRoots.size > 0 && importedCount === this.deferredPayloadRoots.size) {
|
|
894
|
+
if (searchedRoots.size > 0) {
|
|
895
|
+
// the backup search was needed
|
|
896
|
+
this.metrics?.blockInputSync.deferredPayloadResult.inc({
|
|
897
|
+
result: DeferredPayloadResult.ImportedAfterSearch,
|
|
898
|
+
});
|
|
899
|
+
this.metrics?.blockInputSync.deferredPayloadPolls.observe(polls);
|
|
900
|
+
this.logger.verbose("Payload imported after unknown sync search", {
|
|
901
|
+
slot,
|
|
902
|
+
roots: Array.from(searchedRoots).join(","),
|
|
903
|
+
polls,
|
|
904
|
+
});
|
|
905
|
+
} else {
|
|
906
|
+
// this happens most of the time on devnet
|
|
907
|
+
// gossip delivered everything before PAYLOAD_DUE
|
|
908
|
+
this.metrics?.blockInputSync.deferredPayloadResult.inc({
|
|
909
|
+
result: DeferredPayloadResult.ImportedBeforeSearch,
|
|
910
|
+
});
|
|
911
|
+
}
|
|
912
|
+
return;
|
|
913
|
+
}
|
|
914
|
+
|
|
915
|
+
this.triggerUnknownBlockSearch();
|
|
916
|
+
if (polls < tickCount - 1) {
|
|
917
|
+
// no sleep after the last tick: the loop would otherwise end right at the slot boundary,
|
|
918
|
+
// where startPayloadPollAtSlot aborts it
|
|
919
|
+
await sleep(PAYLOAD_POLL_INTERVAL_MS, signal);
|
|
920
|
+
}
|
|
921
|
+
}
|
|
922
|
+
|
|
923
|
+
// reaching here means the early return never fired
|
|
924
|
+
if (this.deferredPayloadRoots.size > 0) {
|
|
925
|
+
this.metrics?.blockInputSync.deferredPayloadResult.inc({result: DeferredPayloadResult.Unresolved});
|
|
926
|
+
this.logger.debug("Deferred payloads still missing at end of slot", {
|
|
927
|
+
slot,
|
|
928
|
+
roots: Array.from(this.deferredPayloadRoots.keys()).join(","),
|
|
929
|
+
});
|
|
930
|
+
} else {
|
|
931
|
+
// no optimistic search and no payload import ended the loop, eg a skipped slot
|
|
932
|
+
this.metrics?.blockInputSync.deferredPayloadResult.inc({result: DeferredPayloadResult.ResolvedNoRoot});
|
|
933
|
+
this.logger.debug("No deferred payloads at slot", {
|
|
934
|
+
slot,
|
|
935
|
+
});
|
|
936
|
+
}
|
|
937
|
+
} catch (e) {
|
|
938
|
+
if (!isErrorAborted(e)) {
|
|
939
|
+
throw e;
|
|
940
|
+
}
|
|
941
|
+
this.logger.verbose("Payload poll aborted", {slot, polls, msIntoSlot: this.chain.clock.msFromSlot(slot)});
|
|
942
|
+
}
|
|
943
|
+
}
|
|
944
|
+
|
|
945
|
+
private addDeferredPayloadRoot(rootHex: RootHex, slot: Slot, source: BlockInputSource, peer?: PeerIdStr): void {
|
|
946
|
+
const isNewRoot = this.addByPayloadRootHex(rootHex, peer, slot);
|
|
947
|
+
if (isNewRoot) {
|
|
948
|
+
this.metrics?.blockInputSync.requests.inc({type: PendingBlockType.DEFERRED_PAYLOAD_BLOCK_ROOT});
|
|
949
|
+
this.metrics?.blockInputSync.payloadSource.inc({source});
|
|
950
|
+
}
|
|
951
|
+
}
|
|
952
|
+
|
|
794
953
|
private async downloadBlock(block: BlockInputSyncCacheItem): Promise<void> {
|
|
795
954
|
if (block.status !== PendingBlockInputStatus.pending) {
|
|
796
955
|
return;
|
|
@@ -1125,15 +1284,25 @@ export class BlockInputSync {
|
|
|
1125
1284
|
return;
|
|
1126
1285
|
}
|
|
1127
1286
|
this.pendingPayloads.set(resultRootHex, pendingPayload);
|
|
1287
|
+
const result = isPendingPayloadEnvelope(pendingPayload)
|
|
1288
|
+
? DownloadResult.WaitingForBlock
|
|
1289
|
+
: this.chain.forkChoice.hasPayloadHexUnsafe(resultRootHex)
|
|
1290
|
+
? DownloadResult.Late
|
|
1291
|
+
: DownloadResult.Resolved;
|
|
1292
|
+
this.metrics?.blockInputSync.downloadedPayloadsResult.inc({result});
|
|
1128
1293
|
|
|
1129
1294
|
if (isPendingPayloadEnvelope(pendingPayload)) {
|
|
1130
1295
|
await this.reconcilePayloadEnvelope(pendingPayload);
|
|
1131
1296
|
} else if (pendingPayload.status === PendingPayloadInputStatus.downloaded) {
|
|
1297
|
+
this.metrics?.blockInputSync.elapsedTimeTillPayloadReceived.observe(
|
|
1298
|
+
Date.now() / 1000 - computeTimeAtSlot(this.config, pendingPayload.payloadInput.slot, this.chain.genesisTime)
|
|
1299
|
+
);
|
|
1132
1300
|
await this.processPayload(pendingPayload);
|
|
1133
1301
|
}
|
|
1134
1302
|
return;
|
|
1135
1303
|
}
|
|
1136
1304
|
|
|
1305
|
+
this.metrics?.blockInputSync.downloadedPayloadsResult.inc({result: DownloadResult.Failed});
|
|
1137
1306
|
this.logger.debug("Ignoring unknown payload root after failed download", logCtx, res.err);
|
|
1138
1307
|
if (!isPendingPayloadEnvelope(payload)) {
|
|
1139
1308
|
payload.status = PendingPayloadInputStatus.pending;
|
|
@@ -1248,6 +1417,11 @@ export class BlockInputSync {
|
|
|
1248
1417
|
: await this.chain.seenPayloadEnvelopeInputCache.getOrReload(rootHex);
|
|
1249
1418
|
let envelope = payloadInput?.hasPayloadEnvelope() ? payloadInput.getPayloadEnvelope() : undefined;
|
|
1250
1419
|
|
|
1420
|
+
const fetchStartSec = Date.now() / 1000;
|
|
1421
|
+
if (typeof slot === "number") {
|
|
1422
|
+
this.metrics?.blockInputSync.payloadFetchBegin.observe(this.chain.clock.secFromSlot(slot, fetchStartSec));
|
|
1423
|
+
}
|
|
1424
|
+
|
|
1251
1425
|
let i = 0;
|
|
1252
1426
|
let deferredByRateLimit = false;
|
|
1253
1427
|
while (i++ < this.getMaxDownloadAttempts()) {
|
|
@@ -1271,6 +1445,11 @@ export class BlockInputSync {
|
|
|
1271
1445
|
pendingColumns.size > 0
|
|
1272
1446
|
? `cannot find peer with needed columns=${prettyPrintIndices(Array.from(pendingColumns))}`
|
|
1273
1447
|
: "no peer available to download pending payload";
|
|
1448
|
+
this.metrics?.blockInputSync.payloadFetchTime.observe(
|
|
1449
|
+
{result: FetchResult.FailureTriedAllPeers},
|
|
1450
|
+
Date.now() / 1000 - fetchStartSec
|
|
1451
|
+
);
|
|
1452
|
+
this.metrics?.blockInputSync.payloadFetchPeers.set({result: FetchResult.FailureTriedAllPeers}, i);
|
|
1274
1453
|
throw Error(`Error fetching payload by root slot=${slot} root=${rootHex} after ${i}: ${reason}`);
|
|
1275
1454
|
}
|
|
1276
1455
|
|
|
@@ -1280,7 +1459,12 @@ export class BlockInputSync {
|
|
|
1280
1459
|
try {
|
|
1281
1460
|
if (!envelope) {
|
|
1282
1461
|
envelope = await this.fetchExecutionPayloadEnvelope(peerId, blockRoot, rootHex);
|
|
1462
|
+
const slotWasUnknown = typeof slot !== "number";
|
|
1283
1463
|
slot = envelope.message.payload.slotNumber;
|
|
1464
|
+
if (slotWasUnknown) {
|
|
1465
|
+
// we were not able to observe the time into slot when starting the fetch, do it now
|
|
1466
|
+
this.metrics?.blockInputSync.payloadFetchBegin.observe(this.chain.clock.secFromSlot(slot, fetchStartSec));
|
|
1467
|
+
}
|
|
1284
1468
|
}
|
|
1285
1469
|
|
|
1286
1470
|
payloadInput ??= await this.chain.seenPayloadEnvelopeInputCache.getOrReload(rootHex);
|
|
@@ -1289,6 +1473,11 @@ export class BlockInputSync {
|
|
|
1289
1473
|
// envelope and wait for the block body; reconcilePayloadEnvelope validates once the block lands.
|
|
1290
1474
|
// payloadInput may be seeded from the block body during download, so a non-null payloadInput does not
|
|
1291
1475
|
// imply the block is imported.
|
|
1476
|
+
this.metrics?.blockInputSync.payloadFetchTime.observe(
|
|
1477
|
+
{result: FetchResult.SuccessWaitingForBlock},
|
|
1478
|
+
Date.now() / 1000 - fetchStartSec
|
|
1479
|
+
);
|
|
1480
|
+
this.metrics?.blockInputSync.payloadFetchPeers.set({result: FetchResult.SuccessWaitingForBlock}, i);
|
|
1292
1481
|
return {
|
|
1293
1482
|
status: PendingPayloadInputStatus.waitingForBlock,
|
|
1294
1483
|
envelope,
|
|
@@ -1339,6 +1528,12 @@ export class BlockInputSync {
|
|
|
1339
1528
|
});
|
|
1340
1529
|
|
|
1341
1530
|
if (pendingPayload.status === PendingPayloadInputStatus.downloaded) {
|
|
1531
|
+
// late = the payload got imported (via gossip) while we were downloading, same as the block path
|
|
1532
|
+
const result = this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)
|
|
1533
|
+
? FetchResult.SuccessLate
|
|
1534
|
+
: FetchResult.SuccessResolved;
|
|
1535
|
+
this.metrics?.blockInputSync.payloadFetchTime.observe({result}, Date.now() / 1000 - fetchStartSec);
|
|
1536
|
+
this.metrics?.blockInputSync.payloadFetchPeers.set({result}, i);
|
|
1342
1537
|
return pendingPayload;
|
|
1343
1538
|
}
|
|
1344
1539
|
|
|
@@ -1373,12 +1568,17 @@ export class BlockInputSync {
|
|
|
1373
1568
|
}
|
|
1374
1569
|
}
|
|
1375
1570
|
|
|
1571
|
+
this.metrics?.blockInputSync.payloadFetchTime.observe(
|
|
1572
|
+
{result: FetchResult.FailureMaxAttempts},
|
|
1573
|
+
Date.now() / 1000 - fetchStartSec
|
|
1574
|
+
);
|
|
1575
|
+
this.metrics?.blockInputSync.payloadFetchPeers.set({result: FetchResult.FailureMaxAttempts}, i - 1);
|
|
1576
|
+
|
|
1376
1577
|
if (deferredByRateLimit && this.peerBalancer.getNextRateLimitRetryAt() !== null) {
|
|
1377
1578
|
throw new UnknownBlockRateLimitedError(
|
|
1378
1579
|
`Error fetching payload with slot=${slot} root=${rootHex} after ${i - 1} attempts: peers are rate-limited`
|
|
1379
1580
|
);
|
|
1380
1581
|
}
|
|
1381
|
-
|
|
1382
1582
|
throw Error(`Error fetching payload with slot=${slot} root=${rootHex} after ${i - 1} attempts.`);
|
|
1383
1583
|
}
|
|
1384
1584
|
|
|
@@ -1483,7 +1683,7 @@ export class BlockInputSync {
|
|
|
1483
1683
|
|
|
1484
1684
|
// no more peer with needed columns to try, throw error
|
|
1485
1685
|
const message = `Error fetching UnknownBlockRoot slot=${slot} root=${rootHex} after ${i}: cannot find peer with needed columns=${prettyPrintIndices(Array.from(pendingColumns))}`;
|
|
1486
|
-
this.metrics?.blockInputSync.
|
|
1686
|
+
this.metrics?.blockInputSync.fetchTime.observe(
|
|
1487
1687
|
{result: FetchResult.FailureTriedAllPeers},
|
|
1488
1688
|
Date.now() / 1000 - fetchStartSec
|
|
1489
1689
|
);
|
|
@@ -1572,7 +1772,7 @@ export class BlockInputSync {
|
|
|
1572
1772
|
: this.chain.forkChoice.hasBlockHex(cacheItem.blockInput.parentRootHex)
|
|
1573
1773
|
? FetchResult.SuccessResolved
|
|
1574
1774
|
: FetchResult.SuccessMissingParent;
|
|
1575
|
-
this.metrics?.blockInputSync.
|
|
1775
|
+
this.metrics?.blockInputSync.fetchTime.observe({result}, Date.now() / 1000 - fetchStartSec);
|
|
1576
1776
|
this.metrics?.blockInputSync.fetchPeers.set({result}, i);
|
|
1577
1777
|
return cacheItem;
|
|
1578
1778
|
}
|
|
@@ -1606,7 +1806,7 @@ export class BlockInputSync {
|
|
|
1606
1806
|
}
|
|
1607
1807
|
}
|
|
1608
1808
|
|
|
1609
|
-
this.metrics?.blockInputSync.
|
|
1809
|
+
this.metrics?.blockInputSync.fetchTime.observe(
|
|
1610
1810
|
{result: FetchResult.FailureMaxAttempts},
|
|
1611
1811
|
Date.now() / 1000 - fetchStartSec
|
|
1612
1812
|
);
|
package/src/util/shuffle.ts
CHANGED
|
@@ -10,12 +10,3 @@ export function shuffle<T>(arr: T[]): T[] {
|
|
|
10
10
|
}
|
|
11
11
|
return _arr;
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Return one random item from array
|
|
16
|
-
*/
|
|
17
|
-
export function shuffleOne<T>(arr: T[]): T | undefined {
|
|
18
|
-
if (arr.length === 0) return undefined;
|
|
19
|
-
|
|
20
|
-
return arr[Math.floor(Math.random() * arr.length)];
|
|
21
|
-
}
|
package/src/util/sszBytes.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {BitArray, deserializeUint8ArrayBitListFromBytes} from "@chainsafe/ssz";
|
|
2
2
|
import {ChainForkConfig} from "@lodestar/config";
|
|
3
3
|
import {
|
|
4
|
+
BYTES_PER_CELL,
|
|
4
5
|
BYTES_PER_FIELD_ELEMENT,
|
|
5
6
|
FIELD_ELEMENTS_PER_BLOB,
|
|
6
7
|
ForkName,
|
|
@@ -551,6 +552,23 @@ export function getBeaconBlockRootFromDataColumnSidecarSerialized(data: Uint8Arr
|
|
|
551
552
|
return "0x" + blockRootBuf.toString("hex");
|
|
552
553
|
}
|
|
553
554
|
|
|
555
|
+
// beaconBlockRoot is the last fixed field in the Gloas layout
|
|
556
|
+
const DATA_COLUMN_SIDECAR_GLOAS_FIXED_SIZE = BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR + ROOT_SIZE; // 56 bytes
|
|
557
|
+
const KZG_PROOF_SIZE = 48; // Bytes48
|
|
558
|
+
const DATA_COLUMN_SIDECAR_GLOAS_PER_BLOB_SIZE = BYTES_PER_CELL + KZG_PROOF_SIZE; // 2048 + 48 = 2096 bytes
|
|
559
|
+
|
|
560
|
+
/**
|
|
561
|
+
* Gloas sidecar size bound uses the largest blob limit across the entire schedule, including future entries.
|
|
562
|
+
* https://github.com/ethereum/consensus-specs/pull/5613
|
|
563
|
+
*/
|
|
564
|
+
export function computeMaxGloasDataColumnSidecarSize(config: ChainForkConfig): number {
|
|
565
|
+
const maxBlobs = config.BLOB_SCHEDULE.reduce(
|
|
566
|
+
(max, entry) => Math.max(max, entry.MAX_BLOBS_PER_BLOCK),
|
|
567
|
+
config.MAX_BLOBS_PER_BLOCK_ELECTRA
|
|
568
|
+
);
|
|
569
|
+
return DATA_COLUMN_SIDECAR_GLOAS_FIXED_SIZE + maxBlobs * DATA_COLUMN_SIDECAR_GLOAS_PER_BLOB_SIZE;
|
|
570
|
+
}
|
|
571
|
+
|
|
554
572
|
/**
|
|
555
573
|
* SignedExecutionPayloadEnvelope SSZ Layout:
|
|
556
574
|
* ├─ 4 bytes: message offset (points to byte 100)
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { CheckpointWithHex } from "@lodestar/fork-choice";
|
|
2
|
-
import { Logger } from "@lodestar/logger";
|
|
3
|
-
import { IBeaconDb } from "../../../db/interface.js";
|
|
4
|
-
import { IBeaconChain } from "../../interface.js";
|
|
5
|
-
/**
|
|
6
|
-
* Backfill sync relies on verified connected ranges (which are represented as key,value
|
|
7
|
-
* with a verified jump from a key back to value). Since the node could have progressed
|
|
8
|
-
* ahead from, we need to save the forward progress of this node as another backfill
|
|
9
|
-
* range entry, that backfill sync will use to jump back if this node is restarted
|
|
10
|
-
* for any reason.
|
|
11
|
-
* The current backfill has its own backfill entry from anchor slot to last backfilled
|
|
12
|
-
* slot. And this would create the entry from the current finalized slot to the anchor
|
|
13
|
-
* slot.
|
|
14
|
-
*/
|
|
15
|
-
export declare function updateBackfillRange({ chain, db, logger }: {
|
|
16
|
-
chain: IBeaconChain;
|
|
17
|
-
db: IBeaconDb;
|
|
18
|
-
logger: Logger;
|
|
19
|
-
}, finalized: CheckpointWithHex): Promise<void>;
|
|
20
|
-
//# sourceMappingURL=updateBackfillRange.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"updateBackfillRange.d.ts","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/updateBackfillRange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAC,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAC,EAAE;IAAC,KAAK,EAAE,YAAY,CAAC;IAAC,EAAE,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,EACzE,SAAS,EAAE,iBAAiB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Backfill sync relies on verified connected ranges (which are represented as key,value
|
|
3
|
-
* with a verified jump from a key back to value). Since the node could have progressed
|
|
4
|
-
* ahead from, we need to save the forward progress of this node as another backfill
|
|
5
|
-
* range entry, that backfill sync will use to jump back if this node is restarted
|
|
6
|
-
* for any reason.
|
|
7
|
-
* The current backfill has its own backfill entry from anchor slot to last backfilled
|
|
8
|
-
* slot. And this would create the entry from the current finalized slot to the anchor
|
|
9
|
-
* slot.
|
|
10
|
-
*/
|
|
11
|
-
export async function updateBackfillRange({ chain, db, logger }, finalized) {
|
|
12
|
-
try {
|
|
13
|
-
// Mark the sequence in backfill db from finalized block's slot till anchor slot as
|
|
14
|
-
// filled.
|
|
15
|
-
const finalizedBlockFC = chain.forkChoice.getBlockHexDefaultStatus(finalized.rootHex);
|
|
16
|
-
if (finalizedBlockFC && finalizedBlockFC.slot > chain.anchorStateLatestBlockSlot) {
|
|
17
|
-
await db.backfilledRanges.put(finalizedBlockFC.slot, chain.anchorStateLatestBlockSlot);
|
|
18
|
-
// Clear previously marked sequence till anchorStateLatestBlockSlot, without
|
|
19
|
-
// touching backfill sync process sequence which are at
|
|
20
|
-
// <=anchorStateLatestBlockSlot i.e. clear >anchorStateLatestBlockSlot
|
|
21
|
-
// and < currentSlot
|
|
22
|
-
const filteredSeqs = await db.backfilledRanges.entries({
|
|
23
|
-
gt: chain.anchorStateLatestBlockSlot,
|
|
24
|
-
lt: finalizedBlockFC.slot,
|
|
25
|
-
});
|
|
26
|
-
logger.debug("updated backfilledRanges", {
|
|
27
|
-
key: finalizedBlockFC.slot,
|
|
28
|
-
value: chain.anchorStateLatestBlockSlot,
|
|
29
|
-
});
|
|
30
|
-
if (filteredSeqs.length > 0) {
|
|
31
|
-
await db.backfilledRanges.batchDelete(filteredSeqs.map((entry) => entry.key));
|
|
32
|
-
logger.debug(`Forward Sync - cleaned up backfilledRanges between ${finalizedBlockFC.slot},${chain.anchorStateLatestBlockSlot}`, { seqs: JSON.stringify(filteredSeqs) });
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
catch (e) {
|
|
37
|
-
logger.error("Error updating backfilledRanges on finalization", { epoch: finalized.epoch }, e);
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
//# sourceMappingURL=updateBackfillRange.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"updateBackfillRange.js","sourceRoot":"","sources":["../../../../src/chain/archiveStore/utils/updateBackfillRange.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAuD,EACzE,SAA4B;IAE5B,IAAI,CAAC;QACH,mFAAmF;QACnF,UAAU;QACV,MAAM,gBAAgB,GAAG,KAAK,CAAC,UAAU,CAAC,wBAAwB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtF,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,IAAI,GAAG,KAAK,CAAC,0BAA0B,EAAE,CAAC;YACjF,MAAM,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAEvF,4EAA4E;YAC5E,uDAAuD;YACvD,sEAAsE;YACtE,oBAAoB;YACpB,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC;gBACrD,EAAE,EAAE,KAAK,CAAC,0BAA0B;gBACpC,EAAE,EAAE,gBAAgB,CAAC,IAAI;aAC1B,CAAC,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;gBACvC,GAAG,EAAE,gBAAgB,CAAC,IAAI;gBAC1B,KAAK,EAAE,KAAK,CAAC,0BAA0B;aACxC,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9E,MAAM,CAAC,KAAK,CACV,sDAAsD,gBAAgB,CAAC,IAAI,IAAI,KAAK,CAAC,0BAA0B,EAAE,EACjH,EAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAC,CACrC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAC,KAAK,EAAE,SAAS,CAAC,KAAK,EAAC,EAAE,CAAU,CAAC,CAAC;IACxG,CAAC;AACH,CAAC"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { DatabaseController, Repository } from "@lodestar/db";
|
|
3
|
-
import { Slot } from "@lodestar/types";
|
|
4
|
-
/**
|
|
5
|
-
* Slot to slot ranges that ensure that block range is fully backfilled
|
|
6
|
-
*
|
|
7
|
-
* If node starts backfilling at slots 1000, and backfills to 800, there will be an entry
|
|
8
|
-
* 1000 -> 800
|
|
9
|
-
*
|
|
10
|
-
* When the node is backfilling if it starts at 1200 and backfills to 1000, it will find this sequence and,
|
|
11
|
-
* jump directly to 800 and delete the key 1000.
|
|
12
|
-
*/
|
|
13
|
-
export declare class BackfilledRanges extends Repository<Slot, Slot> {
|
|
14
|
-
constructor(config: ChainForkConfig, db: DatabaseController<Uint8Array, Uint8Array>);
|
|
15
|
-
decodeKey(data: Buffer): number;
|
|
16
|
-
getId(_value: Slot): number;
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=backfilledRanges.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"backfilledRanges.d.ts","sourceRoot":"","sources":["../../../src/db/repositories/backfilledRanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,kBAAkB,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAC,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAI1C;;;;;;;;GAQG;AACH,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;IAC1D,YAAY,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,EAGlF;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9B;IAED,KAAK,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,CAE1B;CACF"}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { Repository } from "@lodestar/db";
|
|
2
|
-
import { ssz } from "@lodestar/types";
|
|
3
|
-
import { bytesToInt } from "@lodestar/utils";
|
|
4
|
-
import { Bucket, getBucketNameByValue } from "../buckets.js";
|
|
5
|
-
/**
|
|
6
|
-
* Slot to slot ranges that ensure that block range is fully backfilled
|
|
7
|
-
*
|
|
8
|
-
* If node starts backfilling at slots 1000, and backfills to 800, there will be an entry
|
|
9
|
-
* 1000 -> 800
|
|
10
|
-
*
|
|
11
|
-
* When the node is backfilling if it starts at 1200 and backfills to 1000, it will find this sequence and,
|
|
12
|
-
* jump directly to 800 and delete the key 1000.
|
|
13
|
-
*/
|
|
14
|
-
export class BackfilledRanges extends Repository {
|
|
15
|
-
constructor(config, db) {
|
|
16
|
-
const bucket = Bucket.backfilled_ranges;
|
|
17
|
-
super(config, db, bucket, ssz.Slot, getBucketNameByValue(bucket));
|
|
18
|
-
}
|
|
19
|
-
decodeKey(data) {
|
|
20
|
-
return bytesToInt(super.decodeKey(data), "be");
|
|
21
|
-
}
|
|
22
|
-
getId(_value) {
|
|
23
|
-
throw new Error("Cannot get the db key from slot");
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
//# sourceMappingURL=backfilledRanges.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"backfilledRanges.js","sourceRoot":"","sources":["../../../src/db/repositories/backfilledRanges.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,UAAU,EAAC,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAO,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAE,oBAAoB,EAAC,MAAM,eAAe,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,OAAO,gBAAiB,SAAQ,UAAsB;IAC1D,YAAY,MAAuB,EAAE,EAA8C;QACjF,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC;QACxC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,SAAS,CAAC,IAAY;QACpB,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAA0B,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,MAAY;QAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;CACF"}
|