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

Remove the duplicate definitions and functions from evm.rs and move the precompile cache

Browse Source
This commit is contained in:
kamalbuilds
2025-08-24 23:17:03 +05:30
parent 9f952ac2ed
commit a032ffceb3
2 changed files with 21 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/ethereum/evm/src/lib.rs
View File

@ -195,17 +195,6 @@ impl ConfigureEvmEnv for EthEvmConfig {
}
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct BlockAndReceipts {
#[serde(default)]
pub read_precompile_calls: Vec<(Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>)>,
pub highest_precompile_address: Option<Address>,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) enum EvmBlock {
Reth115(SealedBlock),
}
/// Custom EVM configuration.
#[derive(Debug, Clone, Default)]
@ -215,16 +204,6 @@ pub struct HyperliquidEvmFactory {
shared_state: Option<HyperliquidSharedState>,
}
pub(crate) fn collect_s3_block(ingest_path: PathBuf, height: u64) -> Option<BlockAndReceipts> {
let f = ((height - 1) / 1_000_000) * 1_000_000;
let s = ((height - 1) / 1_000) * 1_000;
let path = format!("{}/{f}/{s}/{height}.rmp.lz4", ingest_path.to_string_lossy());
let file = std::fs::read(path).ok()?;
let mut decoder = lz4_flex::frame::FrameDecoder::new(&file[..]);
let blocks: Vec<BlockAndReceipts> = rmp_serde::from_read(&mut decoder).unwrap();
Some(blocks[0].clone())
}
pub(crate) fn get_locally_sourced_precompiles_for_height(
precompiles_cache: PrecompilesCache,
height: u64,
@ -233,27 +212,6 @@ pub(crate) fn get_locally_sourced_precompiles_for_height(
u_cache.remove(&height)
}
pub(crate) fn collect_block(
ingest_path: PathBuf,
shared_state: Option<HyperliquidSharedState>,
height: u64,
) -> Option<BlockAndReceipts> {
// Attempt to source precompile from the cache that is shared the binary level with the block
// ingestor.
if let Some(shared_state) = shared_state {
if let Some(calls) =
get_locally_sourced_precompiles_for_height(shared_state.precompiles_cache, height)
{
return Some(BlockAndReceipts {
read_precompile_calls: calls.precompiles,
highest_precompile_address: calls.highest_precompile_address,
});
}
}
// Fallback to s3 always
collect_s3_block(ingest_path, height)
}
const WARM_PRECOMPILES_BLOCK_NUMBER: u64 = 8_197_684;
impl EvmFactory<EvmEnv> for HyperliquidEvmFactory {

21
crates/hyperliquid-types/src/lib.rs
View File

@ -18,6 +18,27 @@ pub enum ReadPrecompileResult {
UnexpectedError,
}
/// ReadPrecompileCalls represents a collection of precompile calls with their results
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
pub struct ReadPrecompileCalls(pub Vec<(Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>)>);
impl ReadPrecompileCalls {
/// Create an empty ReadPrecompileCalls
pub fn new() -> Self {
Self(Vec::new())
}
/// Create from a vector of precompile calls
pub fn from_vec(calls: Vec<(Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>)>) -> Self {
Self(calls)
}
/// Get the inner vector
pub fn into_inner(self) -> Vec<(Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>)> {
self.0
}
}
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct PrecompileData {
pub precompiles: Vec<(Address, Vec<(ReadPrecompileInput, ReadPrecompileResult)>)>,