Skip to content

Commit 7f7ab4e

Browse files
committed
Merge version
2 parents 733cc31 + 37156ef commit 7f7ab4e

11 files changed

Lines changed: 1029 additions & 169 deletions

File tree

Cargo.lock

Lines changed: 266 additions & 166 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@ publish = false
2828
anyhow = "1"
2929
alloy = { version = "1.1.3", features = ["essentials"] }
3030
axum = "0.8.6"
31+
built = { version = "0.8.0", features = ["git2", "chrono"] }
3132
blst = "0.3.13"
3233
cancellation = "0.1.0"
3334
chrono = { version = "0.4", features = ["serde"] }
3435
clap = { version = "4.5.53", features = ["derive"] }
3536
crossbeam = "0.8.4"
37+
backon = "1.6.0"
3638
hex = { version = "^0.4.3" }
3739
prost = "0.14"
3840
prost-build = "0.14"
@@ -61,6 +63,8 @@ vise = "0.3.2"
6163
vise-exporter = "0.3.2"
6264

6365
# Crates in the workspace
66+
charon = { path = "crates/charon" }
67+
charon-core = { path = "crates/charon-core" }
6468
charon-build-proto = { path = "crates/charon-build-proto" }
6569
charon-crypto = { path = "crates/charon-crypto" }
6670
charon-eth2 = { path = "crates/charon-eth2" }

crates/charon-core/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ hex.workspace = true
1414
serde.workspace = true
1515
serde_json.workspace = true
1616
thiserror.workspace = true
17+
tokio.workspace = true
1718
libp2p.workspace = true
19+
regex.workspace = true
1820
prost.workspace = true
1921
prost-types.workspace = true
2022

@@ -28,6 +30,7 @@ chrono.workspace = true
2830

2931
[build-dependencies]
3032
charon-build-proto.workspace = true
33+
built.workspace = true
3134

3235
[lints]
3336
workspace = true

crates/charon-core/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@
55
use std::io::Result;
66

77
fn main() -> Result<()> {
8-
charon_build_proto::compile_protos("src/corepb/v1")
8+
charon_build_proto::compile_protos("src/corepb/v1")?;
9+
built::write_built_file()?;
10+
11+
Ok(())
912
}

crates/charon-core/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ pub mod consensus;
1313

1414
/// Protobuf definitions.
1515
pub mod corepb;
16+
17+
/// Semver version parsing utilities.
18+
pub mod version;

0 commit comments

Comments
 (0)