refactor(katana): move forked blockchain creation logic to core

bin/katana/src/cli/node.rs

@@ -27,11 +27,13 @@
 use katana_core::service::messaging::MessagingConfig;
 use katana_node::config::db::DbConfig;
 use katana_node::config::dev::DevConfig;
+use katana_node::config::fork::ForkingConfig;
 use katana_node::config::metrics::MetricsConfig;
 use katana_node::config::rpc::{
     ApiKind, RpcConfig, DEFAULT_RPC_ADDR, DEFAULT_RPC_MAX_CONNECTIONS, DEFAULT_RPC_PORT,
 };
 use katana_node::config::{Config, SequencingConfig};
+use katana_primitives::block::BlockHashOrNumber;
 use katana_primitives::chain::ChainId;
 use katana_primitives::chain_spec::{self, ChainSpec};
 use katana_primitives::class::ClassHash;
@@ -47,7 +49,7 @@
 use tracing_subscriber::{fmt, EnvFilter};
 use url::Url;
 
-use crate::utils::{parse_genesis, parse_seed};
+use crate::utils::{parse_block_hash_or_number, parse_genesis, parse_seed};
 
 #[derive(Parser, Debug)]
 pub struct NodeArgs {
@@ -73,10 +75,16 @@
                        initialized Katana database.")]
     pub db_dir: Option<PathBuf>,
 
-    #[arg(long)]
-    #[arg(value_name = "URL")]
+    #[arg(long = "fork.rpc-url", value_name = "URL", alias = "rpc-url")]
     #[arg(help = "The Starknet RPC provider to fork the network from.")]
-    pub rpc_url: Option<Url>,
+    pub fork_rpc_url: Option<Url>,
+
+    #[arg(long = "fork.block", value_name = "BLOCK_ID", alias = "fork-block-number")]
+    #[arg(requires = "fork_rpc_url")]
+    #[arg(help = "Fork the network at a specific block id, can either be a hash (0x-prefixed) \
+                  or number.")]
+    #[arg(value_parser = parse_block_hash_or_number)]
+    pub fork_block: Option<BlockHashOrNumber>,
 
     #[arg(long)]
     pub dev: bool,
@@ -91,12 +99,6 @@
     #[arg(long, value_name = "SOCKET", value_parser = parse_socket_address, help_heading = "Metrics")]
     pub metrics: Option<SocketAddr>,
 
-    #[arg(long)]
-    #[arg(requires = "rpc_url")]
-    #[arg(value_name = "BLOCK_NUMBER")]
-    #[arg(help = "Fork the network at a specific block.")]
-    pub fork_block_number: Option<u64>,
-
     #[arg(long)]
     #[arg(value_name = "PATH")]
     #[arg(value_parser = katana_core::service::messaging::MessagingConfig::parse)]
@@ -170,7 +172,7 @@
 
     #[arg(long)]
     #[arg(value_parser = parse_genesis)]
-    #[arg(conflicts_with_all(["rpc_url", "seed", "total_accounts"]))]
+    #[arg(conflicts_with_all(["fork_rpc_url", "seed", "total_accounts"]))]
     pub genesis: Option<Genesis>,
 }
 
