From 09066e787d66fb7c723e0f5fb1e9de1e18b367a7 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Fri, 18 Jul 2025 12:23:55 -0600 Subject: [PATCH] update `ethereum-consensus` and support more possible inputs for relay key config --- Cargo.lock | 4 ++-- crates/rbuilder/Cargo.toml | 4 ++-- crates/rbuilder/src/live_builder/config.rs | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d86ed34fe..afe505e4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1905,7 +1905,7 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/ethereum-consensus/?rev=ade5ce6c4a19107c1059e5338d8f18855bd2d931#ade5ce6c4a19107c1059e5338d8f18855bd2d931" +source = "git+https://github.com/ralexstokes/ethereum-consensus/?rev=5031d31e318dd861cf3373702c5d92f085d926e4#5031d31e318dd861cf3373702c5d92f085d926e4" dependencies = [ "clap 4.5.36", "ethereum-consensus", @@ -4139,7 +4139,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes/ethereum-consensus/?rev=ade5ce6c4a19107c1059e5338d8f18855bd2d931#ade5ce6c4a19107c1059e5338d8f18855bd2d931" +source = "git+https://github.com/ralexstokes/ethereum-consensus/?rev=5031d31e318dd861cf3373702c5d92f085d926e4#5031d31e318dd861cf3373702c5d92f085d926e4" dependencies = [ "blst", "bs58 0.4.0", diff --git a/crates/rbuilder/Cargo.toml b/crates/rbuilder/Cargo.toml index 0e8d04bd6..680b5c7cd 100644 --- a/crates/rbuilder/Cargo.toml +++ b/crates/rbuilder/Cargo.toml @@ -91,8 +91,8 @@ flate2.workspace = true # Version required by ethereum-consensus beacon-api-client mev-share-sse = { git = "https://github.com/paradigmxyz/mev-share-rs", rev = "9eb2b0138ab3202b9eb3af4b19c7b3bf40b0faa8", default-features = false } jsonrpsee = { version = "0.20.3", features = ["full"] } -beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus/", rev = "ade5ce6c4a19107c1059e5338d8f18855bd2d931" } -ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus/", rev = "ade5ce6c4a19107c1059e5338d8f18855bd2d931" } +beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus/", rev = "5031d31e318dd861cf3373702c5d92f085d926e4" } +ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus/", rev = "5031d31e318dd861cf3373702c5d92f085d926e4" } uuid = { version = "1.6.1", features = ["serde", "v5", "v4"] } prometheus.workspace = true warp.workspace = true diff --git a/crates/rbuilder/src/live_builder/config.rs b/crates/rbuilder/src/live_builder/config.rs index 8e97a7c4a..8c790aac8 100644 --- a/crates/rbuilder/src/live_builder/config.rs +++ b/crates/rbuilder/src/live_builder/config.rs @@ -46,6 +46,7 @@ use crate::{ }; use alloy_chains::ChainKind; use alloy_primitives::{ + hex, utils::{format_ether, parse_ether}, FixedBytes, B256, U256, }; @@ -63,8 +64,8 @@ use reth_primitives::StaticFileSegment; use reth_provider::StaticFileProviderFactory; use serde::Deserialize; use serde_with::{serde_as, OneOrMany}; -use std::collections::HashMap; use std::{ + collections::HashMap, fmt::Debug, path::{Path, PathBuf}, str::FromStr, @@ -286,7 +287,8 @@ impl L1Config { let relay_secret_key = if let Some(secret_key) = &self.relay_secret_key { let resolved_key = secret_key.value()?; - SecretKey::try_from(resolved_key)? + let input = hex::decode(resolved_key)?; + SecretKey::from_bytes(&input)? } else { warn!("No relay secret key provided. A random key will be generated."); SecretKey::random(&mut rand::thread_rng())?