Skip to content

Conversation

@dorimedini-starkware
Copy link
Collaborator

No description provided.

@reviewable-StarkWare
Copy link

This change is Reviewable

@github-actions
Copy link

github-actions bot commented Apr 15, 2025

Artifacts upload workflows:

@dorimedini-starkware dorimedini-starkware self-assigned this Apr 15, 2025
@dorimedini-starkware dorimedini-starkware marked this pull request as ready for review April 15, 2025 14:16
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 47f7df8 to b2bea45 Compare April 15, 2025 14:31
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 83d6363 to 1dbb071 Compare April 15, 2025 14:31
@dorimedini-starkware dorimedini-starkware marked this pull request as draft April 15, 2025 14:32
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from b2bea45 to 1c55dd5 Compare April 15, 2025 14:55
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 1dbb071 to d9d9e5f Compare April 15, 2025 14:56
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 1c55dd5 to c438e17 Compare April 15, 2025 15:09
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from d9d9e5f to 8688f92 Compare April 15, 2025 15:09
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from c438e17 to c57c217 Compare April 15, 2025 15:49
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 8688f92 to 4061106 Compare April 15, 2025 15:49
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from c57c217 to a939bdc Compare April 15, 2025 16:15
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 4061106 to 97825d7 Compare April 15, 2025 16:15
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from a939bdc to 4ed33f4 Compare April 15, 2025 16:32
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 97825d7 to 2e6df53 Compare April 15, 2025 16:32
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 4ed33f4 to 68b8a50 Compare April 16, 2025 07:31
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from a00ac52 to 53fefdc Compare May 26, 2025 09:51
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 2ef9756 to 04364be Compare May 26, 2025 11:52
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 53fefdc to b977413 Compare May 26, 2025 11:52
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 04364be to 5106d5a Compare May 26, 2025 13:10
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from b977413 to 629c819 Compare May 26, 2025 13:11
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 5106d5a to 7e34630 Compare May 26, 2025 13:43
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 629c819 to 073ef22 Compare May 26, 2025 13:43
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 7e34630 to 62086e7 Compare May 26, 2025 14:51
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 073ef22 to f3c678e Compare May 26, 2025 14:51
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from 62086e7 to f26c3f2 Compare May 27, 2025 07:56
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from f3c678e to bcb8b83 Compare May 27, 2025 07:56
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from f26c3f2 to f1e2c5e Compare May 27, 2025 08:36
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from bcb8b83 to 1dd0d61 Compare May 27, 2025 08:36
Copy link
Contributor

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 7 files at r4, 2 of 6 files at r5, 4 of 4 files at r7, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @amosStarkware and @nimrod-starkware)


.github/workflows/committer_and_os_cli_push.yml line 82 at r7 (raw file):

      - 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

Is this included in the install_builld_tools script?

Code quote:

rustup toolchain install

crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs line 48 at r7 (raw file):

        #[clap(long, short = 'o', default_value = "stdout")]
        output_path: String,
    },

Looks like it needs to follow the same structure as the above (if this is changed in a future PR it's OK).

Code quote:

    DumpProgramHash {
        /// File path to output.
        #[clap(long, short = 'o', default_value = "stdout")]
        output_path: String,
    },

crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 115 at r7 (raw file):

    };
    // Dumping the `Program` struct won't work - it is not deserializable via cairo-lang's Program
    // class. JSONify the raw bytes instead.

The first Program is the starknet_api struct (for Cairo 0)? Isn't this struct and the Python class compatible?

Code quote:

    // Dumping the `Program` struct won't work - it is not deserializable via cairo-lang's Program
    // class. JSONify the raw bytes instead.

Copy link
Collaborator Author

@dorimedini-starkware dorimedini-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @amosStarkware, @nimrod-starkware, and @TzahiTaub)


.github/workflows/committer_and_os_cli_push.yml line 82 at r7 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Is this included in the install_builld_tools script?

in the bootstrap script


crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 115 at r7 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

The first Program is the starknet_api struct (for Cairo 0)? Isn't this struct and the Python class compatible?

it's the VM struct, and no, it is not.
python->VM works, not the other way around


crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs line 48 at r7 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Looks like it needs to follow the same structure as the above (if this is changed in a future PR it's OK).

WDYM? what is missing?
we don't need a program param when dumping the program hash; we get the entire dict (OS + aggregator)

@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test branch from f1e2c5e to 12ebfab Compare May 27, 2025 10:24
@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 1dd0d61 to 3ff8c06 Compare May 27, 2025 10:25
Copy link
Contributor

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @amosStarkware, @dorimedini-starkware, and @nimrod-starkware)


crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs line 48 at r7 (raw file):

Previously, dorimedini-starkware wrote…

WDYM? what is missing?
we don't need a program param when dumping the program hash; we get the entire dict (OS + aggregator)

OK, switch to DumpProgramHashes instead. The two commands look equivalent, but the hashes are actually all programs' hashes in one file, and the "program" is for a specific program.


crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 116 at r7 (raw file):

    // 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)

As this can be "any" program

Suggestion:

program_json

@dorimedini-starkware dorimedini-starkware force-pushed the 04-14-feat_starknet_committer_and_os_cli_add_command_to_dump_the_os_compiled_program_to_file branch from 3ff8c06 to 67bf78b Compare May 27, 2025 11:49
Copy link
Collaborator Author

@dorimedini-starkware dorimedini-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @amosStarkware, @nimrod-starkware, and @TzahiTaub)


crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 116 at r7 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

As this can be "any" program

Done.

Copy link
Contributor

@TzahiTaub TzahiTaub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r8, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @amosStarkware and @nimrod-starkware)

@dorimedini-starkware dorimedini-starkware changed the base branch from 04-13-feat_apollo_starknet_os_program_add_fixer_for_program_hash_test to main-v0.14.0 May 27, 2025 21:11
Copy link
Collaborator Author

@dorimedini-starkware dorimedini-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r8, 3 of 3 files at r9, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @amosStarkware and @nimrod-starkware)

@dorimedini-starkware dorimedini-starkware added this pull request to the merge queue May 28, 2025
Merged via the queue into main-v0.14.0 with commit 3683a70 May 28, 2025
22 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators May 29, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants