Port unified archiver binary from monad-bft

debian/etc/monad-services/env

@@ -1,3 +1,38 @@
-# Configuration for the monad-services units. Variables set here are
-# expanded into each unit's ExecStart line; a unit fails to start when a
-# variable it names is missing.
+# Configuration for the monad-services units. The monad-archive binary reads
+# these from its environment; a commented-out variable falls back to its
+# built-in default, and a unit fails to start when a variable it requires is
+# unset.
+
+## Required by the archiver, indexer, and block-writer.
+## For triedb: 'triedb <triedb_path> <concurrent_requests>'
+#BLOCK_DATA_SOURCE=
+
+## Required by the archiver and indexer.
+## For aws: 'aws <bucket_name> <concurrent_requests>'
+#ARCHIVE_SINK=
+
+## Required by the archive-checker: the bucket holding checker state, and
+## the comma-separated replica set to validate,
+## e.g. 'aws bucket-1 20,aws bucket-2 20,aws bucket-3 20'.
+#ARCHIVE_BUCKET=
+#INIT_REPLICAS=
+
+## Required by the block-writer.
+#BLOCK_WRITER_DEST_PATH=
+
+## Optional fallback read source for the archiver.
+#FALLBACK_BLOCK_DATA_SOURCE=
+
+## Optional path to bft blocks the archiver uploads to the archive sink.
+#BFT_BLOCK_PATH=
+
+## Archiver concurrency (default 15).
+#MAX_CONCURRENT_BLOCKS=
+
+# Metrics collector for every unit; metrics are disabled when unset.
+OTEL_ENDPOINT=http://127.0.0.1:4317
+
+# Checker settings carried over from the previous unit command lines
+# (defaults: unlimited compute threads, 15 minute recheck).
+MAX_COMPUTE_THREADS=2
+RECHECK_FREQ_MIN=50

debian/usr/lib/systemd/system/monad-services-archive-checker.service

@@ -7,11 +7,19 @@ Wants=network-online.target
 Type=simple
 User=monad
 Group=monad
+StateDirectory=monad-services
+WorkingDirectory=/var/lib/monad-services
 EnvironmentFile=-/etc/monad-services/env
-ExecStart=/usr/lib/monad-services/monad-archive-checker
+ExecStart=/usr/lib/monad-services/monad-archive check checker
 Restart=always
 RestartSec=5
+DeviceAllow=/dev/triedb rw
 LimitNOFILE=1048576
+# Hugemem configs below
+LimitMEMLOCK=infinity
+MemoryDenyWriteExecute=false
+ProtectKernelModules=no
+ProtectKernelLogs=no
 
 [Install]
 WantedBy=multi-user.target

debian/usr/lib/systemd/system/monad-services-archiver.service

@@ -7,11 +7,19 @@ Wants=network-online.target
 Type=simple
 User=monad
 Group=monad
+StateDirectory=monad-services
+WorkingDirectory=/var/lib/monad-services
 EnvironmentFile=-/etc/monad-services/env
-ExecStart=/usr/lib/monad-services/monad-archiver
+ExecStart=/usr/lib/monad-services/monad-archive archive
 Restart=always
 RestartSec=5
+DeviceAllow=/dev/triedb rw
 LimitNOFILE=1048576
+# Hugemem configs below
+LimitMEMLOCK=infinity
+MemoryDenyWriteExecute=false
+ProtectKernelModules=no
+ProtectKernelLogs=no
 
 [Install]
 WantedBy=multi-user.target

debian/usr/lib/systemd/system/monad-services-block-writer.service

@@ -7,11 +7,19 @@ Wants=network-online.target
 Type=simple
 User=monad
 Group=monad
+StateDirectory=monad-services
+WorkingDirectory=/var/lib/monad-services
 EnvironmentFile=-/etc/monad-services/env
-ExecStart=/usr/lib/monad-services/monad-block-writer
+ExecStart=/usr/lib/monad-services/monad-archive block-writer stream
 Restart=always
 RestartSec=5
+DeviceAllow=/dev/triedb rw
 LimitNOFILE=1048576
+# Hugemem configs below
+LimitMEMLOCK=infinity
+MemoryDenyWriteExecute=false
+ProtectKernelModules=no
+ProtectKernelLogs=no
 
 [Install]
 WantedBy=multi-user.target

debian/usr/lib/systemd/system/monad-services-indexer.service

@@ -7,11 +7,19 @@ Wants=network-online.target
 Type=simple
 User=monad
 Group=monad
+StateDirectory=monad-services
+WorkingDirectory=/var/lib/monad-services
 EnvironmentFile=-/etc/monad-services/env
-ExecStart=/usr/lib/monad-services/monad-indexer
+ExecStart=/usr/lib/monad-services/monad-archive index
 Restart=always
 RestartSec=5
+DeviceAllow=/dev/triedb rw
 LimitNOFILE=1048576
+# Hugemem configs below
+LimitMEMLOCK=infinity
+MemoryDenyWriteExecute=false
+ProtectKernelModules=no
+ProtectKernelLogs=no
 
 [Install]
 WantedBy=multi-user.target

