Pass identifiers instead of only constants to hint data

Author: JulianGCalderon

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,7 +133,7 @@ pub struct HintProcessorData {
     pub code: String,
     pub ap_tracking: ApTracking,
     pub ids_data: HashMap<String, HintReference>,
-    pub constants: Rc<HashMap<String, Felt252>>,
+    pub identifiers: Rc<HashMap<String, Identifier>>,
     pub accessible_scopes: Vec<String>,
 }
 
@@ -142,7 +143,7 @@ impl HintProcessorData {
             code,
             ap_tracking: ApTracking::default(),
             ids_data,
-            constants: Default::default(),
+            identifiers: Default::default(),
             accessible_scopes: Default::default(),
         }
     }
@@ -195,7 +196,20 @@ impl HintProcessorLogic for BuiltinHintProcessor {
         let hint_data = hint_data
             .downcast_ref::<HintProcessorData>()
             .ok_or(HintError::WrongHintData)?;
-        let constants = hint_data.constants.as_ref();
+
+        let identifiers = hint_data.identifiers.as_ref();
+        let owned_constants = identifiers
+            .clone()
+            .into_iter()
+            .filter_map(|(key, identifier)| {
+                if identifier.type_? == "const" {
+                    Some((key, identifier.value?))
+                } else {
+                    None
+                }
+            })
+            .collect();
+        let constants = &owned_constants;
 
         if let Some(hint_func) = self.extra_hints.get(&hint_data.code) {
             return hint_func.0(

vm/src/hint_processor/builtin_hint_processor/cairo_keccak/keccak_hints.rs

@@ -366,7 +366,6 @@ pub fn u64_array_to_mayberelocatable_vec(array: &[u64]) -> Vec<MaybeRelocatable>
 mod tests {
     use super::*;
     use crate::stdlib::string::ToString;
-
     use crate::{
         any_box,
         hint_processor::{
@@ -448,16 +447,19 @@ mod tests {
 
         run_context!(vm, 0, 1, 1);
         let ids_data = ids_data!["n_bytes"];
+        let identifiers = HashMap::from([(
+            "starkware.cairo.common.cairo_keccak.keccak.KECCAK_FULL_RATE_IN_BYTES".to_string(),
+            const_identifier(136),
+        )]);
+        let accessible_scopes = vec!["starkware.cairo.common.cairo_keccak.keccak".to_string()];
         assert_matches!(
             run_hint!(
                 vm,
                 ids_data,
                 hint_code,
                 exec_scopes_ref!(),
-                &[(KECCAK_FULL_RATE_IN_BYTES_CAIRO_KECCAK, Felt252::from(136))]
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v))
-                    .collect()
+                identifiers,
+                accessible_scopes
             ),
             Ok(())
         );
@@ -477,16 +479,19 @@ mod tests {
         run_context!(vm, 0, 1, 1);
 
         let ids_data = ids_data!["n_bytes"];
+        let identifiers = HashMap::from([(
+            "starkware.cairo.common.cairo_keccak.keccak.KECCAK_FULL_RATE_IN_BYTES".to_string(),
+            const_identifier(136),
+        )]);
+        let accessible_scopes = vec!["starkware.cairo.common.cairo_keccak.keccak".to_string()];
         assert_matches!(
             run_hint!(
                 vm,
                 ids_data,
                 hint_code,
                 exec_scopes_ref!(),
-                &[(KECCAK_FULL_RATE_IN_BYTES_CAIRO_KECCAK, Felt252::from(136))]
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v))
-                    .collect()
+                identifiers,
+                accessible_scopes
             ),
             Ok(())
         );
@@ -505,16 +510,19 @@ mod tests {
         run_context!(vm, 0, 1, 1);
 
         let ids_data = ids_data!["n_bytes"];
+        let identifiers = HashMap::from([(
+            "starkware.cairo.common.cairo_keccak.keccak.KECCAK_FULL_RATE_IN_BYTES".to_string(),
+            const_identifier(136),
+        )]);
+        let accessible_scopes = vec!["starkware.cairo.common.cairo_keccak.keccak".to_string()];
         assert_matches!(
             run_hint!(
                 vm,
                 ids_data,
                 hint_code,
                 exec_scopes_ref!(),
-                &[(KECCAK_FULL_RATE_IN_BYTES_CAIRO_KECCAK, Felt252::from(136))]
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v))
-                    .collect()
+                identifiers,
+                accessible_scopes
             ),
             Ok(())
         );

vm/src/hint_processor/builtin_hint_processor/keccak_utils.rs

@@ -357,13 +357,21 @@ mod tests {
         vm.segments = segments![((1, 2), 17)];
         vm.set_fp(3);
         let ids_data = ids_data!["n_words_to_copy", "n_bytes_left", "n_bytes"];
+
+        let identifiers = HashMap::from([(
+            "starkware.cairo.common.builtin_keccak.keccak.BYTES_IN_WORD".to_string(),
+            const_identifier(8),
+        )]);
+        let accessible_scopes = vec!["starkware.cairo.common.builtin_keccak.keccak".to_string()];
+
         assert_matches!(
             run_hint!(
                 vm,
                 ids_data,
                 hint_code::SPLIT_N_BYTES,
                 exec_scopes_ref!(),
-                &HashMap::from([(String::from(BYTES_IN_WORD), Felt252::from(8))])
+                identifiers,
+                accessible_scopes
             ),
             Ok(())
         );
@@ -376,13 +384,19 @@ mod tests {
         vm.segments = segments![((1, 0), 72057594037927938)];
         vm.set_fp(4);
         let ids_data = ids_data!["output1", "output1_low", "output1_mid", "output1_high"];
+        let identifiers = HashMap::from([(
+            "starkware.cairo.common.builtin_keccak.keccak.BYTES_IN_WORD".to_string(),
+            const_identifier(8),
+        )]);
+        let accessible_scopes = vec!["starkware.cairo.common.builtin_keccak.keccak".to_string()];
         assert_matches!(
             run_hint!(
                 vm,
                 ids_data,
                 hint_code::SPLIT_OUTPUT_MID_LOW_HIGH,
                 exec_scopes_ref!(),
-                &HashMap::from([(String::from(BYTES_IN_WORD), Felt252::from(8))])
+                identifiers,
+                accessible_scopes
             ),
             Ok(())
         );