Add identifiers to hint_processor

Author: JulianGCalderon

hint_accountant/src/main.rs

@@ -64,7 +64,13 @@ fn run() {
         .map(|ahe| ahe.hint_lines.join("\n"))
         .filter(|h| {
             let hint_data = hint_executor
-                .compile_hint(h, &ap_tracking_data, &reference_ids, &references)
+                .compile_hint(
+                    h,
+                    &ap_tracking_data,
+                    &reference_ids,
+                    &references,
+                    &HashMap::default(),
+                )
                 .expect("this implementation is infallible");
             matches!(
                 hint_executor.execute_hint(&mut vm, &mut exec_scopes, &hint_data, &constants,),

vm/src/hint_processor/builtin_hint_processor/builtin_hint_processor_definition.rs

@@ -23,6 +23,7 @@ use super::{
         pack::*,
     },
 };
+use crate::serde::deserialize_program::Identifier;
 use crate::Felt252;
 use crate::{
     hint_processor::builtin_hint_processor::secp::secp_utils::{SECP256R1_ALPHA, SECP256R1_P},
@@ -132,6 +133,7 @@ pub struct HintProcessorData {
     pub code: String,
     pub ap_tracking: ApTracking,
     pub ids_data: HashMap<String, HintReference>,
+    pub identifiers: HashMap<String, Identifier>,
 }
 
 impl HintProcessorData {
@@ -140,6 +142,7 @@ impl HintProcessorData {
             code,
             ap_tracking: ApTracking::default(),
             ids_data,
+            identifiers: HashMap::new(),
         }
     }
 }

vm/src/hint_processor/cairo_1_hint_processor/hint_processor.rs

@@ -9,6 +9,7 @@ use super::hint_processor_utils::*;
 use crate::any_box;
 use crate::hint_processor::cairo_1_hint_processor::dict_manager::DictSquashExecScope;
 use crate::hint_processor::hint_processor_definition::HintReference;
+use crate::serde::deserialize_program::Identifier;
 use crate::stdlib::{boxed::Box, collections::HashMap, prelude::*};
 use crate::types::relocatable::{MaybeRelocatable, Relocatable};
 use crate::vm::runners::cairo_runner::ResourceTracker;
@@ -1263,6 +1264,8 @@ impl HintProcessorLogic for Cairo1HintProcessor {
         _reference_ids: &HashMap<String, usize>,
         //List of all references (key corresponds to element of the previous dictionary)
         _references: &[HintReference],
+        // Identifiers stored in the hint's program.
+        _identifiers: &HashMap<String, Identifier>,
     ) -> Result<Box<dyn Any>, VirtualMachineError> {
         let data = hint_code.parse().ok().and_then(|x: usize| self.hints.get(&x).cloned())
         .ok_or_else(|| VirtualMachineError::CompileHintFail(

vm/src/hint_processor/hint_processor_definition.rs

@@ -1,9 +1,9 @@
 use crate::stdlib::{any::Any, boxed::Box, collections::HashMap, prelude::*};
 
 use crate::any_box;
-use crate::serde::deserialize_program::ApTracking;
 use crate::serde::deserialize_program::OffsetValue;
 use crate::serde::deserialize_program::Reference;
+use crate::serde::deserialize_program::{ApTracking, Identifier};
 use crate::types::exec_scope::ExecutionScopes;
 use crate::types::instruction::Register;
 use crate::types::relocatable::Relocatable;
@@ -43,11 +43,14 @@ pub trait HintProcessorLogic {
         reference_ids: &HashMap<String, usize>,
         //List of all references (key corresponds to element of the previous dictionary)
         references: &[HintReference],
+        // Identifiers stored in the hint's program.
+        identifiers: &HashMap<String, Identifier>,
     ) -> Result<Box<dyn Any>, VirtualMachineError> {
         Ok(any_box!(HintProcessorData {
             code: hint_code.to_string(),
             ap_tracking: ap_tracking_data.clone(),
             ids_data: get_ids_data(reference_ids, references)?,
+            identifiers: identifiers.clone(),
         }))
     }
 

vm/src/tests/run_deprecated_contract_class_simplified.rs

@@ -302,6 +302,7 @@ pub fn vm_load_program(
         &hint_ap_tracking_data,
         &reference_ids,
         &references,
+        &HashMap::default(),
     )?;
     // Create the hint extension
     // As the hint from the compiled constract has offset 0, the hint pc will be equal to the loaded contract's program base:

vm/src/vm/runners/cairo_runner.rs

@@ -654,6 +654,7 @@ impl CairoRunner {
                         &hint.flow_tracking_data.ap_tracking,
                         &hint.flow_tracking_data.reference_ids,
                         references,
+                        &self.program.shared_program_data.identifiers,
                     )
                     .map_err(|_| VirtualMachineError::CompileHintFail(hint.code.clone().into()))
             })