Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Merge main into main contract segmentation #1291

Conversation

liorgold2
Copy link
Contributor

@liorgold2 liorgold2 commented Dec 26, 2023

This change is Reviewable

Gilad Chase and others added 30 commits December 7, 2023 07:43
Remove setup/teardown logic: this was relevant for the block executor
(which the validator was copied from) due to concurrency limitations
of papyrus. But since we are not using papyrus in PyValidator,
these are no longer relevant.

In the new flow, multiple `PyValidator` instances can be used
concurrently.

GlobalCache is currently not threadsafe, so isn't used in PyValidator.
To use it, it must be Mutex'ed and updated from Python after each
validate call finishes.
…fety

native_blockifier: Make PyValidator threadsafe (#1221)

Co-Authored-By: Gilad Chase <gilad@starkware.com>
…into-main-v0.13.0

Elin/merge main v0.12.3 into main v0.13.0
Signed-off-by: Dori Medini <dori@starkware.co>
* Update os_resources.json to match the python one

* Fix os_resources expected tests

* Moar fixes (by dori)

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

* Fix test docstrings

Co-Authored-By: Gilad Chase <gilad@starkware.com>
Co-Authored-By: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
elintul and others added 24 commits December 18, 2023 14:27
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
Signed-off-by: Dori Medini <dori@starkware.co>
…into-main

Elin/merge main v0.13.0 into main
@liorgold2 liorgold2 changed the base branch from main to main-contract-segmentation December 26, 2023 16:13
@codecov-commenter
Copy link

Codecov Report

Attention: 45 lines in your changes are missing coverage. Please review.

Comparison is base (6eeb3d8) 70.67% compared to head (c29756e) 71.35%.

Files Patch % Lines
crates/native_blockifier/src/py_validator.rs 0.00% 35 Missing ⚠️
...ates/native_blockifier/src/transaction_executor.rs 0.00% 6 Missing ⚠️
...ve_blockifier/src/py_transaction_execution_info.rs 0.00% 2 Missing ⚠️
crates/native_blockifier/src/lib.rs 0.00% 1 Missing ⚠️
crates/native_blockifier/src/py_block_executor.rs 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                      Coverage Diff                       @@
##           main-contract-segmentation    #1291      +/-   ##
==============================================================
+ Coverage                       70.67%   71.35%   +0.67%     
==============================================================
  Files                              57       59       +2     
  Lines                            7209     7299      +90     
  Branches                         7209     7299      +90     
==============================================================
+ Hits                             5095     5208     +113     
+ Misses                           1691     1673      -18     
+ Partials                          423      418       -5     

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

Copy link
Collaborator

@elintul elintul 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 34 of 34 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @liorgold2)

@liorgold2 liorgold2 merged commit 4e8e7b5 into main-contract-segmentation Dec 26, 2023
15 checks passed
gswirski pushed a commit to reilabs/blockifier that referenced this pull request Jun 26, 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.