fix(ci): allow service CLI access to cairo-compile

Signed-off-by: Dori Medini <dori@starkware.co>

Author: dorimedini-starkware

.github/workflows/committer_and_os_cli_push.yml

@@ -65,8 +65,21 @@ jobs:
           COMMIT_SHA: ${{ github.event.after }}
         run: echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV
 
+      # Setup pypy and link to the location expected by .cargo/config.toml.
+      # Python + requirements are needed to compile the OS.
+      - uses: actions/setup-python@v5
+        id: setup-pypy
+        with:
+          python-version: "pypy3.9"
+          cache: 'pip'
+      - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
+      - env:
+          LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
+        run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
+      - run: pip install -r scripts/requirements.txt
+
       - name: Build CLI binary
-        run: ./build_native_in_docker.sh rustup toolchain install && cargo build -p starknet_committer_and_os_cli -r --bin starknet_committer_and_os_cli --target-dir CLI_TARGET
+        run: ./build_native_in_docker.sh cargo build -p starknet_committer_and_os_cli -r --bin starknet_committer_and_os_cli --target-dir CLI_TARGET
 
       - id: auth
         uses: "google-github-actions/auth@v2"

.github/workflows/committer_ci.yml

@@ -36,6 +36,21 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - uses: actions/checkout@v4
+
+      # Setup pypy and link to the location expected by .cargo/config.toml.
+      # Python + requirements are needed to compile the OS.
+      - uses: actions/setup-python@v5
+        id: setup-pypy
+        with:
+          python-version: "pypy3.9"
+          cache: 'pip'
+      - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
+      - env:
+          LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
+        run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
+      - run: pip install -r scripts/requirements.txt
+
+      # Bootstrap.
       - uses: ./.github/actions/bootstrap
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -57,6 +72,21 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
+
+      # Setup pypy and link to the location expected by .cargo/config.toml.
+      # Python + requirements are needed to compile the OS.
+      - uses: actions/setup-python@v5
+        id: setup-pypy
+        with:
+          python-version: "pypy3.9"
+          cache: 'pip'
+      - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
+      - env:
+          LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin
+        run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
+      - run: pip install -r scripts/requirements.txt
+
+      # Bootstrap.
       - uses: ./.github/actions/bootstrap
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}

crates/starknet_committer_and_os_cli/src/os_cli/commands.rs

@@ -1,7 +1,7 @@
 use std::fs;
 use std::path::Path;
 
-use apollo_starknet_os_program::{CAIRO_FILES_MAP, OS_PROGRAM_BYTES};
+use apollo_starknet_os_program::{CAIRO_FILES_MAP, OS_PROGRAM_BYTES, PROGRAM_HASH};
 use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use cairo_vm::types::layout_name::LayoutName;
 use cairo_vm::vm::runners::cairo_pie::CairoPie;
@@ -14,7 +14,7 @@ use starknet_os::io::os_output::StarknetOsRunnerOutput;
 use starknet_os::runner::run_os_stateless;
 use tracing::info;
 
-use super::run_os_cli::OsCliOutput;
+use crate::os_cli::run_os_cli::{OsCliOutput, ProgramToDump};
 use crate::shared_utils::read::{load_input, write_to_file};
 
 #[derive(Deserialize, Debug)]
@@ -107,8 +107,17 @@ pub(crate) fn dump_source_files(output_path: String) {
     write_to_file(&output_path, &*CAIRO_FILES_MAP);
 }
 
-pub(crate) fn dump_os_program(output_path: String) {
-    let os_program_json = serde_json::from_slice::<serde_json::Value>(OS_PROGRAM_BYTES)
+pub(crate) fn dump_program(output_path: String, program: ProgramToDump) {
+    let bytes = match program {
+        ProgramToDump::Os => OS_PROGRAM_BYTES,
+    };
+    // Dumping the `Program` struct won't work - it is not deserializable via cairo-lang's Program
+    // class. JSONify the raw bytes instead.
+    let os_program_json = serde_json::from_slice::<serde_json::Value>(bytes)
         .expect("OS bytes are JSON-serializable.");
     write_to_file(&output_path, &os_program_json);
 }
+
+pub(crate) fn dump_program_hash(output_path: String) {
+    write_to_file(&output_path, &*PROGRAM_HASH);
+}

crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs

@@ -9,7 +9,12 @@ use tracing::level_filters::LevelFilter;
 use tracing_subscriber::reload::Handle;
 use tracing_subscriber::Registry;
 
-use crate::os_cli::commands::{dump_os_program, dump_source_files, parse_and_run_os};
+use crate::os_cli::commands::{
+    dump_program,
+    dump_program_hash,
+    dump_source_files,
+    parse_and_run_os,
+};
 use crate::os_cli::tests::python_tests::OsPythonTestRunner;
 use crate::shared_utils::types::{run_python_test, IoArgs, PythonTestArg};
 
@@ -19,9 +24,24 @@ pub struct OsCliCommand {
     command: Command,
 }
 
+#[derive(clap::ValueEnum, Clone, Debug, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum ProgramToDump {
+    Os,
+}
+
 #[derive(Debug, Subcommand)]
 enum Command {
-    DumpOsProgram {
+    DumpProgram {
+        /// File path to output.
+        #[clap(long, short = 'o', default_value = "stdout")]
+        output_path: String,
+
+        /// Program to dump.
+        #[clap(long, value_enum)]
+        program: ProgramToDump,
+    },
+    DumpProgramHash {
         /// File path to output.
         #[clap(long, short = 'o', default_value = "stdout")]
         output_path: String,
@@ -44,7 +64,8 @@ pub async fn run_os_cli(
 ) {
     info!("Starting starknet-os-cli with command: \n{:?}", os_command);
     match os_command.command {
-        Command::DumpOsProgram { output_path } => dump_os_program(output_path),
+        Command::DumpProgram { output_path, program } => dump_program(output_path, program),
+        Command::DumpProgramHash { output_path } => dump_program_hash(output_path),
         Command::DumpSourceFiles { output_path } => dump_source_files(output_path),
         Command::PythonTest(python_test_arg) => {
             run_python_test::<OsPythonTestRunner>(python_test_arg).await;