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 17, 2025

Copy link
Collaborator Author

dorimedini-starkware commented Apr 17, 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.

Reviewable status: 0 of 5 files reviewed, all discussions resolved (waiting on @Itay-Tsabary-Starkware)


crates/apollo_infra_utils/Cargo.toml line 30 at r1 (raw file):

assert-json-diff.workspace = true
cached.workspace = true
colored.workspace = true

this is s bugfix - cargo test -p apollo_infra_utils fails without these deps

Code quote:

assert-json-diff.workspace = true
cached.workspace = true
colored.workspace = true

Copy link
Collaborator

@Itay-Tsabary-Starkware Itay-Tsabary-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: 0 of 5 files reviewed, all discussions resolved (waiting on @dorimedini-starkware)


crates/apollo_infra_utils/Cargo.toml line 10 at r2 (raw file):

[features]
testing = ["cached", "colored", "dep:assert-json-diff", "socket2", "toml"]

I checked the testing feature dependencies and noticed the inconsistent use of dep: syntax here.
What have we decided regarding this usage?

Code quote:

dep:

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: 0 of 5 files reviewed, all discussions resolved (waiting on @dorimedini-starkware)


crates/apollo_infra_utils/Cargo.toml line 10 at r2 (raw file):

Previously, Itay-Tsabary-Starkware wrote…

I checked the testing feature dependencies and noticed the inconsistent use of dep: syntax here.
What have we decided regarding this usage?

I don't think we decided anything

Copy link
Collaborator

@Itay-Tsabary-Starkware Itay-Tsabary-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: 0 of 5 files reviewed, 1 unresolved discussion (waiting on @dorimedini-starkware)


crates/blockifier_test_utils/src/cairo_compile.rs line 6 at r2 (raw file):

use std::process::{Command, Output};

use apollo_infra_utils::cairo0_compiler::verify_cairo0_compiler_deps;

What's the motivation for having the compiler utilities part of the apollo_infra crate and not in the blockifier test utils crate? Are there other crates that intend to use it?

Code quote:

use apollo_infra_utils::cairo0_compiler::verify_cairo0_compiler_deps;

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: 0 of 5 files reviewed, 1 unresolved discussion (waiting on @dorimedini-starkware and @Itay-Tsabary-Starkware)


crates/blockifier_test_utils/src/cairo_compile.rs line 6 at r2 (raw file):

Previously, Itay-Tsabary-Starkware wrote…

What's the motivation for having the compiler utilities part of the apollo_infra crate and not in the blockifier test utils crate? Are there other crates that intend to use it?

yes :)

Copy link
Collaborator

@Itay-Tsabary-Starkware Itay-Tsabary-Starkware left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 5 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dorimedini-starkware)


crates/apollo_infra_utils/Cargo.toml line 10 at r2 (raw file):

Previously, dorimedini-starkware wrote…

I don't think we decided anything

Consider removing the dep: then for consistency. Anyhow, not blocking.

@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from ed9e2c1 to e099557 Compare April 17, 2025 13:52
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from b461536 to c163a0d Compare April 17, 2025 13:52
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from e099557 to bbedc2c Compare April 17, 2025 13:57
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from c163a0d to 83c2706 Compare April 17, 2025 13:57
@github-actions
Copy link

github-actions bot commented Apr 17, 2025

Benchmark movements: No major performance changes detected.

@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from a780f22 to 400f179 Compare May 9, 2025 09:34
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from 5bf93a6 to fd328a2 Compare May 9, 2025 09:34
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 400f179 to 9477f04 Compare May 11, 2025 09:49
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from fd328a2 to 94eb0ff Compare May 11, 2025 09:49
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 9477f04 to 7243c38 Compare May 11, 2025 11:12
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from 94eb0ff to b9541ed Compare May 11, 2025 11:12
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 7243c38 to 750f23c Compare May 11, 2025 12:21
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from b9541ed to 78a5acd Compare May 11, 2025 12:21
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 750f23c to 6b18469 Compare May 15, 2025 10:17
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from 78a5acd to 2157f4a Compare May 15, 2025 10:17
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 6b18469 to 0710881 Compare May 15, 2025 10:45
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from 2157f4a to ffe2189 Compare May 15, 2025 10:45
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 0710881 to 3b4fbc0 Compare May 19, 2025 22:10
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from ffe2189 to aab90f7 Compare May 19, 2025 22:10
Copy link
Collaborator

@amosStarkware amosStarkware left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 5 files at r4, all commit messages.
Reviewable status: 4 of 5 files reviewed, 2 unresolved discussions (waiting on @Itay-Tsabary-Starkware and @TzahiTaub)


crates/apollo_infra_utils/src/cairo0_compiler.rs line 16 at r4 (raw file):

pub const STARKNET_COMPILE_DEPRECATED: &str = "starknet-compile-deprecated";
pub const CAIRO0_COMPILE: &str = "cairo-compile";
pub const EXPECTED_CAIRO0_VERSION: &str = "0.14.0a1";

why is it hardcoded here?

Code quote:

pub const EXPECTED_CAIRO0_VERSION: &str = "0.14.0a1";

crates/apollo_infra_utils/src/cairo0_compiler.rs line 32 at r4 (raw file):

pub fn cairo0_compilers_correct_version() -> Result<(), Cairo0CompilerVersionError> {
    for compiler in [CAIRO0_COMPILE, STARKNET_COMPILE_DEPRECATED] {

why are there now two compilers?

Code quote:

for compiler in [CAIRO0_COMPILE, STARKNET_COMPILE_DEPRECATED] {

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: 4 of 5 files reviewed, 2 unresolved discussions (waiting on @amosStarkware, @Itay-Tsabary-Starkware, and @TzahiTaub)


crates/apollo_infra_utils/src/cairo0_compiler.rs line 16 at r4 (raw file):

Previously, amosStarkware wrote…

why is it hardcoded here?

easier to reference it; it's tested for consistency with the pip requirements in test_cairo0_version_pip_requirements


crates/apollo_infra_utils/src/cairo0_compiler.rs line 32 at r4 (raw file):

Previously, amosStarkware wrote…

why are there now two compilers?

one for cairo0 code, and one for cairo0 starknet contracts. they are separate scripts

@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 3b4fbc0 to 85891bd Compare May 25, 2025 14:53
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from aab90f7 to e1800d8 Compare May 25, 2025 14:53
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from 85891bd to e193e22 Compare May 25, 2025 15:25
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from e1800d8 to 793dee7 Compare May 25, 2025 15:26
@dorimedini-starkware dorimedini-starkware force-pushed the 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps branch from e193e22 to f8d0a42 Compare May 25, 2025 15:54
@dorimedini-starkware dorimedini-starkware force-pushed the 04-17-feat_apollo_infra_utils_better_cairo0_compiler_checks branch from 793dee7 to 7e905ce Compare May 25, 2025 17:09
@dorimedini-starkware dorimedini-starkware changed the base branch from 04-13-chore_apollo_infra_utils_explicit_instructions_in_verify_cairo0_compiler_deps to main-v0.14.0 May 25, 2025 17:09
Copy link
Collaborator

@amosStarkware amosStarkware 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 5 files at r4, 2 of 2 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @TzahiTaub)

@dorimedini-starkware dorimedini-starkware added this pull request to the merge queue May 26, 2025
Merged via the queue into main-v0.14.0 with commit b391198 May 26, 2025
22 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators May 27, 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.

5 participants