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

ArbOS11To32UpgradeTest #284

Merged
merged 4 commits into from
Dec 19, 2024
Merged

ArbOS11To32UpgradeTest #284

merged 4 commits into from
Dec 19, 2024

Conversation

diegoximenes
Copy link

@diegoximenes diegoximenes commented Dec 17, 2024

Resolves NIT-2975

Adds a test contract that has a function that uses mcopy, an instruction that is supported in ArbOS 32 but not in ArbOS 11.
It also updates audit-ci.jsonc, with changes that are already in the develop branch.

To be used in OffchainLabs/nitro#2837

Attention to the base branch.
Current version of develop is not compatible with nitro, so a pre-bold branch, checked out from main, was created to support changes that should be introduced to nitro while bold is not fully integrated to it.

@cla-bot cla-bot bot added the s label Dec 17, 2024
@diegoximenes diegoximenes reopened this Dec 18, 2024
@diegoximenes diegoximenes changed the base branch from main to pre-bold December 18, 2024 11:16
@diegoximenes diegoximenes force-pushed the arbos_11_to_32_upgrade_test branch from fb80191 to 54ec0a9 Compare December 18, 2024 11:31
Copy link
Member

@gzeoneth gzeoneth left a comment

Choose a reason for hiding this comment

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

LGTM, I think the plan is not to merge into main but tag v2.1.2 on this branch (only if you need a npm release, if not I might even not bother to tag it but nitro can simply pin to this commit)

Can you also create the same PR on develop so we have this mock also available in v3 (bold)?

@diegoximenes
Copy link
Author

diegoximenes commented Dec 18, 2024

LGTM, I think the plan is not to merge into main but tag v2.1.2 on this branch (only if you need a npm release, if not I might even not bother to tag it but nitro can simply pin to this commit)

I don't need a npm release so I will just merge it.

Can you also create the same PR on develop so we have this mock also available in v3 (bold)?

I created the PR with develop as the base branch: #286

pre-bold doesn't have merge protection if the PR was not approved BTW.
@gzeoneth I don't have access to nitro-contract repo settings, could you set this protection?

@diegoximenes diegoximenes merged commit 763bd77 into pre-bold Dec 19, 2024
13 checks passed
@diegoximenes diegoximenes deleted the arbos_11_to_32_upgrade_test branch December 19, 2024 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants