feat(starknet_os): remove the program from the OS runner inputs

Author: dorimedini-starkware

Cargo.lock

@@ -1,6 +1,3 @@
-use std::fs;
-use std::path::Path;
-
 use apollo_starknet_os_program::{OS_PROGRAM_BYTES, PROGRAM_HASH};
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_vm::types::layout_name::LayoutName;
@@ -17,9 +14,6 @@ use crate::shared_utils::read::{load_input, write_to_file};
 #[derive(Deserialize, Debug)]
 /// Input to the os runner.
 pub(crate) struct Input {
-    // A path to a compiled program that its hint set should be a subset of those defined in
-    // starknet-os.
-    pub compiled_os_path: String,
     pub layout: LayoutName,
     pub os_hints: OsHints,
 }
@@ -62,14 +56,10 @@ pub fn validate_input(os_block_input: &[(OsBlockInput, CachedStateInput)]) {
 }
 
 pub fn parse_and_run_os(input_path: String, output_path: String) {
-    let Input { compiled_os_path, layout, os_hints } = load_input(input_path);
+    let Input { layout, os_hints } = load_input(input_path);
     validate_input(&os_hints.os_input.os_block_and_state_input);
 
-    // Load the compiled_os from the compiled_os_path.
-    let compiled_os =
-        fs::read(Path::new(&compiled_os_path)).expect("Failed to read compiled_os file");
-
-    let output = run_os_stateless(&compiled_os, layout, os_hints)
+    let output = run_os_stateless(layout, os_hints)
         .unwrap_or_else(|err| panic!("OS run failed. Error: {}", err));
     write_to_file(&output_path, &output);
     info!("OS program ran successfully.");

crates/starknet_committer_and_os_cli/src/os_cli/commands.rs

@@ -1,7 +1,5 @@
 use std::any::Any;
 use std::collections::{HashMap, HashSet};
-use std::fs;
-use std::path::Path;
 
 // TODO(Amos): When available in the VM crate, use an existing set, instead of using each hint
 //   const explicitly.
@@ -668,10 +666,7 @@ else:
 
 /// Runs the OS with the given input and returns the deserialized output.
 fn run_os_flow_test(input: &str) -> OsPythonTestResult {
-    let Input { layout, compiled_os_path, os_hints } = serde_json::from_str(input)?;
-    // Load the compiled_os from the compiled_os_path.
-    let compiled_os =
-        fs::read(Path::new(&compiled_os_path)).expect("Failed to read compiled_os file");
-    let os_output = run_os_stateless(&compiled_os, layout, os_hints)?;
+    let Input { layout, os_hints } = serde_json::from_str(input)?;
+    let os_output = run_os_stateless(layout, os_hints)?;
     Ok(serde_json::to_string(&os_output)?)
 }

crates/starknet_committer_and_os_cli/src/os_cli/tests/python_tests.rs

@@ -17,6 +17,7 @@ testing = ["blockifier/testing", "starknet_patricia/testing"]
 
 [dependencies]
 apollo_infra_utils.workspace = true
+apollo_starknet_os_program.workspace = true
 ark-bls12-381.workspace = true
 ark-ff.workspace = true
 ark-poly.workspace = true

crates/starknet_os/Cargo.toml

@@ -1,7 +1,7 @@
+use apollo_starknet_os_program::OS_PROGRAM;
 use blockifier::state::state_api::StateReader;
 use cairo_vm::cairo_run::CairoRunConfig;
 use cairo_vm::types::layout_name::LayoutName;
-use cairo_vm::types::program::Program;
 use cairo_vm::vm::errors::vm_exception::VmException;
 use cairo_vm::vm::runners::cairo_runner::CairoRunner;
 
@@ -16,7 +16,6 @@ use crate::io::os_input::OsHints;
 use crate::io::os_output::{get_run_output, StarknetOsRunnerOutput};
 
 pub fn run_os<S: StateReader>(
-    compiled_os: &[u8],
     layout: LayoutName,
     os_hints: OsHints,
     state_readers: Vec<S>,
@@ -26,12 +25,9 @@ pub fn run_os<S: StateReader>(
         CairoRunConfig { layout, relocate_mem: true, trace_enabled: true, ..Default::default() };
     let allow_missing_builtins = cairo_run_config.allow_missing_builtins.unwrap_or(false);
 
-    // Load the Starknet OS Program.
-    let os_program = Program::from_bytes(compiled_os, Some(cairo_run_config.entrypoint))?;
-
     // Init cairo runner.
     let mut cairo_runner = CairoRunner::new(
-        &os_program,
+        &OS_PROGRAM,
         cairo_run_config.layout,
         cairo_run_config.proof_mode,
         cairo_run_config.trace_enabled,
@@ -46,7 +42,7 @@ pub fn run_os<S: StateReader>(
 
     // Create the hint processor.
     let mut snos_hint_processor = SnosHintProcessor::new(
-        &os_program,
+        &OS_PROGRAM,
         os_hints,
         state_readers,
         syscall_handler,
@@ -90,10 +86,9 @@ pub fn run_os<S: StateReader>(
 /// Run the OS with a "stateless" state reader - panics if the state is accessed for data that was
 /// not pre-loaded as part of the input.
 pub fn run_os_stateless(
-    compiled_os: &[u8],
     layout: LayoutName,
     os_hints: OsHints,
 ) -> Result<StarknetOsRunnerOutput, StarknetOsError> {
     let n_blocks = os_hints.os_input.os_block_and_state_input.len();
-    run_os(compiled_os, layout, os_hints, vec![PanickingStateReader; n_blocks])
+    run_os(layout, os_hints, vec![PanickingStateReader; n_blocks])
 }