From 53e72c8e85f6a21a1e426b3610e6dd613255fbbb Mon Sep 17 00:00:00 2001 From: Soubhik Singha Mahapatra <160333583+Soubhik-10@users.noreply.github.com> Date: Thu, 6 Mar 2025 19:10:17 +0530 Subject: [PATCH] changed sealed_block_with_senders_range() into recovered_block_range() (#14876) --- crates/rpc/rpc/src/trace.rs | 2 +- crates/stages/stages/src/stages/execution.rs | 2 +- .../provider/src/providers/blockchain_provider.rs | 9 +++------ crates/storage/provider/src/providers/consistent.rs | 4 ++-- crates/storage/provider/src/providers/database/mod.rs | 4 ++-- .../provider/src/providers/database/provider.rs | 4 ++-- .../provider/src/providers/static_file/manager.rs | 2 +- crates/storage/provider/src/test_utils/mock.rs | 2 +- crates/storage/storage-api/src/block.rs | 10 +++++----- crates/storage/storage-api/src/noop.rs | 2 +- 10 files changed, 19 insertions(+), 22 deletions(-) diff --git a/crates/rpc/rpc/src/trace.rs b/crates/rpc/rpc/src/trace.rs index 9fc71417ab..28493d994a 100644 --- a/crates/rpc/rpc/src/trace.rs +++ b/crates/rpc/rpc/src/trace.rs @@ -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) diff --git a/crates/stages/stages/src/stages/execution.rs b/crates/stages/stages/src/stages/execution.rs index e34cd23df9..dbc1ff4c21 100644 --- a/crates/stages/stages/src/stages/execution.rs +++ b/crates/stages/stages/src/stages/execution.rs @@ -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, diff --git a/crates/storage/provider/src/providers/blockchain_provider.rs b/crates/storage/provider/src/providers/blockchain_provider.rs index 0213801326..05571a3acf 100644 --- a/crates/storage/provider/src/providers/blockchain_provider.rs +++ b/crates/storage/provider/src/providers/blockchain_provider.rs @@ -343,11 +343,11 @@ impl BlockReader for BlockchainProvider { self.consistent_provider()?.block_with_senders_range(range) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { - 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()), ]); diff --git a/crates/storage/provider/src/providers/consistent.rs b/crates/storage/provider/src/providers/consistent.rs index a438ca65a1..ceb5a044a1 100644 --- a/crates/storage/provider/src/providers/consistent.rs +++ b/crates/storage/provider/src/providers/consistent.rs @@ -889,13 +889,13 @@ impl BlockReader for ConsistentProvider { ) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { 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, ) diff --git a/crates/storage/provider/src/providers/database/mod.rs b/crates/storage/provider/src/providers/database/mod.rs index 0ab5207052..fd9f54756c 100644 --- a/crates/storage/provider/src/providers/database/mod.rs +++ b/crates/storage/provider/src/providers/database/mod.rs @@ -406,11 +406,11 @@ impl BlockReader for ProviderFactory { self.provider()?.block_with_senders_range(range) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { - self.provider()?.sealed_block_with_senders_range(range) + self.provider()?.recovered_block_range(range) } } diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index 45833235df..0f3b1c8e7a 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -1282,7 +1282,7 @@ impl BlockReader for DatabaseProvid ) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { @@ -2759,7 +2759,7 @@ impl 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. diff --git a/crates/storage/provider/src/providers/static_file/manager.rs b/crates/storage/provider/src/providers/static_file/manager.rs index 319c17b452..eaf5a14f00 100644 --- a/crates/storage/provider/src/providers/static_file/manager.rs +++ b/crates/storage/provider/src/providers/static_file/manager.rs @@ -1685,7 +1685,7 @@ impl> Err(ProviderError::UnsupportedProvider) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, _range: RangeInclusive, ) -> ProviderResult>> { diff --git a/crates/storage/provider/src/test_utils/mock.rs b/crates/storage/provider/src/test_utils/mock.rs index 5b5473bb43..e473d9fab3 100644 --- a/crates/storage/provider/src/test_utils/mock.rs +++ b/crates/storage/provider/src/test_utils/mock.rs @@ -629,7 +629,7 @@ impl BlockReader for MockEthProvi Ok(vec![]) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, _range: RangeInclusive, ) -> ProviderResult>> { diff --git a/crates/storage/storage-api/src/block.rs b/crates/storage/storage-api/src/block.rs index 4f0211321d..b3bca3f694 100644 --- a/crates/storage/storage-api/src/block.rs +++ b/crates/storage/storage-api/src/block.rs @@ -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, ) -> ProviderResult>>; @@ -207,11 +207,11 @@ impl BlockReader for Arc { ) -> ProviderResult>> { T::block_with_senders_range(self, range) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { - T::sealed_block_with_senders_range(self, range) + T::recovered_block_range(self, range) } } @@ -268,11 +268,11 @@ impl BlockReader for &T { ) -> ProviderResult>> { T::block_with_senders_range(self, range) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, range: RangeInclusive, ) -> ProviderResult>> { - T::sealed_block_with_senders_range(self, range) + T::recovered_block_range(self, range) } } diff --git a/crates/storage/storage-api/src/noop.rs b/crates/storage/storage-api/src/noop.rs index b286add816..33a939f53a 100644 --- a/crates/storage/storage-api/src/noop.rs +++ b/crates/storage/storage-api/src/noop.rs @@ -208,7 +208,7 @@ impl BlockReader for NoopProvider { Ok(Vec::new()) } - fn sealed_block_with_senders_range( + fn recovered_block_range( &self, _range: RangeInclusive, ) -> ProviderResult>> {