smeb_y/0g-storage-node
1
0
Fork 0
mirror of https://github.com/0glabs/0g-storage-node.git synced 2024-11-20 15:05:19 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge 14edeca41b into a4dd88f2b8

Browse Source
This commit is contained in:
Joel Liu 2024-09-11 18:00:11 +08:00 committed by GitHub
commit ede6385cfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
node/log_entry_sync/src/sync_manager/log_entry_fetcher.rs
View File

@ -362,7 +362,13 @@ impl LogEntryFetcher {
block_hash_cache: &Arc<RwLock<BTreeMap<u64, Option<BlockHashAndSubmissionIndex>>>>, block_hash_cache: &Arc<RwLock<BTreeMap<u64, Option<BlockHashAndSubmissionIndex>>>>,
log_page_size: u64, log_page_size: u64,
) -> Result<Option<(u64, H256, Option<Option<u64>>)>> { ) -> Result<Option<(u64, H256, Option<Option<u64>>)>> {
let latest_block_number = provider.get_block_number().await?.as_u64(); let latest_block_number = provider
.get_block(BlockNumber::Latest)
.await?
.ok_or(anyhow!("failed to get latest block"))?
.number
.ok_or(anyhow!("latest block number is none"))?
.as_u64();
debug!( debug!(
"from block number {}, latest block number {}, confirmation delay {}", "from block number {}, latest block number {}, confirmation delay {}",
from_block_number, latest_block_number, confirmation_delay from_block_number, latest_block_number, confirmation_delay
@ -383,6 +389,9 @@ impl LogEntryFetcher {
block.number block.number
); );
} }
if block.logs_bloom.is_none() {
bail!("block {:?} logs bloom is none", block.number);
}
if from_block_number > 0 && block.parent_hash != parent_block_hash { if from_block_number > 0 && block.parent_hash != parent_block_hash {
// reorg happened // reorg happened
@ -412,13 +421,22 @@ impl LogEntryFetcher {
block.number block.number
); );
} }
if Some(block.parent_hash) != parent_block_hash { if parent_block_hash.is_none() || Some(block.parent_hash) != parent_block_hash {
bail!( bail!(
"parent block hash mismatch, expected {:?}, actual {}", "parent block hash mismatch, expected {:?}, actual {}",
parent_block_hash, parent_block_hash,
block.parent_hash block.parent_hash
); );
} }
if block_number == to_block_number && block.hash.is_none() {
bail!("block {:?} hash is none", block.number);
}
if block.logs_bloom.is_none() {
bail!("block {:?} logs bloom is none", block.number);
}
parent_block_hash = block.hash; parent_block_hash = block.hash;
blocks.insert(block_number, block); blocks.insert(block_number, block);
} }
@ -470,7 +488,7 @@ impl LogEntryFetcher {
} }
let tx = txs_hm[&log.transaction_index]; let tx = txs_hm[&log.transaction_index];
if log.transaction_hash != Some(tx.hash) { if log.transaction_hash.is_none() || log.transaction_hash != Some(tx.hash) {
warn!( warn!(
"log tx hash mismatch, log transaction {:?}, block transaction {:?}", "log tx hash mismatch, log transaction {:?}, block transaction {:?}",
log.transaction_hash, log.transaction_hash,
@ -478,7 +496,9 @@ impl LogEntryFetcher {
); );
return Ok(progress); return Ok(progress);
} }
if log.transaction_index != tx.transaction_index { if log.transaction_index.is_none()
|| log.transaction_index != tx.transaction_index
{
warn!( warn!(
"log tx index mismatch, log tx index {:?}, block transaction index {:?}", "log tx index mismatch, log tx index {:?}, block transaction index {:?}",
log.transaction_index, log.transaction_index,