Skip to content

integrity, stagedsync: cap state collation at block snapshots progress#20680

Merged
AskAlexSharov merged 2 commits into
mainfrom
state_ahead
Apr 20, 2026
Merged

integrity, stagedsync: cap state collation at block snapshots progress#20680
AskAlexSharov merged 2 commits into
mainfrom
state_ahead

Conversation

@sudeepdino008

Copy link
Copy Markdown
Member

No description provided.

@sudeepdino008 sudeepdino008 marked this pull request as ready for review April 20, 2026 09:16
@AskAlexSharov AskAlexSharov added this pull request to the merge queue Apr 20, 2026
Merged via the queue into main with commit 9c527c5 Apr 20, 2026
40 of 65 checks passed
@AskAlexSharov AskAlexSharov deleted the state_ahead branch April 20, 2026 11:44
wmitsuda added a commit that referenced this pull request Apr 27, 2026
… (#20838)

Cherry-picks the integrity-area chain from `main` onto `performance`, in
order:

1. #20435 — `integrity: restore StateProgress check`
2. #20680 — `integrity, stagedsync: cap state collation at block
snapshots progress`
3. #20714 — `add time budget for integrity checks`
4. #20835 — `cmd/utils/app: skip commitment history integrity checks
when disabled`

#20714 is the structural refactor of `doIntegrity`
(`errgroup.Go(switch{...})` → `runCheck := func{}` + budget loop).
Conflicted with performance-only Bloatnet customizations on the same
function (#20806, #20810, #20813); resolved by adopting #20714's shape
and re-applying the Bloatnet handling for `CommitmentKvDeref`,
`CommitmentHistVal`, and `StateRootVerifyByHistory`. `failFast` arg on
`CheckCommitmentHistAtBlkRange` preserved (matches performance's
signature).

Submodule pointer for `execution/tests/execution-spec-tests` left
unchanged.

`make erigon` + `make lint` clean.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants