Begin upgrading to v1.10.0-rc

Author: meyer9

Cargo.lock

@@ -21,10 +21,9 @@ use core::time::Duration;
 use eyre::WrapErr as _;
 use reth::payload::PayloadBuilderAttributes;
 use reth_basic_payload_builder::BuildOutcome;
-use reth_chain_state::ExecutedBlock;
 use reth_chainspec::EthChainSpec;
 use reth_evm::{ConfigureEvm, execute::BlockBuilder};
-use reth_node_api::{Block, NodePrimitives, PayloadBuilderError};
+use reth_node_api::{Block, BuiltPayloadExecutedBlock, NodePrimitives, PayloadBuilderError};
 use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus};
 use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use reth_optimism_forks::OpHardforks;
@@ -1112,11 +1111,11 @@ where
         RecoveredBlock::new_unhashed(block.clone(), info.executed_senders.clone());
     // create the executed block data
 
-    let executed = ExecutedBlock {
+    let executed = BuiltPayloadExecutedBlock {
         recovered_block: Arc::new(recovered_block),
         execution_output: Arc::new(execution_outcome),
-        hashed_state: Arc::new(hashed_state),
-        trie_updates: Arc::new(trie_output),
+        hashed_state: either::Either::Left(Arc::new(hashed_state)),
+        trie_updates: either::Either::Left(Arc::new(trie_output)),
     };
     debug!(target: "payload_builder", message = "Executed block created");
 

Cargo.toml

@@ -470,8 +470,7 @@ mod tests {
     use alloy_primitives::U256;
     use rand::rng;
     use reth::tasks::TokioTaskExecutor;
-    use reth_chain_state::ExecutedBlock;
-    use reth_node_api::NodePrimitives;
+    use reth_node_api::{BuiltPayloadExecutedBlock, NodePrimitives};
     use reth_optimism_payload_builder::{OpPayloadPrimitives, payload::OpPayloadBuilderAttributes};
     use reth_optimism_primitives::OpPrimitives;
     use reth_primitives::SealedBlock;
@@ -590,7 +589,7 @@ mod tests {
         }
 
         /// Returns the entire execution data for the built block, if available.
-        fn executed_block(&self) -> Option<ExecutedBlock<Self::Primitives>> {
+        fn executed_block(&self) -> Option<BuiltPayloadExecutedBlock<Self::Primitives>> {
             None
         }
 

crates/builder/op-rbuilder/src/builders/flashblocks/payload.rs

@@ -14,9 +14,8 @@ use alloy_evm::Database;
 use alloy_primitives::U256;
 use reth::payload::PayloadBuilderAttributes;
 use reth_basic_payload_builder::{BuildOutcome, BuildOutcomeKind, MissingPayloadBehaviour};
-use reth_chain_state::ExecutedBlock;
 use reth_evm::{ConfigureEvm, execute::BlockBuilder};
-use reth_node_api::{Block, PayloadBuilderError};
+use reth_node_api::{Block, BuiltPayloadExecutedBlock, PayloadBuilderError};
 use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus};
 use reth_optimism_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use reth_optimism_forks::OpHardforks;
@@ -586,16 +585,16 @@ impl<Txs: PayloadTxsBounds> OpBuilder<'_, Txs> {
         info!(target: "payload_builder", id=%ctx.attributes().payload_id(), "sealed built block");
 
         // create the executed block data
-        let executed = ExecutedBlock {
+        let executed = BuiltPayloadExecutedBlock {
             recovered_block: Arc::new(
                 RecoveredBlock::<alloy_consensus::Block<OpTransactionSigned>>::new_sealed(
                     sealed_block.as_ref().clone(),
                     info.executed_senders,
                 ),
             ),
             execution_output: Arc::new(execution_outcome),
-            hashed_state: Arc::new(hashed_state),
-            trie_updates: Arc::new(trie_output),
+            hashed_state: either::Either::Left(Arc::new(hashed_state)),
+            trie_updates: either::Either::Left(Arc::new(trie_output)),
         };
 
         let no_tx_pool = ctx.attributes().no_tx_pool;

crates/builder/op-rbuilder/src/builders/generator.rs

@@ -78,6 +78,7 @@ where
             EngineCapabilities::new(OP_ENGINE_CAPABILITIES.iter().copied()),
             engine_validator,
             ctx.config.engine.accept_execution_requests_hash,
+            ctx.node.network().clone(),
         );
 
         Ok(OpEngineApiExt::new(OpEngineApi::new(inner)))

crates/builder/op-rbuilder/src/builders/standard/payload.rs

@@ -0,0 +1 @@
+Subproject commit 7117c90c8cf6c68e5acce4f09a6b24715cea4de6

crates/builder/op-rbuilder/src/primitives/reth/engine_api_builder.rs

@@ -0,0 +1 @@
+Subproject commit fcbae5394ae8ad52d8e580a3477db99814b9d565

crates/test-utils/contracts/lib/forge-std

@@ -0,0 +1 @@
+Subproject commit 89365b880c4f3c786bdd453d4b8e8fe410344a69