feat(apollo_starknet_os_program): add test contracts, add dumper in CLI

Author: dorimedini-starkware

crates/apollo_starknet_os_program/Cargo.toml

@@ -9,6 +9,9 @@ description = "The source (Cairo) code of the Starknet OS."
 [lints]
 workspace = true
 
+[features]
+test_programs = []
+
 [dependencies]
 apollo_infra_utils.workspace = true
 cairo-vm.workspace = true

crates/apollo_starknet_os_program/build.rs

@@ -10,6 +10,8 @@ async fn main() {
     let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR not set."));
 
     let mut task_set = tokio::task::JoinSet::new();
+    #[cfg(feature = "test_programs")]
+    task_set.spawn(compile_test_contracts(out_dir.clone()));
     task_set.spawn(compile_and_output_program(
         out_dir.clone(),
         "starkware/starknet/core/os/os.cairo",
@@ -55,6 +57,17 @@ async fn compile_and_output_program(
     });
 }
 
+#[cfg(feature = "test_programs")]
+async fn compile_test_contracts(out_dir: PathBuf) {
+    let mut task_set = tokio::task::JoinSet::new();
+    task_set.spawn(compile_and_output_program(
+        out_dir,
+        "starkware/starknet/core/os/state/aliases_test.cairo",
+        "aliases_test",
+    ));
+    task_set.join_all().await;
+}
+
 fn cairo_root_path() -> PathBuf {
     PathBuf::from(compile_time_cargo_manifest_dir!()).join("src/cairo")
 }

crates/apollo_starknet_os_program/src/lib.rs

@@ -6,6 +6,8 @@ use cairo_vm::types::program::Program;
 use crate::program_hash::{ProgramHash, PROGRAM_HASH_PATH};
 
 pub mod program_hash;
+#[cfg(feature = "test_programs")]
+pub mod test_programs;
 
 pub const OS_PROGRAM_BYTES: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/starknet_os_bytes"));
 pub const AGGREGATOR_PROGRAM_BYTES: &[u8] =

crates/apollo_starknet_os_program/src/test_programs.rs

@@ -0,0 +1,2 @@
+pub const ALIASES_TEST_BYTES: &[u8] =
+    include_bytes!(concat!(env!("OUT_DIR"), "/aliases_test_bytes"));

crates/starknet_committer_and_os_cli/Cargo.toml

@@ -18,7 +18,8 @@ tempfile.workspace = true
 
 # TODO(Amos): Add `testing` feature and move Python test dependencies under it.
 [dependencies]
-apollo_starknet_os_program.workspace = true
+# `test_programs` feature should be moved under `testing` feature, when it exists.
+apollo_starknet_os_program = { workspace = true, features = ["test_programs"] }
 cairo-lang-starknet-classes.workspace = true
 cairo-vm.workspace = true
 # Should be moved under `testing` feature, when it exists.

crates/starknet_committer_and_os_cli/src/os_cli/commands.rs

@@ -1,6 +1,7 @@
 use std::fs;
 use std::path::Path;
 
+use apollo_starknet_os_program::test_programs::ALIASES_TEST_BYTES;
 use apollo_starknet_os_program::{AGGREGATOR_PROGRAM_BYTES, OS_PROGRAM_BYTES, PROGRAM_HASH};
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_vm::types::layout_name::LayoutName;
@@ -105,6 +106,7 @@ pub(crate) fn serialize_os_runner_output(
 pub(crate) fn dump_program(output_path: String, program: ProgramToDump) {
     let bytes = match program {
         ProgramToDump::Aggregator => AGGREGATOR_PROGRAM_BYTES,
+        ProgramToDump::AliasesTest => ALIASES_TEST_BYTES,
         ProgramToDump::Os => OS_PROGRAM_BYTES,
     };
     // Dumping the `Program` struct won't work - it is not deserializable via cairo-lang's Program

crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs

@@ -20,6 +20,7 @@ pub struct OsCliCommand {
 #[serde(rename_all = "kebab-case")]
 pub enum ProgramToDump {
     Aggregator,
+    AliasesTest,
     Os,
 }