Skip to content

Commit 28d3232

Browse files
committed
Merge remote-tracking branch 'origin/main' into bohdan/p2p-peerinfo-metrics
2 parents 2507411 + 9ad5a5a commit 28d3232

12 files changed

Lines changed: 1146 additions & 29 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ testcontainers = "0.26"
7878
charon = { path = "crates/charon" }
7979
charon-core = { path = "crates/charon-core" }
8080
charon-build-proto = { path = "crates/charon-build-proto" }
81+
charon-cluster = { path = "crates/charon-cluster" }
8182
charon-crypto = { path = "crates/charon-crypto" }
8283
charon-eth2 = { path = "crates/charon-eth2" }
8384
charon-k1util = { path = "crates/charon-k1util" }

crates/charon-cluster/src/ssz.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ pub(crate) const SSZ_LEN_FORK_VERSION: usize = 4;
3232
/// Length of a K1 signature.
3333
pub(crate) const SSZ_LEN_K1_SIG: usize = 65;
3434
/// Length of a BLS signature.
35-
pub(crate) const SSZ_LEN_BLS_SIG: usize = 96;
35+
pub const SSZ_LEN_BLS_SIG: usize = 96;
3636
/// Length of a hash.
3737
pub(crate) const SSZ_LEN_HASH: usize = 32;
3838
/// Length of withdrawal credentials.
3939
pub(crate) const SSZ_LEN_WITHDRAW_CREDS: usize = 32;
4040
/// Length of a public key.
41-
pub(crate) const SSZ_LEN_PUB_KEY: usize = 48;
41+
pub const SSZ_LEN_PUB_KEY: usize = 48;
4242

4343
/// HashFunc is a function that hashes a definition
4444
pub type HashFuncWithBool<T, H> = fn(&T, &mut H, bool) -> Result<(), SSZError<H>>;

crates/charon/Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,16 @@ tracing.workspace = true
2020
tracing-subscriber.workspace = true
2121
alloy.workspace = true
2222
url.workspace = true
23+
reqwest.workspace = true
24+
serde.workspace = true
25+
serde_json.workspace = true
26+
hex.workspace = true
27+
k256.workspace = true
28+
bon.workspace = true
29+
charon-cluster = { workspace = true }
30+
charon-k1util = { workspace = true }
31+
charon-crypto = { workspace = true }
32+
eth2api = { workspace = true }
2333

2434
[build-dependencies]
2535
charon-build-proto.workspace = true

crates/charon/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ pub mod eth1wrap;
2121

2222
/// Featureset defines a set of global features and their rollout status.
2323
pub mod featureset;
24+
25+
/// Obol API client for interacting with the Obol network API.
26+
pub mod obolapi;

0 commit comments

Comments
 (0)