fix: add headers + auto-blake detection

Author: glihm

bin/sozo/src/commands/declare.rs

@@ -48,12 +48,17 @@ impl DeclareArgs {
             return Err(anyhow!("At least one Sierra artifact path must be provided."));
         }
 
-        // TODO: allow cutom headers form the CLI.
-        let headers = None;
-        let account = get_account_from_env(account, &starknet, headers).await?;
+        let account = get_account_from_env(account, &starknet).await?;
 
-        // TODO: maybe add the detection from the provider URL too.
-        let use_blake2s = starknet.use_blake2s_casm_class_hash;
+        let use_blake2s = if let Some(rpc_url) = starknet.rpc_url {
+            if rpc_url.to_string().contains("sepolia") || rpc_url.to_string().contains("testnet") {
+                true
+            } else {
+                starknet.use_blake2s_casm_class_hash
+            }
+        } else {
+            starknet.use_blake2s_casm_class_hash
+        };
 
         let txn_config: TxnConfig = transaction.try_into()?;
 

bin/sozo/src/commands/deploy.rs

@@ -70,9 +70,7 @@ impl DeployArgs {
 
         let txn_config: TxnConfig = transaction.try_into()?;
 
-        // TODO: allow custom headers from the CLI.
-        let headers = None;
-        let account = get_account_from_env(account, &starknet, headers).await?;
+        let account = get_account_from_env(account, &starknet).await?;
 
         ui.title("Deploy contract");
         ui.step("Deploying contract via UDC");

bin/sozo/src/commands/options/starknet.rs

@@ -1,6 +1,8 @@
+use std::fmt::{Display, Formatter};
+use std::str::FromStr;
 use std::time::Duration;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use dojo_utils::env::STARKNET_RPC_URL_ENV_VAR;
 use dojo_world::config::Environment;
@@ -26,6 +28,12 @@ pub struct StarknetOptions {
                   Otherwise, use this flag to manually set it.")]
     #[arg(global = true)]
     pub use_blake2s_casm_class_hash: bool,
+
+    #[arg(long = "rpc-header")]
+    #[arg(value_name = "HEADER")]
+    #[arg(help = "Custom header(s) to add to Starknet RPC requests. Format: Name:Value")]
+    #[arg(global = true)]
+    pub rpc_headers: Vec<RpcHeader>,
 }
 
 impl StarknetOptions {
@@ -54,6 +62,10 @@ impl StarknetOptions {
             }
         }
 
+        for header in &self.rpc_headers {
+            transport.add_header(header.name.clone(), header.value.clone());
+        }
+
         Ok((JsonRpcClient::new(transport), url.to_string()))
     }
 
@@ -70,9 +82,13 @@ impl StarknetOptions {
             client,
         );
 
+        for header in &self.rpc_headers {
+            transport.add_header(header.name.clone(), header.value.clone());
+        }
+
         if let Some(headers) = headers {
-            for header in headers.iter() {
-                transport.add_header(header.0.clone(), header.1.clone());
+            for header in headers.into_iter() {
+                transport.add_header(header.0, header.1);
             }
         }
 
@@ -97,6 +113,36 @@ impl StarknetOptions {
     }
 }
 
+#[derive(Clone, Debug)]
+pub struct RpcHeader {
+    pub name: String,
+    pub value: String,
+}
+
+impl FromStr for RpcHeader {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let (name, value) =
+            s.split_once(':').ok_or_else(|| anyhow!("Invalid header format. Use `Name:Value`"))?;
+
+        let name = name.trim();
+        let value = value.trim();
+
+        if name.is_empty() || value.is_empty() {
+            return Err(anyhow!("Header name and value must be non-empty."));
+        }
+
+        Ok(RpcHeader { name: name.to_string(), value: value.to_string() })
+    }
+}
+
+impl Display for RpcHeader {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}: {}", self.name, self.value)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use clap::Parser;

bin/sozo/src/utils.rs

@@ -190,9 +190,8 @@ pub async fn get_world_diff_and_account(
 pub async fn get_account_from_env(
     account: AccountOptions,
     starknet: &StarknetOptions,
-    headers: Option<Vec<(String, String)>>,
 ) -> Result<SozoAccount<JsonRpcClient<HttpTransport>>> {
-    let provider = starknet.provider_from_url(headers)?;
+    let provider = starknet.provider_from_url(None)?;
 
     account.account(provider, None, starknet, &HashMap::new()).await
 }