wip

Author: kariy

Cargo.lock

@@ -12,12 +12,9 @@ katana-executor.workspace = true
 katana-messaging.workspace = true
 katana-node.workspace = true
 katana-genesis.workspace = true
-katana-pool.workspace = true
-katana-pool-api.workspace = true
 katana-primitives.workspace = true
 katana-provider.workspace = true
 katana-rpc-server.workspace = true
-katana-rpc-types.workspace = true
 katana-slot-controller = { workspace = true, optional = true }
 katana-tee = { workspace = true, optional = true }
 katana-tracing.workspace = true
@@ -30,11 +27,9 @@ alloy-primitives.workspace = true
 anyhow.workspace = true
 clap.workspace = true
 console.workspace = true
-futures.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 shellexpand = "3.1.0"
-starknet = { workspace = true, optional = true }
 tokio.workspace = true
 toml.workspace = true
 tracing.workspace = true
@@ -49,7 +44,6 @@ starknet.workspace = true
 paymaster = [
 	"dep:katana-paymaster",
 	"dep:katana-slot-controller",
-	"dep:starknet",
 	"katana-node/paymaster",
 	"katana-rpc-server/paymaster",
 ]

crates/cli/Cargo.toml

@@ -169,7 +169,7 @@ impl SequencerNodeArgs {
         let config = self.config()?;
 
         #[cfg(feature = "vrf")]
-        let vrf_sidecar = match self.vrf_config(&config.rpc)? {
+        let vrf_sidecar = match self.vrf_config()? {
             Some((_, sidecar)) => sidecar,
             None => None,
         };
@@ -292,7 +292,7 @@ impl SequencerNodeArgs {
         let paymaster = self.paymaster_config(&chain)?.map(|(config, _)| config);
 
         #[cfg(feature = "vrf")]
-        let vrf = self.vrf_config(&rpc)?.map(|(config, _)| config);
+        let vrf = self.vrf_config()?.map(|(config, _)| config);
 
         #[cfg(all(feature = "vrf", feature = "cartridge"))]
         if vrf.is_some() && paymaster.is_none() {
@@ -630,9 +630,8 @@ impl SequencerNodeArgs {
     #[cfg(feature = "vrf")]
     fn vrf_config(
         &self,
-        rpc_config: &RpcConfig,
     ) -> Result<Option<(katana_node::config::paymaster::VrfConfig, Option<VrfSidecarInfo>)>> {
-        build_vrf_config(&self.vrf, Some(rpc_config.socket_addr()))
+        build_vrf_config(&self.vrf)
     }
 
     #[cfg(feature = "tee")]

crates/cli/src/args.rs

@@ -641,7 +641,7 @@ impl PaymasterOptions {
 }
 
 #[cfg(feature = "vrf")]
-#[derive(Debug, Args, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "VRF options")]
 pub struct VrfOptions {
     /// Enable the VRF service.
@@ -660,19 +660,6 @@ pub struct VrfOptions {
     #[serde(default)]
     pub url: Option<Url>,
 
-    /// Port to bind the sidecar VRF service on (vrf-server uses 3000).
-    ///
-    /// Only used when running in sidecar mode. Not applicable if `--vrf.url` is provided.
-    #[arg(conflicts_with = "vrf_url")]
-    #[arg(
-        long = "vrf.port",
-        value_name = "PORT",
-        id = "vrf_port",
-        default_value_t = default_vrf_port()
-    )]
-    #[serde(default = "default_vrf_port")]
-    pub port: u16,
-
     /// Optional path to the VRF sidecar binary (defaults to `vrf-server` in PATH).
     ///
     /// Only used when running in sidecar mode. Not applicable if `--vrf.url` is provided.
@@ -682,13 +669,6 @@ pub struct VrfOptions {
     pub bin: Option<PathBuf>,
 }
 
-#[cfg(feature = "vrf")]
-impl Default for VrfOptions {
-    fn default() -> Self {
-        VrfOptions { enabled: false, url: None, port: default_vrf_port(), bin: None }
-    }
-}
-
 #[cfg(feature = "vrf")]
 impl VrfOptions {
     /// Returns true if the VRF is enabled (either explicitly or via URL).
@@ -711,10 +691,6 @@ impl VrfOptions {
                 self.url = other.url.clone();
             }
 
-            if self.port == default_vrf_port() {
-                self.port = other.port;
-            }
-
             if self.bin.is_none() {
                 self.bin = other.bin.clone();
             }
@@ -867,11 +843,6 @@ fn default_api_url() -> Url {
     Url::parse("https://api.cartridge.gg").expect("qed; invalid url")
 }
 
-#[cfg(feature = "vrf")]
-fn default_vrf_port() -> u16 {
-    3000
-}
-
 #[derive(Debug, Default, Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "Tracer options")]
 pub struct TracerOptions {

crates/cli/src/options.rs

@@ -63,7 +63,6 @@ pub struct PaymasterSidecarInfo {
 #[cfg(feature = "vrf")]
 pub fn build_vrf_config(
     options: &VrfOptions,
-    rpc_addr: Option<SocketAddr>,
 ) -> Result<Option<(VrfConfig, Option<VrfSidecarInfo>)>> {
     if !options.is_enabled() {
         return Ok(None);
@@ -77,20 +76,16 @@ pub fn build_vrf_config(
         let url = options.url.clone().expect("URL must be set in external mode");
         (url, None)
     } else {
-        // Sidecar mode: use configured port (VRF server uses fixed port 3000)
-        let port = options.port;
-        let url = Url::parse(&format!("http://127.0.0.1:{port}")).expect("valid url");
+        // Sidecar mode: find a free port dynamically
+        let listener = std::net::TcpListener::bind("127.0.0.1:0")?;
+        let addr = listener.local_addr()?;
+        let port = addr.port();
+        let url = Url::parse(&format!("http://{addr}"))?;
         let sidecar_info = VrfSidecarInfo { port };
         (url, Some(sidecar_info))
     };
 
-    // Construct RPC URL for VRF server to query state
-    let rpc_url =
-        rpc_addr.map(|addr| Url::parse(&format!("http://{addr}"))).transpose().expect("valid URL");
-
-    let config = VrfConfig { url, rpc_url };
-
-    Ok(Some((config, sidecar_info)))
+    Ok(Some((VrfConfig { url }, sidecar_info)))
 }
 
 // ============================================================================

crates/cli/src/sidecar.rs

@@ -1,7 +1,6 @@
-use url::Url;
-
 #[cfg(feature = "cartridge")]
 use katana_primitives::{ContractAddress, Felt};
+use url::Url;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PaymasterConfig {
@@ -22,8 +21,6 @@ pub struct PaymasterConfig {
 pub struct VrfConfig {
     /// The VRF service URL.
     pub url: Url,
-    /// RPC URL for VRF server to query state (for Nonce-based seed computation).
-    pub rpc_url: Option<Url>,
 }
 
 /// Configuration for connecting to a Cartridge paymaster service.

crates/node/src/config/paymaster.rs

@@ -233,11 +233,16 @@ where
 
                 #[cfg(feature = "vrf")]
                 let vrf = if let Some(vrf) = &config.vrf {
+                    use url::Url;
+
                     let derived = crate::sidecar::derive_vrf_accounts(vrf, &config, &backend)?;
+                    let rpc_url = Url::parse(&format!("http://{}", config.rpc.socket_addr()))
+                        .expect("valid rpc url");
+
                     Some(katana_rpc_server::cartridge::VrfServiceConfig {
+                        rpc_url,
                         url: vrf.url.clone(),
                         account_address: derived.vrf_account_address,
-                        rpc_url: vrf.rpc_url.clone(),
                     })
                 } else {
                     None

crates/node/src/lib.rs

@@ -6,13 +6,9 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-katana-genesis.workspace = true
 katana-primitives.workspace = true
-katana-rpc-client.workspace = true
-katana-rpc-types.workspace = true
 
 anyhow.workspace = true
-futures.workspace = true
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -22,4 +18,5 @@ tracing.workspace = true
 url.workspace = true
 
 [dev-dependencies]
+katana-genesis.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }