Merge v7 into df4ad34 #6
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update compiler version to 2.1.0-rc1. (starkware-libs#768) * Merge remote-tracking branch 'origin/main-v0.12.1' into elin/merge-main-v0.12.1-into-main * Merge pull request starkware-libs#769 from starkware-libs/elin/merge-main-v0.12.1-into-main Elin/merge main v0.12.1 into main (starkware-libs#769) Co-Authored-By: Arnon Hod <[email protected]> Co-Authored-By: Elin Tulchinsky <[email protected]>
Signed-off-by: Dori Medini <[email protected]>
* Refactor run_or_revert. Check actual fee before committing the execution result. Revert and charge max fee when running out of gas instead of failing due to FeeTransferError and charging nothing. * PR changes
…fier/merges/merge-v0121-to-v0122 Elin/blockifier/merges/merge v0121 to v0122
also, switch `syscall_counter` to borrow in `get_additional_os_resources` to avoid needless cloning. (starkware-libs#809)
…mitting changes. else, revert. (starkware-libs#811) * check that user has enough remaining balance to pay for tx before committing changes. else, revert. * add test for revert on overdraft * PR
…in-v0.12.1-into-main-v0.12.2
…main-v0.12.1-into-main-v0.12.2 Elin/merge main v0.12.1 into main v0.12.2
…tStateDiff` (starkware-libs#911) This ensures that the `CommitmentStateDiff` doesn't contain any write actions that don't change the existing value. This is a performance optimization, since it saves the state diff consumer from doing this at a later stage, which could be costly.
…in-v0.12.2-into-main-v0.12.3 (no conflicts).
…main-v0.12.2-into-main-v0.12.3 Elin/merge main v0.12.2 into main v0.12.3
Co-Authored-By: Ilya Lesokhin <[email protected]>
…point (used for simulation and fee estimation). (starkware-libs#785) (starkware-libs#1037)
|
seems like you've included some commits from the origin repo that are newer than this commit f185eba (the latest commit on for simplicity, you can just create a branch from this commit starkware-libs@df4ad34 and just add the Dojo changes that on |
|
hey to avoid confusion, i already created the you use this commit 2b4a0e5 for the Dojo PR |
|
What I did is exactly merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This brings the no validation account commit from upstream blockifier