[r3.4] db/state, ethconfig: bound domain merge; add --erigondb.domain.steps-in-frozen-file#21148
Merged
Merged
Conversation
AskAlexSharov
approved these changes
May 13, 2026
2 tasks
yperbasis
added a commit
that referenced
this pull request
May 21, 2026
## Summary - Backfills `ChangeLog.md` with entries for v3.2.3, v3.3.1–v3.3.10, v3.4.0, and v3.4.1 (previously the file stopped at v3.3.0). - Drafts the v3.4.2 entry (release date TBD): two bugfixes (#21157, #21262) and two improvements (#21148, #21135). - Corrects the v3.3.0 release date to 2025-11-27 to match the GitHub publish date. ## Test plan - [ ] Skim the rendered changelog on GitHub for formatting. - [ ] Confirm v3.4.2 draft contents before tagging. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
bloxster
added a commit
that referenced
this pull request
May 26, 2026
Add --erigondb.domain.steps-in-frozen-file to Database and Caching section. New in v3.4.2 (PR #21148). Flag exists on release/3.4 only; main PR skipped.
AskAlexSharov
pushed a commit
that referenced
this pull request
May 26, 2026
## Summary New in v3.4.2 (PR #21148): `--erigondb.domain.steps-in-frozen-file` **What it does:** Overrides the `steps_in_frozen_file` setting in `erigondb.toml` for the domain merge cap only (history and inverted-index merges are unaffected). Accepts a positive integer or `"Inf"` to leave unbounded. **Verification:** - Defined in `cmd/utils/flags.go` as `ErigondbDomainStepsInFrozenFileFlag` - Registered in `node/cli/default_flags.go` (confirmed in #21148 diff) - Not present on `main` — no `main` PR needed for this change **Docs placement:** Database and Caching section in `configuring-erigon/index.mdx` --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of #20705 to
release/3.4.Conflict-resolution notes:
stepSize/stepsInFrozenFileasuint64(release/3.4 hasn't picked up theatomic.Uint64refactor from main); only the newerigondbDomainStepsInFrozenFileoverride field was added.filledDomainWithHashMapAccessor,TestDomain_KeyPosResetOnCollisionRetry) that exist on main but not onrelease/3.4.node/eth/backend.go: kept thedb/consensuschainimport and addeddb/config3alongside it.Prerequisite for cherry-pick of #21025 to
release/3.4.