Merge remote-tracking branch 'origin/breaking-changes' into alexey/rename-tables

Author: shekhirin

Cargo.lock

@@ -11,6 +11,8 @@
     html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 mod forkid;

crates/ethereum-forks/src/lib.rs

@@ -10,6 +10,8 @@
     html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 pub mod builder;

crates/net/eth-wire/src/lib.rs

@@ -1,5 +1,8 @@
 //! Round-trip encoding fuzzing for the `eth-wire` crate.
 
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
+
 use alloy_rlp::{Decodable, Encodable};
 use serde::Serialize;
 use std::fmt::Debug;

crates/net/eth-wire/tests/fuzz_roundtrip.rs

@@ -451,7 +451,7 @@ where
             return propagated
         }
 
-        // send full transactions to a fraction fo the connected peers (square root of the total
+        // send full transactions to a fraction of the connected peers (square root of the total
         // number of connected peers)
         let max_num_full = (self.peers.len() as f64).sqrt() as usize + 1;
 

crates/net/network/src/transactions/mod.rs

@@ -12,6 +12,8 @@
     html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 mod account;

crates/primitives/src/lib.rs

@@ -591,9 +591,9 @@ mod tests {
         Account, Bytecode, Bytes, ChainSpecBuilder, ForkCondition, Signature, StorageKey,
         Transaction, TransactionKind, TxEip1559, MAINNET,
     };
-    use reth_provider::{
-        AccountReader, BlockHashReader, BundleStateWithReceipts, StateRootProvider,
-    };
+    #[cfg(feature = "optimism")]
+    use reth_provider::BundleStateWithReceipts;
+    use reth_provider::{AccountReader, BlockHashReader, StateRootProvider};
     use reth_trie::updates::TrieUpdates;
     use revm::{Database, TransitionState};
     use std::collections::HashMap;

crates/revm/src/processor.rs

@@ -33,7 +33,6 @@ revm.workspace = true
 # async
 tokio = { workspace = true, features = ["sync"] }
 tokio-stream.workspace = true
-async-trait.workspace = true
 futures-util.workspace = true
 pin-project.workspace = true
 

crates/stages/Cargo.toml

@@ -7,7 +7,7 @@ use reth_primitives::{
 use reth_provider::{BlockReader, DatabaseProviderRW, ProviderError, TransactionsProvider};
 use std::{
     cmp::{max, min},
-    future::poll_fn,
+    future::{poll_fn, Future},
     ops::{Range, RangeInclusive},
     task::{Context, Poll},
 };
@@ -96,7 +96,7 @@ impl ExecInput {
 
         if all_tx_cnt == 0 {
             // if there is no more transaction return back.
-            return Ok((first_tx_num..first_tx_num, start_block..=target_block, true))
+            return Ok((first_tx_num..first_tx_num, start_block..=target_block, true));
         }
 
         // get block of this tx
@@ -247,12 +247,14 @@ pub trait Stage<DB: Database>: Send + Sync {
 }
 
 /// [Stage] trait extension.
-#[async_trait::async_trait]
 pub trait StageExt<DB: Database>: Stage<DB> {
     /// Utility extension for the `Stage` trait that invokes `Stage::poll_execute_ready`
     /// with [poll_fn] context. For more information see [Stage::poll_execute_ready].
-    async fn execute_ready(&mut self, input: ExecInput) -> Result<(), StageError> {
-        poll_fn(|cx| self.poll_execute_ready(cx, input)).await
+    fn execute_ready(
+        &mut self,
+        input: ExecInput,
+    ) -> impl Future<Output = Result<(), StageError>> + Send {
+        poll_fn(move |cx| self.poll_execute_ready(cx, input))
     }
 }
 

crates/stages/src/stage.rs

@@ -565,7 +565,6 @@ mod tests {
             }
         }
 
-        #[async_trait::async_trait]
         impl ExecuteStageTestRunner for BodyTestRunner {
             type Seed = Vec<SealedBlock>;
 

crates/stages/src/stages/bodies.rs

@@ -520,7 +520,6 @@ mod tests {
             }
         }
 
-        #[async_trait::async_trait]
         impl ExecuteStageTestRunner for AccountHashingTestRunner {
             type Seed = Vec<(Address, Account)>;
 

crates/stages/src/stages/hashing_account.rs

@@ -477,7 +477,6 @@ mod tests {
         }
     }
 
-    #[async_trait::async_trait]
     impl ExecuteStageTestRunner for StorageHashingTestRunner {
         type Seed = Vec<SealedBlock>;
 

crates/stages/src/stages/hashing_storage.rs

@@ -382,7 +382,6 @@ mod tests {
             }
         }
 
-        #[async_trait::async_trait]
         impl<D: HeaderDownloader + 'static> ExecuteStageTestRunner for HeadersTestRunner<D> {
             type Seed = Vec<SealedHeader>;
 

crates/stages/src/stages/headers.rs

@@ -457,7 +457,6 @@ mod tests {
         }
     }
 
-    #[async_trait::async_trait]
     impl ExecuteStageTestRunner for MerkleTestRunner {
         type Seed = Vec<SealedBlock>;
 

crates/stages/src/stages/merkle.rs

@@ -224,7 +224,6 @@ mod tests {
         }
     }
 
-    #[async_trait::async_trait]
     impl ExecuteStageTestRunner for TotalDifficultyTestRunner {
         type Seed = Vec<SealedHeader>;
 

crates/stages/src/stages/total_difficulty.rs

@@ -27,7 +27,6 @@ pub(crate) trait StageTestRunner {
     fn stage(&self) -> Self::S;
 }
 
-#[async_trait::async_trait]
 pub(crate) trait ExecuteStageTestRunner: StageTestRunner {
     type Seed: Send + Sync;
 
@@ -63,7 +62,6 @@ pub(crate) trait ExecuteStageTestRunner: StageTestRunner {
     }
 }
 
-#[async_trait::async_trait]
 pub(crate) trait UnwindStageTestRunner: StageTestRunner {
     /// Validate the unwind
     fn validate_unwind(&self, input: UnwindInput) -> Result<(), TestRunnerError>;
@@ -78,7 +76,7 @@ pub(crate) trait UnwindStageTestRunner: StageTestRunner {
             provider.commit().expect("failed to commit");
             tx.send(result).expect("failed to send result");
         });
-        Box::pin(rx).await.unwrap()
+        rx.await.unwrap()
     }
 
     /// Run a hook before [Stage::unwind]. Required for MerkleStage.

crates/stages/src/test_utils/runner.rs

@@ -6,6 +6,8 @@
     issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
 )]
 #![warn(unused_crate_dependencies)]
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(feature = "std"), no_std)]
 

