fix: use in memory state for state_by_hash #10105
Merged
Conversation
This file contains 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
Previously we would just go to the database for state, when the state for that block may only exist in memory. This caused payload building to fail in hive. Now, we check for state in the following order: 1. Database 2. Canonical in-memory state 3. Pending block Otherwise, an error will be returned.
Rjected
added
C-bug
mattsse
requested changes
Aug 5, 2024
Comment on lines
903
to
908
| // ... or this could be tracked by the in memory state | ||
| let last_persisted_block_number = self.database.last_block_number()?; | ||
| let latest_historical = | ||
| self.database.history_by_block_number(last_persisted_block_number)?; | ||
| let state_provider = | ||
| self.canonical_in_memory_state.state_provider(hash, latest_historical); |
There was a problem hiding this comment.
this is susceptible to a race condition,
The BlockState has a list of all in memory parents and the on disk anchor can be obtained via:
reth/crates/chain-state/src/in_memory.rs
Line 569 in eda161a
so we need to use this here to find the proper disk number
There was a problem hiding this comment.
ah yeah, the anchor makes sense here
Rjected
force-pushed
the
dan/add-proper-state-by-hash
branch
from
65c3747
to
ec7639c
Compare
mattsse
approved these changes
Aug 5, 2024
Comment on lines
+902
to
+908
| } else if let Some(state) = self.canonical_in_memory_state.state_by_hash(hash) { | ||
| // ... or this could be tracked by the in memory state | ||
| let anchor_hash = state.anchor().hash; | ||
| let latest_historical = self.database.history_by_block_hash(anchor_hash)?; | ||
| let state_provider = | ||
| self.canonical_in_memory_state.state_provider(hash, latest_historical); | ||
| Ok(Box::new(state_provider)) |
There was a problem hiding this comment.
I'm pretty sure this can be improved with a helper closure that loads the anchor state and avoid the second lookup, but we can track that separately
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.
Previously we would just go to the database for state, when the state for that block may only exist in memory. This caused payload building to fail in hive.
Now, we check for state in the following order:
Otherwise, an error will be returned.