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

build(core): fix use of c-kzg flag and cleanup dependencies #1927

Merged
merged 9 commits into from
Feb 13, 2025
Merged

build(core): fix use of c-kzg flag and cleanup dependencies #1927

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f1543f9
build(core): only cargo build ethrex by default.
mpaulucci Feb 12, 2025
a8b5787
Make sure loc is compiled.
mpaulucci Feb 12, 2025
9dc9cc5
Merge branch 'main' of github.com:lambdaclass/lambda_ethereum_rust in…
mpaulucci Feb 12, 2025
be6b51c
Add dependencies to workspace.
mpaulucci Feb 12, 2025
36e7ce1
Test fixing prover.
mpaulucci Feb 12, 2025
da83e6f
When using vm dependency, use the workspace one.
mpaulucci Feb 12, 2025
d1caef4
Merge branch 'main' of github.com:lambdaclass/lambda_ethereum_rust in…
mpaulucci Feb 12, 2025
5e52e6c
Disable `blst` by default.
mpaulucci Feb 13, 2025
2aafb9b
Merge branch 'main' of github.com:lambdaclass/lambda_ethereum_rust in…
mpaulucci Feb 13, 2025
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
26 changes: 13 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
[workspace]
members = [
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reorder alphabetically

"cmd/ef_tests/blockchain",
"cmd/ef_tests/state",
"cmd/ethrex",
"cmd/ethrex_l2",
"cmd/hive_report",
"cmd/loc",
"crates/blockchain",
"crates/blockchain/dev",
"crates/common",
"crates/common/rlp",
"crates/l2/",
"crates/l2/contracts",
"crates/l2/prover",
"crates/l2/sdk",
"crates/networking/p2p",
"crates/networking/rpc",
"crates/storage/store",
"crates/vm",
"crates/storage/trie",
"crates/common/rlp",
"cmd/ethrex",
"cmd/ef_tests/blockchain",
"cmd/ef_tests/state",
"cmd/ethrex_l2",
"cmd/hive_report",
"crates/vm",
"crates/vm/levm",
"crates/vm/levm/bench/revm_comparison",
"crates/l2/",
"crates/l2/prover",
"crates/l2/contracts",
"crates/l2/sdk",
"cmd/loc",
]
resolver = "2"

default-members = ["cmd/ethrex", "cmd/ethrex_l2", "crates/l2/prover", "cmd/loc"]
default-members = ["cmd/ethrex"]

[workspace.package]
version = "0.1.0"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ loc-stats:
fi

loc-detailed:
cargo run --release --bin loc -- --detailed
cargo run --release -p loc --bin loc -- --detailed

loc-compare-detailed:
cargo run --release --bin loc -- --compare-detailed
cargo run --release -p loc --bin loc -- --compare-detailed

hive-stats:
make hive QUIET=true
Expand Down
1 change: 1 addition & 0 deletions cmd/ef_tests/blockchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ethrex-common.workspace = true
ethrex-storage.workspace = true
ethrex-rlp.workspace = true
ethrex-vm.workspace = true

serde.workspace = true
serde_json.workspace = true
bytes.workspace = true
Expand Down
5 changes: 3 additions & 2 deletions cmd/ef_tests/state/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ version.workspace = true
edition.workspace = true

[dependencies]
ethrex-blockchain = { workspace = true }
ethrex-blockchain.workspace = true
ethrex-common.workspace = true
ethrex-storage.workspace = true
ethrex-rlp.workspace = true
ethrex-vm = { workspace = true }
ethrex-vm = { path = "../../../crates/vm" }
ethrex-levm = { path = "../../../crates/vm/levm" }

serde.workspace = true
serde_json.workspace = true
bytes.workspace = true
Expand Down
16 changes: 8 additions & 8 deletions cmd/ethrex_l2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ version.workspace = true
edition.workspace = true

[dependencies]
ethrex-l2.workspace = true
ethrex-sdk.workspace = true
ethrex-common.workspace = true
ethrex-blockchain.workspace = true
ethrex-prover.workspace = true
ethrex-rlp.workspace = true
ethrex-rpc.workspace = true

serde_json.workspace = true
serde.workspace = true
bytes.workspace = true
Expand All @@ -26,14 +34,6 @@ strum = "0.26.3"
secp256k1.workspace = true
keccak-hash.workspace = true

ethrex-l2.workspace = true
ethrex-sdk.workspace = true
ethrex-common.workspace = true
ethrex-blockchain.workspace = true
ethrex-prover.workspace = true
ethrex-rlp.workspace = true
ethrex-rpc.workspace = true

[[bin]]
name = "ethrex_l2"
path = "./src/main.rs"
10 changes: 6 additions & 4 deletions crates/blockchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ethrex-rlp.workspace = true
ethrex-common.workspace = true
ethrex-storage.workspace = true
ethrex-vm = { path = "../vm", default-features = false }
ethrex-levm = { path = "../vm/levm", default-features = false }

thiserror.workspace = true
sha3.workspace = true
tracing.workspace = true
bytes.workspace = true
cfg-if = "1.0.0"

ethrex-rlp.workspace = true
ethrex-common = { path = "../common", default-features = false }
ethrex-storage = { path = "../storage/store", default-features = false }
ethrex-vm = { path = "../vm", default-features = false }


k256 = { version = "0.13.3", features = ["ecdh"] }

Expand Down
2 changes: 1 addition & 1 deletion crates/blockchain/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ thiserror.workspace = true
serde_json.workspace = true
serde.workspace = true

ethrex-common = { path = "../../common", default-features = false }
ethrex-common.workspace = true


prometheus = { version = "0.13.4", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"

[dependencies]
ethrex-rlp.workspace = true
ethrex-trie = { path = "../storage/trie", default-features = false }
ethrex-trie.workspace = true

tracing.workspace = true
tinyvec = "1.6.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/storage/store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ edition = "2021"

[dependencies]
ethrex-rlp.workspace = true
ethrex-common = { path = "../../common", default-features = false }
ethrex-trie = { path = "../../storage/trie", default-features = false }
ethrex-common.workspace = true
ethrex-trie.workspace = true

ethereum-types.workspace = true
anyhow = "1.0.86"
Expand Down
9 changes: 5 additions & 4 deletions crates/vm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ version = "0.1.0"
edition = "2021"

[dependencies]
ethrex-common = { path = "../common", default-features = false }
ethrex-storage = { path = "../storage/store", default-features = false }
ethrex-common.workspace = true
ethrex-storage.workspace = true
ethrex-levm = { path = "./levm", default-features = false }
ethrex-trie = { path = "../storage/trie", default-features = false }
ethrex-rlp = { path = "../common/rlp", default-features = false }
ethrex-trie.workspace = true
ethrex-rlp.workspace = true

revm = { version = "18.0.0", features = [
"serde",
"std",
Expand Down
2 changes: 1 addition & 1 deletion crates/vm/levm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
edition.workspace = true

[dependencies]
ethrex-common = { path = "../../common", default-features = false }
ethrex-common.workspace = true
ethrex-rlp.workspace = true
revm-primitives = { version = "14.0.0", features = [
"std",
Expand Down
Loading