chore: Make constants consistent

This commit is contained in:
sprites0
2025-08-21 06:48:52 -04:00
parent 2712cbb413
commit 7f0f7c94a6
3 changed files with 11 additions and 5 deletions

View File

@ -15,6 +15,9 @@ use reth_discv4::NodeRecord;
use reth_evm::eth::spec::EthExecutorSpec; use reth_evm::eth::spec::EthExecutorSpec;
use std::{fmt::Display, sync::Arc}; use std::{fmt::Display, sync::Arc};
pub const MAINNET_CHAIN_ID: u64 = 999;
pub const TESTNET_CHAIN_ID: u64 = 998;
/// Hl chain spec type. /// Hl chain spec type.
#[derive(Debug, Default, Clone, PartialEq, Eq)] #[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct HlChainSpec { pub struct HlChainSpec {
@ -144,8 +147,8 @@ impl HlChainSpec {
pub fn official_rpc_url(&self) -> &'static str { pub fn official_rpc_url(&self) -> &'static str {
match self.inner.chain().id() { match self.inner.chain().id() {
999 => Self::MAINNET_RPC_URL, MAINNET_CHAIN_ID => Self::MAINNET_RPC_URL,
998 => Self::TESTNET_RPC_URL, TESTNET_CHAIN_ID => Self::TESTNET_RPC_URL,
_ => unreachable!("Unreachable since ChainSpecParser won't return other chains"), _ => unreachable!("Unreachable since ChainSpecParser won't return other chains"),
} }
} }

View File

@ -12,6 +12,8 @@ use revm::{
Inspector, Inspector,
}; };
use crate::chainspec::MAINNET_CHAIN_ID;
pub mod builder; pub mod builder;
pub mod ctx; pub mod ctx;
mod exec; mod exec;
@ -31,7 +33,9 @@ impl<CTX: ContextTr, INSP>
let mut instruction = EthInstructions::new_mainnet(); let mut instruction = EthInstructions::new_mainnet();
const NON_PLACEHOLDER_BLOCK_HASH_HEIGHT: u64 = 243_538; const NON_PLACEHOLDER_BLOCK_HASH_HEIGHT: u64 = 243_538;
if ctx.chain_id() == 999 && ctx.block_number() < NON_PLACEHOLDER_BLOCK_HASH_HEIGHT { if ctx.chain_id() == MAINNET_CHAIN_ID &&
ctx.block_number() < NON_PLACEHOLDER_BLOCK_HASH_HEIGHT
{
instruction.insert_instruction( instruction.insert_instruction(
BLOCKHASH, BLOCKHASH,
Instruction::new(patch::blockhash_returning_placeholder, 20), Instruction::new(patch::blockhash_returning_placeholder, 20),

View File

@ -3,8 +3,7 @@ use eyre::{Error, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
pub(crate) const MAINNET_CHAIN_ID: u64 = 999; use crate::chainspec::{MAINNET_CHAIN_ID, TESTNET_CHAIN_ID};
pub(crate) const TESTNET_CHAIN_ID: u64 = 998;
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
struct EvmContract { struct EvmContract {