crates/storage/codecs/src/lib.rs

@@ -12,6 +12,9 @@
 //!
 //! TODO(onbjerg): Find appropriate format for this...
 
+// TODO: remove when https://github.com/proptest-rs/proptest/pull/427 is merged
+#![allow(unknown_lints, non_local_definitions)]
+
 pub mod codecs;
 pub mod models;
 

crates/storage/db/src/tables/mod.rs

@@ -417,6 +417,10 @@ where
         self.pool.get_pooled_transaction_elements(tx_hashes, limit)
     }
 
+    fn get_pooled_transaction_element(&self, tx_hash: TxHash) -> Option<PooledTransactionsElement> {
+        self.pool.get_pooled_transaction_element(tx_hash)
+    }
+
     fn best_transactions(
         &self,
     ) -> Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<Self::Transaction>>>> {

crates/transaction-pool/src/lib.rs

@@ -135,6 +135,13 @@ impl TransactionPool for NoopTransactionPool {
         vec![]
     }
 
+    fn get_pooled_transaction_element(
+        &self,
+        _tx_hash: TxHash,
+    ) -> Option<PooledTransactionsElement> {
+        None
+    }
+
     fn best_transactions(
         &self,
     ) -> Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<Self::Transaction>>>> {

crates/transaction-pool/src/noop.rs

@@ -341,6 +341,21 @@ where
         elements
     }
 
+    /// Returns converted [PooledTransactionsElement] for the given transaction hash.
+    pub(crate) fn get_pooled_transaction_element(
+        &self,
+        tx_hash: TxHash,
+    ) -> Option<PooledTransactionsElement> {
+        self.get(&tx_hash).and_then(|transaction| {
+            let tx = transaction.to_recovered_transaction().into_signed();
+            if tx.is_eip4844() {
+                self.get_blob_transaction(tx).map(PooledTransactionsElement::BlobTransaction)
+            } else {
+                Some(PooledTransactionsElement::from(tx))
+            }
+        })
+    }
+
     /// Updates the entire pool after a new block was executed.
     pub(crate) fn on_canonical_state_change(&self, update: CanonicalStateUpdate<'_>) {
         trace!(target: "txpool", ?update, "updating pool on canonical state change");

crates/transaction-pool/src/pool/mod.rs

@@ -221,6 +221,16 @@ pub trait TransactionPool: Send + Sync + Clone {
         limit: GetPooledTransactionLimit,
     ) -> Vec<PooledTransactionsElement>;
 
+    /// Returns converted [PooledTransactionsElement] for the given transaction hash.
+    ///
+    /// This adheres to the expected behavior of
+    /// [`GetPooledTransactions`](https://github.com/ethereum/devp2p/blob/master/caps/eth.md#getpooledtransactions-0x09):
+    ///
+    /// If the transaction is a blob transaction, the sidecar will be included.
+    ///
+    /// Consumer: P2P
+    fn get_pooled_transaction_element(&self, tx_hash: TxHash) -> Option<PooledTransactionsElement>;
+
     /// Returns an iterator that yields transactions that are ready for block production.
     ///
     /// Consumer: Block production

crates/transaction-pool/src/traits.rs

@@ -834,7 +834,7 @@ struct Peer {
 
 Note that the `Peer` struct contains a field `transactions`, which is an [LRU cache](https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used_(LRU)) of the transactions this peer is aware of. 
 
-The `request_tx` field on the `Peer` is used at the sender end of a channel to send requests to the session with the peer.
+The `request_tx` field on the `Peer` is used as the sender end of a channel to send requests to the session with the peer.
 
 After the `Peer` is added to `TransactionsManager.peers`, the hashes of all of the transactions in the node's transaction pool are sent to the peer in a [`NewPooledTransactionHashes` message](https://github.com/ethereum/devp2p/blob/master/caps/eth.md#newpooledtransactionhashes-0x08).
 
@@ -911,7 +911,7 @@ fn propagate_transactions(
 ) -> PropagatedTransactions {
     let mut propagated = PropagatedTransactions::default();
 
-    // send full transactions to a fraction fo the connected peers (square root of the total
+    // send full transactions to a fraction of the connected peers (square root of the total
     // number of connected peers)
     let max_num_full = (self.peers.len() as f64).sqrt() as usize + 1;