Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use pending state if available #11391

Merged
merged 2 commits into from
Oct 1, 2024
Merged

fix: use pending state if available #11391

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c48e7d6
fix: use pending state if available
mattsse Oct 1, 2024
f429e68
wrong check
mattsse Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions crates/storage/provider/src/providers/blockchain_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,8 @@ impl<N: ProviderNodeTypes> BlockchainProvider2<N> {
/// This uses a given [`BlockState`] to initialize a state provider for that block.
fn block_state_provider(
&self,
state: impl AsRef<BlockState>,
state: &BlockState,
) -> ProviderResult<MemoryOverlayStateProvider> {
let state = state.as_ref();
let anchor_hash = state.anchor().hash;
let latest_historical = self.database.history_by_block_hash(anchor_hash)?;
Ok(self.canonical_in_memory_state.state_provider_from_state(state, latest_historical))
Expand Down Expand Up @@ -1093,7 +1092,7 @@ impl<N: ProviderNodeTypes> StateProviderFactory for BlockchainProvider2<N> {
// use latest state provider if the head state exists
if let Some(state) = self.canonical_in_memory_state.head_state() {
trace!(target: "providers::blockchain", "Using head state for latest state provider");
Ok(self.block_state_provider(state)?.boxed())
Ok(self.block_state_provider(&state)?.boxed())
} else {
trace!(target: "providers::blockchain", "Using database state for latest state provider");
self.database.latest()
Expand All @@ -1119,7 +1118,7 @@ impl<N: ProviderNodeTypes> StateProviderFactory for BlockchainProvider2<N> {
Ok(state)
} else if let Some(state) = self.canonical_in_memory_state.state_by_hash(block_hash) {
// ... or this could be tracked by the in memory state
let state_provider = self.block_state_provider(state)?;
let state_provider = self.block_state_provider(&state)?;
Ok(Box::new(state_provider))
} else {
// if we couldn't find it anywhere, then we should return an error
Expand Down Expand Up @@ -1148,26 +1147,19 @@ impl<N: ProviderNodeTypes> StateProviderFactory for BlockchainProvider2<N> {
fn pending(&self) -> ProviderResult<StateProviderBox> {
trace!(target: "providers::blockchain", "Getting provider for pending state");

if let Some(block) = self.canonical_in_memory_state.pending_block_num_hash() {
let historical = self.database.history_by_block_hash(block.hash)?;
let pending_provider =
self.canonical_in_memory_state.state_provider(block.hash, historical);

return Ok(Box::new(pending_provider));
if let Some(pending) = self.canonical_in_memory_state.pending_state() {
// we have a pending block
return Ok(Box::new(self.block_state_provider(&pending)?));
}

// fallback to latest state if the pending block is not available
self.latest()
}

fn pending_state_by_hash(&self, block_hash: B256) -> ProviderResult<Option<StateProviderBox>> {
let historical = self.database.history_by_block_hash(block_hash)?;
if let Some(block) = self.canonical_in_memory_state.pending_block_num_hash() {
if block.hash == block_hash {
let pending_provider =
self.canonical_in_memory_state.state_provider(block_hash, historical);

return Ok(Some(Box::new(pending_provider)))
if let Some(pending) = self.canonical_in_memory_state.pending_state() {
if pending.hash() == block_hash {
return Ok(Some(Box::new(self.block_state_provider(&pending)?)));
}
}
Ok(None)
Expand Down
Loading