Skip to content

bloatnet: allow unknown integrity checks#20806

Merged
AskAlexSharov merged 2 commits into
performancefrom
alex/perf_integrity_warn
Apr 25, 2026
Merged

bloatnet: allow unknown integrity checks#20806
AskAlexSharov merged 2 commits into
performancefrom
alex/perf_integrity_warn

Conversation

@AskAlexSharov

Copy link
Copy Markdown
Collaborator

No description provided.

@AskAlexSharov AskAlexSharov enabled auto-merge (squash) April 25, 2026 06:17

@erigon-copilot erigon-copilot Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if the intent is specifically to make bloatnet integrity-check lists forward-compatible.

Behavior change is clear and small:

  • before: unknown check name -> immediate error
  • now: log.Warn("unknown check: ...") and continue

That makes sense for mixed-version / partially rolled-out environments where the caller may include checks not yet known to this binary. The extra if err != nil is redundant because fmt.Errorf(...) here is never nil, but harmless.

@AskAlexSharov AskAlexSharov merged commit 2f681bd into performance Apr 25, 2026
32 checks passed
@AskAlexSharov AskAlexSharov deleted the alex/perf_integrity_warn branch April 25, 2026 07:47
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.

1 participant