Skip to content

Comments

feat: add cgt to opcmv2#18455

Merged
smartcontracts merged 42 commits intoethereum-optimism:developfrom
defi-wonderland:sc-feat/opcm2-add-cgt
Dec 11, 2025
Merged

feat: add cgt to opcmv2#18455
smartcontracts merged 42 commits intoethereum-optimism:developfrom
defi-wonderland:sc-feat/opcm2-add-cgt

Conversation

@0xniha
Copy link
Contributor

@0xniha 0xniha commented Dec 1, 2025

Description

  • Adds useCustomGasToken input to FullConfig struct.
  • Sets feature in SystemConfig if flag enabled.

* feat: add cgt to opcmv2

* fix: change semver
@0xniha 0xniha requested a review from a team as a code owner December 1, 2025 19:07
@0xniha 0xniha requested a review from alcueca December 1, 2025 19:07
@falcorocks
Copy link
Contributor

falcorocks commented Dec 2, 2025

hi @0xniha, #18471 fixes the bake errors. Can you please rebase your branch?

* feat: add cgt to opcmv2

* fix: change semver
@0xOneTony
Copy link
Contributor

/ci authorize c372ddc

Copy link
Contributor

@AmadiMichael AmadiMichael left a comment

Choose a reason for hiding this comment

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

LGTM, though i do not see a corresponding test added for this, do we plan on adding it in a future pr?

@smartcontracts
Copy link
Contributor

Good point, @0xniha can you add a new CI matrix config that runs OPCMv2 and CGT at the same time?

@0xniha 0xniha requested a review from a team as a code owner December 2, 2025 20:06
@0xniha 0xniha requested a review from joshklop December 2, 2025 20:06
@smartcontracts
Copy link
Contributor

/ci authorize 457e671

@0xOneTony
Copy link
Contributor

/ci authorize df3ecf5

@0xiamflux
Copy link
Contributor

The tests failing seem not to be specific for CGT, I think it makes sense to fix those in a different PR.

* fix: check CGT is not enabled before enabling it

* fix: enable CGT overrides
@0xOneTony
Copy link
Contributor

/ci authorize 2614984

0xniha and others added 10 commits December 8, 2025 20:24
* feat: add cgt to opcmv2

* fix: change semver
* feat: add cgt to opcmv2

* fix: change semver
* fix: check CGT is not enabled before enabling it

* fix: enable CGT overrides
* fix: add check enabled CGT during upgrades

* test: set CGT false by default during forked tests

* chore: expand comment on OPCMv2 regarding CGT
@0xiamflux 0xiamflux requested review from a team as code owners December 9, 2025 01:25
Conflicts:
	packages/contracts-bedrock/interfaces/L1/opcm/IOPContractsManagerV2.sol
	packages/contracts-bedrock/snapshots/semver-lock.json
	packages/contracts-bedrock/src/L1/opcm/OPContractsManagerV2.sol
chore: sync sc-feat/opcm2-add-cgt with develop
chore: Merge develop into sc-feat/opcm2-add-cgt
@0xOneTony
Copy link
Contributor

/ci authorize 550f2be

* refactor: add helper function to match instruction by key only

* chore: pre-pr ready

* test: refactor key matching test

* test: add test suite for IsMatchingKey helper function

* chore: pre-pr ready
@smartcontracts
Copy link
Contributor

/ci authorize 7aea894

@0xOneTony
Copy link
Contributor

/ci authorize 6cee90f

@smartcontracts smartcontracts added this pull request to the merge queue Dec 11, 2025
Merged via the queue into ethereum-optimism:develop with commit adf9b32 Dec 11, 2025
177 checks passed
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.