starknet_os: pointer args wrap Vec<MaybeRelocatable>

Author: nimrod-starkware

crates/starknet_os/src/test_utils/cairo_runner.rs

@@ -44,7 +44,7 @@ pub enum ValueArg {
 /// pointer to a pointer.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum PointerArg {
-    Array(Vec<Felt>),
+    Array(Vec<MaybeRelocatable>),
     Composed(Vec<EndpointArg>),
 }
 
@@ -93,9 +93,9 @@ impl EndpointArg {
                 }
             },
             EndpointArg::Pointer(pointer_arg) => match pointer_arg {
-                PointerArg::Array(felts) => vec![CairoArg::Array(
-                    felts.iter().map(|felt| MaybeRelocatable::Int(*felt)).collect(),
-                )],
+                PointerArg::Array(felts) => {
+                    vec![CairoArg::Array(felts.to_vec())]
+                }
                 PointerArg::Composed(endpoint_args) => vec![CairoArg::Composed(
                     endpoint_args.iter().flat_map(Self::to_cairo_arg_vec).collect(),
                 )],
@@ -433,8 +433,11 @@ fn load_endpoint_arg_from_address(
         EndpointArg::Pointer(pointer_arg) => match pointer_arg {
             PointerArg::Array(array) => {
                 let array_pointer = vm.get_relocatable(address)?;
-                let felt_array = load_sequence_of_felts(array.len(), array_pointer, vm)?;
-                Ok((EndpointArg::Pointer(PointerArg::Array(felt_array)), (address + value_size)?))
+                let array = load_sequence_of_felts(array.len(), array_pointer, vm)?
+                    .into_iter()
+                    .map(MaybeRelocatable::from)
+                    .collect();
+                Ok((EndpointArg::Pointer(PointerArg::Array(array)), (address + value_size)?))
             }
             PointerArg::Composed(endpoint_args) => {
                 let (endpoint_arg_array, _) = load_sequence_of_endpoint_args(

crates/starknet_os/src/tests/aliases.rs

@@ -7,6 +7,7 @@ use blockifier::test_utils::ALIAS_CONTRACT_ADDRESS;
 use cairo_vm::hint_processor::builtin_hint_processor::dict_hint_utils::DICT_ACCESS_SIZE;
 use cairo_vm::hint_processor::hint_processor_utils::felt_to_usize;
 use cairo_vm::types::builtin_name::BuiltinName;
+use cairo_vm::types::relocatable::MaybeRelocatable;
 use rstest::rstest;
 use starknet_api::core::L2_ADDRESS_UPPER_BOUND;
 use starknet_api::state::StorageKey;
@@ -258,14 +259,19 @@ fn allocate_aliases_for_keys_and_replace(
     let expected_explicit_return_values = vec![
         EndpointArg::Value(ValueArg::Single(Felt::ZERO)), // Aliases.len
         EndpointArg::Pointer(PointerArg::Array(vec![ // Aliases.ptr
-            Felt::ZERO;
+            MaybeRelocatable::Int(Felt::ZERO);
             (unique_keys.len()) * DICT_ACCESS_SIZE
             ])),
         // Aliases per-key ptr.
-        EndpointArg::Pointer(PointerArg::Array(vec![Felt::ZERO; keys.len()])),
+        EndpointArg::Pointer(PointerArg::Array(vec![
+            MaybeRelocatable::Int(Felt::ZERO);
+            keys.len()
+        ])),
     ];
     let n_keys_arg = EndpointArg::Value(ValueArg::Single(keys.len().into()));
-    let keys_arg = EndpointArg::Pointer(PointerArg::Array(keys));
+    let keys_arg = EndpointArg::Pointer(PointerArg::Array(
+        keys.iter().cloned().map(MaybeRelocatable::from).collect(),
+    ));
     let explicit_args = vec![n_keys_arg, keys_arg];
     let storage_view = initial_storage
         .into_iter()
@@ -292,8 +298,11 @@ fn allocate_aliases_for_keys_and_replace(
     {
         let n_aliases = felt_to_usize(n_aliases).unwrap();
         assert_eq!(n_aliases, aliases_storage_updates.len() / DICT_ACCESS_SIZE);
-        let actual_alias_storage = parse_squashed_cairo_dict(aliases_storage_updates);
-        (actual_alias_storage, alias_per_key.clone().to_vec())
+        let aliases_storage_updates_as_felts: Vec<Felt> =
+            aliases_storage_updates.iter().map(|f| f.get_int().unwrap()).collect();
+        let actual_alias_storage = parse_squashed_cairo_dict(&aliases_storage_updates_as_felts);
+        let alias_per_key: Vec<Felt> = alias_per_key.iter().map(|f| f.get_int().unwrap()).collect();
+        (actual_alias_storage, alias_per_key)
     } else {
         panic!(
             "The return value doesn't match the given format.\n Got: {explicit_return_values:?}"

crates/starknet_os/src/tests/bls_field.rs

@@ -4,6 +4,7 @@ use std::collections::HashMap;
 use apollo_starknet_os_program::OS_PROGRAM_BYTES;
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::types::program::Program;
+use cairo_vm::types::relocatable::MaybeRelocatable;
 use ethnum::U256;
 use num_bigint::{BigInt, BigUint, RandBigInt, RandomBits, Sign, ToBigInt};
 use num_integer::Integer;
@@ -134,7 +135,9 @@ fn test_horner_eval() {
             .map(|_| Felt::from(RandBigInt::gen_bigint_range(&mut rng, &0.into(), &DEFAULT_PRIME)))
             .collect();
 
-        explicit_args.push(EndpointArg::Pointer(PointerArg::Array(coefficients.clone())));
+        explicit_args.push(EndpointArg::Pointer(PointerArg::Array(
+            coefficients.iter().cloned().map(MaybeRelocatable::from).collect(),
+        )));
         let point =
             RandBigInt::gen_bigint_range(&mut rng, &0.into(), &BLS_PRIME.to_bigint().unwrap());
         explicit_args.push(EndpointArg::Value(ValueArg::Array(