Skip to content

Conversation

@dorimedini-starkware
Copy link
Collaborator

No description provided.

@reviewable-StarkWare
Copy link

This change is Reviewable

Copy link
Collaborator Author

dorimedini-starkware commented Apr 19, 2025

@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from b5385b4 to 622d12c Compare April 19, 2025 17:27
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch 2 times, most recently from 995428a to 3d599de Compare April 19, 2025 17:32
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 622d12c to a136d27 Compare April 22, 2025 13:12
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 3d599de to 0f5874b Compare April 22, 2025 13:12
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from a136d27 to 32cb04d Compare April 23, 2025 14:45
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 0f5874b to 69ea9d5 Compare April 23, 2025 14:45
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 32cb04d to aff8f88 Compare April 23, 2025 15:07
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 69ea9d5 to 3198f53 Compare April 23, 2025 15:07
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from aff8f88 to e1bcc4f Compare April 23, 2025 15:19
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 3198f53 to 26f58f6 Compare April 23, 2025 15:19
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from e1bcc4f to 192afa4 Compare April 24, 2025 09:46
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 26f58f6 to d655d2d Compare April 24, 2025 09:46
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 192afa4 to 08b00d4 Compare April 28, 2025 17:35
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from d655d2d to 70cd54e Compare April 28, 2025 17:36
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 08b00d4 to 3adf43f Compare April 28, 2025 18:50
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 70cd54e to d80cbe1 Compare April 28, 2025 18:50
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 3adf43f to a395b96 Compare April 28, 2025 18:53
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from d80cbe1 to beff0f1 Compare April 28, 2025 18:53
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from a395b96 to 16eb004 Compare April 28, 2025 19:57
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from beff0f1 to 612f5d4 Compare April 28, 2025 19:57
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 16eb004 to 3dd6a3e Compare April 29, 2025 06:35
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 612f5d4 to 19a68f0 Compare April 29, 2025 06:35
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 3dd6a3e to 87dbe9e Compare April 29, 2025 12:59
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 19a68f0 to d3a1ffa Compare April 29, 2025 12:59
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 7cb661d to 9eba377 Compare May 28, 2025 09:02
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 42908ca to e05feb2 Compare May 28, 2025 15:07
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 9eba377 to 0ae3e91 Compare May 28, 2025 15:07
@dorimedini-starkware dorimedini-starkware marked this pull request as ready for review June 3, 2025 07:46
@dorimedini-starkware dorimedini-starkware self-assigned this Jun 3, 2025
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from e05feb2 to 49c095f Compare June 3, 2025 07:48
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 0ae3e91 to 0e13d04 Compare June 3, 2025 07:48
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 49c095f to 34f9837 Compare June 3, 2025 09:22
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 0e13d04 to 8558852 Compare June 3, 2025 09:22
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from 34f9837 to cb73d6f Compare June 3, 2025 15:32
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 8558852 to 9f22c4b Compare June 3, 2025 15:32
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 9 of 9 files at r2, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @dorimedini-starkware)


crates/apollo_starknet_os_program/build/compile_program.rs line 43 at r2 (raw file):

    task_set.spawn(compile_and_output_program(
        out_dir,
        "starkware/starknet/core/os/state/aliases_test.cairo",

Const. And later on - an enum similar to the blockifier's FeatureContract.

Code quote:

"starkware/starknet/core/os/state/aliases_test.cairo",

crates/apollo_starknet_os_program/src/lib.rs line 13 at r2 (raw file):

pub mod program_hash;
#[cfg(feature = "test_programs")]
pub mod test_programs;

Is this needed?

Code quote:

#[cfg(feature = "test_programs")]
pub mod test_programs;

crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 119 at r2 (raw file):

    let bytes = match program {
        ProgramToDump::Aggregator => AGGREGATOR_PROGRAM_BYTES,
        ProgramToDump::AliasesTest => ALIASES_TEST_BYTES,

Possibly condition, see the comment below.

Code quote:

ProgramToDump::AliasesTest => ALIASES_TEST_BYTES,

crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs line 31 at r2 (raw file):

pub enum ProgramToDump {
    Aggregator,
    AliasesTest,

Shoudn't this be under #[cfg(feature = "test_programs")] as well?
If you only want to be able to recompile with this feature, but dump without it - maybe change the name of the feature. Otherwise, add the condition.

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, 4 unresolved discussions (waiting on @TzahiTaub)


crates/apollo_starknet_os_program/build/compile_program.rs line 43 at r2 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Const. And later on - an enum similar to the blockifier's FeatureContract.

see comment in previous PR - same question (this is still the build script)


crates/apollo_starknet_os_program/src/lib.rs line 13 at r2 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Is this needed?

the CLI crate includes an option to dump the aliases_test.cairo compiled program, which I will later use to remove the cairo code from the main repo


crates/starknet_committer_and_os_cli/src/os_cli/commands.rs line 119 at r2 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Possibly condition, see the comment below.

see below


crates/starknet_committer_and_os_cli/src/os_cli/run_os_cli.rs line 31 at r2 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

Shoudn't this be under #[cfg(feature = "test_programs")] as well?
If you only want to be able to recompile with this feature, but dump without it - maybe change the name of the feature. Otherwise, add the condition.

the CLI crate activates the test_programs feature of the OS program crate,
but no reason for the CLI crate to have this feature - it's "always on"

@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously branch from cb73d6f to db02f56 Compare June 4, 2025 14:10
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 9f22c4b to 03b37e8 Compare June 4, 2025 14:10
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, 1 unresolved discussion (waiting on @dorimedini-starkware)


crates/apollo_starknet_os_program/build/main.rs line 18 at r2 (raw file):

    let mut task_set = tokio::task::JoinSet::new();
    #[cfg(feature = "test_programs")]

I'm not sure how much the recompile-if of build scripts can be configured, but if you know how to bind the test_program feature with the test contracts (i.e., that if only a test contract was changed and we don't use the test_program feature - we won't run this scripts) - please do.

Code quote:

#[cfg(feature = "test_programs")]

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, 1 unresolved discussion (waiting on @TzahiTaub)


crates/apollo_starknet_os_program/build/main.rs line 18 at r2 (raw file):

Previously, TzahiTaub (Tzahi) wrote…

I'm not sure how much the recompile-if of build scripts can be configured, but if you know how to bind the test_program feature with the test contracts (i.e., that if only a test contract was changed and we don't use the test_program feature - we won't run this scripts) - please do.

IDK how to do that, and I think it's overkill - if you make a change to the test contract, you should be using the feature, or you are not testing your changes

@dorimedini-starkware dorimedini-starkware changed the base branch from 04-19-feat_apollo_starknet_os_program_compile_programs_asynchronously to main-v0.14.0 June 5, 2025 11:35
@dorimedini-starkware dorimedini-starkware force-pushed the 04-19-feat_apollo_starknet_os_program_add_test_contracts_add_dumper_in_cli branch from 03b37e8 to 6161f7d Compare June 5, 2025 11:35
@graphite-app
Copy link

graphite-app bot commented Jun 5, 2025

Merge activity

  • Jun 5, 11:35 AM UTC: Graphite rebased this pull request, because this pull request is set to merge when ready.

@dorimedini-starkware dorimedini-starkware added this pull request to the merge queue Jun 5, 2025
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 9 of 9 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dorimedini-starkware)

Merged via the queue into main-v0.14.0 with commit 4dc424d Jun 5, 2025
13 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jun 7, 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