Stav/sync starkware dev (#2035)

# TITLE

Cherry-pick all the commits from main 

Description of the pull request changes and motivation.

## Checklist
- [ ] Linked to Github Issue
- [ ] Unit tests added
- [ ] Integration tests added.
- [ ] This change requires new documentation.
  - [ ] Documentation has been added/updated.
  - [ ] CHANGELOG has been updated.

Author: yuvalsw

.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

.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: [ '**' ]
 

.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

.github/workflows/hyper_threading_benchmarks.yml

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

.github/workflows/iai_main.yml

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

.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:

.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: [ '**' ]
 

CHANGELOG.md

@@ -1,6 +1,11 @@
 ## Cairo-VM Changelog
 
 #### Upcoming Changes
+* Refactor: Replaced HashMap with BTreeMap to guarantee deterministic ordering of the data [#2023] (https://github.com/lambdaclass/cairo-vm/pull/2023)
+
+* fix: Updated the logic for collecting builtin segment data for prover input info, removing dependency on the existence of stop pointers. [#2022](https://github.com/lambdaclass/cairo-vm/pull/2022)
+
+* 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)
 

CONTRIBUTING.md

@@ -110,6 +110,9 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/lambda
 - You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. 
 - **Explain why this enhancement would be useful** to most cairo-vm users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
 
+### Pushing commits to Pull Requests
+
+This repository enforces commit signing on all branches. See [this page](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) for more details on how to sign a commit and how to manage signing keys in Github.
 
 <!-- TODO
 ### Your First Code Contribution

vm/src/vm/runners/cairo_runner.rs

@@ -4,7 +4,7 @@ use crate::{
     math_utils::safe_div_usize,
     stdlib::{
         any::Any,
-        collections::{HashMap, HashSet},
+        collections::{BTreeMap, HashMap, HashSet},
         ops::{Add, AddAssign, Mul, MulAssign, Sub, SubAssign},
         prelude::*,
     },
@@ -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
@@ -1516,10 +1516,21 @@ impl CairoRunner {
             })
             .collect();
 
-        let builtins_segments = self
-            .get_builtin_segment_info_for_pie()?
-            .into_iter()
-            .map(|(name, info)| (info.index as usize, name))
+        let builtins_segments: BTreeMap<usize, BuiltinName> = self
+            .vm
+            .builtin_runners
+            .iter()
+            .filter(|builtin| {
+                // Those segments are not treated as builtins by the prover.
+                !matches!(
+                    builtin,
+                    BuiltinRunner::SegmentArena(_) | BuiltinRunner::Output(_)
+                )
+            })
+            .map(|builtin| {
+                let (index, _) = builtin.get_memory_segment_addresses();
+                (index, builtin.name())
+            })
             .collect();
 
         Ok(ProverInputInfo {
@@ -1540,12 +1551,12 @@ 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>>,
+    pub public_memory_offsets: BTreeMap<usize, Vec<usize>>,
     /// A map from the builtin segment index into its name.
-    pub builtins_segments: HashMap<usize, BuiltinName>,
+    pub builtins_segments: BTreeMap<usize, BuiltinName>,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -5581,12 +5592,40 @@ 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,
-            HashMap::from([(2, BuiltinName::ecdsa)])
+            BTreeMap::from([(2, BuiltinName::ecdsa)])
         );
     }
+
+    #[test]
+    fn test_output_not_builtin_segment() {
+        let program_content =
+            include_bytes!("../../../../cairo_programs/proof_programs/split_felt.json");
+        let runner = crate::cairo_run::cairo_run(
+            program_content,
+            &CairoRunConfig {
+                trace_enabled: true,
+                layout: LayoutName::all_cairo,
+                ..Default::default()
+            },
+            &mut BuiltinHintProcessor::new_empty(),
+        )
+        .unwrap();
+        let prover_info = runner.get_prover_input_info().unwrap();
+
+        assert!(!prover_info
+            .builtins_segments
+            .values()
+            .any(|v| *v == BuiltinName::output));
+    }
 }