github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-27 08:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed sealed_block_with_senders_range() into recovered_block_range() (#14876)

Browse Source
This commit is contained in:
Soubhik Singha Mahapatra
2025-03-06 19:10:17 +05:30
committed by GitHub
parent 30eab29f42
commit 53e72c8e85
10 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/rpc/rpc/src/trace.rs
View File

@@ -267,7 +267,7 @@ where
// fetch all blocks in that range
let blocks = self
.provider()
.sealed_block_with_senders_range(start..=end)
.recovered_block_range(start..=end)
.map_err(Eth::Error::from_eth_err)?
.into_iter()
.map(Arc::new)

2
crates/stages/stages/src/stages/execution.rs
View File

@@ -514,7 +514,7 @@ where
// Prepare the input for post unwind commit hook, where an `ExExNotification` will be sent.
if self.exex_manager_handle.has_exexs() {
// Get the blocks for the unwound range.
let blocks = provider.sealed_block_with_senders_range(range.clone())?;
let blocks = provider.recovered_block_range(range.clone())?;
let previous_input = self.post_unwind_commit_input.replace(Chain::new(
blocks,
bundle_state_with_receipts,

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

@@ -343,11 +343,11 @@ impl<N: ProviderNodeTypes> BlockReader for BlockchainProvider<N> {
self.consistent_provider()?.block_with_senders_range(range)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
self.consistent_provider()?.sealed_block_with_senders_range(range)
self.consistent_provider()?.recovered_block_range(range)
}
}
@@ -2358,10 +2358,7 @@ mod tests {
(sealed_headers_range, |block: &SealedBlock| block.clone_sealed_header()),
(block_range, |block: &SealedBlock| block.clone().into_block()),
(block_with_senders_range, |block: &SealedBlock| block.clone().try_recover().unwrap()),
(sealed_block_with_senders_range, |block: &SealedBlock| block
.clone()
.try_recover()
.unwrap()),
(recovered_block_range, |block: &SealedBlock| block.clone().try_recover().unwrap()),
(transactions_by_block_range, |block: &SealedBlock| block.body().transactions.clone()),
]);

4
crates/storage/provider/src/providers/consistent.rs
View File

@@ -889,13 +889,13 @@ impl<N: ProviderNodeTypes> BlockReader for ConsistentProvider<N> {
)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
self.get_in_memory_or_storage_by_block_range_while(
range,
|db_provider, range, _| db_provider.sealed_block_with_senders_range(range),
|db_provider, range, _| db_provider.recovered_block_range(range),
|block_state, _| Some(block_state.block().recovered_block().clone()),
|_| true,
)

4
crates/storage/provider/src/providers/database/mod.rs
View File

@@ -406,11 +406,11 @@ impl<N: ProviderNodeTypes> BlockReader for ProviderFactory<N> {
self.provider()?.block_with_senders_range(range)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
self.provider()?.sealed_block_with_senders_range(range)
self.provider()?.recovered_block_range(range)
}
}

4
crates/storage/provider/src/providers/database/provider.rs
View File

@@ -1282,7 +1282,7 @@ impl<TX: DbTx + 'static, N: NodeTypesForProvider> BlockReader for DatabaseProvid
)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
@@ -2759,7 +2759,7 @@ impl<TX: DbTxMut + DbTx + 'static, N: NodeTypesForProvider + 'static> BlockExecu
// get execution res
let execution_state = self.take_state_above(block, remove_from)?;
let blocks = self.sealed_block_with_senders_range(range)?;
let blocks = self.recovered_block_range(range)?;
// remove block bodies it is needed for both get block range and get block execution results
// that is why it is deleted afterwards.

2
crates/storage/provider/src/providers/static_file/manager.rs
View File

@@ -1685,7 +1685,7 @@ impl<N: FullNodePrimitives<SignedTx: Value, Receipt: Value, BlockHeader: Value>>
Err(ProviderError::UnsupportedProvider)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
_range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {

2
crates/storage/provider/src/test_utils/mock.rs
View File

@@ -629,7 +629,7 @@ impl<T: SignedTransaction, ChainSpec: EthChainSpec> BlockReader for MockEthProvi
Ok(vec![])
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
_range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {

10
crates/storage/storage-api/src/block.rs
View File

@@ -148,7 +148,7 @@ pub trait BlockReader:
/// Returns a range of sealed blocks from the database, along with the senders of each
/// transaction in the blocks.
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>>;
@@ -207,11 +207,11 @@ impl<T: BlockReader> BlockReader for Arc<T> {
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
T::block_with_senders_range(self, range)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
T::sealed_block_with_senders_range(self, range)
T::recovered_block_range(self, range)
}
}
@@ -268,11 +268,11 @@ impl<T: BlockReader> BlockReader for &T {
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
T::block_with_senders_range(self, range)
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {
T::sealed_block_with_senders_range(self, range)
T::recovered_block_range(self, range)
}
}

2
crates/storage/storage-api/src/noop.rs
View File

@@ -208,7 +208,7 @@ impl<C: Send + Sync, N: NodePrimitives> BlockReader for NoopProvider<C, N> {
Ok(Vec::new())
}
fn sealed_block_with_senders_range(
fn recovered_block_range(
&self,
_range: RangeInclusive<BlockNumber>,
) -> ProviderResult<Vec<RecoveredBlock<Self::Block>>> {