From d9d7b622703b3637d25c650d4d404ec553d7328a Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Thu, 26 Sep 2024 15:46:12 +0200 Subject: [PATCH 01/23] primitives: rm more alloy_primitives reexports --- crates/node/builder/src/launch/mod.rs | 2 +- .../primitives/benches/recover_ecdsa_crit.rs | 3 ++- crates/primitives/src/block.rs | 2 +- crates/primitives/src/lib.rs | 4 +-- crates/primitives/src/proofs.rs | 4 +-- crates/primitives/src/receipt.rs | 3 +-- crates/primitives/src/transaction/tx_type.rs | 15 ++++++----- crates/revm/src/test_utils.rs | 2 +- crates/stages/stages/src/stages/bodies.rs | 25 ++++++++++--------- crates/stages/stages/src/stages/execution.rs | 6 ++--- crates/stages/stages/src/stages/mod.rs | 6 ++--- .../stages/src/stages/sender_recovery.rs | 16 ++++++------ crates/stages/stages/src/stages/tx_lookup.rs | 10 ++++---- .../stages/stages/src/test_utils/test_db.rs | 8 +++--- .../provider/src/providers/static_file/mod.rs | 4 +-- .../storage/provider/src/test_utils/blocks.rs | 8 +++--- .../storage/provider/src/test_utils/mock.rs | 2 +- crates/trie/db/src/trie_cursor.rs | 2 +- crates/trie/db/tests/trie.rs | 4 +-- 19 files changed, 60 insertions(+), 66 deletions(-) diff --git a/crates/node/builder/src/launch/mod.rs b/crates/node/builder/src/launch/mod.rs index 9c7d562d19d2..db98ffacedeb 100644 --- a/crates/node/builder/src/launch/mod.rs +++ b/crates/node/builder/src/launch/mod.rs @@ -11,6 +11,7 @@ pub use exex::ExExLauncher; use std::{future::Future, sync::Arc}; +use alloy_primitives::utils::format_ether; use alloy_rpc_types::engine::ClientVersionV1; use futures::{future::Either, stream, stream_select, StreamExt}; use reth_beacon_consensus::{ @@ -33,7 +34,6 @@ use reth_node_core::{ version::{CARGO_PKG_VERSION, CLIENT_CODE, NAME_CLIENT, VERGEN_GIT_SHA}, }; use reth_node_events::{cl::ConsensusLayerHealthEvents, node}; -use reth_primitives::format_ether; use reth_provider::providers::BlockchainProvider; use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi}; use reth_tasks::TaskExecutor; diff --git a/crates/primitives/benches/recover_ecdsa_crit.rs b/crates/primitives/benches/recover_ecdsa_crit.rs index e1e896dbbf8f..8e8e279b2a4a 100644 --- a/crates/primitives/benches/recover_ecdsa_crit.rs +++ b/crates/primitives/benches/recover_ecdsa_crit.rs @@ -1,8 +1,9 @@ #![allow(missing_docs)] +use alloy_primitives::hex_literal::hex; use alloy_rlp::Decodable; use criterion::{criterion_group, criterion_main, Criterion}; use pprof::criterion::{Output, PProfProfiler}; -use reth_primitives::{hex_literal::hex, TransactionSigned}; +use reth_primitives::TransactionSigned; /// Benchmarks the recovery of the public key from the ECDSA message using criterion. pub fn criterion_benchmark(c: &mut Criterion) { diff --git a/crates/primitives/src/block.rs b/crates/primitives/src/block.rs index a5357fcec993..78a98f78ab2a 100644 --- a/crates/primitives/src/block.rs +++ b/crates/primitives/src/block.rs @@ -709,8 +709,8 @@ impl<'a> arbitrary::Arbitrary<'a> for BlockBody { #[cfg(test)] mod tests { use super::{BlockNumberOrTag::*, *}; - use crate::hex_literal::hex; use alloy_eips::eip1898::HexStringMissingPrefixError; + use alloy_primitives::hex_literal::hex; use alloy_rlp::{Decodable, Encodable}; use std::str::FromStr; diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs index b0564ed07d5a..778230f5f870 100644 --- a/crates/primitives/src/lib.rs +++ b/crates/primitives/src/lib.rs @@ -72,9 +72,7 @@ pub use transaction::{ pub use alloy_primitives::{ self, address, b256, bloom, bytes, bytes::{Buf, BufMut, BytesMut}, - hex, hex_literal, ruint, - utils::format_ether, - Bytes, StorageValue, TxHash, TxIndex, TxNumber, B128, B256, B512, B64, U128, U256, U64, + hex, Bytes, TxHash, B256, U256, U64, }; pub use reth_ethereum_forks::*; pub use revm_primitives::{self, JumpTable}; diff --git a/crates/primitives/src/proofs.rs b/crates/primitives/src/proofs.rs index 040ec365503e..454524081f0b 100644 --- a/crates/primitives/src/proofs.rs +++ b/crates/primitives/src/proofs.rs @@ -65,9 +65,9 @@ pub fn calculate_ommers_root(ommers: &[Header]) -> B256 { #[cfg(test)] mod tests { use super::*; - use crate::{constants::EMPTY_ROOT_HASH, hex_literal::hex, Block, U256}; + use crate::{constants::EMPTY_ROOT_HASH, Block, U256}; use alloy_genesis::GenesisAccount; - use alloy_primitives::{b256, Address}; + use alloy_primitives::{b256, hex_literal::hex, Address}; use alloy_rlp::Decodable; use reth_chainspec::{HOLESKY, MAINNET, SEPOLIA}; use reth_trie_common::root::{state_root_ref_unhashed, state_root_unhashed}; diff --git a/crates/primitives/src/receipt.rs b/crates/primitives/src/receipt.rs index 6b43e77e913a..0b32e0899a12 100644 --- a/crates/primitives/src/receipt.rs +++ b/crates/primitives/src/receipt.rs @@ -501,8 +501,7 @@ impl<'a> Encodable for ReceiptWithBloomEncoder<'a> { #[cfg(test)] mod tests { use super::*; - use crate::hex_literal::hex; - use alloy_primitives::{address, b256, bytes}; + use alloy_primitives::{address, b256, bytes, hex_literal::hex}; // Test vector from: https://eips.ethereum.org/EIPS/eip-2481 #[test] diff --git a/crates/primitives/src/transaction/tx_type.rs b/crates/primitives/src/transaction/tx_type.rs index 4017d8d4b9c4..315361abb681 100644 --- a/crates/primitives/src/transaction/tx_type.rs +++ b/crates/primitives/src/transaction/tx_type.rs @@ -1,5 +1,4 @@ -use crate::U64; -use alloy_primitives::U8; +use alloy_primitives::{U64, U8}; use alloy_rlp::{Decodable, Encodable}; use serde::{Deserialize, Serialize}; @@ -114,19 +113,19 @@ impl TryFrom for TxType { fn try_from(value: u8) -> Result { #[cfg(feature = "optimism")] if value == Self::Deposit { - return Ok(Self::Deposit) + return Ok(Self::Deposit); } if value == Self::Legacy { - return Ok(Self::Legacy) + return Ok(Self::Legacy); } else if value == Self::Eip2930 { - return Ok(Self::Eip2930) + return Ok(Self::Eip2930); } else if value == Self::Eip1559 { - return Ok(Self::Eip1559) + return Ok(Self::Eip1559); } else if value == Self::Eip4844 { - return Ok(Self::Eip4844) + return Ok(Self::Eip4844); } else if value == Self::Eip7702 { - return Ok(Self::Eip7702) + return Ok(Self::Eip7702); } Err("invalid tx type") diff --git a/crates/revm/src/test_utils.rs b/crates/revm/src/test_utils.rs index bbdc196cd528..b3ce6b631ef3 100644 --- a/crates/revm/src/test_utils.rs +++ b/crates/revm/src/test_utils.rs @@ -135,7 +135,7 @@ impl StateProvider for StateProviderTest { &self, account: Address, storage_key: StorageKey, - ) -> ProviderResult> { + ) -> ProviderResult> { Ok(self.accounts.get(&account).and_then(|(storage, _)| storage.get(&storage_key).copied())) } diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index cc30fc90a11d..c75e8ebfa0eb 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -6,6 +6,7 @@ use std::{ use futures_util::TryStreamExt; use tracing::*; +use alloy_primitives::TxNumber; use reth_db::tables; use reth_db_api::{ cursor::{DbCursorRO, DbCursorRW}, @@ -13,7 +14,7 @@ use reth_db_api::{ transaction::DbTxMut, }; use reth_network_p2p::bodies::{downloader::BodyDownloader, response::BlockResponse}; -use reth_primitives::{StaticFileSegment, TxNumber}; +use reth_primitives::StaticFileSegment; use reth_provider::{ providers::{StaticFileProvider, StaticFileWriter}, BlockReader, DBProvider, ProviderError, StaticFileProviderFactory, StatsReader, @@ -84,7 +85,7 @@ where input: ExecInput, ) -> Poll> { if input.target_reached() || self.buffer.is_some() { - return Poll::Ready(Ok(())) + return Poll::Ready(Ok(())); } // Update the header range on the downloader @@ -110,7 +111,7 @@ where /// header, limited by the stage's batch size. fn execute(&mut self, provider: &Provider, input: ExecInput) -> Result { if input.target_reached() { - return Ok(ExecOutput::done(input.checkpoint())) + return Ok(ExecOutput::done(input.checkpoint())); } let (from_block, to_block) = input.next_block_range().into_inner(); @@ -188,7 +189,7 @@ where segment: StaticFileSegment::Transactions, database: block_number, static_file: appended_block_number, - }) + }); } } @@ -211,7 +212,7 @@ where segment: StaticFileSegment::Transactions, database: next_tx_num, static_file: appended_tx_number, - }) + }); } // Increment transaction id for each transaction. @@ -282,7 +283,7 @@ where let mut rev_walker = body_cursor.walk_back(None)?; while let Some((number, block_meta)) = rev_walker.next().transpose()? { if number <= input.unwind_to { - break + break; } // Delete the ommers entry if any @@ -329,7 +330,7 @@ where static_file_tx_num, &static_file_provider, provider, - )?) + )?); } // Unwinds static file @@ -360,11 +361,11 @@ where loop { if let Some(indices) = provider.block_body_indices(last_block)? { if indices.last_tx_num() <= last_tx_num { - break + break; } } if last_block == 0 { - break + break; } last_block -= 1; } @@ -929,7 +930,7 @@ mod tests { let this = self.get_mut(); if this.headers.is_empty() { - return Poll::Ready(None) + return Poll::Ready(None); } let mut response = Vec::default(); @@ -943,12 +944,12 @@ mod tests { } if response.len() as u64 >= this.batch_size { - break + break; } } if !response.is_empty() { - return Poll::Ready(Some(Ok(response))) + return Poll::Ready(Some(Ok(response))); } panic!("requested bodies without setting headers") diff --git a/crates/stages/stages/src/stages/execution.rs b/crates/stages/stages/src/stages/execution.rs index 04cc1dd65923..1305e6825451 100644 --- a/crates/stages/stages/src/stages/execution.rs +++ b/crates/stages/stages/src/stages/execution.rs @@ -658,16 +658,14 @@ where mod tests { use super::*; use crate::test_utils::TestStageDB; - use alloy_primitives::{keccak256, Address}; + use alloy_primitives::{hex_literal::hex, keccak256, Address}; use alloy_rlp::Decodable; use assert_matches::assert_matches; use reth_chainspec::ChainSpecBuilder; use reth_db_api::{models::AccountBeforeTx, transaction::DbTxMut}; use reth_evm_ethereum::execute::EthExecutorProvider; use reth_execution_errors::BlockValidationError; - use reth_primitives::{ - address, hex_literal::hex, Account, Bytecode, SealedBlock, StorageEntry, B256, U256, - }; + use reth_primitives::{address, Account, Bytecode, SealedBlock, StorageEntry, B256, U256}; use reth_provider::{ test_utils::create_test_provider_factory, AccountReader, DatabaseProviderFactory, ReceiptProvider, StaticFileProviderFactory, diff --git a/crates/stages/stages/src/stages/mod.rs b/crates/stages/stages/src/stages/mod.rs index d3c5b7099d21..6ae1b30e7e24 100644 --- a/crates/stages/stages/src/stages/mod.rs +++ b/crates/stages/stages/src/stages/mod.rs @@ -42,7 +42,7 @@ use utils::*; mod tests { use super::*; use crate::test_utils::{StorageKind, TestStageDB}; - use alloy_primitives::{keccak256, BlockNumber}; + use alloy_primitives::{hex_literal::hex, keccak256, BlockNumber}; use alloy_rlp::Decodable; use reth_chainspec::ChainSpecBuilder; use reth_db::{ @@ -56,9 +56,7 @@ mod tests { }; use reth_evm_ethereum::execute::EthExecutorProvider; use reth_exex::ExExManagerHandle; - use reth_primitives::{ - address, hex_literal::hex, Account, Bytecode, SealedBlock, StaticFileSegment, B256, U256, - }; + use reth_primitives::{address, Account, Bytecode, SealedBlock, StaticFileSegment, B256, U256}; use reth_provider::{ providers::{StaticFileProvider, StaticFileWriter}, test_utils::MockNodeTypesWithDB, diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 344a8ea848ee..7e2fd6f4e652 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -1,4 +1,4 @@ -use alloy_primitives::Address; +use alloy_primitives::{Address, TxNumber}; use reth_config::config::SenderRecoveryConfig; use reth_consensus::ConsensusError; use reth_db::{static_file::TransactionMask, tables, RawValue}; @@ -7,7 +7,7 @@ use reth_db_api::{ transaction::{DbTx, DbTxMut}, DbTxUnwindExt, }; -use reth_primitives::{GotExpected, StaticFileSegment, TransactionSignedNoHash, TxNumber}; +use reth_primitives::{GotExpected, StaticFileSegment, TransactionSignedNoHash}; use reth_provider::{ BlockReader, DBProvider, HeaderProvider, ProviderError, PruneCheckpointReader, StaticFileProviderFactory, StatsReader, @@ -71,7 +71,7 @@ where /// entries in the [`TransactionSenders`][reth_db::tables::TransactionSenders] table. fn execute(&mut self, provider: &Provider, input: ExecInput) -> Result { if input.target_reached() { - return Ok(ExecOutput::done(input.checkpoint())) + return Ok(ExecOutput::done(input.checkpoint())); } let (tx_range, block_range, is_final_range) = @@ -85,7 +85,7 @@ where checkpoint: StageCheckpoint::new(end_block) .with_entities_stage_checkpoint(stage_checkpoint(provider)?), done: is_final_range, - }) + }); } // Acquire the cursor for inserting elements @@ -185,7 +185,7 @@ where // We exit early since we could not process this chunk. let _ = recovered_senders_tx .send(Err(Box::new(SenderRecoveryStageError::StageError(err.into())))); - break + break; } }; @@ -206,7 +206,7 @@ where // Finish early if is_err { - break + break; } } }); @@ -248,7 +248,7 @@ where .into(), )) } - } + }; } }; senders_cursor.append(tx_id, sender)?; @@ -630,7 +630,7 @@ mod tests { let end_block = output.checkpoint.block_number; if start_block > end_block { - return Ok(()) + return Ok(()); } let mut body_cursor = diff --git a/crates/stages/stages/src/stages/tx_lookup.rs b/crates/stages/stages/src/stages/tx_lookup.rs index 4e68cfe90b76..d272853c2856 100644 --- a/crates/stages/stages/src/stages/tx_lookup.rs +++ b/crates/stages/stages/src/stages/tx_lookup.rs @@ -1,3 +1,4 @@ +use alloy_primitives::{TxHash, TxNumber}; use num_traits::Zero; use reth_config::config::{EtlConfig, TransactionLookupConfig}; use reth_db::{tables, RawKey, RawValue}; @@ -6,7 +7,6 @@ use reth_db_api::{ transaction::{DbTx, DbTxMut}, }; use reth_etl::Collector; -use reth_primitives::{TxHash, TxNumber}; use reth_provider::{ BlockReader, DBProvider, PruneCheckpointReader, PruneCheckpointWriter, StaticFileProviderFactory, StatsReader, TransactionsProvider, TransactionsProviderExt, @@ -109,7 +109,7 @@ where } } if input.target_reached() { - return Ok(ExecOutput::done(input.checkpoint())) + return Ok(ExecOutput::done(input.checkpoint())); } // 500MB temporary files @@ -172,7 +172,7 @@ where "Transaction hashes inserted" ); - break + break; } } @@ -199,7 +199,7 @@ where let mut rev_walker = body_cursor.walk_back(Some(*range.end()))?; while let Some((number, body)) = rev_walker.next().transpose()? { if number <= unwind_to { - break + break; } // Delete all transactions that belong to this block @@ -537,7 +537,7 @@ mod tests { let end_block = output.checkpoint.block_number; if start_block > end_block { - return Ok(()) + return Ok(()); } let mut body_cursor = diff --git a/crates/stages/stages/src/test_utils/test_db.rs b/crates/stages/stages/src/test_utils/test_db.rs index 89d74d9d4092..8b0087f00477 100644 --- a/crates/stages/stages/src/test_utils/test_db.rs +++ b/crates/stages/stages/src/test_utils/test_db.rs @@ -1,4 +1,4 @@ -use alloy_primitives::{keccak256, Address, BlockNumber}; +use alloy_primitives::{keccak256, Address, BlockNumber, TxNumber}; use reth_chainspec::MAINNET; use reth_db::{ tables, @@ -15,8 +15,8 @@ use reth_db_api::{ DatabaseError as DbError, }; use reth_primitives::{ - Account, Receipt, SealedBlock, SealedHeader, StaticFileSegment, StorageEntry, TxHash, TxNumber, - B256, U256, + Account, Receipt, SealedBlock, SealedHeader, StaticFileSegment, StorageEntry, TxHash, B256, + U256, }; use reth_provider::{ providers::{StaticFileProvider, StaticFileProviderRWRefMut, StaticFileWriter}, @@ -490,7 +490,7 @@ impl StorageKind { fn tx_offset(&self) -> u64 { if let Self::Database(offset) = self { - return offset.unwrap_or_default() + return offset.unwrap_or_default(); } 0 } diff --git a/crates/storage/provider/src/providers/static_file/mod.rs b/crates/storage/provider/src/providers/static_file/mod.rs index 04f032b0fef4..45b7816af02a 100644 --- a/crates/storage/provider/src/providers/static_file/mod.rs +++ b/crates/storage/provider/src/providers/static_file/mod.rs @@ -56,7 +56,7 @@ impl Deref for LoadedJar { mod tests { use super::*; use crate::{test_utils::create_test_provider_factory, HeaderProvider}; - use alloy_primitives::{BlockHash, B256, U256}; + use alloy_primitives::{BlockHash, TxNumber, B256, U256}; use rand::seq::SliceRandom; use reth_db::{ test_utils::create_test_static_files_dir, CanonicalHeaders, HeaderNumbers, @@ -65,7 +65,7 @@ mod tests { use reth_db_api::transaction::DbTxMut; use reth_primitives::{ static_file::{find_fixed_range, SegmentRangeInclusive, DEFAULT_BLOCKS_PER_STATIC_FILE}, - Header, Receipt, TransactionSignedNoHash, TxNumber, + Header, Receipt, TransactionSignedNoHash, }; use reth_storage_api::{ReceiptProvider, TransactionsProvider}; use reth_testing_utils::generators::{self, random_header_range}; diff --git a/crates/storage/provider/src/test_utils/blocks.rs b/crates/storage/provider/src/test_utils/blocks.rs index 6f6aae992446..91c49dd6166c 100644 --- a/crates/storage/provider/src/test_utils/blocks.rs +++ b/crates/storage/provider/src/test_utils/blocks.rs @@ -1,14 +1,14 @@ //! Dummy blocks and data for tests use crate::{DatabaseProviderRW, ExecutionOutcome}; use alloy_consensus::TxLegacy; -use alloy_primitives::{Address, BlockNumber, Log, Parity, Sealable, TxKind}; +use alloy_primitives::{hex_literal::hex, Address, BlockNumber, Log, Parity, Sealable, TxKind}; use once_cell::sync::Lazy; use reth_db::tables; use reth_db_api::{database::Database, models::StoredBlockBodyIndices}; use reth_primitives::{ - alloy_primitives, b256, hex_literal::hex, Account, BlockBody, Bytes, Header, Receipt, - SealedBlock, SealedBlockWithSenders, SealedHeader, Signature, Transaction, TransactionSigned, - TxType, Withdrawal, Withdrawals, B256, U256, + alloy_primitives, b256, Account, BlockBody, Bytes, Header, Receipt, SealedBlock, + SealedBlockWithSenders, SealedHeader, Signature, Transaction, TransactionSigned, TxType, + Withdrawal, Withdrawals, B256, U256, }; use reth_trie::root::{state_root_unhashed, storage_root_unhashed}; use revm::{ diff --git a/crates/storage/provider/src/test_utils/mock.rs b/crates/storage/provider/src/test_utils/mock.rs index 9277df6e6c5f..0a0045c9bf6c 100644 --- a/crates/storage/provider/src/test_utils/mock.rs +++ b/crates/storage/provider/src/test_utils/mock.rs @@ -296,7 +296,7 @@ impl TransactionsProvider for MockEthProvider { .map(|excess_blob_gas| excess_blob_gas as u64), timestamp: block.header.timestamp, }; - return Ok(Some((tx.clone(), meta))) + return Ok(Some((tx.clone(), meta))); } } } diff --git a/crates/trie/db/src/trie_cursor.rs b/crates/trie/db/src/trie_cursor.rs index 124b8ccb20ca..601100b3faee 100644 --- a/crates/trie/db/src/trie_cursor.rs +++ b/crates/trie/db/src/trie_cursor.rs @@ -209,8 +209,8 @@ where #[cfg(test)] mod tests { use super::*; + use alloy_primitives::hex_literal::hex; use reth_db_api::{cursor::DbCursorRW, transaction::DbTxMut}; - use reth_primitives::hex_literal::hex; use reth_provider::test_utils::create_test_provider_factory; #[test] diff --git a/crates/trie/db/tests/trie.rs b/crates/trie/db/tests/trie.rs index f7413c64509f..59fffec58d06 100644 --- a/crates/trie/db/tests/trie.rs +++ b/crates/trie/db/tests/trie.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] -use alloy_primitives::{keccak256, Address, B256, U256}; +use alloy_primitives::{hex_literal::hex, keccak256, Address, B256, U256}; use proptest::{prelude::ProptestConfig, proptest}; use proptest_arbitrary_interop::arb; use reth_db::{tables, test_utils::TempDatabase, DatabaseEnv}; @@ -8,7 +8,7 @@ use reth_db_api::{ cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO}, transaction::DbTxMut, }; -use reth_primitives::{constants::EMPTY_ROOT_HASH, hex_literal::hex, Account, StorageEntry}; +use reth_primitives::{constants::EMPTY_ROOT_HASH, Account, StorageEntry}; use reth_provider::{ test_utils::create_test_provider_factory, DatabaseProviderRW, StorageTrieWriter, TrieWriter, }; From 0afd010942127de9704197d98a4009d461bd6c10 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:46:59 -0700 Subject: [PATCH 02/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index c75e8ebfa0eb..06dcb356baf2 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -283,7 +283,7 @@ where let mut rev_walker = body_cursor.walk_back(None)?; while let Some((number, block_meta)) = rev_walker.next().transpose()? { if number <= input.unwind_to { - break; + break } // Delete the ommers entry if any From f25fd0083903a26b760e881994b9c19d0d91f268 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:48:57 -0700 Subject: [PATCH 03/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 06dcb356baf2..c5396e6cf2e8 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -85,7 +85,7 @@ where input: ExecInput, ) -> Poll> { if input.target_reached() || self.buffer.is_some() { - return Poll::Ready(Ok(())); + return Poll::Ready(Ok(())) } // Update the header range on the downloader From 0f5e09bf8e8eab5b8c9b9cccddaac17820288f95 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:04 -0700 Subject: [PATCH 04/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index c5396e6cf2e8..d970bb1387c5 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -111,7 +111,7 @@ where /// header, limited by the stage's batch size. fn execute(&mut self, provider: &Provider, input: ExecInput) -> Result { if input.target_reached() { - return Ok(ExecOutput::done(input.checkpoint())); + return Ok(ExecOutput::done(input.checkpoint())) } let (from_block, to_block) = input.next_block_range().into_inner(); From 393740a986653a97f8dac385e5383309893ec2ee Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:14 -0700 Subject: [PATCH 05/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index d970bb1387c5..6d140efa4fd1 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -189,7 +189,7 @@ where segment: StaticFileSegment::Transactions, database: block_number, static_file: appended_block_number, - }); + }) } } From d2dde66f8a086809a3d600d15a656e7edbfa41b6 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:19 -0700 Subject: [PATCH 06/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 6d140efa4fd1..19d01105aa3f 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -330,7 +330,7 @@ where static_file_tx_num, &static_file_provider, provider, - )?); + )?) } // Unwinds static file From 8607395c618ecadc1d4f25f7a6dc4c664fff97cd Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:23 -0700 Subject: [PATCH 07/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 19d01105aa3f..392a3f8215d6 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -212,7 +212,7 @@ where segment: StaticFileSegment::Transactions, database: next_tx_num, static_file: appended_tx_number, - }); + }) } // Increment transaction id for each transaction. From f95619cdea8a08ea7e5ba822aef6610da69e917b Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:29 -0700 Subject: [PATCH 08/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 7e2fd6f4e652..884cd36d5443 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -206,7 +206,7 @@ where // Finish early if is_err { - break; + break } } }); From 01b2ecb5cc2abfeadd2dc97759c28f202cb474fe Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:34 -0700 Subject: [PATCH 09/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 884cd36d5443..5632e8c90de8 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -248,7 +248,7 @@ where .into(), )) } - }; + } } }; senders_cursor.append(tx_id, sender)?; From 7dc8d6418721821bb2900e98694371abcdface04 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:39 -0700 Subject: [PATCH 10/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 5632e8c90de8..e623a10c083a 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -630,7 +630,7 @@ mod tests { let end_block = output.checkpoint.block_number; if start_block > end_block { - return Ok(()); + return Ok(()) } let mut body_cursor = From 3a58303a7055da969965e3d4a63820cdc66302a1 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:44 -0700 Subject: [PATCH 11/23] Update crates/stages/stages/src/test_utils/test_db.rs --- crates/stages/stages/src/test_utils/test_db.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/test_utils/test_db.rs b/crates/stages/stages/src/test_utils/test_db.rs index 8b0087f00477..7607b1d3142c 100644 --- a/crates/stages/stages/src/test_utils/test_db.rs +++ b/crates/stages/stages/src/test_utils/test_db.rs @@ -490,7 +490,7 @@ impl StorageKind { fn tx_offset(&self) -> u64 { if let Self::Database(offset) = self { - return offset.unwrap_or_default(); + return offset.unwrap_or_default() } 0 } From 4f69354fbbe663e8c12ced215dcf6d8f7b454113 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:49 -0700 Subject: [PATCH 12/23] Update crates/storage/provider/src/test_utils/mock.rs --- crates/storage/provider/src/test_utils/mock.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/storage/provider/src/test_utils/mock.rs b/crates/storage/provider/src/test_utils/mock.rs index 0a0045c9bf6c..9277df6e6c5f 100644 --- a/crates/storage/provider/src/test_utils/mock.rs +++ b/crates/storage/provider/src/test_utils/mock.rs @@ -296,7 +296,7 @@ impl TransactionsProvider for MockEthProvider { .map(|excess_blob_gas| excess_blob_gas as u64), timestamp: block.header.timestamp, }; - return Ok(Some((tx.clone(), meta))); + return Ok(Some((tx.clone(), meta))) } } } From 9192c0c8f7cfcb4de10ff638ddb6f2a776206287 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:49:57 -0700 Subject: [PATCH 13/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 392a3f8215d6..b58d39fe1f41 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -361,7 +361,7 @@ where loop { if let Some(indices) = provider.block_body_indices(last_block)? { if indices.last_tx_num() <= last_tx_num { - break; + break } } if last_block == 0 { From a0b25ace02030477b6ea8749c57b16b6669a24a6 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:04 -0700 Subject: [PATCH 14/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index b58d39fe1f41..f68e61458499 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -365,7 +365,7 @@ where } } if last_block == 0 { - break; + break } last_block -= 1; } From b96a95b15f4cd2e19d18d8e038e53a83d7c9b0af Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:11 -0700 Subject: [PATCH 15/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index f68e61458499..55e913505181 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -930,7 +930,7 @@ mod tests { let this = self.get_mut(); if this.headers.is_empty() { - return Poll::Ready(None); + return Poll::Ready(None) } let mut response = Vec::default(); From c085780535202651c11195fb77093781c0cc1f64 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:18 -0700 Subject: [PATCH 16/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 55e913505181..a3c725127bca 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -944,7 +944,7 @@ mod tests { } if response.len() as u64 >= this.batch_size { - break; + break } } From cc2375527f746882e1301a821075d03f55fe4dc1 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:25 -0700 Subject: [PATCH 17/23] Update crates/stages/stages/src/stages/bodies.rs --- crates/stages/stages/src/stages/bodies.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index a3c725127bca..95ca1a9f4690 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -949,7 +949,7 @@ mod tests { } if !response.is_empty() { - return Poll::Ready(Some(Ok(response))); + return Poll::Ready(Some(Ok(response))) } panic!("requested bodies without setting headers") From 547f97e6669ae5e183f2547a7efee93aa964f215 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:34 -0700 Subject: [PATCH 18/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index e623a10c083a..1e16027af834 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -71,7 +71,7 @@ where /// entries in the [`TransactionSenders`][reth_db::tables::TransactionSenders] table. fn execute(&mut self, provider: &Provider, input: ExecInput) -> Result { if input.target_reached() { - return Ok(ExecOutput::done(input.checkpoint())); + return Ok(ExecOutput::done(input.checkpoint())) } let (tx_range, block_range, is_final_range) = From 3600a17b9f2e9289124022f9a27fec86ceee2d23 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:42 -0700 Subject: [PATCH 19/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 1e16027af834..4c48006524ed 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -85,7 +85,7 @@ where checkpoint: StageCheckpoint::new(end_block) .with_entities_stage_checkpoint(stage_checkpoint(provider)?), done: is_final_range, - }); + }) } // Acquire the cursor for inserting elements From 9aba37e7aa16ada964f1ce75c23a5e9e22548ff7 Mon Sep 17 00:00:00 2001 From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com> Date: Thu, 26 Sep 2024 06:50:48 -0700 Subject: [PATCH 20/23] Update crates/stages/stages/src/stages/sender_recovery.rs --- crates/stages/stages/src/stages/sender_recovery.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stages/stages/src/stages/sender_recovery.rs b/crates/stages/stages/src/stages/sender_recovery.rs index 4c48006524ed..8ffbb2070aa1 100644 --- a/crates/stages/stages/src/stages/sender_recovery.rs +++ b/crates/stages/stages/src/stages/sender_recovery.rs @@ -185,7 +185,7 @@ where // We exit early since we could not process this chunk. let _ = recovered_senders_tx .send(Err(Box::new(SenderRecoveryStageError::StageError(err.into())))); - break; + break } }; From 97457086ad6030ec7b80ca727f67ccd192308762 Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Thu, 26 Sep 2024 15:52:03 +0200 Subject: [PATCH 21/23] fmt fixes --- crates/primitives/src/transaction/tx_type.rs | 12 ++++++------ crates/stages/stages/src/stages/tx_lookup.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/primitives/src/transaction/tx_type.rs b/crates/primitives/src/transaction/tx_type.rs index 315361abb681..14ac420e0a90 100644 --- a/crates/primitives/src/transaction/tx_type.rs +++ b/crates/primitives/src/transaction/tx_type.rs @@ -113,19 +113,19 @@ impl TryFrom for TxType { fn try_from(value: u8) -> Result { #[cfg(feature = "optimism")] if value == Self::Deposit { - return Ok(Self::Deposit); + return Ok(Self::Deposit) } if value == Self::Legacy { - return Ok(Self::Legacy); + return Ok(Self::Legacy) } else if value == Self::Eip2930 { - return Ok(Self::Eip2930); + return Ok(Self::Eip2930) } else if value == Self::Eip1559 { - return Ok(Self::Eip1559); + return Ok(Self::Eip1559) } else if value == Self::Eip4844 { - return Ok(Self::Eip4844); + return Ok(Self::Eip4844) } else if value == Self::Eip7702 { - return Ok(Self::Eip7702); + return Ok(Self::Eip7702) } Err("invalid tx type") diff --git a/crates/stages/stages/src/stages/tx_lookup.rs b/crates/stages/stages/src/stages/tx_lookup.rs index d272853c2856..1744b933c2d3 100644 --- a/crates/stages/stages/src/stages/tx_lookup.rs +++ b/crates/stages/stages/src/stages/tx_lookup.rs @@ -537,7 +537,7 @@ mod tests { let end_block = output.checkpoint.block_number; if start_block > end_block { - return Ok(()); + return Ok(()) } let mut body_cursor = From 2e2d46e5324f9c9cc071429a1f52253e2568f334 Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Thu, 26 Sep 2024 16:05:03 +0200 Subject: [PATCH 22/23] fix clippy --- crates/stages/stages/src/stages/bodies.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/stages/stages/src/stages/bodies.rs b/crates/stages/stages/src/stages/bodies.rs index 95ca1a9f4690..248e2ff52748 100644 --- a/crates/stages/stages/src/stages/bodies.rs +++ b/crates/stages/stages/src/stages/bodies.rs @@ -622,7 +622,7 @@ mod tests { UnwindStageTestRunner, }, }; - use alloy_primitives::{BlockHash, BlockNumber}; + use alloy_primitives::{BlockHash, BlockNumber, TxNumber}; use futures_util::Stream; use reth_db::{static_file::HeaderMask, tables}; use reth_db_api::{ @@ -638,7 +638,7 @@ mod tests { error::DownloadResult, }; use reth_primitives::{ - BlockBody, Header, SealedBlock, SealedHeader, StaticFileSegment, TxNumber, B256, + BlockBody, Header, SealedBlock, SealedHeader, StaticFileSegment, B256, }; use reth_provider::{ providers::StaticFileWriter, test_utils::MockNodeTypesWithDB, HeaderProvider, From cbd50fa8cdcd64dd8a286bba5b28234b469f150e Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Thu, 26 Sep 2024 16:10:21 +0200 Subject: [PATCH 23/23] fix clippy --- crates/primitives/src/transaction/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/primitives/src/transaction/mod.rs b/crates/primitives/src/transaction/mod.rs index ec1ddaa87810..be3bf063f442 100644 --- a/crates/primitives/src/transaction/mod.rs +++ b/crates/primitives/src/transaction/mod.rs @@ -1907,7 +1907,7 @@ mod tests { #[test] fn decode_raw_tx_and_recover_signer() { - use crate::hex_literal::hex; + use alloy_primitives::hex_literal::hex; // transaction is from ropsten let hash: B256 =