From 2206cde65df13978ff5a238ceb0d4bcbc6aab7ce Mon Sep 17 00:00:00 2001 From: refcell Date: Fri, 30 Aug 2024 12:07:25 -0400 Subject: [PATCH] feat(workspace): Workspace Re-exports (#468) * feat(workspace): re-exports * run actions --- Cargo.toml | 14 ++++++++++++-- bin/client/Cargo.toml | 14 +++++++------- bin/host/Cargo.toml | 14 +++++++------- crates/common-proc/Cargo.toml | 2 +- crates/derive/Cargo.toml | 2 +- crates/executor/Cargo.toml | 4 ++-- crates/preimage/Cargo.toml | 2 +- examples/trusted-sync/Cargo.toml | 4 ++-- 8 files changed, 33 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0482cf7a7..0794f8ee9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,6 +36,16 @@ codegen-units = 1 lto = "fat" [workspace.dependencies] +# Workspace +kona-client = { path = "bin/client", version = "0.1.0" } +kona-mpt = { path = "crates/mpt", version = "0.0.2" } +kona-common = { path = "crates/common", version = "0.0.2" } +kona-preimage = { path = "crates/preimage", version = "0.0.2" } +kona-executor = { path = "crates/executor", version = "0.0.1" } +kona-common-proc = { path = "crates/common-proc", version = "0.0.2" } +kona-derive = { path = "crates/derive", version = "0.0.2", default-feature = false } +kona-primitives = { path = "crates/primitives", version = "0.0.1", default-feature = false } + # General anyhow = { version = "1.0.86", default-features = false } tracing = { version = "0.1.40", default-features = false } @@ -84,15 +94,15 @@ superchain = "0.3.1" superchain-primitives = { version = "0.3.1", default-features = false } # Alloy +alloy-rlp = { version = "0.3.5", default-features = false } alloy-trie = { version = "0.4.1", default-features = false } alloy-provider = { version = "0.2", default-features = false } alloy-primitives = { version = "0.7.7", default-features = false } -alloy-rlp = { version = "0.3.5", default-features = false } alloy-rpc-types = { version = "0.2" } -alloy-consensus = { version = "0.2", default-features = false } alloy-transport = { version = "0.2", default-features = false } alloy-transport-http = { version = "0.2" } alloy-eips = { version = "0.2", default-features = false } alloy-node-bindings = { version = "0.2", default-features = false } alloy-rpc-client = { version = "0.2", default-features = false } +alloy-consensus = { version = "0.2", default-features = false } op-alloy-consensus = { version = "0.1.4", default-features = false } diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml index e7f9423b3..b1718e57d 100644 --- a/bin/client/Cargo.toml +++ b/bin/client/Cargo.toml @@ -10,13 +10,13 @@ publish = false [dependencies] # Workspace -kona-common = { path = "../../crates/common", version = "0.0.2" } -kona-common-proc = { path = "../../crates/common-proc", version = "0.0.2" } -kona-preimage = { path = "../../crates/preimage", version = "0.0.2" } -kona-mpt = { path = "../../crates/mpt", version = "0.0.2" } -kona-derive = { path = "../../crates/derive", default-features = false, version = "0.0.2" } -kona-executor = { path = "../../crates/executor", version = "0.0.1" } -kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["serde"] } +kona-common.workspace = true +kona-common-proc.workspace = true +kona-preimage.workspace = true +kona-mpt.workspace = true +kona-derive.workspace = true +kona-executor.workspace = true +kona-primitives = { workspace = true, features = ["serde"] } # Revm + Alloy revm.workspace = true diff --git a/bin/host/Cargo.toml b/bin/host/Cargo.toml index 6213d7ad7..9424bd8fb 100644 --- a/bin/host/Cargo.toml +++ b/bin/host/Cargo.toml @@ -10,22 +10,22 @@ publish = false [dependencies] # Workspace -kona-client = { path = "../client", version = "0.1.0" } -kona-common = { path = "../../crates/common", version = "0.0.2" } -kona-preimage = { path = "../../crates/preimage", version = "0.0.2" } -kona-mpt = { path = "../../crates/mpt", version = "0.0.2" } -kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["online"] } -kona-derive = { path = "../../crates/derive", version = "0.0.2", features = ["online"] } +kona-mpt.workspace = true +kona-client.workspace = true +kona-common.workspace = true +kona-preimage.workspace = true +kona-derive = { workspace = true, features = ["online"] } +kona-primitives = { workspace = true, features = ["online"] } # Alloy & Revm alloy-eips.workspace = true alloy-consensus.workspace = true alloy-rlp.workspace = true -alloy-primitives = { workspace = true, features = ["serde"] } alloy-provider.workspace = true alloy-transport-http.workspace = true alloy-rpc-client.workspace = true alloy-rpc-types.workspace = true +alloy-primitives = { workspace = true, features = ["serde"] } revm = { workspace = true, features = ["std", "c-kzg", "secp256k1", "portable", "blst"] } # General diff --git a/crates/common-proc/Cargo.toml b/crates/common-proc/Cargo.toml index 9f605cc9e..54ea12d48 100644 --- a/crates/common-proc/Cargo.toml +++ b/crates/common-proc/Cargo.toml @@ -17,7 +17,7 @@ anyhow.workspace = true cfg-if.workspace = true # Workspace -kona-common = { path = "../common", version = "0.0.2" } +kona-common.workspace = true # Proc Macros syn = { version = "2.0", features = ["full"] } diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml index 1efe5ea69..7152feb67 100644 --- a/crates/derive/Cargo.toml +++ b/crates/derive/Cargo.toml @@ -28,7 +28,7 @@ tracing.workspace = true async-trait.workspace = true # Workspace -kona-primitives = { path = "../primitives", version = "0.0.1", default-features = false } +kona-primitives.workspace = true # `serde` feature dependencies serde = { workspace = true, optional = true } diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml index 18173f8cf..e1629345b 100644 --- a/crates/executor/Cargo.toml +++ b/crates/executor/Cargo.toml @@ -19,8 +19,8 @@ op-alloy-consensus.workspace = true revm = { workspace = true, features = ["optimism"] } # Workspace -kona-mpt = { path = "../mpt", version = "0.0.2" } -kona-primitives = { path = "../primitives", version = "0.0.1", default-features = false } +kona-mpt.workspace = true +kona-primitives.workspace = true [dev-dependencies] alloy-rlp.workspace = true diff --git a/crates/preimage/Cargo.toml b/crates/preimage/Cargo.toml index 20f8e1ea5..8ae32876e 100644 --- a/crates/preimage/Cargo.toml +++ b/crates/preimage/Cargo.toml @@ -16,7 +16,7 @@ alloy-primitives.workspace = true async-trait.workspace = true # Workspace -kona-common = { path = "../common", version = "0.0.2" } +kona-common.workspace = true # `rkyv` feature dependencies rkyv = { workspace = true, optional = true } diff --git a/examples/trusted-sync/Cargo.toml b/examples/trusted-sync/Cargo.toml index 23aad43b6..9f8db5ec8 100644 --- a/examples/trusted-sync/Cargo.toml +++ b/examples/trusted-sync/Cargo.toml @@ -11,8 +11,8 @@ homepage.workspace = true [dependencies] # Workspace -kona-primitives = { path = "../../crates/primitives", version = "0.0.1", features = ["serde"] } -kona-derive = { path = "../../crates/derive", version = "0.0.2", features = ["serde", "online", "metrics"] } +kona-primitives = { workspace = true, features = ["serde"] } +kona-derive = { workspace = true, features = ["serde", "online", "metrics"] } # General anyhow.workspace = true