refactor: constants into config

Author: prestwich

Cargo.lock

@@ -10,7 +10,6 @@ use init4_bin_base::{
     deps::tracing::{info, info_span},
     utils::from_env::FromEnv,
 };
-use signet_types::constants::SignetSystemConstants;
 use tokio::select;
 
 // Note: Must be set to `multi_thread` to support async tasks.
@@ -22,19 +21,14 @@ async fn main() -> eyre::Result<()> {
 
     // Pull the configuration from the environment
     let config = BuilderConfig::from_env()?.clone();
-    let constants = SignetSystemConstants::pecorino();
 
     // We connect the WS greedily, so we can fail early if the connection is
     // invalid.
     let ru_provider = config.connect_ru_provider().await?;
 
     // Spawn the EnvTask
-    let env_task = EnvTask::new(
-        config.clone(),
-        constants.clone(),
-        config.connect_host_provider().await?,
-        ru_provider.clone(),
-    );
+    let env_task =
+        EnvTask::new(config.clone(), config.connect_host_provider().await?, ru_provider.clone());
     let (block_env, env_jh) = env_task.spawn();
 
     // Spawn the cache system
@@ -55,7 +49,6 @@ async fn main() -> eyre::Result<()> {
         zenith,
         quincey,
         config: config.clone(),
-        constants: constants.clone(),
         outbound_tx_channel: tx_channel,
     };
 
@@ -64,7 +57,8 @@ async fn main() -> eyre::Result<()> {
 
     // Set up the simulator
     let sim = Simulator::new(&config, ru_provider.clone(), block_env);
-    let build_jh = sim.spawn_simulator_task(constants, cache_system.sim_cache, submit_channel);
+    let build_jh =
+        sim.spawn_simulator_task(config.constants.clone(), cache_system.sim_cache, submit_channel);
 
     // Start the healthcheck server
     let server = serve_builder(([0, 0, 0, 0], config.builder_port));

bin/builder.rs

@@ -21,6 +21,7 @@ use init4_bin_base::{
         signer::{LocalOrAws, SignerError},
     },
 };
+use signet_constants::SignetSystemConstants;
 use signet_zenith::Zenith;
 use std::borrow::Cow;
 use tokio::join;
@@ -159,6 +160,9 @@ pub struct BuilderConfig {
 
     /// The slot calculator for the builder.
     pub slot_calculator: SlotCalculator,
+
+    /// The signet system constants.
+    pub constants: SignetSystemConstants,
 }
 
 impl BuilderConfig {

src/config.rs

@@ -6,7 +6,6 @@ use alloy::{
     providers::Provider,
 };
 use init4_bin_base::deps::tracing::{Instrument, debug, error, info_span};
-use signet_constants::SignetSystemConstants;
 use tokio::{sync::watch, task::JoinHandle};
 use tokio_stream::StreamExt;
 use tracing::warn;
@@ -18,9 +17,6 @@ pub struct EnvTask {
     /// Builder configuration values.
     config: BuilderConfig,
 
-    /// Signet system constants.
-    constants: SignetSystemConstants,
-
     /// Host provider is used to get the latest host block header for
     /// constructing the next block environment.
     host_provider: HostProvider,
@@ -69,11 +65,10 @@ impl EnvTask {
     /// Create a new [`EnvTask`] with the given config and providers.
     pub const fn new(
         config: BuilderConfig,
-        constants: SignetSystemConstants,
         host_provider: HostProvider,
         ru_provider: RuProvider,
     ) -> Self {
-        Self { config, constants, host_provider, ru_provider }
+        Self { config, host_provider, ru_provider }
     }
 
     /// Construct a [`BlockEnv`] by from the previous block header.
@@ -115,7 +110,7 @@ impl EnvTask {
             headers.next().instrument(info_span!("EnvTask::task_fut::stream")).await
         {
             let host_block_number =
-                self.constants.rollup_block_to_host_block_num(rollup_header.number);
+                self.config.constants.rollup_block_to_host_block_num(rollup_header.number);
 
             let span = info_span!("SimEnv", %host_block_number, %rollup_header.hash, %rollup_header.number);
 

src/tasks/env.rs

@@ -19,7 +19,6 @@ use init4_bin_base::deps::{
     metrics::{counter, histogram},
     tracing::{Instrument, debug, debug_span, error, info, warn},
 };
-use signet_constants::SignetSystemConstants;
 use std::{ops::Range, time::Instant};
 use tokio::{sync::mpsc, task::JoinHandle};
 
@@ -81,8 +80,6 @@ pub struct BuilderHelperTask {
     pub zenith: ZenithInstance,
     /// Quincey
     pub quincey: Quincey,
-    /// Constants
-    pub constants: SignetSystemConstants,
     /// Config
     pub config: crate::config::BuilderConfig,
     /// Channel over which to send pending transactions
@@ -287,7 +284,6 @@ impl BuilderHelperTask {
                 self.provider().clone(),
                 self.quincey.clone(),
                 self.config.clone(),
-                self.constants.clone(),
             );
             let bumpable = res_unwrap_or_continue!(
                 prep.prep_transaction(&sim_result.sim_env.prev_host)

src/tasks/submit/builder_helper.rs

@@ -64,9 +64,12 @@ impl FlashbotsTask {
         outbound: mpsc::UnboundedSender<TxHash>,
         bundle_helper: bool,
     ) -> eyre::Result<FlashbotsTask> {
-        let flashbots = config.flashbots_provider().await?;
-        let quincey = config.connect_quincey().await?;
-        let host_provider = config.connect_host_provider().await?;
+        let (flashbots, quincey, host_provider) = tokio::try_join!(
+            config.flashbots_provider(),
+            config.connect_quincey(),
+            config.connect_host_provider(),
+        )?;
+
         let zenith = config.connect_zenith(host_provider);
 
         Ok(Self {
@@ -105,7 +108,6 @@ impl FlashbotsTask {
             self.host_provider(),
             self.quincey.clone(),
             self.config.clone(),
-            self.constants.clone(),
         );
 
         let tx = prep.prep_transaction(&sim_result.sim_env.prev_header).await.map_err(|err| {

src/tasks/submit/flashbots.rs

@@ -12,7 +12,6 @@ use alloy::{
     sol_types::SolCall,
 };
 use init4_bin_base::deps::tracing::debug;
-use signet_constants::SignetSystemConstants;
 use signet_sim::BuiltBlock;
 use signet_types::{SignRequest, SignResponse};
 use signet_zenith::BundleHelper;
@@ -31,7 +30,6 @@ pub struct SubmitPrep<'a> {
     provider: HostProvider,
     quincey: Quincey,
     config: BuilderConfig,
-    constants: SignetSystemConstants,
 
     // Memoized quincey request and response
     sig_request: std::sync::OnceLock<SignRequest>,
@@ -45,7 +43,6 @@ impl<'a> SubmitPrep<'a> {
         provider: HostProvider,
         quincey: Quincey,
         config: BuilderConfig,
-        constants: SignetSystemConstants,
     ) -> Self {
         Self {
             block,
@@ -54,15 +51,14 @@ impl<'a> SubmitPrep<'a> {
             provider,
             quincey,
             config,
-            constants,
         }
     }
 
     /// Construct a quincey signature request for the block.
     fn sig_request(&self) -> &SignRequest {
         self.sig_request.get_or_init(|| {
             let host_block_number =
-                self.constants.rollup_block_to_host_block_num(self.block.block_number());
+                self.config.constants.rollup_block_to_host_block_num(self.block.block_number());
 
             SignRequest {
                 host_block_number: U256::from(host_block_number),
@@ -102,7 +98,7 @@ impl<'a> SubmitPrep<'a> {
         // Build the block header
         let header = BundleHelper::BlockHeader {
             hostBlockNumber: self.sig_request().host_block_number,
-            rollupChainId: U256::from(self.constants.ru_chain_id()),
+            rollupChainId: U256::from(self.config.constants.ru_chain_id()),
             gasLimit: self.sig_request().gas_limit,
             rewardAddress: self.sig_request().ru_reward_address,
             blockDataHash: *self.block.contents_hash(),

src/tasks/submit/prep.rs

@@ -14,6 +14,7 @@ use init4_bin_base::{
     perms::OAuthConfig,
     utils::{calc::SlotCalculator, flashbots::FlashbotsConfig, provider::ProviderConfig},
 };
+use signet_constants::SignetSystemConstants;
 use std::env;
 use std::str::FromStr;
 use trevm::revm::{context::BlockEnv, context_interface::block::BlobExcessGasAndPrice};
@@ -61,6 +62,7 @@ pub fn setup_test_config() -> Result<BuilderConfig> {
             1740681556, // pecorino start timestamp as sane default
             0, 1,
         ),
+        constants: SignetSystemConstants::pecorino(),
     };
     Ok(config)
 }

src/test_utils.rs

@@ -44,7 +44,6 @@ async fn test_handle_build() {
 
     let block_env = EnvTask::new(
         config.clone(),
-        constants.clone(),
         config.connect_host_provider().await.unwrap(),
         ru_provider.clone(),
     )

tests/block_builder_test.rs

@@ -3,7 +3,6 @@ use builder::{
     test_utils::{setup_logging, setup_test_config},
 };
 use init4_bin_base::deps::tracing::warn;
-use signet_constants::SignetSystemConstants;
 use std::time::Duration;
 
 #[ignore = "integration test. This test will take >12 seconds to run, and requires Authz configuration env vars."]
@@ -15,7 +14,6 @@ async fn test_bundle_poller_roundtrip() -> eyre::Result<()> {
 
     let (block_env, _jh) = EnvTask::new(
         config.clone(),
-        SignetSystemConstants::pecorino(),
         config.connect_host_provider().await?,
         config.connect_ru_provider().await?,
     )