github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 07:17:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix consistency check against headers table

Browse Source
This commit is contained in:
Matthias Seitz
2024-03-22 18:05:51 +01:00
parent 30d79a98aa
commit 1ecf66dfb2
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/interfaces/src/provider.rs
View File

@@ -164,7 +164,7 @@ pub enum ConsistentViewError {
#[error("inconsistent database state: {tip:?}")]
Inconsistent {
/// The tip diff.
tip: GotExpected<Option<B256>>,
tip: GotExpected<Option<(u64, B256)>>,
},
}

16
crates/storage/provider/src/providers/consistent_view.rs
View File

@@ -25,7 +25,7 @@ pub use reth_interfaces::provider::ConsistentViewError;
pub struct ConsistentDbView<DB, Provider> {
database: PhantomData<DB>,
provider: Provider,
tip: Option<B256>,
tip: Option<(u64, B256)>,
}
impl<DB, Provider> ConsistentDbView<DB, Provider>
@@ -34,7 +34,7 @@ where
Provider: DatabaseProviderFactory<DB>,
{
/// Creates new consistent database view.
pub fn new(provider: Provider, tip: Option<B256>) -> Self {
pub fn new(provider: Provider, tip: Option<(u64, B256)>) -> Self {
Self { database: PhantomData, provider, tip }
}
@@ -45,7 +45,7 @@ where
.tx_ref()
.cursor_read::<tables::CanonicalHeaders>()?
.last()?;
Ok(Self::new(provider, tip.map(|(_, hash)| hash)))
Ok(Self::new(provider, tip))
}
/// Creates new read-only provider and performs consistency checks on the current tip.
@@ -57,7 +57,7 @@ where
.and_then(|mut cursor| cursor.last())
.map_err(ProviderError::Database)?;
let tip = last_entry.map(|(_, hash)| hash);
let tip = last_entry;
if self.tip != tip {
return Err(ConsistentViewError::Inconsistent {
tip: GotExpected { got: tip, expected: self.tip },
@@ -65,9 +65,11 @@ where
.into())
}
let best_block_number = provider_ro.best_block_number()?;
if last_entry.map(|(number, _)| number).unwrap_or_default() != best_block_number {
return Err(ConsistentViewError::Syncing(best_block_number).into())
if let Some((num, _)) = last_entry {
let best_block_number = provider_ro.best_block_number()?;
if num != best_block_number {
return Err(ConsistentViewError::Syncing(best_block_number).into())
}
}
Ok(provider_ro)