Feat/api daemon

Cargo.toml

@@ -5,6 +5,7 @@ members = [
     "crates/core/",
     "crates/engine_provider",
     "crates/report",
+    "crates/server",
     "crates/sqlite_db/",
     "crates/testfile/",
 ]
@@ -21,12 +22,14 @@ homepage = "https://github.com/flashbots/contender"
 repository = "https://github.com/flashbots/contender"
 
 [workspace.dependencies]
+contender_cli = { path = "crates/cli" }
 contender_core = { path = "crates/core/" }
 contender_sqlite = { path = "crates/sqlite_db/" }
 contender_testfile = { path = "crates/testfile/" }
 contender_bundle_provider = { path = "crates/bundle_provider/" }
 contender_engine_provider = { path = "crates/engine_provider/" }
 contender_report = { path = "crates/report/" }
+contender_server = { path = "crates/server/" }
 
 tokio = { version = "1.40.0" }
 tokio-tungstenite = { version = "0.26", features = ["native-tls"] }
@@ -49,6 +52,11 @@ csv = "1.3.0"
 miette = { version = "7.6.0" }
 url = "2.5.7"
 uuid = "1.19.0"
+base64 = "0.22"
+
+## server
+axum = "0.8"
+tokio-stream = "0.1"
 
 ## core
 futures = "0.3.30"
@@ -57,6 +65,7 @@ jsonrpsee = { version = "0.24" }
 alloy-serde = "0.5.4"
 serde_json = "1.0.132"
 tower = "0.5.2"
+tower-http = { version = "0.6", features = ["cors"] }
 alloy-rpc-types-engine = { version = "1.0.22", default-features = false }
 alloy-json-rpc = { version = "1.0.22", default-features = false }
 alloy-chains = { version = "0.2.5", default-features = false }

crates/cli/src/commands/campaign.rs

@@ -5,14 +5,16 @@ use crate::commands::{
     common::{ScenarioSendTxsCliArgs, SendTxsCliArgsInner},
     SpamCliArgs,
 };
+use crate::default_scenarios::fill_block::SpamRate;
+use crate::default_scenarios::{BuiltinOptions, BuiltinScenarioCli};
 use crate::error::CliError;
 use crate::util::load_testconfig;
 use crate::util::{load_seedfile, parse_duration};
-use crate::BuiltinScenarioCli;
 use alloy::primitives::{keccak256, U256};
 use clap::Args;
 use contender_core::db::DbOps;
 use contender_core::error::RuntimeParamErrorKind;
+use contender_core::generator::RandSeed;
 use contender_testfile::{CampaignConfig, CampaignMode, ResolvedMixEntry, ResolvedStage};
 use std::path::Path;
 use std::time::Duration;
@@ -445,10 +447,21 @@ async fn prepare_scenario(
         skip_setup,
     );
 
+    let rand_seed = RandSeed::seed_from_str(&scenario_seed);
     let spam_scenario = if let Some(builtin_cli) = parse_builtin_reference(&mix.scenario) {
         let provider = args.eth_json_rpc_args.new_rpc_provider()?;
         let builtin = builtin_cli
-            .to_builtin_scenario(&provider, &spam_cli_args, ctx.data_dir)
+            .to_builtin_scenario(
+                &provider,
+                BuiltinOptions {
+                    accounts_per_agent: ctx.args.eth_json_rpc_args.accounts_per_agent,
+                    seed: rand_seed,
+                    spam_rate: Some(match ctx.campaign.spam.mode {
+                        CampaignMode::Tps => SpamRate::TxsPerSecond(mix.rate),
+                        CampaignMode::Tpb => SpamRate::TxsPerBlock(mix.rate),
+                    }),
+                },
+            )
             .await?;
         SpamScenario::Builtin(builtin)
     } else {

crates/cli/src/commands/common.rs

@@ -3,6 +3,7 @@
 use super::EngineArgs;
 use crate::commands::error::ArgsError;
 use crate::commands::SpamScenario;
+use crate::default_scenarios::fill_block::SpamRate;
 use crate::error::CliError;
 use crate::util::get_signers_with_defaults;
 use alloy::consensus::TxType;
@@ -336,6 +337,17 @@ Requires --priv-key to be set for each 'from' address in the given testfile.",
     pub run_forever: bool,
 }
 
+impl SendSpamCliArgs {
+    pub fn spam_rate(&self) -> Result<SpamRate, ArgsError> {
+        match (self.txs_per_second, self.txs_per_block) {
+            (Some(_), Some(_)) => Err(ArgsError::SpamRateNotFound),
+            (None, None) => Err(ArgsError::SpamRateNotFound),
+            (Some(tps), None) => Ok(SpamRate::TxsPerSecond(tps)),
+            (None, Some(tpb)) => Ok(SpamRate::TxsPerBlock(tpb)),
+        }
+    }
+}
+
 #[derive(Copy, Debug, Clone, clap::ValueEnum)]
 pub enum TxTypeCli {
     /// Legacy transaction (type `0x0`)

crates/cli/src/commands/spam.rs

@@ -5,7 +5,7 @@ use crate::{
         error::ArgsError,
         Result,
     },
-    default_scenarios::BuiltinScenario,
+    default_scenarios::{BuiltinOptions, BuiltinScenario},
     error::CliError,
     util::{
         bold, check_private_keys, fund_accounts, load_seedfile, load_testconfig, parse_duration,
@@ -151,6 +151,24 @@ pub struct SpamCliArgs {
     )]
     pub flashblocks_ws_url: Option<Url>,
 }
