Merge branch 'main' into klkvr/2718-tx

.github/assets/check_wasm.sh

@@ -35,7 +35,6 @@ exclude_crates=(
   reth-ethereum-payload-builder
   reth-etl
   reth-evm-ethereum
-  reth-evm-optimism
   reth-execution-errors
   reth-exex
   reth-exex-test-utils
@@ -49,8 +48,9 @@ exclude_crates=(
   reth-node-ethereum
   reth-node-events
   reth-node-metrics
-  reth-node-optimism
   reth-optimism-cli
+  reth-optimism-evm
+  reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc
   reth-payload-builder

.github/workflows/integration.yml

@@ -47,7 +47,7 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            --locked -p reth-optimism-node --features "optimism"
 
   integration-success:
     name: integration success

Cargo.toml

@@ -333,7 +333,7 @@ reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }
 reth-evm-ethereum = { path = "crates/ethereum/evm" }
-reth-evm-optimism = { path = "crates/optimism/evm" }
+reth-optimism-evm = { path = "crates/optimism/evm" }
 reth-execution-errors = { path = "crates/evm/execution-errors" }
 reth-execution-types = { path = "crates/evm/execution-types" }
 reth-exex = { path = "crates/exex/exex" }
@@ -360,7 +360,7 @@ reth-node-core = { path = "crates/node/core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
 reth-node-metrics = { path = "crates/node/metrics" }
-reth-node-optimism = { path = "crates/optimism/node" }
+reth-optimism-node = { path = "crates/optimism/node" }
 reth-node-types = { path = "crates/node/types" }
 reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
 reth-optimism-cli = { path = "crates/optimism/cli" }
@@ -426,7 +426,7 @@ alloy-dyn-abi = "0.8.0"
 alloy-primitives = { version = "0.8.4", default-features = false }
 alloy-rlp = "0.3.4"
 alloy-sol-types = "0.8.0"
-alloy-trie = { version = "0.5", default-features = false }
+alloy-trie = { version = "0.6", default-features = false }
 
 alloy-consensus = { version = "0.3.6", default-features = false }
 alloy-eips = { version = "0.3.6", default-features = false }

book/developers/exex/hello-world.md

@@ -125,7 +125,7 @@ async fn my_exex<Node: FullNodeComponents>(mut ctx: ExExContext<Node>) -> eyre::
 
         if let Some(committed_chain) = notification.committed_chain() {
             ctx.events
-                .send(ExExEvent::FinishedHeight(committed_chain.tip().number))?;
+                .send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
         }
     }
 

book/developers/exex/how-it-works.md

@@ -23,4 +23,4 @@ event to signify what blocks have been processed. This event is used by Reth to
 
 An ExEx will only receive notifications for block numbers greater than the block in the most recently emitted `FinishedHeight` event.
 
-To clarify: if an ExEx emits `ExExEvent::FinishedHeight(0)` it will receive notifications for any `block_number > 0`.
+To clarify: if an ExEx emits `ExExEvent::FinishedHeight` for `block #0` it will receive notifications for any `block_number > 0`.

book/developers/exex/remote.md

@@ -279,7 +279,7 @@ async fn remote_exex<Node: FullNodeComponents>(
     while let Some(notification) = ctx.notifications.next().await {
         if let Some(committed_chain) = notification.committed_chain() {
             ctx.events
-                .send(ExExEvent::FinishedHeight(committed_chain.tip().number))?;
+                .send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
         }
 
         info!("Notification sent to the gRPC server");
@@ -388,7 +388,7 @@ async fn remote_exex<Node: FullNodeComponents>(
     while let Some(notification) = ctx.notifications.next().await {
         if let Some(committed_chain) = notification.committed_chain() {
             ctx.events
-                .send(ExExEvent::FinishedHeight(committed_chain.tip().number))?;
+                .send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
         }
 
         info!(?notification, "Notification sent to the gRPC server");

book/developers/exex/tracking-state.md

@@ -57,7 +57,7 @@ impl<Node: FullNodeComponents> Future for MyExEx<Node> {
             if let Some(committed_chain) = notification.committed_chain() {
                 this.ctx
                     .events
-                    .send(ExExEvent::FinishedHeight(committed_chain.tip().number))?;
+                    .send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
             }
         }
 
@@ -152,7 +152,7 @@ impl<Node: FullNodeComponents> Future for MyExEx<Node> {
 
                 this.ctx
                     .events
-                    .send(ExExEvent::FinishedHeight(committed_chain.tip().number))?;
+                    .send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
             }
 
             if let Some(first_block) = this.first_block {

crates/blockchain-tree/Cargo.toml

@@ -32,6 +32,7 @@ reth-node-types.workspace = true
 
 # ethereum
 alloy-primitives.workspace = true
+alloy-eips.workspace = true
 
 # common
 parking_lot.workspace = true

crates/blockchain-tree/src/block_buffer.rs

@@ -183,8 +183,9 @@ impl BlockBuffer {
 #[cfg(test)]
 mod tests {
     use crate::BlockBuffer;
+    use alloy_eips::BlockNumHash;
     use alloy_primitives::BlockHash;
-    use reth_primitives::{BlockNumHash, SealedBlockWithSenders};
+    use reth_primitives::SealedBlockWithSenders;
     use reth_testing_utils::generators::{self, random_block, BlockParams, Rng};
     use std::collections::HashMap;
 

crates/blockchain-tree/src/block_indices.rs

@@ -2,10 +2,11 @@
 
 use super::state::SidechainId;
 use crate::canonical_chain::CanonicalChain;
+use alloy_eips::BlockNumHash;
 use alloy_primitives::{BlockHash, BlockNumber};
 use linked_hash_set::LinkedHashSet;
 use reth_execution_types::Chain;
-use reth_primitives::{BlockNumHash, SealedBlockWithSenders};
+use reth_primitives::SealedBlockWithSenders;
 use std::collections::{btree_map, hash_map, BTreeMap, BTreeSet, HashMap, HashSet};
 
 /// Internal indices of the blocks and chains.

crates/blockchain-tree/src/blockchain_tree.rs

@@ -5,6 +5,7 @@ use crate::{
     state::{SidechainId, TreeState},
     AppendableChain, BlockIndices, BlockchainTreeConfig, ExecutionData, TreeExternals,
 };
+use alloy_eips::{BlockNumHash, ForkBlock};
 use alloy_primitives::{BlockHash, BlockNumber, B256, U256};
 use reth_blockchain_tree_api::{
     error::{BlockchainTreeError, CanonicalError, InsertBlockError, InsertBlockErrorKind},
@@ -16,8 +17,8 @@ use reth_execution_errors::{BlockExecutionError, BlockValidationError};
 use reth_execution_types::{Chain, ExecutionOutcome};
 use reth_node_types::NodeTypesWithDB;
 use reth_primitives::{
-    BlockNumHash, EthereumHardfork, ForkBlock, GotExpected, Hardforks, Receipt, SealedBlock,
-    SealedBlockWithSenders, SealedHeader, StaticFileSegment,
+    EthereumHardfork, GotExpected, Hardforks, Receipt, SealedBlock, SealedBlockWithSenders,
+    SealedHeader, StaticFileSegment,
 };
 use reth_provider::{
     providers::ProviderNodeTypes, BlockExecutionWriter, BlockNumReader, BlockWriter,

crates/blockchain-tree/src/bundle.rs

@@ -1,7 +1,7 @@
 //! [`ExecutionDataProvider`] implementations used by the tree.
 
+use alloy_eips::ForkBlock;
 use alloy_primitives::{BlockHash, BlockNumber};
-use reth_primitives::ForkBlock;
 use reth_provider::{BlockExecutionForkProvider, ExecutionDataProvider, ExecutionOutcome};
 use std::collections::BTreeMap;
 

crates/blockchain-tree/src/canonical_chain.rs

@@ -1,5 +1,5 @@
+use alloy_eips::BlockNumHash;
 use alloy_primitives::{BlockHash, BlockNumber};
-use reth_primitives::BlockNumHash;
 use std::collections::BTreeMap;
 
 /// This keeps track of (non-finalized) blocks of the canonical chain.