blockifier_reexecution: allow custom chain id

Author: AvivYossef-starkware

crates/blockifier_reexecution/README.md

@@ -7,6 +7,19 @@ The blockier reexecution crate is intended to verify blockifier changes do not b
 ## CLI Commands
 Using the different CLI commands, it is possible to run reexecution tests in different modes, to download (permisionless) files for offline reexecution from the GC bucket, and to upload (permissioned) files for offline reexecution to the GC bucket.
 
+### Chain ID Option
+Commands that use RPC (`rpc-test`, `reexecute-single-tx`, `write-to-file`) accept an optional `-c/--chain-id` argument. If not provided, the chain ID is guessed from the node URL.
+
+Standard chain IDs:
+- `SN_MAIN` - Mainnet
+- `SN_SEPOLIA` - Sepolia testnet
+- `SN_INTEGRATION_SEPOLIA` - Integration Sepolia
+
+Custom chain IDs are also supported for private/custom networks:
+```
+cargo run --bin blockifier_reexecution rpc-test -n <node_url> -b <block_number> -c MY_CUSTOM_CHAIN
+```
+
 ### Reexecution Modes
 
 Reexecution can be run via CLI in the following modes: 

crates/blockifier_reexecution/src/state_reader/cli.rs

@@ -20,40 +20,24 @@ pub struct BlockifierReexecutionCliArgs {
     pub command: Command,
 }
 
-#[derive(clap::ValueEnum, Clone, Debug)]
-pub enum SupportedChainId {
-    Mainnet,
-    Testnet,
-    Integration,
-}
-
-impl From<SupportedChainId> for ChainId {
-    fn from(chain_id: SupportedChainId) -> Self {
-        match chain_id {
-            SupportedChainId::Mainnet => Self::Mainnet,
-            SupportedChainId::Testnet => Self::Sepolia,
-            SupportedChainId::Integration => Self::IntegrationSepolia,
-        }
-    }
-}
-
 #[derive(Clone, Debug, Args)]
 pub struct RpcArgs {
     /// Node url.
     #[clap(long, short = 'n')]
     pub node_url: String,
 
     /// Optional chain ID (if not provided, it will be guessed from the node url).
+    /// Standard chain IDs: SN_MAIN, SN_SEPOLIA, SN_INTEGRATION_SEPOLIA.
+    /// Custom chain IDs are also supported.
     #[clap(long, short = 'c')]
-    pub chain_id: Option<SupportedChainId>,
+    pub chain_id: Option<ChainId>,
 }
 
 impl RpcArgs {
     pub fn parse_chain_id(&self) -> ChainId {
         self.chain_id
             .clone()
-            .map(ChainId::from)
-            .unwrap_or(guess_chain_id_from_node_url(self.node_url.as_str()).unwrap())
+            .unwrap_or_else(|| guess_chain_id_from_node_url(self.node_url.as_str()).unwrap())
     }
 }
 

crates/blockifier_reexecution/src/state_reader/utils.rs

@@ -10,9 +10,9 @@ use blockifier::blockifier::config::ContractClassManagerConfig;
 use blockifier::context::{ChainInfo, FeeTokenAddresses};
 use blockifier::execution::contract_class::{CompiledClassV0, CompiledClassV1};
 use blockifier::state::cached_state::{CachedState, CommitmentStateDiff, StateMaps};
+use blockifier::state::contract_class_manager::ContractClassManager;
 use blockifier::state::global_cache::CompiledClasses;
 use blockifier::state::state_api::{StateReader, StateResult};
-use blockifier::state::contract_class_manager::ContractClassManager;
 use indexmap::IndexMap;
 use pretty_assertions::assert_eq;
 use serde::{Deserialize, Serialize};

crates/starknet_api/src/core.rs

@@ -81,6 +81,14 @@ impl std::fmt::Display for ChainId {
     }
 }
 
+impl std::str::FromStr for ChainId {
+    type Err = std::convert::Infallible;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self::from(s.to_owned()))
+    }
+}
+
 impl ChainId {
     pub fn as_hex(&self) -> String {
         format!("0x{}", hex::encode(self.to_string()))