+
+impl SpamCliArgs {
+    pub fn builtin_options(&self, data_dir: &PathBuf) -> Result<BuiltinOptions> {
+        let seed = self
+            .eth_json_rpc_args
+            .rpc_args
+            .seed
+            .clone()
+            .unwrap_or(load_seedfile(data_dir)?);
+        let seed = RandSeed::seed_from_str(&seed);
+        Ok(BuiltinOptions {
+            accounts_per_agent: self.eth_json_rpc_args.rpc_args.accounts_per_agent,
+            seed,
+            spam_rate: Some(self.spam_args.spam_rate()?),
+        })
+    }
+}
+
 #[derive(Clone)]
 pub enum SpamScenario {
     Testfile(String),

crates/cli/src/default_scenarios/blobs.rs

@@ -1,10 +1,11 @@
 use clap::Parser;
 use contender_core::generator::{types::SpamRequest, FunctionCallDefinition};
 use contender_testfile::TestConfig;
+use serde::{Deserialize, Serialize};
 
 use crate::default_scenarios::builtin::ToTestConfig;
 
-#[derive(Parser, Clone, Debug)]
+#[derive(Parser, Clone, Debug, Deserialize, Serialize)]
 /// Send blob transactions. Note: the tx type will always be overridden to eip4844.
 pub struct BlobsCliArgs {
     #[arg(

crates/cli/src/default_scenarios/builtin.rs

@@ -1,13 +1,11 @@
-use std::path::Path;
-
 use super::fill_block::{fill_block, FillBlockArgs, FillBlockCliArgs};
 use crate::{
-    commands::SpamCliArgs,
     default_scenarios::{
         blobs::BlobsCliArgs,
         custom_contract::{CustomContractArgs, CustomContractCliArgs},
         erc20::{Erc20Args, Erc20CliArgs},
         eth_functions::{opcodes::EthereumOpcode, EthFunctionsArgs, EthFunctionsCliArgs},
+        fill_block::SpamRate,
         revert::RevertCliArgs,
         setcode::{SetCodeArgs, SetCodeCliArgs, SetCodeSubCommand},
         storage::{StorageStressArgs, StorageStressCliArgs},
@@ -16,7 +14,7 @@ use crate::{
         uni_v2::{UniV2Args, UniV2CliArgs},
     },
     error::CliError,
-    util::{bold, load_seedfile},
+    util::bold,
 };
 use alloy::primitives::U256;
 use clap::Subcommand;
@@ -26,10 +24,12 @@ use contender_core::{
     generator::{constants::setcode_placeholder, types::AnyProvider, RandSeed},
 };
 use contender_testfile::TestConfig;
+use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 use tracing::warn;
 
-#[derive(Clone, Debug, Subcommand)]
+#[derive(Clone, Debug, Subcommand, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
 pub enum BuiltinScenarioCli {
     /// Send EIP-4844 blob transactions.
     Blobs(BlobsCliArgs),
@@ -76,12 +76,18 @@ pub trait ToTestConfig {
     fn to_testconfig(&self) -> TestConfig;
 }
 
+#[derive(Default)]
+pub struct BuiltinOptions {
+    pub accounts_per_agent: Option<u64>,
+    pub seed: RandSeed,
+    pub spam_rate: Option<SpamRate>,
+}
+
 impl BuiltinScenarioCli {
     pub async fn to_builtin_scenario(
         &self,
         provider: &AnyProvider,
-        spam_args: &SpamCliArgs,
-        data_dir: &Path,
+        options: BuiltinOptions,
     ) -> Result<BuiltinScenario, CliError> {
         match self.to_owned() {
             BuiltinScenarioCli::Blobs(args) => Ok(BuiltinScenario::Blobs(args)),
@@ -91,21 +97,11 @@ impl BuiltinScenarioCli {
             )),
 
             BuiltinScenarioCli::Erc20(args) => {
-                let seed = spam_args
-                    .eth_json_rpc_args
-                    .rpc_args
-                    .seed
-                    .to_owned()
-                    .unwrap_or(load_seedfile(data_dir)?);
-                let seed = RandSeed::seed_from_str(&seed);
                 let mut agents = AgentStore::new();
                 agents.init(
                     &["spammers"],
-                    spam_args
-                        .eth_json_rpc_args
-                        .rpc_args
-                        .accounts_per_agent_or(10) as usize,
-                    &seed,
+                    options.accounts_per_agent.unwrap_or(10) as usize,
+                    &options.seed,
                 );
                 let spammers = agents
                     .get_agent("spammers")
@@ -118,7 +114,7 @@ impl BuiltinScenarioCli {
             }
 
             BuiltinScenarioCli::FillBlock(args) => {
-                fill_block(provider, &spam_args.spam_args, &args).await
+                fill_block(provider, options.spam_rate.unwrap_or_default(), &args).await
             }
 
             BuiltinScenarioCli::EthFunctions(args) => {

crates/cli/src/default_scenarios/custom_contract.rs

@@ -6,13 +6,14 @@ use contender_core::generator::types::SpamRequest;
 use contender_core::generator::util::encode_calldata;
 use contender_core::generator::{CompiledContract, CreateDefinition, FunctionCallDefinition};
 use contender_testfile::TestConfig;
+use serde::{Deserialize, Serialize};
 use std::process::Command;
 use thiserror::Error;
 use tracing::debug;
 
 const ARTIFACTS_PATH: &str = "/tmp/contender-contracts";
 
-#[derive(Clone, Debug, clap::Parser)]
+#[derive(Clone, Debug, clap::Parser, Deserialize, Serialize)]
 pub struct CustomContractCliArgs {
     /// Path to smart contract source. Format: <path/to/contract.sol>:<ContractName>
     contract_path: std::path::PathBuf,

crates/cli/src/default_scenarios/erc20.rs

@@ -1,16 +1,18 @@
 use alloy::primitives::{Address, U256};
 use contender_core::generator::{
-    types::SpamRequest, util::parse_value, CreateDefinition, FunctionCallDefinition, FuzzParam,
+    types::SpamRequest, util::parse_value, util::deserialize_value, CreateDefinition,
+    FunctionCallDefinition, FuzzParam,
 };
 use contender_testfile::TestConfig;
+use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 
 use crate::default_scenarios::{builtin::ToTestConfig, contracts::test_token};
 
 pub static DEFAULT_TOKENS_SENT: &str = "0.00001 ether";
 pub static DEFAULT_TOKENS_FUNDED: &str = "1000000 ether";
 
-#[derive(Clone, Debug, clap::Parser)]
+#[derive(Clone, Debug, clap::Parser, Deserialize, Serialize)]
 pub struct Erc20CliArgs {
     #[arg(
         short,
@@ -19,6 +21,7 @@ pub struct Erc20CliArgs {
         default_value = DEFAULT_TOKENS_SENT,
         value_parser = parse_value,
     )]
+    #[serde(deserialize_with = "deserialize_value")]
     pub send_amount: U256,
 
     #[arg(
@@ -28,6 +31,7 @@ pub struct Erc20CliArgs {
         default_value = DEFAULT_TOKENS_FUNDED,
         value_parser = parse_value,
     )]
+    #[serde(deserialize_with = "deserialize_value")]
     pub fund_amount: U256,
 
     #[arg(

crates/cli/src/default_scenarios/eth_functions/command.rs

@@ -9,8 +9,9 @@ use crate::default_scenarios::{
 use clap::Parser;
 use contender_core::generator::CreateDefinition;
 use contender_testfile::TestConfig;
+use serde::{Deserialize, Serialize};
 
-#[derive(Parser, Clone, Debug)]
+#[derive(Parser, Clone, Debug, Deserialize, Serialize)]
 pub struct EthFunctionsCliArgs {
     #[arg(
         short,

crates/cli/src/default_scenarios/eth_functions/opcodes.rs

@@ -1,9 +1,12 @@
 use crate::default_scenarios::contracts::SPAM_ME;
 use clap::ValueEnum;
 use contender_core::generator::{types::SpamRequest, FunctionCallDefinition};
+use serde::{Deserialize, Serialize};
 use strum::EnumIter;
 
-#[derive(ValueEnum, Clone, Debug, strum::Display, EnumIter, PartialEq, Eq)]
+#[derive(
+    ValueEnum, Clone, Debug, strum::Display, EnumIter, PartialEq, Eq, Deserialize, Serialize,
+)]
 pub enum EthereumOpcode {
     Stop,
     Add,

crates/cli/src/default_scenarios/eth_functions/precompiles.rs

@@ -1,9 +1,12 @@
 use crate::default_scenarios::contracts::SPAM_ME;
 use clap::ValueEnum;
 use contender_core::generator::{types::SpamRequest, FunctionCallDefinition};
+use serde::{Deserialize, Serialize};
 use strum::EnumIter;
 
-#[derive(ValueEnum, Clone, Debug, strum::Display, EnumIter, PartialEq, Eq)]
+#[derive(
+    ValueEnum, Clone, Debug, strum::Display, EnumIter, PartialEq, Eq, Deserialize, Serialize,
+)]
 // TODO: add missing precompiles to SpamMe contract & here.
 pub enum EthereumPrecompile {
     #[clap(aliases = ["sha256"])]