rm new crate

Cargo.toml

@@ -74,7 +74,6 @@ kona-proof-interop = { path = "crates/proof-sdk/proof-interop", version = "0.1.1
 kona-std-fpvm = { path = "crates/proof-sdk/std-fpvm", version = "0.1.2", default-features = false }
 kona-preimage = { path = "crates/proof-sdk/preimage", version = "0.2.1", default-features = false }
 kona-std-fpvm-proc = { path = "crates/proof-sdk/std-fpvm-proc", version = "0.1.2", default-features = false }
-kona-preimage-server = { path = "crates/proof-sdk/preimage-server", version = "0.1.0", default-features = false }
 
 # Maili
 maili-consensus = { version = "0.1.6", default-features = false }

bin/host/Cargo.toml

@@ -20,7 +20,6 @@ kona-preimage = { workspace = true, features = ["std"] }
 kona-proof = { workspace = true, features = ["std"] }
 kona-proof-interop.workspace = true
 kona-client.workspace = true
-kona-preimage-server.workspace = true
 
 # Maili
 maili-protocol = { workspace = true, features = ["std", "serde"] }
@@ -51,6 +50,7 @@ tracing.workspace = true
 reqwest.workspace = true
 serde_json.workspace = true
 async-trait.workspace = true
+rocksdb.workspace = true
 tokio = { workspace = true, features = ["full"] }
 serde = { workspace = true, features = ["derive"] }
 clap = { workspace = true, features = ["derive", "env"] }

bin/host/src/interop/fetcher.rs

@@ -18,11 +18,11 @@ use alloy_rpc_types::{
 };
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
+use kona_host::KeyValueStore;
 use kona_preimage::{
     errors::{PreimageOracleError, PreimageOracleResult},
     HintRouter, PreimageFetcher, PreimageKey, PreimageKeyType,
 };
-use kona_preimage_server::KeyValueStore;
 use kona_proof_interop::{Hint, HintType, PreState};
 use maili_protocol::BlockInfo;
 use maili_registry::ROLLUP_CONFIGS;

bin/host/src/interop/local_kv.rs

@@ -4,8 +4,8 @@
 use super::InteropHostCli;
 use alloy_primitives::{keccak256, B256};
 use anyhow::Result;
+use kona_host::KeyValueStore;
 use kona_preimage::PreimageKey;
-use kona_preimage_server::KeyValueStore;
 use kona_proof_interop::boot::{
     L1_HEAD_KEY, L2_AGREED_PRE_STATE_KEY, L2_CHAIN_ID_KEY, L2_CLAIMED_POST_STATE_KEY,
     L2_CLAIMED_TIMESTAMP_KEY, L2_ROLLUP_CONFIG_KEY,

bin/host/src/interop/orchestrator.rs

@@ -1,17 +1,15 @@
 //! [SingleChainHostCli]'s [HostOrchestrator] + [DetachedHostOrchestrator] implementations.
 
 use super::{InteropFetcher, InteropHostCli, LocalKeyValueStore};
-use crate::{
-    eth::{http_provider, OnlineBlobProvider},
-    orchestrator::{DetachedHostOrchestrator, HostOrchestrator},
-};
+use crate::eth::{http_provider, OnlineBlobProvider};
 use alloy_provider::{Provider, ReqwestProvider};
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
-use kona_preimage::{HintWriter, NativeChannel, OracleReader};
-use kona_preimage_server::{
-    DiskKeyValueStore, Fetcher, MemoryKeyValueStore, SharedKeyValueStore, SplitKeyValueStore,
+use kona_host::{
+    DetachedHostOrchestrator, DiskKeyValueStore, Fetcher, HostOrchestrator, MemoryKeyValueStore,
+    SharedKeyValueStore, SplitKeyValueStore,
 };
+use kona_preimage::{HintWriter, NativeChannel, OracleReader};
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::RwLock;
 

bin/host/src/lib.rs

@@ -3,3 +3,19 @@
 
 mod orchestrator;
 pub use orchestrator::{DetachedHostOrchestrator, HostOrchestrator};
+
+mod fetcher;
+pub use fetcher::Fetcher;
+
+mod kv;
+pub use kv::{
+    DiskKeyValueStore, KeyValueStore, MemoryKeyValueStore, SharedKeyValueStore, SplitKeyValueStore,
+};
+
+mod preimage;
+pub use preimage::{
+    OfflineHintRouter, OfflinePreimageFetcher, OnlineHintRouter, OnlinePreimageFetcher,
+};
+
+mod server;
+pub use server::PreimageServer;

bin/host/src/main.rs

@@ -7,13 +7,12 @@
 use crate::cli::{init_tracing_subscriber, HostCli, HostMode};
 use anyhow::Result;
 use clap::Parser;
-use orchestrator::DetachedHostOrchestrator;
+use kona_host::DetachedHostOrchestrator;
 use tracing::info;
 
 pub mod cli;
 pub mod eth;
 pub mod interop;
-pub mod orchestrator;
 pub mod single;
 
 #[tokio::main(flavor = "multi_thread")]

bin/host/src/orchestrator.rs

@@ -1,12 +1,12 @@
 //! Contains the [HostOrchestrator] trait, which defines entry points for the host to run a given
 //! module.
 
+use crate::{Fetcher, PreimageServer, SharedKeyValueStore};
 use anyhow::Result;
 use async_trait::async_trait;
 use kona_preimage::{
     BidirectionalChannel, HintReader, HintWriter, NativeChannel, OracleReader, OracleServer,
 };
-use kona_preimage_server::{Fetcher, PreimageServer, SharedKeyValueStore};
 use kona_std_fpvm::{FileChannel, FileDescriptor};
 use std::sync::Arc;
 use tokio::{sync::RwLock, task};
@@ -46,7 +46,7 @@ pub trait HostOrchestrator {
 
     /// Constructs the [KeyValueStore] for the host.
     ///
-    /// [KeyValueStore]: kona_preimage_server::KeyValueStore
+    /// [KeyValueStore]: crate::KeyValueStore
     fn create_key_value_store(&self) -> Result<SharedKeyValueStore>;
 
     /// Creates a [Fetcher] for the host program's preimage server.

bin/host/src/single/fetcher.rs

@@ -16,11 +16,11 @@ use alloy_rpc_types::{
     Transaction,
 };
 use anyhow::{anyhow, Result};
+use kona_host::KeyValueStore;
 use kona_preimage::{
     errors::{PreimageOracleError, PreimageOracleResult},
     HintRouter, PreimageFetcher, PreimageKey, PreimageKeyType,
 };
-use kona_preimage_server::KeyValueStore;
 use kona_proof::{Hint, HintType};
 use maili_protocol::BlockInfo;
 use op_alloy_rpc_types_engine::OpPayloadAttributes;

bin/host/src/single/local_kv.rs

@@ -4,8 +4,8 @@
 use super::SingleChainHostCli;
 use alloy_primitives::B256;
 use anyhow::Result;
+use kona_host::KeyValueStore;
 use kona_preimage::PreimageKey;
-use kona_preimage_server::KeyValueStore;
 use kona_proof::boot::{
     L1_HEAD_KEY, L2_CHAIN_ID_KEY, L2_CLAIM_BLOCK_NUMBER_KEY, L2_CLAIM_KEY, L2_OUTPUT_ROOT_KEY,
     L2_ROLLUP_CONFIG_KEY,

bin/host/src/single/orchestrator.rs

@@ -1,17 +1,15 @@
 //! [SingleChainHostCli]'s [HostOrchestrator] + [DetachedHostOrchestrator] implementations.
 
 use super::{LocalKeyValueStore, SingleChainFetcher, SingleChainHostCli};
-use crate::{
-    eth::{http_provider, OnlineBlobProvider},
-    orchestrator::{DetachedHostOrchestrator, HostOrchestrator},
-};
+use crate::eth::{http_provider, OnlineBlobProvider};
 use alloy_provider::ReqwestProvider;
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
-use kona_preimage::{HintWriter, NativeChannel, OracleReader};
-use kona_preimage_server::{
-    DiskKeyValueStore, Fetcher, MemoryKeyValueStore, SharedKeyValueStore, SplitKeyValueStore,
+use kona_host::{
+    DetachedHostOrchestrator, DiskKeyValueStore, Fetcher, HostOrchestrator, MemoryKeyValueStore,
+    SharedKeyValueStore, SplitKeyValueStore,
 };
+use kona_preimage::{HintWriter, NativeChannel, OracleReader};
 use std::sync::Arc;
 use tokio::sync::RwLock;
 

build/asterisc/asterisc-repro.dockerfile

@@ -46,7 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git
 
 # Build kona-client on the selected tag
 RUN git checkout $CLIENT_TAG && \
-  cargo build -Zbuild-std=core,alloc --workspace --bin kona --locked --profile release-client-lto --exclude kona-preimage-server --exclude kona-host && \
+  cargo build -Zbuild-std=core,alloc --workspace --bin kona --locked --profile release-client-lto --exclude kona-host && \
   mv ./target/riscv64imac-unknown-none-elf/release-client-lto/kona /kona-client-elf
 
 ################################################################

justfile

@@ -105,7 +105,7 @@ build-cannon *args='':
     --platform linux/amd64 \
     -v `pwd`/:/workdir \
     -w="/workdir" \
-    ghcr.io/op-rs/kona/cannon-builder:main cargo build --workspace -Zbuild-std=core,alloc $@ --exclude kona-preimage-server --exclude kona-host
+    ghcr.io/op-rs/kona/cannon-builder:main cargo build --workspace -Zbuild-std=core,alloc $@ --exclude kona-host
 
 # Build for the `asterisc` target. Any crates that require the stdlib are excluded from the build for this target.
 build-asterisc *args='':
@@ -114,7 +114,7 @@ build-asterisc *args='':
     --platform linux/amd64 \
     -v `pwd`/:/workdir \
     -w="/workdir" \
-    ghcr.io/op-rs/kona/asterisc-builder:main cargo build --workspace -Zbuild-std=core,alloc $@ --exclude kona-preimage-server --exclude kona-host
+    ghcr.io/op-rs/kona/asterisc-builder:main cargo build --workspace -Zbuild-std=core,alloc $@ --exclude kona-host
 
 # Build the `kona-client` prestate artifacts for the latest release.
 build-client-prestate-asterisc-artifacts kona_tag asterisc_tag out='./prestate-artifacts-asterisc':