From 1b9b61bb77f257e2779e4f08d6037541ebd20975 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Tue, 25 Feb 2025 14:00:28 +1100 Subject: [PATCH] lcli http-sync hacks --- lcli/src/http_sync.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lcli/src/http_sync.rs b/lcli/src/http_sync.rs index 1ef40e6397..e96d0beaab 100644 --- a/lcli/src/http_sync.rs +++ b/lcli/src/http_sync.rs @@ -2,7 +2,9 @@ use clap::ArgMatches; use clap_utils::{parse_optional, parse_required}; use environment::Environment; use eth2::{ - types::{BlockId, ChainSpec, ForkName, PublishBlockRequest, SignedBlockContents}, + types::{ + BlockId, BroadcastValidation, ChainSpec, ForkName, PublishBlockRequest, SignedBlockContents, + }, BeaconNodeHttpClient, Error, SensitiveUrl, Timeouts, }; use eth2_network_config::Eth2NetworkConfig; @@ -85,7 +87,10 @@ pub async fn run_async( // 2. Apply blocks to target. for (slot, block) in blocks.iter().rev() { println!("posting block at slot {slot}"); - if let Err(e) = target.post_beacon_blocks(block).await { + if let Err(e) = target + .post_beacon_blocks_v2(block, Some(BroadcastValidation::Consensus)) + .await + { if let Error::ServerMessage(ref e) = e { if e.code == 202 { println!("duplicate block detected while posting block at slot {slot}"); @@ -115,7 +120,7 @@ async fn get_block_from_source( let mut f = File::open(&cache_path).unwrap(); let mut bytes = vec![]; f.read_to_end(&mut bytes).unwrap(); - PublishBlockRequest::from_ssz_bytes(&bytes, ForkName::Deneb).unwrap() + PublishBlockRequest::from_ssz_bytes(&bytes, ForkName::Electra).unwrap() } else { let block_from_source = source .get_beacon_blocks_ssz::(block_id, spec)