monad-archive/Cargo.toml

@@ -3,26 +3,17 @@ name = "monad-archive"
 description = "Monad archive solution"
 version = "0.1.0"
 edition = "2021"
+# src/bin/ holds the modules of the single monad-archive binary, not a binary each.
+autobins = false
 
 # this is necessary for criterion bench options
 # https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 [lib]
 bench = false
 
 [[bin]]
-name = "monad-archive-checker"
-bench = false
-
-[[bin]]
-name = "monad-archiver"
-bench = false
-
-[[bin]]
-name = "monad-block-writer"
-bench = false
-
-[[bin]]
-name = "monad-indexer"
+name = "monad-archive"
+path = "src/bin/main.rs"
 bench = false
 
 [features]
@@ -48,7 +39,7 @@ aws-sdk-s3 = { workspace = true }
 base64 = { workspace = true }
 bytes = { workspace = true }
 chrono = { workspace = true }
-clap = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive", "env"] }
 dashmap = { workspace = true }
 enum_dispatch = { workspace = true }
 eyre = { workspace = true }

monad-archive/src/bin/monad-archiver/cli.rs → monad-archive/src/bin/archive/cli.rs

@@ -24,19 +24,19 @@ use eyre::{eyre, Context, Result};
 use monad_archive::cli::{ArchiveArgs, BlockDataReaderArgs};
 use serde::Deserialize;
 
-/// Runtime configuration for the `monad-archiver` binary.
+/// Runtime configuration for the `monad-archive archive` subcommand.
 ///
 /// Values can come from either a `--config path/to/config.toml` file or from
 /// CLI flags. When both are supplied, CLI arguments win. For example:
 ///
 /// ```text
-/// monad-archiver --config config.toml --max-blocks-per-iteration 50
+/// monad-archive archive --config config.toml --max-blocks-per-iteration 50
 /// ```
 ///
 /// will load every field from `config.toml` and then replace the
 /// `max_blocks_per_iteration` value with `50` before execution.
 #[derive(Debug, Deserialize)]
