flashblocks: update versions with latest developments from upstream

Cargo.toml

@@ -523,11 +523,11 @@ alloy-transport-ws = { version = "1.0.41", default-features = false }
 # op
 alloy-op-evm = { version = "0.23.0", default-features = false }
 alloy-op-hardforks = "0.4.4"
-op-alloy-rpc-types = { version = "0.22.0", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false }
-op-alloy-network = { version = "0.22.0", default-features = false }
-op-alloy-consensus = { version = "0.22.0", default-features = false }
-op-alloy-rpc-jsonrpsee = { version = "0.22.0", default-features = false }
+op-alloy-rpc-types = { version = "0.22.1", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.22.1", default-features = false }
+op-alloy-network = { version = "0.22.1", default-features = false }
+op-alloy-consensus = { version = "0.22.1", default-features = false }
+op-alloy-rpc-jsonrpsee = { version = "0.22.1", default-features = false }
 op-alloy-flz = { version = "0.13.1", default-features = false }
 
 # misc

crates/node/builder/src/rpc.rs

@@ -973,7 +973,12 @@ where
         );
 
         let eth_config = config.rpc.eth_config().max_batch_size(config.txpool.max_batch_size());
-        let ctx = EthApiCtx { components: &node, config: eth_config, cache };
+        let ctx = EthApiCtx {
+            components: &node,
+            config: eth_config,
+            cache,
+            engine_handle: beacon_engine_handle.clone(),
+        };
         let eth_api = eth_api_builder.build_eth_api(ctx).await?;
 
         let auth_config = config.rpc.auth_server_config(jwt_secret)?;
@@ -1137,6 +1142,8 @@ pub struct EthApiCtx<'a, N: FullNodeTypes> {
     pub config: EthConfig,
     /// Cache for eth state
     pub cache: EthStateCache<PrimitivesTy<N::Types>>,
+    /// Handle to the beacon consensus engine
+    pub engine_handle: ConsensusEngineHandle<<N::Types as NodeTypes>::Payload>,
 }
 
 impl<'a, N: FullNodeComponents<Types: NodeTypes<ChainSpec: Hardforks + EthereumHardforks>>>

crates/optimism/evm/src/config.rs

@@ -1,6 +1,7 @@
 pub use alloy_op_evm::{
     spec as revm_spec, spec_by_timestamp_after_bedrock as revm_spec_by_timestamp_after_bedrock,
 };
+use op_alloy_rpc_types_engine::OpFlashblockPayloadBase;
 use revm::primitives::{Address, Bytes, B256};
 
 /// Context relevant for execution of a next block w.r.t OP.
@@ -35,3 +36,16 @@ impl<H: alloy_consensus::BlockHeader> reth_rpc_eth_api::helpers::pending_block::
         }
     }
 }
+
+impl From<OpFlashblockPayloadBase> for OpNextBlockEnvAttributes {
+    fn from(base: OpFlashblockPayloadBase) -> Self {
+        Self {
+            timestamp: base.timestamp,
+            suggested_fee_recipient: base.fee_recipient,
+            prev_randao: base.prev_randao,
+            gas_limit: base.gas_limit,
+            parent_beacon_block_root: Some(base.parent_beacon_block_root),
+            extra_data: base.extra_data,
+        }
+    }
+}

crates/optimism/flashblocks/Cargo.toml

@@ -13,7 +13,6 @@ workspace = true
 [dependencies]
 # reth
 reth-optimism-primitives = { workspace = true, features = ["serde"] }
-reth-optimism-evm.workspace = true
 reth-chain-state = { workspace = true, features = ["serde"] }
 reth-primitives-traits = { workspace = true, features = ["serde"] }
 reth-engine-primitives = { workspace = true, features = ["std"] }
@@ -30,15 +29,16 @@ reth-metrics.workspace = true
 
 # alloy
 alloy-eips = { workspace = true, features = ["serde"] }
-alloy-serde.workspace = true
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-rpc-types-engine = { workspace = true, features = ["serde"] }
 alloy-consensus.workspace = true
 
+# op-alloy
+op-alloy-rpc-types-engine = { workspace = true, features = ["k256"] }
+
 # io
 tokio.workspace = true
 tokio-tungstenite = { workspace = true, features = ["rustls-tls-native-roots"] }
-serde.workspace = true
 serde_json.workspace = true
 url.workspace = true
 futures-util.workspace = true
@@ -57,3 +57,4 @@ derive_more.workspace = true
 [dev-dependencies]
 test-case.workspace = true
 alloy-consensus.workspace = true
+op-alloy-consensus.workspace = true