flashblocks sealed header

Cargo.toml

@@ -19,7 +19,6 @@ members = [
     "crates/flashblocks/payload",
     "crates/flashblocks/node",
     "crates/flashblocks/cli",
-    "crates/flashblocks/provider",
 ]
 default-members = [
     "crates/flashblocks/p2p",
@@ -29,7 +28,6 @@ default-members = [
     "crates/flashblocks/payload",
     "crates/flashblocks/node",
     "crates/flashblocks/cli",
-    "crates/flashblocks/provider",
     "crates/world/bin",
     "crates/world/node",
     "crates/world/payload",
@@ -56,7 +54,6 @@ flashblocks-rpc = { path = "crates/flashblocks/rpc" }
 flashblocks-builder = { path = "crates/flashblocks/builder" }
 flashblocks-payload = { path = "crates/flashblocks/payload" }
 flashblocks-cli = { path = "crates/flashblocks/cli" }
-flashblocks-provider = { path = "crates/flashblocks/provider" }
 
 # Internal
 world-chain-node = { path = "crates/world/node" }

crates/flashblocks/builder/Cargo.toml

@@ -7,9 +7,6 @@ license.workspace = true
 
 
 [dependencies]
-# internal
-flashblocks-provider.workspace = true
-
 # reth
 reth.workspace = true
 reth-basic-payload-builder.workspace = true
@@ -68,4 +65,5 @@ jsonrpsee.workspace = true
 futures.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-eyre.workspace = true
+eyre.workspace = true
+

crates/flashblocks/builder/src/executor.rs

@@ -6,10 +6,10 @@ use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
 use alloy_op_evm::{OpBlockExecutionCtx, OpBlockExecutorFactory, OpEvmFactory};
 use alloy_primitives::{address, b256, hex, Address, Bytes, B256};
 use alloy_rpc_types_engine::PayloadId;
+use eyre::eyre::OptionExt as _;
 use flashblocks_p2p::protocol::handler::FlashblocksHandle;
 use flashblocks_primitives::p2p::AuthorizedPayload;
 use flashblocks_primitives::primitives::FlashblocksPayloadV1;
-use flashblocks_provider::InMemoryState;
 use futures::StreamExt as _;
 use op_alloy_consensus::{encode_holocene_extra_data, OpDepositReceipt, OpTxEnvelope};
 use parking_lot::RwLock;
@@ -705,9 +705,7 @@ impl FlashblocksStateExecutor {
     ) where
         Pool: TransactionPool + 'static,
         Node: FullNodeTypes,
-        Node::Provider: InMemoryState<Primitives = OpPrimitives>
-            + StateProviderFactory
-            + HeaderProvider<Header = alloy_consensus::Header>,
+        Node::Provider: StateProviderFactory + HeaderProvider<Header = alloy_consensus::Header>,
         Node::Types: NodeTypes<ChainSpec = OpChainSpec>,
         P: PayloadBuilderCtxBuilder<Node::Provider, OpEvmConfig, OpChainSpec> + 'static,
     {
@@ -802,10 +800,8 @@ fn process_flashblock<Provider, Pool, P>(
     pending_block: tokio::sync::watch::Sender<Option<ExecutedBlockWithTrieUpdates<OpPrimitives>>>,
 ) -> eyre::Result<()>
 where
-    Provider: InMemoryState<Primitives = OpPrimitives>
-        + StateProviderFactory
-        + HeaderProvider<Header = alloy_consensus::Header>
-        + Clone,
+    Provider: StateProviderFactory + HeaderProvider<Header = alloy_consensus::Header> + Clone,
+
     Pool: TransactionPool + 'static,
     P: PayloadBuilderCtxBuilder<Provider, OpEvmConfig, OpChainSpec> + 'static,
 {
@@ -876,53 +872,46 @@ where
         eip_1559_params: Some(eip1559[1..=8].try_into()?),
     };
 
-    let state_provider = provider.state_by_block_hash(base.parent_hash)?;
-
     // The header either exists in the in memory state (has not been persisted to disk) or exists within
     // the database. First check the in memory state, then fall back to the database.
-    // TODO: Figure out a way to see if there is a writer on the DB and avoid crashing the node by reading
-    // the header from disk if
-    let sealed_header = provider.in_memory_state().header_by_hash(base.parent_hash);
-
-    if let Some(sealed_header) = sealed_header {
-        let config = PayloadConfig::new(Arc::new(sealed_header), attributes);
-        let builder_ctx = payload_builder_ctx_builder.build(
-            provider.clone(),
-            evm_config.clone(),
-            state_executor.da_config.clone(),
-            config,
-            &cancel,
-            latest_payload.as_ref().map(|p| p.0.clone()),
-        );
+    let sealed_header = provider
+        .sealed_header_by_hash(base.parent_hash)?
+        .ok_or_eyre("missing sealed header")?;
 
-        let best = |_| BestPayloadTransactions::new(vec![].into_iter());
-        let db = StateProviderDatabase::new(&state_provider);
-
-        let outcome = FlashblockBuilder::new(best).build(
-            pool.clone(),
-            db,
-            &state_provider,
-            &builder_ctx,
-            latest_payload.as_ref().map(|p| p.0.clone()),
-        )?;
-
-        let payload = match outcome {
-            BuildOutcomeKind::Better { payload } => payload,
-            BuildOutcomeKind::Freeze(payload) => payload,
-            _ => return Ok(()),
-        };
+    let state_provider = provider.state_by_block_hash(base.parent_hash)?;
 
-        trace!(target: "flashblocks::state_executor", hash = %payload.block().hash(), "setting latest payload");
+    let config = PayloadConfig::new(Arc::new(sealed_header), attributes);
+    let builder_ctx = payload_builder_ctx_builder.build(
+        provider.clone(),
+        evm_config.clone(),
+        state_executor.da_config.clone(),
+        config,
+        &cancel,
+        latest_payload.as_ref().map(|p| p.0.clone()),
+    );
+
+    let best = |_| BestPayloadTransactions::new(vec![].into_iter());
+    let db = StateProviderDatabase::new(&state_provider);
+
+    let outcome = FlashblockBuilder::new(best).build(
+        pool.clone(),
+        db,
+        &state_provider,
+        &builder_ctx,
+        latest_payload.as_ref().map(|p| p.0.clone()),
+    )?;
 
-        *latest_payload = Some((payload.clone(), flashblock.index));
+    let payload = match outcome {
+        BuildOutcomeKind::Better { payload } => payload,
+        BuildOutcomeKind::Freeze(payload) => payload,
+        _ => return Ok(()),
+    };
 
-        pending_block.send_replace(payload.executed_block());
-    } else {
-        error!(target: "flashblocks::state_executor", hash = %base.parent_hash, "parent header not found in memory or database");
-    }
+    trace!(target: "flashblocks::state_executor", hash = %payload.block().hash(), "setting latest payload");
+
+    *latest_payload = Some((payload.clone(), flashblock.index));
 
-    // The default engine api implementation should reset the in memory pending
-    // state on new_payload.
+    pending_block.send_replace(payload.executed_block());
 
     Ok(())
 }

crates/flashblocks/node/Cargo.toml

@@ -11,7 +11,6 @@ flashblocks-primitives.workspace = true
 flashblocks-cli.workspace = true
 flashblocks-builder.workspace = true
 flashblocks-payload.workspace = true
-flashblocks-provider.workspace = true
 
 reth.workspace = true
 reth-optimism-node.workspace = true

crates/flashblocks/node/src/lib.rs

@@ -7,7 +7,6 @@ use flashblocks_builder::{
 use flashblocks_cli::FlashblocksArgs;
 use flashblocks_p2p::{net::FlashblocksNetworkBuilder, protocol::handler::FlashblocksHandle};
 use flashblocks_primitives::p2p::Authorization;
-use flashblocks_provider::InMemoryState;
 use flashblocks_rpc::eth::FlashblocksEthApiBuilder;
 use op_alloy_consensus::OpTxEnvelope;
 use reth::chainspec::EthChainSpec;
@@ -83,7 +82,6 @@ pub trait FlashblocksProvider:
     + ChainSpecProvider<ChainSpec: EthChainSpec + OpHardforks>
     + Clone
     + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-    + InMemoryState<Primitives = OpPrimitives>
 {
 }
 
@@ -92,7 +90,6 @@ impl<T> FlashblocksProvider for T where
         + ChainSpecProvider<ChainSpec: EthChainSpec + OpHardforks>
         + Clone
         + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-        + InMemoryState<Primitives = OpPrimitives>
 {
 }
 
@@ -197,8 +194,7 @@ where
         + ChainSpecProvider<ChainSpec = OpChainSpec>
         + HeaderProvider<Header = alloy_consensus::Header>
         + Clone
-        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-        + InMemoryState<Primitives = OpPrimitives>,
+        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>,
     N::Types: NodeTypes<
         ChainSpec = OpChainSpec,
         Payload: PayloadTypes<
@@ -301,8 +297,7 @@ where
         + ChainSpecProvider<ChainSpec = OpChainSpec>
         + HeaderProvider<Header = alloy_consensus::Header>
         + Clone
-        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-        + InMemoryState<Primitives = OpPrimitives>,
+        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>,
     N::Types: NodeTypes<
         ChainSpec = OpChainSpec,
         Payload: PayloadTypes<

crates/flashblocks/node/src/payload.rs

@@ -2,7 +2,6 @@ use flashblocks_builder::executor::FlashblocksStateExecutor;
 use flashblocks_builder::traits::context::PayloadBuilderCtx;
 use flashblocks_builder::traits::context_builder::PayloadBuilderCtxBuilder;
 use flashblocks_builder::FlashblocksPayloadBuilder;
-use flashblocks_provider::InMemoryState;
 use op_alloy_consensus::OpTxEnvelope;
 use reth::builder::components::PayloadBuilderBuilder;
 use reth::builder::{BuilderContext, FullNodeTypes};
@@ -11,7 +10,6 @@ use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_node::txpool::OpPooledTx;
 use reth_optimism_node::{OpBuiltPayload, OpEvmConfig, OpPayloadBuilderAttributes};
 use reth_optimism_payload_builder::config::{OpBuilderConfig, OpDAConfig};
-use reth_optimism_primitives::OpPrimitives;
 use reth_provider::{
     ChainSpecProvider, DatabaseProviderFactory, HeaderProvider, StateProviderFactory,
 };
@@ -49,7 +47,6 @@ where
         + ChainSpecProvider<ChainSpec = OpChainSpec>
         + Clone
         + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-        + InMemoryState<Primitives = OpPrimitives>
         + HeaderProvider<Header = alloy_consensus::Header>,
     Node::Types: NodeTypes<
         ChainSpec = OpChainSpec,

crates/flashblocks/node/src/payload_service.rs

@@ -5,7 +5,6 @@ use flashblocks_payload::generator::{
 };
 use flashblocks_payload::metrics::PayloadBuilderMetrics;
 use flashblocks_primitives::p2p::Authorization;
-use flashblocks_provider::InMemoryState;
 use reth::payload::{PayloadBuilderHandle, PayloadBuilderService};
 use reth_node_api::{FullNodeTypes, NodeTypes, PayloadTypes};
 use reth_node_builder::{
@@ -14,7 +13,6 @@ use reth_node_builder::{
 };
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_node::{OpBuiltPayload, OpPayloadBuilderAttributes};
-use reth_optimism_primitives::OpPrimitives;
 use reth_provider::{
     CanonStateSubscriptions, ChainSpecProvider, DatabaseProviderFactory, HeaderProvider,
     StateProviderFactory,
@@ -55,8 +53,7 @@ where
         + ChainSpecProvider<ChainSpec = OpChainSpec>
         + HeaderProvider<Header = alloy_consensus::Header>
         + Clone
-        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>
-        + InMemoryState<Primitives = OpPrimitives>,
+        + DatabaseProviderFactory<Provider: HeaderProvider<Header = alloy_consensus::Header>>,
     Node::Types: NodeTypes<
         ChainSpec = OpChainSpec,
         Payload: PayloadTypes<

crates/flashblocks/rpc/Cargo.toml

@@ -8,7 +8,6 @@ license.workspace = true
 [dependencies]
 # internal
 flashblocks-primitives.workspace = true
-flashblocks-provider.workspace = true
 
 # reth
 reth.workspace = true