diff --git a/sequencer_core/src/lib.rs b/sequencer_core/src/lib.rs index 9a2ca2b1..cad7e20e 100644 --- a/sequencer_core/src/lib.rs +++ b/sequencer_core/src/lib.rs @@ -28,6 +28,9 @@ pub mod indexer_client; #[cfg(feature = "mock")] pub mod mock; +#[cfg(feature = "mock")] +pub use mock::SequencerCoreWithMockClients; + pub struct SequencerCore< BC: BlockSettlementClientTrait = BlockSettlementClient, IC: IndexerClientTrait = IndexerClient, diff --git a/sequencer_rpc/Cargo.toml b/sequencer_rpc/Cargo.toml index 36b7f7a1..210f3077 100644 --- a/sequencer_rpc/Cargo.toml +++ b/sequencer_rpc/Cargo.toml @@ -27,3 +27,8 @@ borsh.workspace = true [dev-dependencies] sequencer_core = { workspace = true, features = ["mock"] } + +[features] +default = [] +# Includes types to run the sequencer in standalone mode +standalone = ["sequencer_core/mock"] diff --git a/sequencer_rpc/src/lib.rs b/sequencer_rpc/src/lib.rs index 6898c17c..ac92ff45 100644 --- a/sequencer_rpc/src/lib.rs +++ b/sequencer_rpc/src/lib.rs @@ -49,3 +49,9 @@ pub fn rpc_error_responce_inverter(err: RpcError) -> RpcError { data: content, } } + +#[cfg(feature = "standalone")] +use sequencer_core::mock::{MockBlockSettlementClient, MockIndexerClient}; + +#[cfg(feature = "standalone")] +pub type JsonHandlerWithMockClients = JsonHandler; diff --git a/sequencer_rpc/src/net_utils.rs b/sequencer_rpc/src/net_utils.rs index 5e33e76b..ee9f6aa1 100644 --- a/sequencer_rpc/src/net_utils.rs +++ b/sequencer_rpc/src/net_utils.rs @@ -9,10 +9,19 @@ use common::{ use futures::{Future, FutureExt}; use log::info; use mempool::MemPoolHandle; +#[cfg(not(feature = "standalone"))] use sequencer_core::SequencerCore; +#[cfg(feature = "standalone")] +use sequencer_core::SequencerCoreWithMockClients as SequencerCore; + +#[cfg(not(feature = "standalone"))] +use super::JsonHandler; + +#[cfg(feature = "standalone")] +type JsonHandler = super::JsonHandlerWithMockClients; + use tokio::sync::Mutex; -use super::JsonHandler; use crate::process::Process; pub const SHUTDOWN_TIMEOUT_SECS: u64 = 10; diff --git a/sequencer_runner/Cargo.toml b/sequencer_runner/Cargo.toml index 04861c7f..5e627ed2 100644 --- a/sequencer_runner/Cargo.toml +++ b/sequencer_runner/Cargo.toml @@ -18,3 +18,8 @@ actix.workspace = true actix-web.workspace = true tokio.workspace = true futures.workspace = true + +[features] +default = [] +# Runs the sequencer in standalone mode without depending on Bedrock and Indexer services. +standalone = ["sequencer_core/mock", "sequencer_rpc/standalone"] diff --git a/sequencer_runner/src/lib.rs b/sequencer_runner/src/lib.rs index b3020e93..e4d5289c 100644 --- a/sequencer_runner/src/lib.rs +++ b/sequencer_runner/src/lib.rs @@ -5,11 +5,12 @@ use anyhow::{Context as _, Result}; use clap::Parser; use common::rpc_primitives::RpcConfig; use futures::{FutureExt as _, never::Never}; -use log::{error, info, warn}; -use sequencer_core::{ - SequencerCore, block_settlement_client::BlockSettlementClientTrait as _, - config::SequencerConfig, -}; +use log::{error, info}; +#[cfg(not(feature = "standalone"))] +use sequencer_core::SequencerCore; +#[cfg(feature = "standalone")] +use sequencer_core::SequencerCoreWithMockClients as SequencerCore; +use sequencer_core::config::SequencerConfig; use sequencer_rpc::new_http_server; use tokio::{sync::Mutex, task::JoinHandle}; @@ -156,6 +157,7 @@ async fn main_loop(seq_core: Arc>, block_timeout: Duration) } } +#[cfg(not(feature = "standalone"))] async fn retry_pending_blocks_loop( seq_core: Arc>, retry_pending_blocks_timeout: Duration, @@ -180,8 +182,8 @@ async fn retry_pending_blocks_loop( "Resubmitting pending block with id {}", block.header.block_id ); - // TODO: We could cache the inscribe tx for each pending block to avoid re-creating it - // on every retry. + // TODO: We could cache the inscribe tx for each pending block to avoid re-creating + // it on every retry. let (tx, _msg_id) = block_settlement_client .create_inscribe_tx(block) .context("Failed to create inscribe tx for pending block")?; @@ -199,6 +201,7 @@ async fn retry_pending_blocks_loop( } } +#[cfg(not(feature = "standalone"))] async fn listen_for_bedrock_blocks_loop(seq_core: Arc>) -> Result { use indexer_service_rpc::RpcClient as _; @@ -235,6 +238,19 @@ async fn listen_for_bedrock_blocks_loop(seq_core: Arc>) -> } } +#[cfg(feature = "standalone")] +async fn listen_for_bedrock_blocks_loop(_seq_core: Arc>) -> Result { + std::future::pending::>().await +} + +#[cfg(feature = "standalone")] +async fn retry_pending_blocks_loop( + _seq_core: Arc>, + _retry_pending_blocks_timeout: Duration, +) -> Result { + std::future::pending::>().await +} + pub async fn main_runner() -> Result<()> { env_logger::init();