feat: backfill sync v2 #9238
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import {ContainerType, ListBasicType, OptionalType, ValueOf} from "@chainsafe/ssz"; | ||
| import {ChainForkConfig} from "@lodestar/config"; | ||
| import {DatabaseController, Repository} from "@lodestar/db"; | ||
| import {NUMBER_OF_COLUMNS} from "@lodestar/params"; | ||
| import {ssz} from "@lodestar/types"; | ||
| import {bytesToInt} from "@lodestar/utils"; | ||
| import {Bucket, getBucketNameByValue} from "../buckets.js"; | ||
| import {BACKFILLED_RANGE_KEY} from "../single/backfilledRange.js"; | ||
|
|
||
| export const backfillStateWrapperSsz = new ContainerType( | ||
| { | ||
| hasBlock: ssz.Boolean, | ||
| hasBlobs: new OptionalType(ssz.Boolean), | ||
| columnIndices: new OptionalType(new ListBasicType(ssz.ColumnIndex, NUMBER_OF_COLUMNS)), | ||
| }, | ||
| {typeName: "BackfillStateWrapper", jsonCase: "eth2"} | ||
| ); | ||
| export type BackfillStateWrapper = ValueOf<typeof backfillStateWrapperSsz>; | ||
|
|
||
| export class BackfillStateRepository extends Repository<number, BackfillStateWrapper> { | ||
| constructor(config: ChainForkConfig, db: DatabaseController<Uint8Array, Uint8Array>) { | ||
| const bucket = Bucket.backfill_state; | ||
| super(config, db, bucket, backfillStateWrapperSsz, getBucketNameByValue(bucket)); | ||
| } | ||
|
|
||
| encodeKey(key: number): Uint8Array { | ||
| if (key === BACKFILLED_RANGE_KEY) { | ||
| throw new Error("Reserved key for backfill range singleton object"); | ||
| } | ||
| return super.encodeKey(key); | ||
| } | ||
|
|
||
| decodeKey(data: Uint8Array): number { | ||
| return bytesToInt(super.decodeKey(data) as unknown as Uint8Array, "be"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import {ContainerType, ValueOf} from "@chainsafe/ssz"; | ||
| import {ChainForkConfig} from "@lodestar/config"; | ||
| import {Db, DbReqOpts, encodeKey} from "@lodestar/db"; | ||
| import {ssz} from "@lodestar/types"; | ||
| import {Bucket, getBucketNameByValue} from "../buckets.js"; | ||
|
|
||
| export const backfilledRangeWrapperSsz = new ContainerType( | ||
| {beginningEpoch: ssz.Epoch, endingEpoch: ssz.Epoch}, | ||
| {typeName: "BackfilledRange", jsonCase: "eth2"} | ||
| ); | ||
| export type BackfilledRangeWrapper = ValueOf<typeof backfilledRangeWrapperSsz>; | ||
| export const BACKFILLED_RANGE_KEY = -1; | ||
|
|
||
| export class BackfilledRange { | ||
| private readonly db: Db; | ||
| private readonly key: Uint8Array; | ||
| private readonly dbReqOpts: DbReqOpts; | ||
|
|
||
| constructor(_config: ChainForkConfig, db: Db) { | ||
| this.db = db; | ||
| this.key = encodeKey(Bucket.backfill_state, BACKFILLED_RANGE_KEY); | ||
| this.dbReqOpts = {bucketId: getBucketNameByValue(Bucket.backfill_state)}; | ||
| } | ||
|
|
||
| async put(value: BackfilledRangeWrapper): Promise<void> { | ||
| await this.db.put(this.key, backfilledRangeWrapperSsz.serialize(value), this.dbReqOpts); | ||
| } | ||
|
|
||
| async get(): Promise<BackfilledRangeWrapper | null> { | ||
| const value = await this.db.get(this.key, this.dbReqOpts); | ||
| return value ? backfilledRangeWrapperSsz.deserialize(value) : null; | ||
| } | ||
|
|
||
| async delete(): Promise<void> { | ||
| await this.db.delete(this.key, this.dbReqOpts); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export {BACKFILLED_RANGE_KEY, BackfilledRange} from "./backfilledRange.js"; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic for updating the backfill range during finalization has been commented out. This effectively disables progress tracking for backfill sync during normal node operation. If this logic is being replaced by the new
backfillStateandbackfilledRangesingleton, it should be updated to use them instead of being left as commented-out code.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Confirmed — the entire
updateBackfillRangebody is now commented out (lines ~17-43 ofpackages/beacon-node/src/chain/archiveStore/utils/updateBackfillRange.ts). The function is still called from the finalization path but is a no-op. Same scope question asdiscussion_r3109761377— either restore it pointing at the new singletonbackfilledRange+ per-epochbackfillState, or delete the call site and the helper entirely as part of the legacy-removal change.