feat: integrate custom-evm example

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["bin/alphanet/"]
+members = ["bin/alphanet/", "crates/node"]
 default-members = ["bin/alphanet/"]
 resolver = "2"
 
@@ -47,10 +47,14 @@ tracing = "0.1.0"
 # tokio
 tokio = { version = "1.21", default-features = false }
 
+# reth
+reth = { git = "https://github.com/paradigmxyz/reth.git", rev = "96fcdfb", features = ["optimism"] }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "96fcdfb" }
+
 # revm
 revm = { version = "6.1.0", features = ["std", "secp256k1"], default-features = false }
 revm-primitives = { version = "2.1.0", features = ["std"], default-features = false }
-revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "75a187b" }
+revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "7068d39" }
 
 # misc
 clap = "4"

bin/alphanet/Cargo.toml

@@ -15,14 +15,14 @@ workspace = true
 tracing.workspace = true
 
 [target.'cfg(not(windows))'.dependencies]
-tikv-jemallocator = { version = "0.5.0", optional = true }
+jemallocator = { version = "0.5", optional = true }
 
 [features]
 default = ["jemalloc"]
 asm-keccak = []
 
-jemalloc = ["dep:tikv-jemallocator"]
-jemalloc-prof = ["jemalloc", "tikv-jemallocator?/profiling"]
+jemalloc = ["dep:jemallocator"]
+jemalloc-prof = ["jemalloc", "jemallocator?/profiling"]
 
 min-error-logs = ["tracing/release_max_level_error"]
 min-warn-logs = ["tracing/release_max_level_warn"]

bin/alphanet/src/main.rs

@@ -8,7 +8,7 @@
 // We use jemalloc for performance reasons.
 #[cfg(all(feature = "jemalloc", unix))]
 #[global_allocator]
-static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 fn main() {
     tracing::info!("Hello, world!");

crates/node/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "node"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+reth.workspace = true
+reth-node-api.workspace = true
+
+[lints]
+workspace = true

crates/node/src/engine.rs

@@ -0,0 +1 @@
+

crates/node/src/evm.rs

@@ -0,0 +1,112 @@
+use reth::{
+    primitives::{
+        address,
+        revm::{config::revm_spec, env::fill_op_tx_env},
+        revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, Env, PrecompileResult, TxEnv},
+        Address, Bytes, ChainSpec, Head, Header, Transaction, U256,
+    },
+    revm::{
+        handler::register::EvmHandler,
+        precompile::{Precompile, PrecompileSpecId, Precompiles},
+        Database,
+    },
+};
+use reth_node_api::ConfigureEvmEnv;
+use std::sync::Arc;
+
+/// Custom EVM configuration
+#[derive(Debug, Clone, Copy, Default)]
+#[non_exhaustive]
+pub struct AlphaNetEvmConfig;
+
+impl AlphaNetEvmConfig {
+    /// Sets the precompiles to the EVM handler
+    ///
+    /// This will be invoked when the EVM is created via [ConfigureEvm::evm] or
+    /// [ConfigureEvm::evm_with_inspector]
+    ///
+    /// This will use the default mainnet precompiles and add additional precompiles.
+    pub fn set_precompiles<EXT, DB>(handler: &mut EvmHandler<'_, EXT, DB>)
+    where
+        DB: Database,
+    {
+        // first we need the evm spec id, which determines the precompiles
+        let spec_id = handler.cfg.spec_id;
+
+        // install the precompiles
+        handler.pre_execution.load_precompiles = Arc::new(move || {
+            let mut precompiles = Precompiles::new(PrecompileSpecId::from_spec_id(spec_id)).clone();
+            precompiles.inner.insert(
+                address!("0000000000000000000000000000000000000999"),
+                Precompile::Env(Self::my_precompile),
+            );
+            precompiles
+        });
+    }
+
+    /// A custom precompile that does nothing
+    fn my_precompile(_data: &Bytes, _gas: u64, _env: &Env) -> PrecompileResult {
+        Ok((0, Bytes::new()))
+    }
+}
+
+impl ConfigureEvmEnv for AlphaNetEvmConfig {
+    type TxMeta = Bytes;
+
+    fn fill_tx_env<T>(tx_env: &mut TxEnv, transaction: T, sender: Address, meta: Self::TxMeta)
+    where
+        T: AsRef<Transaction>,
+    {
+        fill_op_tx_env(tx_env, transaction, sender, meta)
+    }
+
+    fn fill_cfg_env(
+        cfg_env: &mut CfgEnvWithHandlerCfg,
+        chain_spec: &ChainSpec,
+        header: &Header,
+        total_difficulty: U256,
+    ) {
+        let spec_id = revm_spec(
+            chain_spec,
+            Head {
+                number: header.number,
+                timestamp: header.timestamp,
+                difficulty: header.difficulty,
+                total_difficulty,
+                hash: Default::default(),
+            },
+        );
+
+        cfg_env.chain_id = chain_spec.chain().id();
+        cfg_env.perf_analyse_created_bytecodes = AnalysisKind::Analyse;
+
+        cfg_env.handler_cfg.spec_id = spec_id;
+        cfg_env.handler_cfg.is_optimism = chain_spec.is_optimism();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use reth_primitives::revm_primitives::{BlockEnv, CfgEnv};
+
+    #[test]
+    #[ignore]
+    fn test_fill_cfg_and_block_env() {
+        let mut cfg_env = CfgEnvWithHandlerCfg::new_with_spec_id(CfgEnv::default(), SpecId::LATEST);
+        let mut block_env = BlockEnv::default();
+        let header = Header::default();
+        let chain_spec = ChainSpec::default();
+        let total_difficulty = U256::ZERO;
+
+        AlphaNetEvmConfig::fill_cfg_and_block_env(
+            &mut cfg_env,
+            &mut block_env,
+            &chain_spec,
+            &header,
+            total_difficulty,
+        );
+
+        assert_eq!(cfg_env.chain_id, chain_spec.chain().id());
+    }
+}

crates/node/src/lib.rs

@@ -0,0 +1,10 @@
+//! Standalone crate for Reth configuration and builder types.
+
+#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
+
+/// Implementation of the EngineTypes trait.
+pub mod engine;
+/// Implementation of the ConfigureEvmEnv trait.
+pub mod evm;
+/// Node types config.
+pub mod node;

crates/node/src/node.rs

@@ -0,0 +1 @@
+