From 7836ee60316b0d070bf2b9891ef023e23797e3b7 Mon Sep 17 00:00:00 2001 From: Eitan Seri-Levi Date: Mon, 8 Jan 2024 06:36:06 +0200 Subject: [PATCH] Block v3 builder boost factor (#9) * add builder boost factor param * fmt --- Cargo.lock | 78 +++++++++++++++++++++++++-------------------------- Cargo.toml | 10 +++---- src/config.rs | 2 ++ src/main.rs | 5 ++-- src/node.rs | 35 +++++++++++++++++------ 5 files changed, 76 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 594d986..0392f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "account_utils" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "directory", "eth2_keystore", @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "arbitrary", "blst", @@ -673,7 +673,7 @@ dependencies = [ [[package]] name = "cached_tree_hash" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "ethereum-types 0.14.1", "ethereum_hashing", @@ -834,7 +834,7 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "clap 2.34.0", "dirs", @@ -866,7 +866,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "itertools", ] @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "quote", "syn 1.0.109", @@ -1181,7 +1181,7 @@ dependencies = [ [[package]] name = "deposit_contract" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "ethabi", "ethereum_ssz", @@ -1284,7 +1284,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "clap 2.34.0", "clap_utils", @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "account_utils", "bytes", @@ -1558,7 +1558,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "paste", "types", @@ -1567,7 +1567,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "bls", "ethereum_hashing", @@ -1581,7 +1581,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "bls", "num-bigint-dig", @@ -1593,7 +1593,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "aes 0.7.5", "bls", @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "bytes", "discv5", @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "eth2_wallet" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "eth2_key_derivation", "eth2_keystore", @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "winapi", "windows-acl", @@ -2662,7 +2662,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "bytes", ] @@ -2764,7 +2764,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "arbitrary", "c-kzg", @@ -3431,7 +3431,7 @@ dependencies = [ [[package]] name = "lighthouse_metrics" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "lazy_static", "prometheus", @@ -3440,7 +3440,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "delay_map", "directory", @@ -3487,7 +3487,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "git-version", "target_info", @@ -3524,7 +3524,7 @@ dependencies = [ [[package]] name = "lockfile" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "fs2", ] @@ -3538,7 +3538,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "chrono", "lazy_static", @@ -3584,7 +3584,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "fnv", ] @@ -3652,7 +3652,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "ethereum-types 0.14.1", "ethereum_hashing", @@ -4404,7 +4404,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "reqwest", "sensitive_url", @@ -4560,7 +4560,7 @@ dependencies = [ [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -5152,7 +5152,7 @@ checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" [[package]] name = "salsa20" @@ -5255,7 +5255,7 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "serde", "url", @@ -5431,7 +5431,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -5550,7 +5550,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "lazy_static", "lighthouse_metrics", @@ -5650,7 +5650,7 @@ dependencies = [ [[package]] name = "state_processing" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "arbitrary", "bls", @@ -5681,7 +5681,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "db-key", "directory", @@ -5758,7 +5758,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "ethereum-types 0.14.1", "ethereum_hashing", @@ -5840,7 +5840,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "exit-future", "futures", @@ -5878,7 +5878,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "quote", "syn 1.0.109", @@ -6257,7 +6257,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "arbitrary", "bls", @@ -6427,7 +6427,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "lazy_static", "lru_cache", @@ -6464,7 +6464,7 @@ dependencies = [ [[package]] name = "validator_dir" version = "0.1.0" -source = "git+https://github.com/michaelsproul/lighthouse?branch=v3-api-headers#64be25362884a86d0293d20d10b4a7a1fa21f570" +source = "git+https://github.com/eserilev/lighthouse?branch=block-v3-builder-comparison-factor#68e76dda8f3610144d687811bbf7c3b25c21f619" dependencies = [ "bls", "deposit_contract", diff --git a/Cargo.toml b/Cargo.toml index 5dbed97..91f1931 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,11 +20,11 @@ serde_json = "1.0.0" clap = { version = "4", features = ["derive"] } libp2p = "0.52.4" -eth2 = { git = "https://github.com/michaelsproul/lighthouse", branch = "v3-api-headers" } -eth2_network_config = { git = "https://github.com/michaelsproul/lighthouse", branch = "v3-api-headers" } -sensitive_url = { git = "https://github.com/michaelsproul/lighthouse", branch = "v3-api-headers" } -slot_clock = { git = "https://github.com/michaelsproul/lighthouse", branch = "v3-api-headers" } -logging = { git = "https://github.com/michaelsproul/lighthouse", branch = "v3-api-headers" } +eth2 = { git = "https://github.com/eserilev/lighthouse", branch = "block-v3-builder-comparison-factor" } +eth2_network_config = { git = "https://github.com/eserilev/lighthouse", branch = "block-v3-builder-comparison-factor" } +sensitive_url = { git = "https://github.com/eserilev/lighthouse", branch = "block-v3-builder-comparison-factor" } +slot_clock = { git = "https://github.com/eserilev/lighthouse", branch = "block-v3-builder-comparison-factor" } +logging = { git = "https://github.com/eserilev/lighthouse", branch = "block-v3-builder-comparison-factor" } [dev-dependencies] proptest = "1.0.0" diff --git a/src/config.rs b/src/config.rs index a580c9b..cb2a9b2 100644 --- a/src/config.rs +++ b/src/config.rs @@ -36,6 +36,8 @@ pub struct Node { pub v3: bool, #[serde(default = "default_true")] pub enabled: bool, + #[serde(default)] + pub builder_boost_factor: Option, } #[derive(Debug, Deserialize)] diff --git a/src/main.rs b/src/main.rs index 522f7a9..b321e07 100644 --- a/src/main.rs +++ b/src/main.rs @@ -188,8 +188,9 @@ async fn run(shutdown_signal: Arc) -> Result<(), String> { ); } - let (blinded_block, opt_metadata) = - inner.get_block_with_timeout::(slot).await?; + let (blinded_block, opt_metadata) = inner + .get_block_with_timeout::(slot, inner.config.builder_boost_factor) + .await?; Ok((blinded_block, opt_metadata)) }) }) diff --git a/src/node.rs b/src/node.rs index 8acdd5c..3e678cd 100644 --- a/src/node.rs +++ b/src/node.rs @@ -33,6 +33,7 @@ impl Node { slot: Slot, randao_reveal: &SignatureBytes, skip_randao_verification: SkipRandaoVerification, + builder_boost_factor: Option, ) -> Result<(BlindedBeaconBlock, ProduceBlockV3Metadata), String> { let (response, metadata) = self .client @@ -41,11 +42,12 @@ impl Node { randao_reveal, None, skip_randao_verification, + builder_boost_factor, ) .await .map_err(|e| format!("Error fetching block from {}: {:?}", self.config.url, e))?; - match response { + match response.data { ProduceBlockV3Response::Full(block_contents) => { // Throw away the blobs for now. Ok((block_contents.block().to_ref().into(), metadata)) @@ -59,6 +61,7 @@ impl Node { slot: Slot, randao_reveal: &SignatureBytes, skip_randao_verification: SkipRandaoVerification, + builder_boost_factor: Option, ) -> Result<(BlindedBeaconBlock, ProduceBlockV3Metadata), String> { let (response, metadata) = self .client @@ -67,6 +70,7 @@ impl Node { randao_reveal, None, skip_randao_verification, + builder_boost_factor, ) .await .map_err(|e| format!("Error fetching block from {}: {:?}", self.config.url, e))?; @@ -83,6 +87,7 @@ impl Node { pub async fn get_block( &self, slot: Slot, + builder_boost_factor: Option, ) -> Result<(BlindedBeaconBlock, Option), String> { let randao_reveal = Signature::infinity().unwrap().into(); let skip_randao_verification = if self.config.skip_randao_verification { @@ -92,11 +97,21 @@ impl Node { }; if self.config.v3 { if self.config.ssz { - self.get_block_v3_ssz(slot, &randao_reveal, skip_randao_verification) - .await + self.get_block_v3_ssz( + slot, + &randao_reveal, + skip_randao_verification, + builder_boost_factor, + ) + .await } else { - self.get_block_v3_json(slot, &randao_reveal, skip_randao_verification) - .await + self.get_block_v3_json( + slot, + &randao_reveal, + skip_randao_verification, + builder_boost_factor, + ) + .await } .map(|(block, metadata)| (block, Some(metadata))) } else if self.config.ssz { @@ -153,9 +168,13 @@ impl Node { pub async fn get_block_with_timeout( &self, slot: Slot, + builder_boost_factor: Option, ) -> Result<(BlindedBeaconBlock, Option), String> { - tokio::time::timeout(Duration::from_secs(6), self.get_block(slot)) - .await - .map_err(|_| format!("request to {} timed out after 6s", self.config.name))? + tokio::time::timeout( + Duration::from_secs(6), + self.get_block(slot, builder_boost_factor), + ) + .await + .map_err(|_| format!("request to {} timed out after 6s", self.config.name))? } }