Skip to content

fix: validate HTTP(S) RPC network early and remove dead get_payloads #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
radik878 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −41
Open

fix: validate HTTP(S) RPC network early and remove dead get_payloads #744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 10 additions & 41 deletions ethereum/src/consensus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use alloy::rpc::types::{Block, BlockTransactions, Header, Transaction};
use chrono::Duration;
use eyre::eyre;
use eyre::Result;
use futures::future::join_all;

use tracing::{debug, error, info, warn};
use tree_hash::TreeHash;
use url::Url;
Expand Down Expand Up @@ -143,6 +143,15 @@ impl<S: ConsensusSpec, R: ConsensusRpc<S>, DB: Database> ConsensusClient<S, R, D
checkpoint_send,
config.clone(),
);
if let Ok(parsed) = Url::parse(&rpc) {
if parsed.scheme() == "http" || parsed.scheme() == "https" {
if let Err(err) = inner.check_rpc().await {
error!(target: "helios::consensus", err = %err, "incorrect rpc network");
_ = sync_status_send.send(ConsensusSyncStatus::Error(err.to_string()));
return;
}
}
}

let res = inner.sync(initial_checkpoint).await;
if let Err(err) = res {
Expand Down Expand Up @@ -343,46 +352,6 @@ impl<S: ConsensusSpec, R: ConsensusRpc<S>> Inner<S, R> {
}
}

pub async fn get_payloads(
&self,
start_slot: u64,
end_slot: u64,
) -> Result<Vec<ExecutionPayload<S>>> {
let payloads_fut = (start_slot..end_slot)
.rev()
.map(|slot| self.rpc.get_block(slot));

let mut prev_parent_hash: B256 = *self
.rpc
.get_block(end_slot)
.await?
.body
.execution_payload()
.parent_hash();

let mut payloads: Vec<ExecutionPayload<S>> = Vec::new();
for result in join_all(payloads_fut).await {
if result.is_err() {
continue;
}
let payload = result.unwrap().body.execution_payload().clone();
if payload.block_hash() != &prev_parent_hash {
warn!(
target: "helios::consensus",
error = %ConsensusError::InvalidHeaderHash(
prev_parent_hash,
*payload.parent_hash(),
),
"error while backfilling blocks"
);
break;
}
prev_parent_hash = *payload.parent_hash();
payloads.push(payload);
}
Ok(payloads)
}

pub async fn sync(&mut self, checkpoint: B256) -> Result<()> {
self.store = LightClientStore::default();
self.last_checkpoint = None;
Expand Down