chore: remove constants

Author: prestwich

Cargo.toml

@@ -25,6 +25,7 @@ path = "bin/submit_transaction.rs"
 init4-bin-base = "0.3"
 
 signet-zenith = { git = "https://github.com/init4tech/signet-sdk", branch = "main" }
+signet-constants = { 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" }

src/lib.rs

@@ -12,9 +12,6 @@
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-/// Constants for the Builder.
-pub mod constants;
-
 /// Configuration for the Builder binary.
 pub mod config;
 

src/tasks/block.rs

@@ -3,7 +3,6 @@
 //! and turns them into valid Pecorino blocks for network submission.
 use crate::{
     config::{BuilderConfig, RuProvider},
-    constants::{BASEFEE_DEFAULT, PECORINO_CHAIN_ID},
     tasks::bundler::Bundle,
 };
 use alloy::{
@@ -347,7 +346,7 @@ impl Simulator {
             Some(basefee) => basefee,
             None => {
                 warn!("get basefee failed - RPC error likely occurred");
-                BASEFEE_DEFAULT
+                todo!()
             }
         };
         debug!(basefee = basefee, "setting basefee");
@@ -433,7 +432,7 @@ impl trevm::Cfg for PecorinoCfg {
     fn fill_cfg_env(&self, cfg_env: &mut CfgEnv) {
         let CfgEnv { chain_id, spec, .. } = cfg_env;
 
-        *chain_id = PECORINO_CHAIN_ID;
+        *chain_id = signet_constants::pecorino::RU_CHAIN_ID;
         *spec = SpecId::default();
     }
 }

src/test_utils.rs

@@ -1,9 +1,5 @@
 //! Test utilities for testing builder tasks
-use crate::{
-    config::BuilderConfig,
-    constants::{PECORINO_CHAIN_ID, PECORINO_HOST_CHAIN_ID},
-    tasks::block::PecorinoBlockEnv,
-};
+use crate::{config::BuilderConfig, tasks::block::PecorinoBlockEnv};
 use alloy::{
     consensus::{SignableTransaction, TxEip1559, TxEnvelope},
     primitives::{Address, FixedBytes, TxKind, U256},
@@ -25,8 +21,8 @@ use std::{
 /// Sets up a block builder with test values
 pub fn setup_test_config() -> Result<BuilderConfig> {
     let config = BuilderConfig {
-        host_chain_id: PECORINO_HOST_CHAIN_ID,
-        ru_chain_id: PECORINO_CHAIN_ID,
+        host_chain_id: signet_constants::pecorino::HOST_CHAIN_ID,
+        ru_chain_id: signet_constants::pecorino::RU_CHAIN_ID,
         host_rpc_url: "https://host-rpc.pecorino.signet.sh".into(),
         ru_rpc_url: "https://rpc.pecorino.signet.sh".into(),
         tx_broadcast_urls: vec!["http://localhost:9000".into()],
@@ -64,7 +60,7 @@ pub fn new_signed_tx(
     mpfpg: u128,
 ) -> Result<TxEnvelope> {
     let tx = TxEip1559 {
-        chain_id: PECORINO_CHAIN_ID,
+        chain_id: signet_constants::pecorino::RU_CHAIN_ID,
         nonce,
         max_fee_per_gas: 50_000,
         max_priority_fee_per_gas: mpfpg,

tests/block_builder_test.rs

@@ -9,7 +9,6 @@ mod tests {
         signers::local::PrivateKeySigner,
     };
     use builder::{
-        constants::PECORINO_CHAIN_ID,
         tasks::block::Simulator,
         test_utils::{new_signed_tx, setup_logging, setup_test_config, test_block_env},
     };
@@ -37,7 +36,9 @@ mod tests {
         let constants = SignetSystemConstants::pecorino();
 
         // Create an anvil instance for testing
-        let anvil_instance = Anvil::new().chain_id(PECORINO_CHAIN_ID).spawn();
+        let anvil_instance = Anvil::new().chain_id(
+            signet_constants::pecorino::RU_CHAIN_ID,
+        ).spawn();
 
         // Create a wallet
         let keys = anvil_instance.keys();
@@ -94,7 +95,7 @@ mod tests {
         let constants = SignetSystemConstants::pecorino();
 
         // Create an anvil instance for testing
-        let anvil_instance = Anvil::new().chain_id(PECORINO_CHAIN_ID).spawn();
+        let anvil_instance = Anvil::new().chain_id(signet_constants::pecorino::RU_CHAIN_ID).spawn();
 
         // Create a wallet
         let keys = anvil_instance.keys();