pulls chain configs out into constants module

Author: dylanlott

src/config.rs

@@ -1,4 +1,7 @@
-use crate::signer::{LocalOrAws, SignerError};
+use crate::{
+    constants::{self, HOST_WBTC},
+    signer::{LocalOrAws, SignerError},
+};
 use alloy::{
     network::{Ethereum, EthereumWallet},
     primitives::{Address, address},
@@ -251,26 +254,26 @@ impl BuilderConfig {
     pub const fn load_pecorino_constants(&self) -> SignetSystemConstants {
         let host = HostConfig::new(
             self.host_chain_id,
-            149984,
+            constants::PECORINO_DEPLOY_HEIGHT,
             self.zenith_address,
-            address!("0x4E8cC181805aFC307C83298242271142b8e2f249"),
-            address!("0xd553C4CA4792Af71F4B61231409eaB321c1Dd2Ce"),
-            address!("0x1af3A16857C28917Ab2C4c78Be099fF251669200"),
+            constants::HOST_ORDERS,
+            constants::HOST_PASSAGE,
+            constants::HOST_TRANSACTOR,
             PredeployTokens::new(
-                address!("0x885F8DB528dC8a38aA3DDad9D3F619746B4a6A81"),
-                address!("0x7970D259D4a96764Fa9B23FF0715A35f06f52D1A"),
-                address!("0x7970D259D4a96764Fa9B23FF0715A35f06f52D1A"),
+                constants::HOST_USDC,
+                constants::HOST_USDT,
+                constants::HOST_WBTC,
             ),
         );
         let rollup = RollupConfig::new(
             self.ru_chain_id,
-            address!("0x4E8cC181805aFC307C83298242271142b8e2f249"),
-            address!("0xd553C4CA4792Af71F4B61231409eaB321c1Dd2Ce"),
-            address!("0xe0eDA3701D44511ce419344A4CeD30B52c9Ba231"),
+            constants::ROLLUP_ORDERS,
+            constants::ROLLUP_PASSAGE,
+            constants::BASE_FEE_RECIPIENT,
             PredeployTokens::new(
-                address!("0x0B8BC5e60EE10957E0d1A0d95598fA63E65605e2"),
-                address!("0xF34326d3521F1b07d1aa63729cB14A372f8A737C"),
-                address!("0xE3d7066115f7d6b65F88Dff86288dB4756a7D733"),
+                constants::ROLLUP_USDC,
+                constants::ROLLUP_USDT,
+                constants::ROLLUP_WBTC,
             ),
         );
 

src/constants.rs

@@ -0,0 +1,45 @@
+//! Constants used in the builder.
+
+use alloy::primitives::{Address, address};
+
+/// Pecorino Chain ID used for the Pecorino network.
+pub const PECORINO_CHAIN_ID: u64 = 14174;
+
+/// Block number at which the Pecorino rollup contract is deployed.
+pub const PECORINO_DEPLOY_HEIGHT: u64 = 149984;
+
+/// Address of the orders contract on the host.
+pub const HOST_ORDERS: Address = address!("0x4E8cC181805aFC307C83298242271142b8e2f249");
+
+/// Address of the passage contract on the host.
+pub const HOST_PASSAGE: Address = address!("0xd553C4CA4792Af71F4B61231409eaB321c1Dd2Ce");
+
+/// Address of the transactor contract on the host.
+pub const HOST_TRANSACTOR: Address = address!("0x1af3A16857C28917Ab2C4c78Be099fF251669200");
+
+/// Address of the USDC token contract on the host.
+pub const HOST_USDC: Address = address!("0x885F8DB528dC8a38aA3DDad9D3F619746B4a6A81");
+
+/// Address of the USDT token contract on the host.
+pub const HOST_USDT: Address = address!("0x7970D259D4a96764Fa9B23FF0715A35f06f52D1A");
+
+/// Address of the WBTC token contract on the host.
+pub const HOST_WBTC: Address = address!("0x7970D259D4a96764Fa9B23FF0715A35f06f52D1A");
+
+/// Address of the orders contract on the rollup.
+pub const ROLLUP_ORDERS: Address = address!("0x4E8cC181805aFC307C83298242271142b8e2f249");
+
+/// Address of the passage contract on the rollup.
+pub const ROLLUP_PASSAGE: Address = address!("0xd553C4CA4792Af71F4B61231409eaB321c1Dd2Ce");
+
+/// Base fee recipient address.
+pub const BASE_FEE_RECIPIENT: Address = address!("0xe0eDA3701D44511ce419344A4CeD30B52c9Ba231");
+
+/// Address of the USDC token contract on the rollup.
+pub const ROLLUP_USDC: Address = address!("0x0B8BC5e60EE10957E0d1A0d95598fA63E65605e2");
+
+/// Address of the USDT token contract on the rollup.
+pub const ROLLUP_USDT: Address = address!("0xF34326d3521F1b07d1aa63729cB14A372f8A737C");
+
+/// Address of the WBTC token contract on the rollup.
+pub const ROLLUP_WBTC: Address = address!("0xE3d7066115f7d6b65F88Dff86288dB4756a7D733");

src/consts.rs

@@ -13,7 +13,7 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
 /// Constants for the Builder.
-pub mod consts;
+pub mod constants;
 
 /// Configuration for the Builder binary.
 pub mod config;

src/lib.rs

@@ -1,6 +1,6 @@
 use crate::{
     config::{BuilderConfig, RuProvider},
-    consts::PECORINO_CHAIN_ID,
+    constants::PECORINO_CHAIN_ID,
     tasks::bundler::Bundle,
 };
 use alloy::{

src/tasks/block.rs

@@ -1,5 +1,5 @@
 //! Test utilities for testing builder tasks
-use crate::{config::BuilderConfig, consts::PECORINO_CHAIN_ID};
+use crate::{config::BuilderConfig, constants::PECORINO_CHAIN_ID};
 use alloy::{
     consensus::{SignableTransaction, TxEip1559, TxEnvelope},
     primitives::{Address, TxKind, U256},

src/test_utils.rs

@@ -6,7 +6,7 @@ mod tests {
         signers::local::PrivateKeySigner,
     };
     use builder::{
-        consts::PECORINO_CHAIN_ID,
+        constants::PECORINO_CHAIN_ID,
         tasks::block::Simulator,
         test_utils::{new_signed_tx, setup_logging, setup_test_config},
     };