Skip to content

Commit aa431cb

Browse files
committed
Merge branch 'main' into mb/dirk_integration
2 parents 93821c3 + 2ca412c commit aa431cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1952
-947
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
platforms: linux/amd64,linux/arm64
137137
tags: |
138138
ghcr.io/commit-boost/pbs:${{ github.ref_name }}
139-
ghcr.io/commit-boost/pbs:latest
139+
${{ !contains(github.ref_name, 'rc') && 'ghcr.io/commit-boost/pbs:latest' || '' }}
140140
cache-from: type=registry,ref=ghcr.io/commit-boost/pbs:buildcache
141141
cache-to: type=registry,ref=ghcr.io/commit-boost/pbs:buildcache,mode=max
142142
file: provisioning/pbs.Dockerfile
@@ -172,7 +172,7 @@ jobs:
172172
platforms: linux/amd64,linux/arm64
173173
tags: |
174174
ghcr.io/commit-boost/signer:${{ github.ref_name }}
175-
ghcr.io/commit-boost/signer:latest
175+
${{ !contains(github.ref_name, 'rc') && 'ghcr.io/commit-boost/signer:latest' || '' }}
176176
cache-from: type=registry,ref=ghcr.io/commit-boost/signer:buildcache
177177
cache-to: type=registry,ref=ghcr.io/commit-boost/signer:buildcache,mode=max
178178
file: provisioning/signer.Dockerfile

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ members = [
1717
resolver = "2"
1818

1919
[workspace.package]
20-
version = "0.6.0"
20+
version = "0.7.0-rc.1"
2121
rust-version = "1.83"
2222
edition = "2021"
2323

@@ -37,7 +37,7 @@ alloy = { version = "0.8.0", features = [
3737
"getrandom",
3838
"providers",
3939
] }
40-
ssz_types = "0.8"
40+
ssz_types = "0.10"
4141
ethereum_serde_utils = "0.7.0"
4242

4343
# networking
@@ -63,6 +63,8 @@ serde_json = "1.0.117"
6363
serde_yaml = "0.9.33"
6464
base64 = "0.22.1"
6565
unicode-normalization = "0.1.24"
66+
ethereum_ssz = "0.8"
67+
ethereum_ssz_derive = "0.8"
6668

6769
# telemetry
6870
tracing = "0.1.40"
@@ -73,8 +75,8 @@ prometheus = "0.13.4"
7375
# crypto
7476
blst = "0.3.11"
7577
blsful = "2.5"
76-
tree_hash = "0.8"
77-
tree_hash_derive = "0.8"
78+
tree_hash = "0.9"
79+
tree_hash_derive = "0.9"
7880
eth2_keystore = { git = "https://github.com/sigp/lighthouse", rev = "9e12c21f268c80a3f002ae0ca27477f9f512eb6f" }
7981
k256 = "0.13"
8082
aes = "0.8"

LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Commit-Boost
3+
Copyright (c) 2025 Commit-Boost
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

config.example.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ skip_sigverify = false
4444
# Can be specified as a float or a string for extra precision (e.g. "0.01")
4545
# OPTIONAL, DEFAULT: 0.0
4646
min_bid_eth = 0.0
47-
# List of URLs of relay monitors to send registrations to
48-
# OPTIONAL
49-
relay_monitors = []
5047
# How late in milliseconds in the slot is "late". This impacts the `get_header` requests, by shortening timeouts for `get_header` calls to
5148
# relays and make sure a header is returned within this deadline. If the request from the CL comes later in the slot, then fetching headers is skipped
5249
# to force local building and miniminzing the risk of missed slots. See also the timing games section below

crates/common/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ toml.workspace = true
2525
serde.workspace = true
2626
serde_json.workspace = true
2727
serde_yaml.workspace = true
28+
ethereum_ssz.workspace = true
29+
ethereum_ssz_derive.workspace = true
2830

2931
# telemetry
3032
tracing.workspace = true

crates/common/src/config/pbs.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ pub struct PbsConfig {
111111
/// Minimum bid that will be accepted from get_header
112112
#[serde(rename = "min_bid_eth", with = "as_eth_str", default = "default_u256")]
113113
pub min_bid_wei: U256,
114-
/// List of relay monitor urls in the form of scheme://host
115-
#[serde(default)]
116-
pub relay_monitors: Vec<Url>,
117114
/// How late in the slot we consider to be "late"
118115
#[serde(default = "default_u64::<LATE_IN_SLOT_TIME_MS>")]
119116
pub late_in_slot_time_ms: u64,

crates/common/src/pbs/constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub const RELOAD_PATH: &str = "/reload";
1414
// const HEADER_SLOT_UUID_KEY: &str = "X-MEVBoost-SlotID";
1515
pub const HEADER_VERSION_KEY: &str = "X-CommitBoost-Version";
1616
pub const HEADER_VERSION_VALUE: &str = COMMIT_BOOST_VERSION;
17-
pub const HEADER_START_TIME_UNIX_MS: &str = "X-MEVBoost-StartTimeUnixMS";
17+
pub const HEADER_START_TIME_UNIX_MS: &str = "Date-Milliseconds";
1818

1919
pub const BUILDER_EVENTS_PATH: &str = "/builder_events";
2020
pub const DEFAULT_PBS_JWT_KEY: &str = "DEFAULT_PBS";

crates/common/src/pbs/error.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,7 @@ pub enum ValidationError {
8383

8484
#[error("invalid gas limit: parent: {parent} header: {header}")]
8585
GasLimit { parent: u64, header: u64 },
86+
87+
#[error("payload mismatch: request: {request} response: {response}")]
88+
PayloadVersionMismatch { request: &'static str, response: &'static str },
8689
}

0 commit comments

Comments
 (0)