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

TestArbos11To32Upgrade #2837

Merged
merged 18 commits into from
Dec 20, 2024
Merged

TestArbos11To32Upgrade #2837

merged 18 commits into from
Dec 20, 2024

Conversation

diegoximenes
Copy link
Contributor

@diegoximenes diegoximenes commented Dec 17, 2024

Resolves NIT-2975

Adds a test which guarantees that there is no problem if a transaction that executes an instruction like mcopy, that is available in ArbOS 32 but not in ArbOS 11, is included in the same block that the ArbOS 11 to 32 upgrade happens.

Depends on OffchainLabs/nitro-contracts#284

@cla-bot cla-bot bot added the s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA. label Dec 17, 2024
@diegoximenes diegoximenes force-pushed the test_arbos_upgrade_divergence branch from bdc48f7 to 4598b50 Compare December 18, 2024 12:25
@diegoximenes diegoximenes marked this pull request as ready for review December 18, 2024 14:50
gligneul
gligneul previously approved these changes Dec 19, 2024
Copy link
Contributor

Choose a reason for hiding this comment

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

There are tons of other changes in the contracts. Maybe the branch you chose as a base wasn't the correct one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nitro-contracts/pre-bold was branched off nitro-contracts/main.
There were some changes introduced in nitro-contracts/main that were not included in nitro's contracts submodule, these are the changes in the contracts that you are observing.

PlasmaPower
PlasmaPower previously approved these changes Dec 19, 2024
Copy link
Collaborator

@PlasmaPower PlasmaPower left a comment

Choose a reason for hiding this comment

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

LGTM

@PlasmaPower PlasmaPower merged commit ffa2388 into master Dec 20, 2024
17 checks passed
@PlasmaPower PlasmaPower deleted the test_arbos_upgrade_divergence branch December 20, 2024 15:56
Copy link

codecov bot commented Dec 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 22.53%. Comparing base (22596d4) to head (d72ebdc).
Report is 19 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2837      +/-   ##
==========================================
- Coverage   22.60%   22.53%   -0.07%     
==========================================
  Files         269      269              
  Lines       39696    39696              
==========================================
- Hits         8974     8947      -27     
- Misses      29248    29272      +24     
- Partials     1474     1477       +3     

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design-approved s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants