Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump core and rm ssz feat #1167

Merged
merged 5 commits into from
Aug 27, 2024
Merged

chore: bump core and rm ssz feat #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
579eb97
chore: bump core and rm ssz feat
yash-atreya Aug 21, 2024
b4741fb
bump ethereum_ssz
yash-atreya Aug 21, 2024
7a7d3bb
feat ssz in meta
yash-atreya Aug 21, 2024
16c5eb6
bump ethereum_ssz
yash-atreya Aug 23, 2024
36ad228
enable alloy-eips/ssz from rpc-types-engine
yash-atreya Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ alloy-transport-http = { version = "0.2", path = "crates/transport-http", defaul
alloy-transport-ipc = { version = "0.2", path = "crates/transport-ipc", default-features = false }
alloy-transport-ws = { version = "0.2", path = "crates/transport-ws", default-features = false }

alloy-core = { version = "0.7.7", default-features = false }
alloy-dyn-abi = { version = "0.7.7", default-features = false }
alloy-json-abi = { version = "0.7.7", default-features = false }
alloy-primitives = { version = "0.7.7", default-features = false }
alloy-sol-types = { version = "0.7.7", default-features = false }
alloy-core = { version = "0.8.0", default-features = false }
alloy-dyn-abi = { version = "0.8.0", default-features = false }
alloy-json-abi = { version = "0.8.0", default-features = false }
alloy-primitives = { version = "0.8.0", default-features = false }
alloy-sol-types = { version = "0.8.0", default-features = false }

alloy-rlp = { version = "0.3", default-features = false }

alloy-chains = { version = "0.1.18", default-features = false }

# ethereum
ethereum_ssz_derive = "0.5"
ethereum_ssz = "0.5"
ethereum_ssz_derive = "0.7.1"
ethereum_ssz = "0.7.1"

# crypto
c-kzg = { version = "1.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/alloy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ getrandom = ["alloy-core/getrandom"]
rand = ["alloy-core/rand"]
rlp = ["alloy-core/rlp"]
serde = ["alloy-core/serde", "alloy-eips?/serde", "dep:alloy-serde"]
ssz = ["alloy-core/ssz", "alloy-rpc-types?/ssz"]
yash-atreya marked this conversation as resolved.
Show resolved Hide resolved
ssz = ["alloy-rpc-types?/ssz"]
arbitrary = [
"alloy-core/arbitrary",
"alloy-consensus?/arbitrary",
Expand Down
29 changes: 24 additions & 5 deletions crates/eips/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ serde = { workspace = true, optional = true }

# kzg
c-kzg = { workspace = true, optional = true }
derive_more = { workspace = true, features = ["as_ref", "deref", "deref_mut"], optional = true }
derive_more = { workspace = true, features = [
"as_ref",
"deref",
"deref_mut",
], optional = true }
once_cell = { workspace = true, features = ["race", "alloc"], optional = true }
sha2 = { workspace = true, optional = true }

Expand All @@ -44,19 +48,34 @@ k256 = { workspace = true, optional = true }
rand = { workspace = true, optional = true }

[dev-dependencies]
alloy-primitives = { workspace = true, features = ["rand", "serde", "arbitrary"] }
alloy-primitives = { workspace = true, features = [
"rand",
"serde",
"arbitrary",
] }
arbitrary = { workspace = true, features = ["derive"] }
serde_json.workspace = true

[features]
default = ["std", "kzg-sidecar"]
std = ["alloy-primitives/std", "alloy-rlp/std", "serde?/std", "c-kzg?/std", "once_cell?/std"]
serde = ["dep:alloy-serde", "dep:serde", "alloy-primitives/serde", "c-kzg?/serde"]
std = [
"alloy-primitives/std",
"alloy-rlp/std",
"serde?/std",
"c-kzg?/std",
"once_cell?/std",
]
serde = [
"dep:alloy-serde",
"dep:serde",
"alloy-primitives/serde",
"c-kzg?/serde",
]
kzg = ["kzg-sidecar", "sha2", "dep:derive_more", "dep:c-kzg", "dep:once_cell"]
kzg-sidecar = ["sha2"]
sha2 = ["dep:sha2"]
k256 = ["alloy-primitives/k256", "dep:k256"]
ssz = ["std", "dep:ethereum_ssz", "dep:ethereum_ssz_derive", "alloy-primitives/ssz"]
ssz = ["std", "dep:ethereum_ssz", "dep:ethereum_ssz_derive"]
arbitrary = [
"std",
"kzg-sidecar",
Expand Down
1 change: 0 additions & 1 deletion crates/rpc-types-beacon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ serde_json.workspace = true
ssz = [
"dep:ethereum_ssz",
"dep:ethereum_ssz_derive",
"alloy-primitives/ssz",
"alloy-rpc-types-engine/ssz",
]
7 changes: 1 addition & 6 deletions crates/rpc-types-engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,7 @@ rand = { workspace = true, optional = true }
default = ["jwt"]
jwt = ["dep:jsonwebtoken", "dep:rand"]
jsonrpsee-types = ["dep:jsonrpsee-types"]
ssz = [
"dep:ethereum_ssz",
"dep:ethereum_ssz_derive",
"alloy-primitives/ssz",
"alloy-eips/ssz",
]
ssz = ["dep:ethereum_ssz", "dep:ethereum_ssz_derive", "alloy-eips/ssz"]
kzg = ["alloy-consensus/kzg"]

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion crates/rpc-types-eth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,4 @@ arbitrary = [
"alloy-eips/k256",
]
jsonrpsee-types = ["dep:jsonrpsee-types"]
ssz = ["alloy-primitives/ssz", "alloy-eips/ssz"]
k256 = ["alloy-consensus/k256", "alloy-eips/k256"]
8 changes: 2 additions & 6 deletions crates/rpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ alloy-rpc-types-eth = { workspace = true, optional = true }
alloy-rpc-types-mev = { workspace = true, optional = true }
alloy-rpc-types-trace = { workspace = true, optional = true }
alloy-rpc-types-txpool = { workspace = true, optional = true }
serde = { workspace = true, features = ["derive", "std"]}
serde = { workspace = true, features = ["derive", "std"] }

[dev-dependencies]
serde_json.workspace = true
Expand All @@ -49,10 +49,6 @@ jsonrpsee-types = [
"alloy-rpc-types-eth?/jsonrpsee-types",
"alloy-rpc-types-engine?/jsonrpsee-types",
]
ssz = [
"alloy-rpc-types-beacon?/ssz",
"alloy-rpc-types-engine?/ssz",
"alloy-rpc-types-eth?/ssz",
]
ssz = ["alloy-rpc-types-beacon?/ssz", "alloy-rpc-types-engine?/ssz"]
k256 = ["alloy-rpc-types-eth?/k256"]
kzg = ["alloy-rpc-types-engine?/kzg"]