jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(engine): initial sync target (#2194)

Browse Source
This commit is contained in:
Roman Krasiuk
2023-04-12 07:44:20 +03:00
committed by GitHub
parent c9eeb181a5
commit 18fd8c133a
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/consensus/beacon/src/engine/mod.rs
View File

@ -155,8 +155,7 @@ where
match self.blockchain_tree.make_canonical(&state.head_block_hash) {
Ok(_) => {
let head_block_number = self
.db
.view(|tx| tx.get::<tables::HeaderNumbers>(state.head_block_hash))??
.get_block_number(state.head_block_hash)?
.expect("was canonicalized, so it exists");
let pipeline_min_progress =
FINISH.get_progress(&self.db.tx()?)?.unwrap_or_default();
@ -183,7 +182,10 @@ where
warn!(target: "consensus::engine", ?state, ?error, "Error canonicalizing the head hash");
// If this is the first forkchoice received, start downloading from safe block
// hash.
let target = if is_first_forkchoice && !state.safe_block_hash.is_zero() {
let target = if is_first_forkchoice &&
!state.safe_block_hash.is_zero() &&
self.get_block_number(state.safe_block_hash)?.is_none()
{
PipelineTarget::Safe
} else {
PipelineTarget::Head
@ -317,14 +319,8 @@ where
.then_some(H256::zero());
let status = match error {
Error::Execution(ExecutorError::PendingBlockIsInFuture { .. }) => {
if let Some(ForkchoiceState { head_block_hash, .. }) =
self.forkchoice_state
{
if self
.db
.view(|tx| tx.get::<tables::HeaderNumbers>(head_block_hash))??
.is_none()
{
if let Some(state) = self.forkchoice_state {
if self.get_block_number(state.head_block_hash)?.is_none() {
self.require_pipeline_run(PipelineTarget::Head);
}
}
@ -377,7 +373,7 @@ where
&mut self,
finalized_hash: BlockHash,
) -> Result<(), reth_interfaces::Error> {
match self.db.view(|tx| tx.get::<tables::HeaderNumbers>(finalized_hash))?? {
match self.get_block_number(finalized_hash)? {
Some(number) => self.blockchain_tree.restore_canonical_hashes(number)?,
None => self.require_pipeline_run(PipelineTarget::Head),
};
@ -398,6 +394,11 @@ where
false
}
}
/// Retrieve the block number for the given block hash.
fn get_block_number(&self, hash: H256) -> Result<Option<BlockNumber>, reth_interfaces::Error> {
Ok(self.db.view(|tx| tx.get::<tables::HeaderNumbers>(hash))??)
}
}
/// On initialization, the consensus engine will poll the message receiver and return