fix frozen

Cargo.toml

@@ -14,10 +14,15 @@ serde_with = "3.11.0"
 serde = "1.0.197"
 cairo-native = "0.2.4"
 # Sequencer Dependencies
-starknet_api = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
-blockifier = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2", features = ["cairo_native"] } # main
-starknet_gateway = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
-blockifier_reexecution = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
+# starknet_api = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
+# blockifier = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2", features = ["cairo_native"] } # main
+# starknet_gateway = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
+# blockifier_reexecution = { git = "https://github.com/lambdaclass/sequencer.git", branch = "update-main-2" } # main
+
+starknet_api = { path = "../sequencer/crates/starknet_api" } # main
+blockifier = { path = "../sequencer/crates/blockifier", features = ["cairo_native"] } # main
+starknet_gateway = { path = "../sequencer/crates/starknet_gateway" } # main
+blockifier_reexecution = { path = "../sequencer/crates/blockifier_reexecution" } # main
 
 # [patch.'https://github.com/lambdaclass/cairo_native']
 # cairo-native = { git = "https://github.com/lambdaclass//cairo_native.git", rev = "76e83965d3bf1252eb6c68200a3accd5fd1ec004" }

rpc-state-reader/src/reader.rs

@@ -294,11 +294,14 @@ impl StateReader for RpcStateReader {
     }
 
     fn get_compiled_class(&self, class_hash: ClassHash) -> StateResult<RunnableCompiledClass> {
+        dbg!("ENTERED_GET_COMPILED_CLASS");
         Ok(match self.get_contract_class(&class_hash)? {
             SNContractClass::Legacy(compressed_legacy_cc) => {
+                dbg!("ENTERED_LEGACY");
                 compile_legacy_cc(compressed_legacy_cc)
             }
             SNContractClass::Sierra(flattened_sierra_cc) => {
+                dbg!("ENTERED_SIERRA");
                 compile_sierra_cc(flattened_sierra_cc, class_hash)
             }
         })
@@ -350,7 +353,9 @@ fn compile_sierra_cc(
 
         RunnableCompiledClass::V1(casm_cc.try_into().unwrap())
     } else {
+        dbg!("COMPILED_EXECUTOR");
         let executor = utils::get_native_executor(&sierra_cc, class_hash);
+        dbg!("COMPILED_EXECUTOR_PASSED");
         let casm = CasmContractClass::from_contract_class(sierra_cc, false, usize::MAX).unwrap();
         let casm = CompiledClassV1::try_from(casm).unwrap();
 

rpc-state-reader/src/utils.rs

@@ -75,11 +75,10 @@ pub fn decode_reader(bytes: Vec<u8>) -> io::Result<String> {
 pub fn get_native_executor(contract: &ContractClass, class_hash: ClassHash) -> AotContractExecutor {
     let cache_lock = AOT_PROGRAM_CACHE.get_or_init(|| RwLock::new(HashMap::new()));
 
-    let executor = cache_lock.read().unwrap();
-    let executor = executor.get(&class_hash);
+    let executor = cache_lock.read().unwrap().get(&class_hash).map(Clone::clone);
 
     match executor {
-        Some(executor) => executor.clone(),
+        Some(executor) => executor,
         None => {
             let mut cache = cache_lock.write().unwrap();
             let path = PathBuf::from(format!(
@@ -122,7 +121,9 @@ pub fn get_native_executor(contract: &ContractClass, class_hash: ClassHash) -> A
                 executor
             };
 
-            cache.insert(class_hash, executor).unwrap()
+            cache.insert(class_hash, executor.clone());
+
+            executor
         }
     }
 }