Skip to content

chore: sync sc-feat/opcm2-add-cgt with develop#742

Merged
0xiamflux merged 10 commits intosc-feat/opcm2-add-cgtfrom
sync/opcm2
Dec 9, 2025
Merged

chore: sync sc-feat/opcm2-add-cgt with develop#742
0xiamflux merged 10 commits intosc-feat/opcm2-add-cgtfrom
sync/opcm2

Conversation

@0xiamflux
Copy link
Copy Markdown

Conflicts:

  • packages/contracts-bedrock/interfaces/L1/opcm/IOPContractsManagerV2.sol
  • packages/contracts-bedrock/snapshots/semver-lock.json
  • packages/contracts-bedrock/src/L1/opcm/OPContractsManagerV2.sol

janjakubnanista and others added 10 commits December 6, 2025 16:17
* jovian: remove feature toggles

scope is now fixed

* Updated op-geth to v1.101604.0-synctest.0.0.20251120150812-e50f80a16afc

* lint

* just update-op-geth f48f382

* Use Jovian in test error message

* just update-op-geth ba6bdcfef42341fe2b5ce124c31ff2d6b264e9e4
…mism#18462)

* feat: have OPCM upgrade allowances be upgrade specific

Updates the OPCMv2 check for allowed extra instructions to be
specific to releases. When release versions are bumped, the
allowances become automatically invalid and would reveal
anywhere in the codebase where the allowance is being used.

* fix: semver lock

* fix: emit instruction key in error

* fix: better semantics

* docs: proper OPCM versioning policy

* fix: final version tweaks
Conflicts:
	packages/contracts-bedrock/interfaces/L1/opcm/IOPContractsManagerV2.sol
	packages/contracts-bedrock/snapshots/semver-lock.json
	packages/contracts-bedrock/src/L1/opcm/OPContractsManagerV2.sol
@0xiamflux 0xiamflux requested review from 0xOneTony and 0xniha December 9, 2025 15:58
@0xiamflux 0xiamflux self-assigned this Dec 9, 2025
@0xiamflux 0xiamflux changed the title sync: opcm2 chore: sync sc-feat/opcm2-add-cgt with develop Dec 9, 2025
@0xiamflux 0xiamflux merged commit eb2e248 into sc-feat/opcm2-add-cgt Dec 9, 2025
1 check passed
@0xiamflux 0xiamflux deleted the sync/opcm2 branch December 9, 2025 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants