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: make WithdrawalsProvider methods aware of in-memory state (#10245)

Browse Source
This commit is contained in:
Dan Cline
2024-08-09 16:47:18 -04:00
committed by GitHub
parent 80cf638e58
commit 2840a95785
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,9 @@ use reth_db_api::{
use reth_evm::ConfigureEvmEnv; use reth_evm::ConfigureEvmEnv;
use reth_primitives::{ use reth_primitives::{
Account, Address, Block, BlockHash, BlockHashOrNumber, BlockId, BlockNumHash, BlockNumber, Account, Address, Block, BlockHash, BlockHashOrNumber, BlockId, BlockNumHash, BlockNumber,
BlockNumberOrTag, BlockWithSenders, Header, Receipt, SealedBlock, SealedBlockWithSenders, BlockNumberOrTag, BlockWithSenders, EthereumHardforks, Header, Receipt, SealedBlock,
SealedHeader, TransactionMeta, TransactionSigned, TransactionSignedNoHash, TxHash, TxNumber, SealedBlockWithSenders, SealedHeader, TransactionMeta, TransactionSigned,
Withdrawal, Withdrawals, B256, U256, TransactionSignedNoHash, TxHash, TxNumber, Withdrawal, Withdrawals, B256, U256,
}; };
use reth_prune_types::{PruneCheckpoint, PruneSegment}; use reth_prune_types::{PruneCheckpoint, PruneSegment};
use reth_stages_types::{StageCheckpoint, StageId}; use reth_stages_types::{StageCheckpoint, StageId};
@ -797,11 +797,29 @@ where
id: BlockHashOrNumber, id: BlockHashOrNumber,
timestamp: u64, timestamp: u64,
) -> ProviderResult<Option<Withdrawals>> { ) -> ProviderResult<Option<Withdrawals>> {
self.database.withdrawals_by_block(id, timestamp) if !self.database.chain_spec().is_shanghai_active_at_timestamp(timestamp) {
return Ok(None)
}
let Some(number) = self.convert_hash_or_number(id)? else { return Ok(None) };
if let Some(block) = self.canonical_in_memory_state.state_by_number(number) {
Ok(block.block().block().withdrawals.clone())
} else {
self.database.withdrawals_by_block(id, timestamp)
}
} }
fn latest_withdrawal(&self) -> ProviderResult<Option<Withdrawal>> { fn latest_withdrawal(&self) -> ProviderResult<Option<Withdrawal>> {
self.database.latest_withdrawal() let best_block_num = self.best_block_number()?;
// If the best block is in memory, use that. Otherwise, use the latest withdrawal in the
// database.
if let Some(block) = self.canonical_in_memory_state.state_by_number(best_block_num) {
Ok(block.block().block().withdrawals.clone().and_then(|mut w| w.pop()))
} else {
self.database.latest_withdrawal()
}
} }
} }