Merge branch 'main' into dori/is-accessed

Author: JulianGCalderon

Diff for: .github/workflows/bench.yml

@@ -2,7 +2,7 @@ name: benchmark
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
 
 permissions:
   # deployments permission to deploy GitHub pages website

Diff for: .github/workflows/cairo_1_programs.yml

@@ -2,7 +2,7 @@ name: Cairo 1 programs execution
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
   pull_request:
     branches: [ '**' ]
 

Diff for: .github/workflows/hint_accountant.yml

@@ -2,7 +2,7 @@ name: Update missing hints tracking issue
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
 
 env:
   CARGO_TERM_COLOR: always

Diff for: .github/workflows/hyper_threading_benchmarks.yml

@@ -8,8 +8,7 @@ permissions:
 
 on:
   pull_request:
-    branches:
-      - main
+    branches: [ main, starkware-development ]
 
 jobs:
   benchmark:

Diff for: .github/workflows/iai_main.yml

@@ -2,7 +2,7 @@ name: iai Benchmark
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
 
 jobs:
   cache-iai-results:

Diff for: .github/workflows/rust.yml

@@ -3,7 +3,7 @@ name: QA
 on:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
   pull_request:
     branches: [ '**' ]
 
@@ -42,13 +42,12 @@ jobs:
     strategy:
       matrix:
         # NOTE: we build cairo_bench_programs so clippy can check the benchmarks too
-        program-target: [
-          cairo_bench_programs,
-          cairo_proof_programs,
-          cairo_test_programs,
-          cairo_1_test_contracts,
-          cairo_2_test_contracts,
-        ]
+        program-target:
+        - cairo_bench_programs
+        - cairo_proof_programs
+        - cairo_test_programs
+        - cairo_1_test_contracts
+        - cairo_2_test_contracts
     name: Build Cairo programs
     runs-on: ubuntu-24.04
     steps:
@@ -162,7 +161,7 @@ jobs:
         key: all-programs-cache-${{ hashFiles('cairo_programs/**/*.cairo', 'examples/wasm-demo/src/array_sum.cairo') }}
 
   lint:
-    needs: build-programs
+    needs: merge-caches
     name: Run Lints
     runs-on: ubuntu-24.04
     steps:

Diff for: .github/workflows/test_install.yml

@@ -3,7 +3,7 @@ name: Test dependencies and cairo-vm install
 on:
   merge_group:
   push:
-    branches: [ main ]
+    branches: [ main, starkware-development ]
   pull_request:
     branches: [ '**' ]
 

Diff for: CHANGELOG.md

@@ -4,6 +4,8 @@
 
 * feat: implement VirtualMachine::is_accessed [#2024](https://github.com/lambdaclass/cairo-vm/pull/2024)
 
+* fix: Keep None values in memory segments for the prover input info [#2021](https://github.com/lambdaclass/cairo-vm/pull/2021)
+
 * refactor: Clap attribute macros from #[clap(...)] to #[arg(...)] and #[command(...)] in v4.x [#2003] (https://github.com/lambdaclass/cairo-vm/pull/2003)
 
 * fix: Fix `WriteReturnFp` error due to a bad loading of initial gas [#2015](https://github.com/lambdaclass/cairo-vm/pull/2015)

Diff for: vm/src/vm/runners/cairo_runner.rs

@@ -1502,7 +1502,7 @@ impl CairoRunner {
             .memory
             .data
             .iter()
-            .map(|segment| segment.iter().filter_map(|cell| cell.get_value()).collect())
+            .map(|segment| segment.iter().map(|cell| cell.get_value()).collect())
             .collect();
 
         let public_memory_offsets = self
@@ -1540,8 +1540,8 @@ impl CairoRunner {
 pub struct ProverInputInfo {
     /// A vector of trace entries, i.e. pc, ap, fp, where pc is relocatable.
     pub relocatable_trace: Vec<TraceEntry>,
-    /// A vector of segments, where each segment is a vector of maybe relocatable values.
-    pub relocatable_memory: Vec<Vec<MaybeRelocatable>>,
+    /// A vector of segments, where each segment is a vector of maybe relocatable values or holes (`None`).
+    pub relocatable_memory: Vec<Vec<Option<MaybeRelocatable>>>,
     /// A map from segment index to a vector of offsets within the segment, representing the public memory addresses.
     pub public_memory_offsets: HashMap<usize, Vec<usize>>,
     /// A map from the builtin segment index into its name.
@@ -5581,8 +5581,14 @@ mod tests {
             offset: 0,
         });
         assert_eq!(prover_info.relocatable_trace, expected_trace);
-        assert_eq!(prover_info.relocatable_memory[0][3], expected_in_memory_0_3);
-        assert_eq!(prover_info.relocatable_memory[1][0], expected_in_memory_1_0);
+        assert_eq!(
+            prover_info.relocatable_memory[0][3],
+            Some(expected_in_memory_0_3)
+        );
+        assert_eq!(
+            prover_info.relocatable_memory[1][0],
+            Some(expected_in_memory_1_0)
+        );
         assert!(prover_info.public_memory_offsets.is_empty());
         assert_eq!(
             prover_info.builtins_segments,