WIP filler bin

Cargo.toml

@@ -21,12 +21,29 @@ path = "bin/builder.rs"
 name = "transaction-submitter"
 path = "bin/submit_transaction.rs"
 
+[[bin]]
+name = "fill-order"
+path = "bin/fill_order.rs"
+
 [dependencies]
-init4-bin-base = "0.1.0"
+init4-bin-base = { git = "https://github.com/init4tech/bin-base.git" }
 
-zenith-types = "0.13"
+signet-zenith = { git = "https://github.com/init4tech/signet-sdk", branch = "main" }
+signet-types = { git = "https://github.com/init4tech/signet-sdk", branch = "main" }
+signet-bundle = { git = "https://github.com/init4tech/signet-sdk", branch = "main" }
+signet-sim = { git = "https://github.com/init4tech/signet-sdk", branch = "main" }
 
-alloy = { version = "0.7.3", features = ["full", "json-rpc", "signer-aws", "rpc-types-mev", "rlp"] }
+trevm = { version = "0.20.10", features = ["concurrent-db", "test-utils"] }
+
+alloy = { version = "0.12.6", features = [
+    "full",
+    "json-rpc",
+    "signer-aws",
+    "rpc-types-mev",
+    "rlp",
+    "node-bindings",
+    "serde",
+] }
 
 aws-config = "1.1.7"
 aws-sdk-kms = "1.15.0"
@@ -48,3 +65,4 @@ tokio = { version = "1.36.0", features = ["full", "macros", "rt-multi-thread"] }
 
 async-trait = "0.1.80"
 oauth2 = "4.4.2"
+tracing-subscriber = "0.3.19"

bin/builder.rs

@@ -1,12 +1,14 @@
-#![allow(dead_code)]
-
-use builder::config::BuilderConfig;
-use builder::service::serve_builder_with_span;
-use builder::tasks::block::BlockBuilder;
-use builder::tasks::metrics::MetricsTask;
-use builder::tasks::oauth::Authenticator;
-use builder::tasks::submit::SubmitTask;
-
+use builder::{
+    config::BuilderConfig,
+    service::serve_builder_with_span,
+    tasks::{
+        block::Simulator, bundler, metrics::MetricsTask, oauth::Authenticator, submit::SubmitTask,
+        tx_poller,
+    },
+};
+use signet_sim::SimCache;
+use signet_types::SlotCalculator;
+use std::sync::Arc;
 use tokio::select;
 
 #[tokio::main]
@@ -16,19 +18,20 @@ async fn main() -> eyre::Result<()> {
     let span = tracing::info_span!("zenith-builder");
 
     let config = BuilderConfig::load_from_env()?.clone();
-    let host_provider = config.connect_host_provider().await?;
-    let ru_provider = config.connect_ru_provider().await?;
+    let constants = config.load_pecorino_constants();
     let authenticator = Authenticator::new(&config);
 
-    tracing::debug!(rpc_url = config.host_rpc_url.as_ref(), "instantiated provider");
+    let (host_provider, ru_provider, sequencer_signer) = tokio::try_join!(
+        config.connect_host_provider(),
+        config.connect_ru_provider(),
+        config.connect_sequencer_signer(),
+    )?;
 
-    let sequencer_signer = config.connect_sequencer_signer().await?;
     let zenith = config.connect_zenith(host_provider.clone());
 
     let metrics = MetricsTask { host_provider: host_provider.clone() };
     let (tx_channel, metrics_jh) = metrics.spawn();
 
-    let builder = BlockBuilder::new(&config, authenticator.clone(), ru_provider.clone());
     let submit = SubmitTask {
         authenticator: authenticator.clone(),
         host_provider,
@@ -39,14 +42,43 @@ async fn main() -> eyre::Result<()> {
         outbound_tx_channel: tx_channel,
     };
 
+    let tx_poller = tx_poller::TxPoller::new(&config);
+    let (tx_receiver, tx_poller_jh) = tx_poller.spawn();
+
+    let bundle_poller = bundler::BundlePoller::new(&config, authenticator.clone());
+    let (bundle_receiver, bundle_poller_jh) = bundle_poller.spawn();
+
     let authenticator_jh = authenticator.spawn();
+
     let (submit_channel, submit_jh) = submit.spawn();
-    let build_jh = builder.spawn(submit_channel);
+
+    let sim_items = SimCache::new();
+    let slot_calculator =
+        SlotCalculator::new(config.start_timestamp, config.chain_offset, config.target_slot_time);
+
+    let sim = Arc::new(Simulator::new(&config, ru_provider.clone(), slot_calculator));
+
+    let (basefee_jh, sim_cache_jh) =
+        sim.clone().spawn_cache_task(tx_receiver, bundle_receiver, sim_items.clone());
+
+    let build_jh = sim.clone().spawn_simulator_task(constants, sim_items.clone(), submit_channel);
 
     let port = config.builder_port;
     let server = serve_builder_with_span(([0, 0, 0, 0], port), span);
 
     select! {
+        _ = tx_poller_jh => {
+            tracing::info!("tx_poller finished");
+        },
+        _ = bundle_poller_jh => {
+            tracing::info!("bundle_poller finished");
+        },
+        _ = sim_cache_jh => {
+            tracing::info!("sim cache task finished");
+        }
+        _ = basefee_jh => {
+            tracing::info!("basefee task finished");
+        }
         _ = submit_jh => {
             tracing::info!("submit finished");
         },