Skip to content

Commit

Permalink
fix: run zepter checks for features of non-workspace dependencies (#2144
Browse files Browse the repository at this point in the history
)

* fix: run zepter for non-workspace dependencies

* bump either

* zepter

* fix
  • Loading branch information
klkvr authored Mar 5, 2025
1 parent 6565ba7 commit 04ab8d6
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 29 deletions.
5 changes: 3 additions & 2 deletions .config/zepter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ workflows:
"--left-side-feature-missing=ignore",
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
"--left-side-outside-workspace=ignore",
# limit to the workspace
"--workspace",
# Only check normal dependencies.
# Propagating to dev-dependencies leads to compilation issues: https://github.com/alloy-rs/alloy/pull/2144#issuecomment-2702291349
"--dep-kinds=normal:check,dev:ignore",
"--show-path",
"--quiet",
]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ base64 = "0.22"
bimap = "0.6"
cfg-if = "1"
derive_more = { version = "2", default-features = false }
either = { version = "1.13", default-features = false }
either = { version = "1.15", default-features = false }
home = "0.5"
http = "1.1.0"
itertools = { version = ">=0.13, <=0.14", default-features = false }
Expand Down
5 changes: 4 additions & 1 deletion crates/consensus-any/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ default = ["std"]
std = [
"alloy-eips/std",
"alloy-consensus/std",
"alloy-serde?/std"
"alloy-serde?/std",
"alloy-primitives/std",
"alloy-rlp/std",
"serde?/std"
]
arbitrary = ["std", "dep:arbitrary", "alloy-eips/arbitrary"]
serde = [
Expand Down
32 changes: 25 additions & 7 deletions crates/consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ derive_more = { workspace = true, features = [
], default-features = false }
auto_impl.workspace = true
thiserror.workspace = true
either = { workspace = true }
either.workspace = true

[dev-dependencies]
alloy-eips = { workspace = true, features = ["arbitrary"] }
Expand All @@ -67,15 +67,33 @@ tokio = { workspace = true, features = ["macros"] }

[features]
default = ["std"]
std = ["alloy-eips/std", "c-kzg?/std", "alloy-serde?/std"]
std = [
"alloy-eips/std",
"c-kzg?/std",
"alloy-serde?/std",
"alloy-primitives/std",
"alloy-rlp/std",
"alloy-trie/std",
"derive_more/std",
"k256?/std",
"serde?/std",
"serde_json/std",
"serde_with?/std",
"thiserror/std",
"either/std"
]
k256 = ["dep:k256", "alloy-primitives/k256", "alloy-eips/k256"]
kzg = ["dep:c-kzg", "alloy-eips/kzg", "std"]
arbitrary = ["std", "dep:rand", "dep:arbitrary", "alloy-eips/arbitrary"]
serde = [
"dep:serde",
"alloy-primitives/serde",
"dep:alloy-serde",
"alloy-eips/serde",
"alloy-trie/serde",
"dep:serde",
"alloy-primitives/serde",
"dep:alloy-serde",
"alloy-eips/serde",
"alloy-trie/serde",
"c-kzg?/serde",
"either/serde",
"k256?/serde",
"rand?/serde"
]
serde-bincode-compat = ["alloy-eips/serde-bincode-compat", "serde_with"]
34 changes: 22 additions & 12 deletions crates/eips/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,30 @@ rand.workspace = true
[features]
default = ["std", "kzg-sidecar"]
std = [
"alloy-primitives/std",
"alloy-rlp/std",
"serde?/std",
"c-kzg?/std",
"once_cell?/std",
"alloy-serde?/std",
"alloy-primitives/std",
"alloy-rlp/std",
"serde?/std",
"c-kzg?/std",
"once_cell?/std",
"alloy-serde?/std",
"alloy-eip2124/std",
"alloy-eip2930/std",
"alloy-eip7702/std",
"derive_more/std",
"serde_json/std",
"sha2?/std",
"either/std"
]
serde = [
"dep:alloy-serde",
"dep:serde",
"alloy-primitives/serde",
"c-kzg?/serde",
"alloy-eip2930/serde",
"alloy-eip7702/serde",
"dep:alloy-serde",
"dep:serde",
"alloy-primitives/serde",
"c-kzg?/serde",
"alloy-eip2930/serde",
"alloy-eip7702/serde",
"alloy-eip2124/serde",
"either/serde",
"rand/serde"
]
serde-bincode-compat = ["alloy-eip7702/serde-bincode-compat"]
kzg = ["kzg-sidecar", "sha2", "dep:c-kzg", "dep:once_cell"]
Expand Down
3 changes: 2 additions & 1 deletion crates/genesis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ std = [
"alloy-serde/std",
"serde/std",
"alloy-trie/std",
"alloy-eips/std"
"alloy-eips/std",
"serde_json/std"
]
3 changes: 2 additions & 1 deletion crates/network-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ std = [
"alloy-primitives/std",
"alloy-consensus/std",
"alloy-eips/std",
"alloy-serde/std"
"alloy-serde/std",
"serde/std"
]
10 changes: 8 additions & 2 deletions crates/rpc-types-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,19 @@ std = [
"derive_more/std",
"strum/std",
"alloy-eips/std",
"alloy-serde?/std"
"alloy-serde?/std",
"alloy-primitives/std",
"alloy-rlp/std",
"serde?/std",
"serde_json/std"
]
serde = [
"dep:serde",
"dep:alloy-serde",
"alloy-consensus/serde",
"alloy-eips/serde"
"alloy-eips/serde",
"alloy-primitives/serde",
"rand?/serde",
]
jwt = ["std", "dep:jsonwebtoken", "dep:rand"]
jsonrpsee-types = ["dep:jsonrpsee-types"]
Expand Down
10 changes: 8 additions & 2 deletions crates/rpc-types-eth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ std = [
"alloy-eips/std",
"alloy-consensus-any/std",
"alloy-network-primitives/std",
"alloy-serde?/std"
"alloy-serde?/std",
"alloy-rlp/std",
"alloy-sol-types/std",
"serde?/std",
"serde_json?/std",
"thiserror/std"
]
serde = [
"dep:serde",
Expand All @@ -77,7 +82,8 @@ serde = [
"alloy-primitives/serde",
"alloy-consensus/serde",
"alloy-eips/serde",
"alloy-consensus-any/serde"
"alloy-consensus-any/serde",
"rand/serde",
]
arbitrary = [
"std",
Expand Down

0 comments on commit 04ab8d6

Please sign in to comment.