github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-02-06 21:15:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

perf(tree): check block before inserting (#2324)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-21 11:54:34 +02:00
committed by GitHub
parent ec418d924d
commit 16412116a7
3 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/blockchain-tree/src/blockchain_tree/block_indices.rs
View File

@@ -274,8 +274,9 @@ impl BlockIndices {
}
/// Used for finalization of block.
///
/// Return list of chains for removal that depend on finalized canonical chain.
pub fn finalize_canonical_blocks(
pub(crate) fn finalize_canonical_blocks(
&mut self,
finalized_block: BlockNumber,
num_of_additional_canonical_hashes_to_retain: u64,

77
crates/blockchain-tree/src/blockchain_tree/mod.rs
View File

@@ -142,6 +142,34 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
})
}
/// Ensures that block matches range requirements depending on the current state of the tree.
/// - Ensures that the block's height is not lagging behind the currently tracked last
/// finalized block.
/// - Ensures that the distance of from the currently tracked last finalized block and the
/// given block's number is not larger than the configured maximum block range
pub(crate) fn ensure_block_is_in_range(&self, block: &SealedBlock) -> Result<(), ExecError> {
// check if block number is inside pending block slide
let last_finalized_block = self.block_indices.last_finalized_block();
if block.number <= last_finalized_block {
return Err(ExecError::PendingBlockIsFinalized {
block_number: block.number,
block_hash: block.hash(),
last_finalized: last_finalized_block,
})
}
// we will not even try to insert blocks that are too far in the future.
if block.number > last_finalized_block + self.config.max_blocks_in_chain() {
return Err(ExecError::PendingBlockIsInFuture {
block_number: block.number,
block_hash: block.hash(),
last_finalized: last_finalized_block,
})
}
Ok(())
}
/// Expose internal indices of the BlockchainTree.
pub fn block_indices(&self) -> &BlockIndices {
&self.block_indices
@@ -230,7 +258,7 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
let canonical_block_hashes = self.block_indices.canonical_chain();
// append the block if it is continuing the chain.
if chain_tip == block.parent_hash {
return if chain_tip == block.parent_hash {
let block_hash = block.hash();
let block_number = block.number;
parent_chain.append_block(
@@ -242,7 +270,7 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
)?;
self.block_indices.insert_non_fork_block(block_number, block_hash, chain_id);
return Ok(BlockStatus::Valid)
Ok(BlockStatus::Valid)
} else {
let chain = parent_chain.new_chain_fork(
block,
@@ -252,7 +280,7 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
&self.externals,
)?;
self.insert_chain(chain);
return Ok(BlockStatus::Accepted)
Ok(BlockStatus::Accepted)
}
}
// if not found, check if the parent can be found inside canonical chain.
@@ -379,15 +407,15 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
/// Insert a block (with senders recovered) in the tree.
///
/// Returns `true` if:
/// Returns the [BlockStatus] on success:
///
/// - The block is already part of a sidechain in the tree, or
/// - The block is already part of the canonical chain, or
/// - The parent is part of a sidechain in the tree, and we can fork at this block, or
/// - The parent is part of the canonical chain, and we can fork at this block
///
/// Otherwise `false` is returned, indicating that neither the block nor its parent is part of
/// the chain or any sidechains.
/// Otherwise, and error is returned, indicating that neither the block nor its parent is part
/// of the chain or any sidechains.
///
/// This means that if the block becomes canonical, we need to fetch the missing blocks over
/// P2P.
@@ -400,35 +428,24 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTree<DB, C, EF>
&mut self,
block: SealedBlockWithSenders,
) -> Result<BlockStatus, Error> {
// check if block number is inside pending block slide
let last_finalized_block = self.block_indices.last_finalized_block();
if block.number <= last_finalized_block {
return Err(ExecError::PendingBlockIsFinalized {
block_number: block.number,
block_hash: block.hash(),
last_finalized: last_finalized_block,
}
.into())
}
// we will not even try to insert blocks that are too far in future.
if block.number > last_finalized_block + self.config.max_blocks_in_chain() {
return Err(ExecError::PendingBlockIsInFuture {
block_number: block.number,
block_hash: block.hash(),
last_finalized: last_finalized_block,
}
.into())
}
self.ensure_block_is_in_range(&block.block)?;
self.insert_in_range_block_with_senders(block)
}
/// Same as [BlockchainTree::insert_block_with_senders] but expects that the block is in range,
/// See [BlockchainTree::ensure_block_is_in_range].
pub(crate) fn insert_in_range_block_with_senders(
&mut self,
block: SealedBlockWithSenders,
) -> Result<BlockStatus, Error> {
// check if block known and is already inside Tree
if let Some(chain_id) = self.block_indices.get_blocks_chain_id(&block.hash()) {
let canonical_fork = self.canonical_fork(chain_id).expect("Chain id is valid");
// if block chain extends canonical chain
if canonical_fork == self.block_indices.canonical_tip() {
return Ok(BlockStatus::Valid)
// if blockchain extends canonical chain
return if canonical_fork == self.block_indices.canonical_tip() {
Ok(BlockStatus::Valid)
} else {
return Ok(BlockStatus::Accepted)
Ok(BlockStatus::Accepted)
}
}

10
crates/blockchain-tree/src/blockchain_tree/shareable.rs
View File

@@ -36,6 +36,16 @@ impl<DB: Database, C: Consensus, EF: ExecutorFactory> ShareableBlockchainTree<DB
impl<DB: Database, C: Consensus, EF: ExecutorFactory> BlockchainTreeEngine
for ShareableBlockchainTree<DB, C, EF>
{
/// Recover senders and call [`BlockchainTreeEngine::insert_block_with_senders`].
fn insert_block(&self, block: SealedBlock) -> Result<BlockStatus, Error> {
let mut tree = self.tree.write();
tree.ensure_block_is_in_range(&block)?;
let block = block
.seal_with_senders()
.ok_or(reth_interfaces::executor::Error::SenderRecoveryError)?;
tree.insert_in_range_block_with_senders(block)
}
fn insert_block_with_senders(
&self,
block: SealedBlockWithSenders,