Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync with the lastest changes in the Blockifier repo #24

Merged
merged 1 commit into from
Jul 22, 2024

Conversation

TzahiTaub
Copy link
Contributor

@TzahiTaub TzahiTaub commented Jul 22, 2024

chore: sync with the lastest changes in the Blockifier repo


This change is Reviewable

@TzahiTaub TzahiTaub self-assigned this Jul 22, 2024
@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from 3e6d766 to af1775f Compare July 22, 2024 10:59
@TzahiTaub TzahiTaub changed the title Tzahi/final sync of blockifier chore: sync with the lastest changes in the Blockifier repo Jul 22, 2024
@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from af1775f to fead13e Compare July 22, 2024 11:02
@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from fead13e to 8abb01b Compare July 22, 2024 11:50
Copy link
Collaborator

@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 3 of 25 files at r1.
Reviewable status: 3 of 25 files reviewed, 2 unresolved discussions (waiting on @dafnamatsry, @noaov1, and @TzahiTaub)


Cargo.toml line 72 at r1 (raw file):

cairo-lang-sierra = "=2.7.0-rc.3"
cairo-lang-starknet-classes = "2.7.0-rc.3"
cairo-lang-utils = "2.7.0-rc.3"

this will potentially break other crates...
I would like to see the papyrus CI run successfully here.
Can you try adding a dummy comment in some papyrus file and pushing? so the papyrus CI runs with the new compiler?
(for papyrus CI to pass, this PR needs to be merged and the current (#24) PR should be rebased, but you can ignore the docker-build papyrus phases for now)

Code quote:

cairo-lang-casm = "2.7.0-rc.3"
cairo-lang-runner = "2.7.0-rc.3"
cairo-lang-sierra = "=2.7.0-rc.3"
cairo-lang-starknet-classes = "2.7.0-rc.3"
cairo-lang-utils = "2.7.0-rc.3"

Cargo.toml line 119 at r1 (raw file):

os_info = "3.6.0"
page_size = "0.6.0"
papyrus_storage = "0.4.0-dev.4"

no - papyrus storage is a crate in this repo.
dependency should be via path, not version, in the (native_) blockifier cargo toml (not the root)

Code quote:

papyrus_storage = "0.4.0-dev.4"

@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from 8abb01b to 5282a0e Compare July 22, 2024 12:09
Copy link
Contributor Author

@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: 2 of 26 files reviewed, 2 unresolved discussions (waiting on @dafnamatsry, @dorimedini-starkware, and @noaov1)


Cargo.toml line 119 at r1 (raw file):

Previously, dorimedini-starkware wrote…

no - papyrus storage is a crate in this repo.
dependency should be via path, not version, in the (native_) blockifier cargo toml (not the root)

Trying to remove this. I guess it shouldn't appear in here at all, I see every crate's toml declares it explicitly. Don't we want to define it once in here and make all others use workspace settings for this crate?

Copy link

codecov bot commented Jul 22, 2024

Codecov Report

Attention: Patch coverage is 77.27273% with 25 lines in your changes missing coverage. Please review.

Project coverage is 76.88%. Comparing base (e16fff4) to head (c27bb8c).
Report is 3 commits behind head on main.

Files Patch % Lines
.../blockifier/src/execution/entry_point_execution.rs 81.03% 5 Missing and 6 partials ⚠️
.../src/execution/deprecated_entry_point_execution.rs 25.00% 4 Missing and 2 partials ⚠️
.../blockifier/src/blockifier/transaction_executor.rs 71.42% 3 Missing and 1 partial ⚠️
crates/blockifier/src/concurrency/utils.rs 50.00% 3 Missing ⚠️
crates/blockifier/src/versioned_constants.rs 92.30% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #24      +/-   ##
==========================================
- Coverage   76.90%   76.88%   -0.02%     
==========================================
  Files         267      267              
  Lines       31923    32011      +88     
  Branches    31923    32011      +88     
==========================================
+ Hits        24550    24613      +63     
- Misses       5179     5196      +17     
- Partials     2194     2202       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@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 1 of 2 files at r2, all commit messages.
Reviewable status: 3 of 26 files reviewed, 1 unresolved discussion (waiting on @dafnamatsry, @noaov1, and @TzahiTaub)

Copy link
Collaborator

@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: 3 of 26 files reviewed, 1 unresolved discussion (waiting on @dafnamatsry, @noaov1, and @TzahiTaub)


Cargo.toml line 72 at r1 (raw file):

Previously, dorimedini-starkware wrote…

this will potentially break other crates...
I would like to see the papyrus CI run successfully here.
Can you try adding a dummy comment in some papyrus file and pushing? so the papyrus CI runs with the new compiler?
(for papyrus CI to pass, this PR needs to be merged and the current (#24) PR should be rebased, but you can ignore the docker-build papyrus phases for now)

looks good


crates/papyrus_node/examples/get_transaction_hash.rs line 96 at r2 (raw file):

}

// Define a tuple struct to hold transaction type and version.

lol

Code quote:

.

Copy link
Contributor Author

@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: 3 of 26 files reviewed, 1 unresolved discussion (waiting on @dafnamatsry, @dorimedini-starkware, and @noaov1)


crates/papyrus_node/examples/get_transaction_hash.rs line 96 at r2 (raw file):

Previously, dorimedini-starkware wrote…

lol

Don't want to force myself

@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from 5282a0e to f42b3cf Compare July 22, 2024 13:24
@TzahiTaub TzahiTaub force-pushed the tzahi/final_sync_of_blockifier branch from f42b3cf to c27bb8c Compare July 22, 2024 14:27
Copy link
Collaborator

@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.

:lgtm:

Reviewed 22 of 25 files at r1, 1 of 2 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dafnamatsry and @noaov1)

@TzahiTaub TzahiTaub merged commit 0dacbef into main Jul 22, 2024
25 checks passed
@TzahiTaub TzahiTaub deleted the tzahi/final_sync_of_blockifier branch July 22, 2024 15:30
@github-actions github-actions bot locked and limited conversation to collaborators Jul 24, 2024
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.

2 participants