Skip to content

Commit efef826

Browse files
committed
fulu support first part
1 parent 6f32b95 commit efef826

File tree

20 files changed

+1103
-1196
lines changed

20 files changed

+1103
-1196
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ axum = { version = "0.8.1", features = ["macros"] }
2424
axum-extra = { version = "0.10.0", features = ["typed-header"] }
2525
base64 = "0.22.1"
2626
bimap = { version = "0.6.3", features = ["serde"] }
27-
blst = "^0.3.15"
2827
blsful = "^2.5"
28+
blst = "^0.3.15"
2929
bytes = "1.10.1"
3030
cb-cli = { path = "crates/cli" }
3131
cb-common = { path = "crates/common" }
@@ -48,6 +48,7 @@ headers = "0.4.0"
4848
indexmap = "2.2.6"
4949
jsonwebtoken = { version = "9.3.1", default-features = false }
5050
lazy_static = "1.5.0"
51+
lh_eth2 = { package = "eth2", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
5152
lh_eth2_keystore = { package = "eth2_keystore", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
5253
lh_types = { package = "types", git = "https://github.com/sigp/lighthouse", tag = "v8.0.0-rc.0" }
5354
parking_lot = "0.12.3"
@@ -82,4 +83,4 @@ url = { version = "2.5.0", features = ["serde"] }
8283
uuid = { version = "1.8.0", features = ["fast-rng", "serde", "v4"] }
8384

8485
[patch.crates-io]
85-
blstrs_plus = { git = "https://github.com/Commit-Boost/blstrs" }
86+
blstrs_plus = { git = "https://github.com/Commit-Boost/blstrs" }

crates/common/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ ethereum_ssz_derive.workspace = true
2323
eyre.workspace = true
2424
futures.workspace = true
2525
jsonwebtoken.workspace = true
26+
lh_eth2.workspace = true
2627
lh_eth2_keystore.workspace = true
2728
lh_types.workspace = true
2829
pbkdf2.workspace = true

crates/common/src/pbs/error.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use alloy::primitives::{B256, U256};
22
use thiserror::Error;
33

4-
use crate::{types::BlsPublicKey, utils::ResponseReadError};
4+
use crate::{types::BlsPublicKeyBytes, utils::ResponseReadError};
55

66
#[derive(Debug, Error)]
77
pub enum PbsError {
@@ -55,7 +55,7 @@ pub enum ValidationError {
5555
EmptyBlockhash,
5656

5757
#[error("pubkey mismatch: expected {expected} got {got}")]
58-
PubkeyMismatch { expected: Box<BlsPublicKey>, got: Box<BlsPublicKey> },
58+
PubkeyMismatch { expected: BlsPublicKeyBytes, got: BlsPublicKeyBytes },
5959

6060
#[error("parent hash mismatch: expected {expected} got {got}")]
6161
ParentHashMismatch { expected: B256, got: B256 },
@@ -96,4 +96,7 @@ pub enum ValidationError {
9696

9797
#[error("payload mismatch: request: {request} response: {response}")]
9898
PayloadVersionMismatch { request: &'static str, response: &'static str },
99+
100+
#[error("unsupported fork")]
101+
UnsupportedFork,
99102
}

crates/common/src/pbs/types/beacon_block.rs

Lines changed: 0 additions & 186 deletions
This file was deleted.

0 commit comments

Comments
 (0)