-pub struct Cli {
+pub struct ArchiveRunCli {
     /// Where blocks, receipts and traces are read from
     /// For triedb: 'triedb <triedb_path> <concurrent_requests>'
     pub block_data_source: BlockDataReaderArgs,
@@ -143,43 +143,42 @@ pub struct Cli {
 }
 
 /// Result of parsing CLI arguments - either a subcommand or daemon config
-pub enum ParsedCli {
+pub enum ArchiveRunParsedCli {
     /// A subcommand was provided - handle and exit
     Command(Commands),
     /// No subcommand - run as daemon with this config
-    Daemon(Cli),
+    Daemon(ArchiveRunCli),
 }
 
-impl Cli {
-    pub fn parse() -> ParsedCli {
-        Self::try_parse().unwrap_or_else(|err| {
+impl ArchiveRunCli {
+    pub fn parse(args: ArchiveRunCliArgs) -> ArchiveRunParsedCli {
+        Self::try_parse(args).unwrap_or_else(|err| {
             eprintln!("failed to load monad-archiver configuration: {err:?}");
             process::exit(2);
         })
     }
 
-    pub fn try_parse() -> Result<ParsedCli> {
-        let args = CliArgs::parse();
+    pub fn try_parse(args: ArchiveRunCliArgs) -> Result<ArchiveRunParsedCli> {
         // If a subcommand is provided, return it without requiring daemon args
         if let Some(command) = args.command {
-            return Ok(ParsedCli::Command(command));
+            return Ok(ArchiveRunParsedCli::Command(command));
         }
         // No subcommand - parse full daemon config (this requires block_data_source, archive_sink, etc.)
-        let (_, cli) = CliArgs {
+        let (_, cli) = ArchiveRunCliArgs {
             command: None,
             ..args
         }
         .into_cli()?;
-        Ok(ParsedCli::Daemon(cli))
+        Ok(ArchiveRunParsedCli::Daemon(cli))
     }
 
-    fn from_sources(config: Option<Cli>, overrides: CliOverrides) -> Result<Self> {
+    fn from_sources(config: Option<ArchiveRunCli>, overrides: CliOverrides) -> Result<Self> {
         match config {
             Some(mut cli) => {
                 cli.apply_overrides(overrides);
                 Ok(cli)
             }
-            None => Cli::from_overrides(overrides),
+            None => Self::from_overrides(overrides),
         }
     }
 
@@ -356,8 +355,7 @@ pub enum Commands {
 }
 
 #[derive(Debug, Parser)]
-#[command(name = "monad-archive", about, long_about = None)]
-struct CliArgs {
+pub struct ArchiveRunCliArgs {
     #[command(subcommand)]
     pub command: Option<Commands>,
 
@@ -367,23 +365,23 @@ struct CliArgs {
 
     /// Where blocks, receipts and traces are read from
     /// For triedb: 'triedb <triedb_path> <concurrent_requests>'
-    #[arg(long, value_parser = clap::value_parser!(BlockDataReaderArgs))]
+    #[arg(long, env = "BLOCK_DATA_SOURCE", value_parser = clap::value_parser!(BlockDataReaderArgs))]
     block_data_source: Option<BlockDataReaderArgs>,
 
     /// If reading from --block-data-source fails, attempts to read from
     /// this optional fallback
-    #[arg(long, value_parser = clap::value_parser!(BlockDataReaderArgs))]
+    #[arg(long, env = "FALLBACK_BLOCK_DATA_SOURCE", value_parser = clap::value_parser!(BlockDataReaderArgs))]
     fallback_block_data_source: Option<BlockDataReaderArgs>,
 
     /// Where archive data is written to
     /// For aws: 'aws <bucket_name> <concurrent_requests>'
-    #[arg(long, value_parser = clap::value_parser!(ArchiveArgs))]
+    #[arg(long, env = "ARCHIVE_SINK", value_parser = clap::value_parser!(ArchiveArgs))]
     archive_sink: Option<ArchiveArgs>,
 
     #[arg(long)]
     max_blocks_per_iteration: Option<u64>,
 
-    #[arg(long)]
+    #[arg(long, env = "MAX_CONCURRENT_BLOCKS")]
     max_concurrent_blocks: Option<usize>,
 
     /// Override block number to stop at
@@ -411,7 +409,7 @@ struct CliArgs {
 
     /// Path to folder containing bft blocks
     /// If set, archiver will upload these files to blob store provided in archive_sink
-    #[arg(long)]
+    #[arg(long, env = "BFT_BLOCK_PATH")]
     bft_block_path: Option<PathBuf>,
 
     #[arg(long)]
@@ -467,7 +465,7 @@ struct CliArgs {
     #[arg(long, action = ArgAction::SetTrue)]
     unsafe_allow_traces_overwrite: bool,
 
-    #[arg(long)]
+    #[arg(long, env = "OTEL_ENDPOINT")]
     otel_endpoint: Option<String>,
 
     #[arg(long)]
@@ -477,14 +475,14 @@ struct CliArgs {
     skip_connectivity_check: bool,
 }
 
-impl CliArgs {
-    fn into_cli(self) -> Result<(Option<Commands>, Cli)> {
+impl ArchiveRunCliArgs {
+    fn into_cli(self) -> Result<(Option<Commands>, ArchiveRunCli)> {
         let (command, config_path, overrides) = self.into_parts();
         let config = match config_path {
             Some(path) => Some(load_config(&path)?),
             None => None,
         };
-        Ok((command, Cli::from_sources(config, overrides)?))
+        Ok((command, ArchiveRunCli::from_sources(config, overrides)?))
     }
 
     fn into_parts(self) -> (Option<Commands>, Option<PathBuf>, CliOverrides) {
@@ -588,7 +586,7 @@ struct CliOverrides {
     unsafe_allow_traces_overwrite: Option<bool>,
 }
 
-fn load_config(path: &Path) -> Result<Cli> {
+fn load_config(path: &Path) -> Result<ArchiveRunCli> {
     let contents = fs::read_to_string(path)
         .wrap_err_with(|| format!("failed to read config file {}", path.display()))?;
     toml::from_str(&contents)
@@ -683,7 +681,7 @@ mod tests {
             db = "sink-db"
         "#;
 
-        let cli: Cli = toml::from_str(config).expect("toml should deserialize");
+        let cli: ArchiveRunCli = toml::from_str(config).expect("toml should deserialize");
 
         assert_eq!(cli.max_blocks_per_iteration, 250);
         assert_eq!(cli.max_concurrent_blocks, 32);
@@ -750,7 +748,7 @@ mod tests {
             concurrency = 50
         "#;
 
-        let cli: Cli = toml::from_str(config).expect("toml should deserialize");
+        let cli: ArchiveRunCli = toml::from_str(config).expect("toml should deserialize");
 
         assert_eq!(cli.max_blocks_per_iteration, 100);
         assert_eq!(cli.max_concurrent_blocks, 15);
@@ -802,10 +800,13 @@ mod tests {
         )
         .unwrap();
 
-        let (_, cli) =
-            CliArgs::parse_from(["monad-archiver", "--config", file.path().to_str().unwrap()])
-                .into_cli()
-                .expect("config file should load");
+        let (_, cli) = ArchiveRunCliArgs::parse_from([
+            "monad-archiver",
+            "--config",
+            file.path().to_str().unwrap(),
+        ])
+        .into_cli()
+        .expect("config file should load");
 
         assert_eq!(cli.max_blocks_per_iteration, 222);
         assert_eq!(cli.max_concurrent_blocks, 16);
@@ -843,7 +844,7 @@ mod tests {
         )
         .unwrap();
 
-        let (_, cli) = CliArgs::parse_from([
+        let (_, cli) = ArchiveRunCliArgs::parse_from([
             "monad-archiver",
             "--config",
             file.path().to_str().unwrap(),