Skip to content

integrity: restore StateProgress check#20435

Merged
AskAlexSharov merged 3 commits into
mainfrom
revert-remove-state-progress-check-main
Apr 10, 2026
Merged

integrity: restore StateProgress check#20435
AskAlexSharov merged 3 commits into
mainfrom
revert-remove-state-progress-check-main

Conversation

@sudeepdino008

Copy link
Copy Markdown
Member

@AskAlexSharov AskAlexSharov added this pull request to the merge queue Apr 10, 2026
Merged via the queue into main with commit 529b256 Apr 10, 2026
35 checks passed
@AskAlexSharov AskAlexSharov deleted the revert-remove-state-progress-check-main branch April 10, 2026 02:54
sudeepdino008 added a commit that referenced this pull request Apr 27, 2026
- Reverts #19738
- Restores the check that state/commitment files aren't ahead of block
files

---------

Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
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