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

Modifications to be able to run cargo test on Reth primitives crate #2

Open
wants to merge 3 commits into
base: 1.1.1-delendum
Choose a base branch
from
Open

Modifications to be able to run cargo test on Reth primitives crate #2

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f34e88
Dependency modifications required to run cargo test on reth-primitives
lewis1revill Dec 4, 2024
b221ce8
Add runner to cargo config for valida
lewis1revill Dec 10, 2024
ec24d78
Add io.o file to config.toml
lewis1revill Dec 19, 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
19 changes: 19 additions & 0 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,22 @@ rustflags = [
# in line with Linux (whereas default for Windows is 1MB)
"-Clink-arg=/STACK:10000000",
]


[build]
target = "valida-unknown-baremetal-gnu"

[target.valida-unknown-baremetal-gnu]
runner = "/valida-toolchain/valida-runner.sh"
linker = "/valida-toolchain/bin/ld.lld"
rustflags = [
"-C", "link-arg=/valida-toolchain/ValidaEntryPoint.o",
Copy link

Choose a reason for hiding this comment

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

Missing io.o. That's not reported because of --noinhibit-exec 👯‍♂️

Copy link

Choose a reason for hiding this comment

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

Perhaps it does not affect this PR yet if it's based on older toolchain but on the most recent one it will

Copy link
Author

Choose a reason for hiding this comment

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

Good catch, I've added it because that patch got merged to the toolchain

"-C", "link-arg=--script=/valida-toolchain/valida.ld",
"-C", "link-arg=/valida-toolchain/lib/valida-unknown-baremetal-gnu/libc.a",
"-C", "link-arg=/valida-toolchain/lib/valida-unknown-baremetal-gnu/libm.a",
"-C", "link-arg=--noinhibit-exec",
]

[env]
CC_valida_unknown_baremetal_gnu = "/valida-toolchain/bin/clang"
CFLAGS_valida_unknown_baremetal_gnu = "--sysroot=/valida-toolchain/ -isystem /valida-toolchain/include"
11 changes: 10 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,16 @@ tikv-jemalloc-ctl = "0.6"
tikv-jemallocator = "0.6"
tracy-client = "0.17.3"

#[patch.crates-io]
[patch.crates-io]
wait-timeout = { git = "https://github.com/lita-xyz/wait-timeout", branch = "0.2.0-valida" }
rusty-fork = { git = "https://github.com/lita-xyz/rusty-fork", branch = "0.3.0-valida" }
is-terminal = { git = "https://github.com/lita-xyz/is-terminal", branch = "0.4.13-valida" }
cc = { git = "https://github.com/lita-xyz/cc-rs.git", branch = "1.1.18-delendum" }
blst = { git = "https://github.com/lita-xyz/blst.git", branch = "0.3.13-delendum" }
c-kzg = { git = "https://github.com/lita-xyz/c-kzg-4844.git", branch = "1.0.3-delendum" }
zstd-sys = { git = "https://github.com/lita-xyz/zstd-rs.git", branch = "zstd-sys-2.0.13-delendum" }
proptest = { git = "https://github.com/lita-xyz/proptest", branch = "1.5.0-valida" }
pprof = { git = "https://github.com/lita-xyz/pprof-rs", branch = "0.13.0-valida" }
#alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "a971b3a" }
#alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "a971b3a" }
#alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "a971b3a" }
Expand Down
1 change: 1 addition & 0 deletions bin/reth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ default-run = "reth"
workspace = true

[dependencies]
valida-rs = { git = "https://github.com/lita-xyz/valida-rs.git", branch = "main" }
# reth
reth-cli.workspace = true
reth-ethereum-cli.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ description = "Commonly used types in reth."
workspace = true

[dependencies]
valida-rs = { git = "https://github.com/lita-xyz/valida-rs.git", branch = "main" }
# reth
reth-primitives-traits.workspace = true
reth-ethereum-forks.workspace = true
Expand Down
Loading