Skip to content

Commit

Permalink
fix: remove kona-derive-alloy (#789)
Browse files Browse the repository at this point in the history
  • Loading branch information
refcell authored Nov 8, 2024
1 parent 534b32e commit 9efaa74
Show file tree
Hide file tree
Showing 20 changed files with 796 additions and 1,793 deletions.
525 changes: 356 additions & 169 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ kona-derive = { path = "crates/derive", version = "0.0.6", default-features = fa
kona-preimage = { path = "crates/preimage", version = "0.0.4", default-features = false }
kona-executor = { path = "crates/executor", version = "0.0.5", default-features = false }
kona-common-proc = { path = "crates/common-proc", version = "0.0.5", default-features = false }
kona-derive-alloy = { path = "crates/derive-alloy", version = "0.0.3", default-features = false }

# Alloy
alloy-rlp = { version = "0.3.9", default-features = false }
Expand Down
7 changes: 4 additions & 3 deletions bin/host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@ kona-client.workspace = true
kona-derive.workspace = true
kona-common.workspace = true
kona-preimage.workspace = true
kona-derive-alloy.workspace = true

# Alloy
alloy-rlp.workspace = true
alloy-eips.workspace = true
alloy-provider.workspace = true
alloy-eips = { workspace = true, features = ["kzg"] }
alloy-serde.workspace = true
alloy-provider = { workspace = true, features = ["reqwest"] }
alloy-consensus.workspace = true
alloy-rpc-client.workspace = true
alloy-transport-http.workspace = true
alloy-rpc-types = { workspace = true, features = ["eth"] }
alloy-primitives = { workspace = true, features = ["serde"] }
alloy-rpc-types-beacon.workspace = true

# Op Alloy
op-alloy-genesis = { workspace = true, features = ["std", "serde"] }
Expand Down
2 changes: 1 addition & 1 deletion bin/host/src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use crate::{
DiskKeyValueStore, LocalKeyValueStore, MemoryKeyValueStore, SharedKeyValueStore,
SplitKeyValueStore,
},
providers::{OnlineBeaconClient, OnlineBlobProvider},
util,
};
use alloy_primitives::B256;
Expand All @@ -14,7 +15,6 @@ use clap::{
builder::styling::{AnsiColor, Color, Style},
ArgAction, Parser,
};
use kona_derive_alloy::{OnlineBeaconClient, OnlineBlobProvider};
use op_alloy_genesis::RollupConfig;
use serde::Serialize;
use std::{path::PathBuf, sync::Arc};
Expand Down
7 changes: 5 additions & 2 deletions bin/host/src/fetcher/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
//! This module contains the [Fetcher] struct, which is responsible for fetching preimages from a
//! remote source.
use crate::{kv::KeyValueStore, util};
use crate::{
kv::KeyValueStore,
providers::{OnlineBeaconClient, OnlineBlobProvider},
util,
};
use alloy_consensus::{Header, TxEnvelope, EMPTY_ROOT_HASH};
use alloy_eips::{eip2718::Encodable2718, eip4844::FIELD_ELEMENTS_PER_BLOB, BlockId};
use alloy_primitives::{address, keccak256, Address, Bytes, B256};
Expand All @@ -13,7 +17,6 @@ use alloy_rpc_types::{
use anyhow::{anyhow, Result};
use kona_client::HintType;
use kona_derive::sources::IndexedBlobHash;
use kona_derive_alloy::{OnlineBeaconClient, OnlineBlobProvider};
use kona_preimage::{PreimageKey, PreimageKeyType};
use op_alloy_protocol::BlockInfo;
use std::sync::Arc;
Expand Down
1 change: 1 addition & 0 deletions bin/host/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub mod cli;
pub mod fetcher;
pub mod kv;
pub mod preimage;
pub mod providers;
pub mod server;
pub mod util;

Expand Down
File renamed without changes.
Loading

0 comments on commit 9efaa74

Please sign in to comment.