jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use actual latest state for BlockchainProvider2 (#10137)

Browse Source
This commit is contained in:
Dan Cline
2024-08-06 11:06:49 -04:00
committed by GitHub
parent eb731762ec
commit 680ca6b73f
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/chain-state/src/memory_overlay.rs
View File

@ -6,7 +6,8 @@ use reth_primitives::{
Account, Address, BlockNumber, Bytecode, Bytes, StorageKey, StorageValue, B256,
};
use reth_storage_api::{
AccountReader, BlockHashReader, StateProofProvider, StateProvider, StateRootProvider,
AccountReader, BlockHashReader, StateProofProvider, StateProvider, StateProviderBox,
StateRootProvider,
};
use reth_trie::{updates::TrieUpdates, AccountProof, HashedPostState, HashedStorage};
@ -37,6 +38,11 @@ impl MemoryOverlayStateProvider {
}
Self { in_memory, hashed_post_state, historical }
}
/// Turn this state provider into a [`StateProviderBox`]
pub fn boxed(self) -> StateProviderBox {
Box::new(self)
}
}
impl BlockHashReader for MemoryOverlayStateProvider {

31
crates/storage/provider/src/providers/blockchain_provider.rs
View File

@ -8,7 +8,7 @@ use crate::{
StaticFileProviderFactory, TransactionVariant, TransactionsProvider, WithdrawalsProvider,
};
use alloy_rpc_types_engine::ForkchoiceState;
use reth_chain_state::CanonicalInMemoryState;
use reth_chain_state::{BlockState, CanonicalInMemoryState, MemoryOverlayStateProvider};
use reth_chainspec::{ChainInfo, ChainSpec};
use reth_db_api::{
database::Database,
@ -119,6 +119,17 @@ where
(start, end)
}
/// This uses a given [`BlockState`] to initialize a state provider for that block.
fn block_state_provider(
&self,
state: impl AsRef<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(state.hash(), latest_historical))
}
}
impl<DB> BlockchainProvider2<DB>
@ -877,7 +888,14 @@ where
/// Storage provider for latest block
fn latest(&self) -> ProviderResult<StateProviderBox> {
trace!(target: "providers::blockchain", "Getting latest block state provider");
self.database.latest()
// 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())
} else {
trace!(target: "providers::blockchain", "Using database state for latest state provider");
self.database.latest()
}
}
fn history_by_block_number(
@ -901,10 +919,7 @@ where
Ok(state)
} 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);
let state_provider = self.block_state_provider(state)?;
Ok(Box::new(state_provider))
} else if let Ok(Some(pending)) = self.pending_state_by_hash(hash) {
// .. or this could be the pending state
@ -1098,6 +1113,8 @@ where
{
/// Get basic account information.
fn basic_account(&self, address: Address) -> ProviderResult<Option<Account>> {
self.database.provider()?.basic_account(address)
// use latest state provider
let state_provider = self.latest()?;
state_provider.basic_account(address)
}
}