Merge pull request #68 from weaveVM/reth-toml-prune-config

feat: Enable building prune nodes from CLI

.dockerignore

@@ -2,6 +2,7 @@
 *
 
 # include source files
+!/conf
 !/bin
 !/crates
 !/testing

Cargo.toml

@@ -604,3 +604,5 @@ exex-wvm-da = { git = "https://github.com/weaveVM/exex-templates?a", branch = "m
 tikv-jemalloc-ctl = "0.6"
 tikv-jemallocator = "0.6"
 tracy-client = "0.17.3"
+
+parse_duration = "2.1.1"

crates/ethereum/evm/src/lib.rs

@@ -51,29 +51,6 @@ impl EthEvmConfig {
 }
 
 impl ConfigureEvmEnv for EthEvmConfig {
-    fn fill_cfg_env(
-        &self,
-        cfg_env: &mut CfgEnvWithHandlerCfg,
-        header: &Header,
-        total_difficulty: U256,
-    ) {
-        let spec_id = config::revm_spec(
-            self.chain_spec(),
-            &Head {
-                number: header.number,
-                timestamp: header.timestamp,
-                difficulty: header.difficulty,
-                total_difficulty,
-                hash: Default::default(),
-            },
-        );
-
-        cfg_env.chain_id = self.chain_spec.chain().id();
-        cfg_env.perf_analyse_created_bytecodes = AnalysisKind::Analyse;
-
-        cfg_env.handler_cfg.spec_id = spec_id;
-    }
-
     fn fill_tx_env(&self, tx_env: &mut TxEnv, transaction: &TransactionSigned, sender: Address) {
         transaction.fill_tx_env(tx_env, sender);
     }
@@ -118,6 +95,29 @@ impl ConfigureEvmEnv for EthEvmConfig {
         // disable the base fee check for this call by setting the base fee to zero
         env.block.basefee = U256::ZERO;
     }
+
+    fn fill_cfg_env(
+        &self,
+        cfg_env: &mut CfgEnvWithHandlerCfg,
+        header: &Header,
+        total_difficulty: U256,
+    ) {
+        let spec_id = config::revm_spec(
+            self.chain_spec(),
+            &Head {
+                number: header.number,
+                timestamp: header.timestamp,
+                difficulty: header.difficulty,
+                total_difficulty,
+                hash: Default::default(),
+            },
+        );
+
+        cfg_env.chain_id = self.chain_spec.chain().id();
+        cfg_env.perf_analyse_created_bytecodes = AnalysisKind::Analyse;
+
+        cfg_env.handler_cfg.spec_id = spec_id;
+    }
 }
 
 impl ConfigureEvm for EthEvmConfig {

crates/node/builder/src/builder/mod.rs

@@ -158,7 +158,7 @@ pub struct NodeBuilder<DB> {
     /// All settings for how the node should be configured.
     config: NodeConfig,
     /// The configured database for the node.
-    database: DB,
+    pub database: DB,
 }
 
 impl NodeBuilder<()> {
@@ -272,6 +272,11 @@ where
         self.builder.config()
     }
 
+    /// Returns a reference to the node builder's config.
+    pub const fn db(&self) -> &DB {
+        &self.builder.database
+    }
+
     /// Configures the types of the node.
     pub fn with_types<T>(self) -> WithLaunchContext<NodeBuilderWithTypes<RethFullAdapter<DB, T>>>
     where

crates/primitives-traits/src/constants/mod.rs

@@ -22,7 +22,7 @@ pub const EPOCH_SLOTS: u64 = 32;
 
 /// The duration of a slot in seconds.
 ///
-/// This is the time period of 12 seconds in which a randomly chosen validator has time to propose a
+/// This is the time period of 1 seconds in which a randomly chosen validator has time to propose a
 /// block.
 pub const SLOT_DURATION: Duration = Duration::from_secs(1); // Wevm #356: 1s per block
 

wvm-apps/wvm-exexed/Cargo.toml

@@ -43,6 +43,8 @@ types = { path = "crates/types" }
 rbrotli = { path = "crates/brotli" }
 borsh.workspace = true
 
+parse_duration.workspace = true
+
 [dev-dependencies]
 reth-exex-test-utils.workspace = true
 reth-testing-utils.workspace = true

wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml

@@ -26,4 +26,5 @@ arweave-upload = { path = "../arweave-upload" }
 precompiles = { path = "../precompiles" }
 rbrotli = { path = "../brotli" }
 tokio.workspace = true
-exex-wvm-da.workspace = true
+exex-wvm-da.workspace = true
+parse_duration.workspace = true

wvm-apps/wvm-exexed/crates/reth-exexed/src/main.rs

@@ -13,7 +13,8 @@ use repository::state_repository;
 use reth::{api::FullNodeComponents, builder::Node};
 use reth_exex::{ExExContext, ExExEvent, ExExNotification};
 use std::env;
-
+use std::ops::Mul;
+use std::sync::Arc;
 use crate::{network_tag::get_network_tag, util::check_block_existence};
 use arweave_upload::{ArweaveRequest, UploaderProvider};
 use exex_wvm_da::{DefaultWvmDataSettler, WvmDataSettler};
@@ -24,6 +25,9 @@ use reth_node_ethereum::{
 };
 use reth_tracing::tracing::info;
 use serde_json::to_string;
+use reth::args::PruningArgs;
+use reth::builder::NodeBuilder;
+use reth_primitives::constants::SLOT_DURATION;
 use types::types::ExecutionTipState;
 use wevm_borsh::block::BorshSealedBlockWithSenders;
 
@@ -96,7 +100,21 @@ async fn exex_etl_processor<Node: FullNodeComponents>(
 /// Main loop of the exexed WVM node
 fn main() -> eyre::Result<()> {
     reth::cli::Cli::parse_args().run(|builder, _| async move {
-        let mut handle = builder
+        // Original config
+        let mut config = builder.config().clone();
+        let pruning_args = config.pruning.clone();
+        let prune_node = std::env::var("WVM_PRUNE");
+
+        if let Ok(prune_conf) = prune_node {
+           config = config.with_pruning(PruningArgs {
+               block_interval: parse_prune_config(prune_conf.as_str()),
+               ..pruning_args
+           });
+        }
+
+        let mut handle = NodeBuilder::new(config)
+            .with_database(builder.db().clone())
+            .with_launch_context(builder.task_executor().clone())
             .with_types::<EthereumNode>()
             .with_components(EthereumNode::components().executor(WvmEthExecutorBuilder::default()))
             .with_add_ons::<EthereumAddOns>();
@@ -140,3 +158,34 @@ fn main() -> eyre::Result<()> {
         handle.wait_for_node_exit().await
     })
 }
+
+fn parse_prune_config(prune_conf: &str) -> u64 {
+    let mut d = "";
+    if prune_conf == "true" {
+        d = "30d"
+    } else {
+        d = prune_conf;
+    }
+
+    let duration = parse_duration::parse(d).unwrap();
+    let secs = duration.as_secs();
+    SLOT_DURATION.as_secs() * secs
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::parse_prune_config;
+
+    #[test]
+    pub fn check_prune_config() {
+        let true_prune = parse_prune_config("true");
+        assert_eq!(true_prune, 2_592_000);
+
+        let thirty_days_prune = parse_prune_config("30d");
+        assert_eq!(thirty_days_prune, 2_592_000);
+
+        let thirty_days_prune = parse_prune_config("15d");
+        assert_eq!(thirty_days_prune, 1296000);
+    }
+
+}