@@ -255,10 +257,9 @@
     }
 
     fn init_logging(&self) -> Result<()> {
-        const DEFAULT_LOG_FILTER: &str = "tasks=debug,info,executor=trace,forking::backend=trace,\
-                                          server=debug,katana_core=trace,blockifier=off,\
-                                          jsonrpsee_server=off,hyper=off,messaging=debug,\
-                                          node=error";
+        const DEFAULT_LOG_FILTER: &str = "info,tasks=debug,executor=trace,forking::backend=trace,\
+                                          server=debug,blockifier=off,jsonrpsee_server=off,\
+                                          hyper=off,messaging=debug,node=error";
 
         LogTracer::init()?;
 
@@ -282,10 +283,11 @@
         let chain = self.chain_spec()?;
         let metrics = self.metrics_config();
         let starknet = self.starknet_config()?;
+        let forking = self.forking_config()?;
         let sequencing = self.sequencer_config();
         let messaging = self.messaging.clone();
 
-        Ok(Config { metrics, db, dev, rpc, chain, starknet, sequencing, messaging })
+        Ok(Config { metrics, db, dev, rpc, chain, starknet, sequencing, messaging, forking })
     }
 
     fn sequencer_config(&self) -> SequencingConfig {
@@ -347,15 +349,21 @@
 
     fn starknet_config(&self) -> Result<StarknetConfig> {
         Ok(StarknetConfig {
-            fork_rpc_url: self.rpc_url.clone(),
-            fork_block_number: self.fork_block_number,
             env: Environment {
                 invoke_max_steps: self.starknet.environment.invoke_max_steps,
                 validate_max_steps: self.starknet.environment.validate_max_steps,
             },
         })
     }
 
+    fn forking_config(&self) -> Result<Option<ForkingConfig>> {
+        if let Some(url) = self.fork_rpc_url.clone() {
+            Ok(Some(ForkingConfig { url, block: self.fork_block }))
+        } else {
+            Ok(None)
+        }
+    }
+
     fn db_config(&self) -> DbConfig {
         DbConfig { dir: self.db_dir.clone() }
     }
@@ -488,8 +496,7 @@
 
         assert!(config.dev.fee);
         assert!(config.dev.account_validation);
-        assert_eq!(config.starknet.fork_rpc_url, None);
-        assert_eq!(config.starknet.fork_block_number, None);
+        assert!(config.forking.is_none());
         assert_eq!(config.starknet.env.invoke_max_steps, DEFAULT_INVOKE_MAX_STEPS);
         assert_eq!(config.starknet.env.validate_max_steps, DEFAULT_VALIDATE_MAX_STEPS);
         assert_eq!(config.db.dir, None);

bin/katana/src/utils.rs

@@ -1,5 +1,7 @@
 use std::path::PathBuf;
 
+use anyhow::{Context, Result};
+use katana_primitives::block::{BlockHash, BlockHashOrNumber, BlockNumber};
 use katana_primitives::genesis::json::GenesisJson;
 use katana_primitives::genesis::Genesis;
 
@@ -16,12 +18,22 @@
 }
 
 /// Used as clap value parser for [Genesis].
-pub fn parse_genesis(value: &str) -> Result<Genesis, anyhow::Error> {
+pub fn parse_genesis(value: &str) -> Result<Genesis> {
     let path = PathBuf::from(shellexpand::full(value)?.into_owned());
     let genesis = Genesis::try_from(GenesisJson::load(path)?)?;
     Ok(genesis)
 }
 
+/// If the value starts with `0x`, it is parsed as a [`BlockHash`], otherwise as a [`BlockNumber`].
+pub fn parse_block_hash_or_number(value: &str) -> Result<BlockHashOrNumber> {
+    if value.starts_with("0x") {
+        Ok(BlockHashOrNumber::Hash(BlockHash::from_hex(value)?))
+    } else {
+        let num = value.parse::<BlockNumber>().context("could not parse block number")?;
+        Ok(BlockHashOrNumber::Num(num))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/katana/core/Cargo.toml

@@ -21,6 +21,7 @@ dojo-metrics.workspace = true
 futures.workspace = true
 lazy_static.workspace = true
 metrics.workspace = true
+num-traits.workspace = true
 parking_lot.workspace = true
 reqwest.workspace = true
 serde.workspace = true

crates/katana/core/src/backend/config.rs

@@ -1,14 +1,9 @@
-use katana_primitives::block::BlockNumber;
-use url::Url;
-
 use crate::constants::{DEFAULT_INVOKE_MAX_STEPS, DEFAULT_VALIDATE_MAX_STEPS};
 use crate::env::BlockContextGenerator;
 
 #[derive(Debug, Clone, Default)]
 pub struct StarknetConfig {
     pub env: Environment,
-    pub fork_rpc_url: Option<Url>,
-    pub fork_block_number: Option<BlockNumber>,
 }
 
 impl StarknetConfig {