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

chore: remove network dep from tree (#13921)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-22 21:10:53 +01:00
committed by GitHub
parent 2ab2b6ef88
commit 66fb8c8cac
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -7179,7 +7179,6 @@ dependencies = [
"reth-evm", "reth-evm",
"reth-exex-types", "reth-exex-types",
"reth-metrics", "reth-metrics",
"reth-network",
"reth-network-p2p", "reth-network-p2p",
"reth-payload-builder", "reth-payload-builder",
"reth-payload-builder-primitives", "reth-payload-builder-primitives",

5
crates/engine/tree/Cargo.toml
View File

@ -34,8 +34,6 @@ reth-trie-db.workspace = true
reth-trie-parallel.workspace = true reth-trie-parallel.workspace = true
reth-trie-sparse.workspace = true reth-trie-sparse.workspace = true
reth-trie.workspace = true reth-trie.workspace = true
# TODO(mattsse): get rid of this by optimizing cache
reth-network.workspace = true
# alloy # alloy
alloy-consensus.workspace = true alloy-consensus.workspace = true
@ -126,6 +124,5 @@ test-utils = [
"reth-trie-sparse/test-utils", "reth-trie-sparse/test-utils",
"reth-prune-types?/test-utils", "reth-prune-types?/test-utils",
"reth-trie-db/test-utils", "reth-trie-db/test-utils",
"reth-trie-parallel/test-utils", "reth-trie-parallel/test-utils"
"reth-network/test-utils"
] ]

20
crates/engine/tree/src/tree/block_buffer.rs
View File

@ -1,9 +1,9 @@
use crate::tree::metrics::BlockBufferMetrics; use crate::tree::metrics::BlockBufferMetrics;
use alloy_consensus::BlockHeader; use alloy_consensus::BlockHeader;
use alloy_primitives::{BlockHash, BlockNumber}; use alloy_primitives::{BlockHash, BlockNumber};
use reth_network::cache::LruCache;
use reth_primitives::RecoveredBlock; use reth_primitives::RecoveredBlock;
use reth_primitives_traits::Block; use reth_primitives_traits::Block;
use schnellru::{ByLength, LruMap};
use std::collections::{BTreeMap, HashMap, HashSet}; use std::collections::{BTreeMap, HashMap, HashSet};
/// Contains the tree of pending blocks that cannot be executed due to missing parent. /// Contains the tree of pending blocks that cannot be executed due to missing parent.
@ -32,7 +32,7 @@ pub(super) struct BlockBuffer<B: Block> {
/// first in line for evicting if `max_blocks` limit is hit. /// first in line for evicting if `max_blocks` limit is hit.
/// ///
/// Used as counter of amount of blocks inside buffer. /// Used as counter of amount of blocks inside buffer.
pub(crate) lru: LruCache<BlockHash>, pub(crate) lru: LruMap<BlockHash, ()>,
/// Various metrics for the block buffer. /// Various metrics for the block buffer.
pub(crate) metrics: BlockBufferMetrics, pub(crate) metrics: BlockBufferMetrics,
} }
@ -44,7 +44,7 @@ impl<B: Block> BlockBuffer<B> {
blocks: Default::default(), blocks: Default::default(),
parent_to_child: Default::default(), parent_to_child: Default::default(),
earliest_blocks: Default::default(), earliest_blocks: Default::default(),
lru: LruCache::new(limit), lru: LruMap::new(ByLength::new(limit)),
metrics: Default::default(), metrics: Default::default(),
} }
} }
@ -71,7 +71,7 @@ impl<B: Block> BlockBuffer<B> {
self.earliest_blocks.entry(block.number()).or_default().insert(hash); self.earliest_blocks.entry(block.number()).or_default().insert(hash);
self.blocks.insert(hash, block); self.blocks.insert(hash, block);
if let (_, Some(evicted_hash)) = self.lru.insert_and_get_evicted(hash) { if let Some(evicted_hash) = self.insert_hash_and_get_evicted(hash) {
// evict the block if limit is hit // evict the block if limit is hit
if let Some(evicted_block) = self.remove_block(&evicted_hash) { if let Some(evicted_block) = self.remove_block(&evicted_hash) {
// evict the block if limit is hit // evict the block if limit is hit
@ -81,6 +81,18 @@ impl<B: Block> BlockBuffer<B> {
self.metrics.blocks.set(self.blocks.len() as f64); self.metrics.blocks.set(self.blocks.len() as f64);
} }
/// Inserts the hash and returns the oldest evicted hash if any.
fn insert_hash_and_get_evicted(&mut self, entry: BlockHash) -> Option<BlockHash> {
let new = self.lru.peek(&entry).is_none();
let evicted = if new && self.lru.limiter().max_length() as usize <= self.lru.len() {
self.lru.pop_oldest().map(|(k, ())| k)
} else {
None
};
self.lru.get_or_insert(entry, || ());
evicted
}
/// Removes the given block from the buffer and also all the children of the block. /// Removes the given block from the buffer and also all the children of the block.
/// ///
/// This is used to get all the blocks that are dependent on the block that is included. /// This is used to get all the blocks that are dependent on the block that is included.