Integrate state-diff into State()
#16033
Merged
Conversation
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
Inspector-Butters
force-pushed
the
read-state-diff
branch
from
e30a4fd to
4dc14e5
Compare
| // If state diff is enabled, we get the state from the state-diff db. | ||
| if features.Get().EnableStateDiff { | ||
| st, err := s.getStateUsingStateDiff(ctx, blockRoot) | ||
| if err != nil { |
Member
There was a problem hiding this comment.
If there error is a state not found error, could it fallback to the original implementation? I am thinking about folks that enabled state diff on a fully or partially synced node and they may have some states in the other bucket.
Contributor
There was a problem hiding this comment.
we won't have coexisting dbs. If the node reaches this point it can't use the previous impl.
potuz
reviewed
Nov 20, 2025
Contributor
potuz
left a comment
potuz
left a comment
There was a problem hiding this comment.
LGTM, added a request for a change in tests.
beacon-chain/db/kv/state_test.go
Outdated
| err = db.saveStateByDiff(context.Background(), st1) | ||
| require.NoError(t, err) | ||
|
|
||
| slot := primitives.Slot(math.PowerOf2(5)) |
Contributor
There was a problem hiding this comment.
The chaindiff is trivial for this slot, better to do something like 2^exponents[len(exponents)-2] + 2^exponents[len(exponents)-1] to have some non-trivial diffs, you´ll also need to save the anchor at the penultimate level.
potuz
approved these changes
Nov 24, 2025
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 24, 2025
**What type of PR is this?** Feature **What does this PR do? Why is it needed?** This PR integrates the state diff path into the `State()` function from `db/kv`, which allows reading of states using the state diff db, when the `EnableStateDiff` flag is enabled. **Notes for reviewers:** Files `kv/state_diff_test.go` and `config/features/config.go` only contain renamings: - `kv/state_diff_test.go`: rename `setDefaultExponents()` to `setDefaultStateDiffExponents()` to be less vague. - `config/features/config.go`: rename `enableStateDiff` to `EnableStateDiff` to make it public.
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 24, 2025
**Review after #16033 is merged** **What type of PR is this?** Other **What does this PR do? Why is it needed?** This PR refactors the code to find the corresponding slot of a given block root using state summary or the block itself, into its own function `SlotByBlockRoot(ctx, blockroot)`. Note that there exists a function `slotByBlockRoot(ctx context.Context, tx *bolt.Tx, blockRoot []byte)` immediately below the new function. Also note that this function has two drawbacks, which led to creation of the new function: - the old function requires a boltdb tx, which is not necessarily available to the caller. - the old function does NOT make use of the state summary cache. edit: - the old function also uses the state bucket to retrieve the state and it's slot. this is not something we want in the state diff feature, since there is no state bucket.
terencechain
pushed a commit
that referenced
this pull request
Nov 24, 2025
**Review after #16033 is merged** **What type of PR is this?** Other **What does this PR do? Why is it needed?** This PR refactors the code to find the corresponding slot of a given block root using state summary or the block itself, into its own function `SlotByBlockRoot(ctx, blockroot)`. Note that there exists a function `slotByBlockRoot(ctx context.Context, tx *bolt.Tx, blockRoot []byte)` immediately below the new function. Also note that this function has two drawbacks, which led to creation of the new function: - the old function requires a boltdb tx, which is not necessarily available to the caller. - the old function does NOT make use of the state summary cache. edit: - the old function also uses the state bucket to retrieve the state and it's slot. this is not something we want in the state diff feature, since there is no state bucket.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this?
Feature
What does this PR do? Why is it needed?
This PR integrates the state diff path into the
State()function fromdb/kv, which allows reading of states using the state diff db, when theEnableStateDiffflag is enabled.Notes for reviewers:
Files
kv/state_diff_test.goandconfig/features/config.goonly contain renamings:kv/state_diff_test.go: renamesetDefaultExponents()tosetDefaultStateDiffExponents()to be less vague.config/features/config.go: renameenableStateDifftoEnableStateDiffto make it public.