feat(katana): add builder pattern for katana config

crates/dojo/test-utils/src/sequencer.rs

@@ -114,19 +114,15 @@ impl TestSequencer {
 }
 
 pub fn get_default_test_config(sequencing: SequencingConfig) -> Config {
-    let dev = DevConfig { fee: false, account_validation: true, fixed_gas_prices: None };
-    let mut chain = ChainSpec { id: ChainId::SEPOLIA, ..Default::default() };
-    chain.genesis.sequencer_address = *DEFAULT_SEQUENCER_ADDRESS;
-
-    let rpc = RpcConfig {
-        cors_origins: Vec::new(),
-        port: 0,
-        addr: DEFAULT_RPC_ADDR,
-        apis: RpcModulesList::all(),
-        max_connections: DEFAULT_RPC_MAX_CONNECTIONS,
-        max_event_page_size: Some(100),
-        max_proof_keys: Some(100),
-    };
-
-    Config { sequencing, rpc, dev, chain: chain.into(), ..Default::default() }
+    let mut chain_spec = ChainSpec { id: ChainId::SEPOLIA, ..Default::default() };
+    chain_spec.genesis.sequencer_address =
+        katana_primitives::ContractAddress(*DEFAULT_SEQUENCER_ADDRESS);
+    ConfigBuilder::new()
+        .dev_fee(false)
+        .chain(chain_spec)
+        .rpc_apis(RpcModulesList::all())
+        .rpc_max_event_page_size(Some(100))
+        .rpc_max_proof_keys(Some(100))
+        .sequencing(sequencing)
+        .build()
 }

crates/katana/cli/src/args.rs

@@ -242,7 +242,8 @@ impl NodeArgs {
         if let Some(genesis) = self.starknet.genesis.clone() {
             chain_spec.genesis = genesis;
         } else {
-            chain_spec.genesis.sequencer_address = *DEFAULT_SEQUENCER_ADDRESS;
+            chain_spec.genesis.sequencer_address =
+                katana_primitives::ContractAddress(*DEFAULT_SEQUENCER_ADDRESS);
         }
 
         // generate dev accounts
@@ -423,7 +424,10 @@ mod test {
         assert_eq!(config.execution.validation_max_steps, DEFAULT_VALIDATION_MAX_STEPS);
         assert_eq!(config.db.dir, None);
         assert_eq!(config.chain.id, ChainId::parse("KATANA").unwrap());
-        assert_eq!(config.chain.genesis.sequencer_address, *DEFAULT_SEQUENCER_ADDRESS);
+        assert_eq!(
+            config.chain.genesis.sequencer_address,
+            katana_primitives::ContractAddress(*DEFAULT_SEQUENCER_ADDRESS)
+        );
     }
 
     #[test]
@@ -450,7 +454,10 @@ mod test {
         assert_eq!(config.execution.validation_max_steps, 100);
         assert_eq!(config.db.dir, Some(PathBuf::from("/path/to/db")));
         assert_eq!(config.chain.id, ChainId::GOERLI);
-        assert_eq!(config.chain.genesis.sequencer_address, *DEFAULT_SEQUENCER_ADDRESS);
+        assert_eq!(
+            config.chain.genesis.sequencer_address,
+            katana_primitives::ContractAddress(*DEFAULT_SEQUENCER_ADDRESS)
+        );
     }
 
     #[test]

crates/katana/core/Cargo.toml

@@ -20,7 +20,6 @@ async-trait.workspace = true
 derive_more.workspace = true
 dojo-metrics.workspace = true
 futures.workspace = true
-lazy_static.workspace = true
 metrics.workspace = true
 num-traits.workspace = true
 parking_lot.workspace = true

crates/katana/core/src/constants.rs

@@ -1,5 +1,4 @@
 use katana_primitives::contract::ContractAddress;
-use lazy_static::lazy_static;
 use starknet::macros::felt;
 
 // Default gas prices
@@ -10,10 +9,4 @@ pub const DEFAULT_STRK_L1_GAS_PRICE: u128 = 20 * u128::pow(10, 9); // Given in u
 pub const DEFAULT_ETH_L1_DATA_GAS_PRICE: u128 = u128::pow(10, 6); // Given in units of Wei.
 pub const DEFAULT_STRK_L1_DATA_GAS_PRICE: u128 = u128::pow(10, 6); // Given in units of STRK.
 
-lazy_static! {
-
-    // Predefined contract addresses
-
-    pub static ref DEFAULT_SEQUENCER_ADDRESS: ContractAddress = ContractAddress(felt!("0x1"));
-
-}
+pub const DEFAULT_SEQUENCER_ADDRESS: ContractAddress = ContractAddress(felt!("0x1"));

crates/katana/node/src/config/execution.rs

@@ -13,9 +13,9 @@ pub struct ExecutionConfig {
 impl std::default::Default for ExecutionConfig {
     fn default() -> Self {
         Self {
-            max_recursion_depth: MAX_RECURSION_DEPTH,
             invocation_max_steps: DEFAULT_INVOCATION_MAX_STEPS,
             validation_max_steps: DEFAULT_VALIDATION_MAX_STEPS,
+            max_recursion_depth: MAX_RECURSION_DEPTH,
         }
     }
 }

crates/katana/node/src/config/metrics.rs

@@ -20,3 +20,9 @@ impl MetricsConfig {
         SocketAddr::new(self.addr, self.port)
     }
 }
+
+impl Default for MetricsConfig {
+    fn default() -> Self {
+        MetricsConfig { addr: DEFAULT_METRICS_ADDR, port: DEFAULT_METRICS_PORT }
+    }
+}