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.

Sign up for GitHub

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

Jump to bottom

feat: support permit2 on OptimismSuperchainERC20 + upgrade solady's erc20 implementation #12476

Merged
merged 51 commits into from
Oct 22, 2024
Merged

feat: support permit2 on OptimismSuperchainERC20 + upgrade solady's erc20 implementation #12476

merged 51 commits into from
Oct 22, 2024

Conversation

0xDiscotech
Copy link
Contributor

@0xDiscotech 0xDiscotech commented Oct 15, 2024 •
edited
Loading

Description

  • Add a new Solady version, as a separate dependency from the current Solady package being used
  • Inherit from the new Solady's version ERC20 on SuperchainERC20
  • Support Permit2 on OptimismSuperchainERC20

Tests

Added 3 new tests over OptimismSuperchainERC20 contract to ensure the Permit2 implementation works well.

Metadata

CLOSES #11899

Additional context

  • The Permit2 support modifications over SuperchainWETH will be done on a different PR.
  • We upgraded the Solady version due to the Permit2 support on the ERC20 implementation. The modifications can be found here: ✨ Permit2 ERC20 Vectorized/solady#1093

agusduha and others added 30 commits September 25, 2024 15:20
@agusduha
feat: add superchain erc20 bridge (#61)
ae024a5 
* feat: add superchain erc20 bridge

* fix: interfaces and versions
@0xDiscotech
refactor: optimism superchain erc20 redesign (#62)
2a22161 
* refactor: use oz upgradeable erc20 as dependency

* chore: update interfaces

* fix: tests based on changes

* refactor: remove op as dependency

* feat: add check for supererc20 bridge on modifier

* chore: update tests and interfaces

* chore: update stack vars name on test

* chore: remove empty gitmodules file

* chore: update superchain weth errors
@agusduha
test: add superchain erc20 bridge tests (#65)
6aaf905 
* test: add superchain erc20 bridge tests

* test: add optimism superchain erc20 beacon tests

* test: remove unnecessary test

* test: tests fixes

* test: tests fixes
@0xDiscotech @agusduha
chore: update missing bridge on natspec (#69)
11fda67 
* chore: update missing bridge on natspec

* fix: natspecs

---------

Co-authored-by: agusduha <[email protected]>
@agusduha
fix: remove superchain erc20 base (#70)
7a69a7e
@0xDiscotech @agusduha
refactor: update isuperchainweth (#71)
07c9c77 
---------

Co-authored-by: agusduha <[email protected]>
@agusduha @0xDiscotech
feat: rename mint/burn and add SuperchainERC20 (#74)
d9bdad1 
* refactor: rename mint and burn functions on superchain erc20

* chore: rename optimism superchain erc20 to superchain erc20

* feat: create optimism superchain erc20 contract

* chore: update natspec and errors

* fix: superchain erc20 tests

* refactor: make superchain erc20 abstract

* refactor: move storage and erc20 metadata functions to implementation

* chore: update interfaces

* chore: update superchain erc20 events

* fix: tests

* fix: natspecs

* fix: add semmver lock and snapshots

* fix: remove unused imports

* fix: natspecs

---------

Co-authored-by: 0xDiscotech <[email protected]>
@agusduha
fix: refactor zero check (#76)
2e507b2
@agusduha
Merge branch 'develop' into fix/redesign-merge-conflicts
7fcaf6c
@agusduha
fix: pre pr
619f23c
@0xDiscotech
chore: add new solady version and import it for erc20
a16cca5
@agusduha
Merge pull request #77 from defi-wonderland/fix/redesign-merge-conflicts
1981789 
fix: update redesign with dev
@0xDiscotech
fix: undo forge std changes
0938dd8
@0xDiscotech
Merge branch 'sc/superchain-erc20-redesign' into chore/erc20-new-sola…
62235f7 
…dy-version
@0xDiscotech
chore: re run pre pr script
68dc9db
@agusduha
fix: semver natspec check failure (#79)
ae019b8 
* fix: semver natspec check failure

* fix: ignore mock contracts in semver natspec script

* fix: error message
@agusduha
feat: add crosschain erc20 interface (#80)
a5aca61 
* feat: add crosschain erc20 interface

* fix: refactor interfaces
@agusduha
fix: superchain bridge natspec (#83)
83757ea
@agusduha @0xng
@0xParticle @gotzenx
fix: superchain weth natspec (#84)
904a0ce 
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
@0xDiscotech
Merge branch 'sc/superchain-erc20-redesign' into chore/erc20-new-sola…
bd87a99 
…dy-version
@0xDiscotech
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
9fb4bc6 
…ersion
@agusduha
fix: stop inheriting superchain interfaces (#85)
3ebb1d1 
* fix: stop inheriting superchain interfaces

* fix: move events and erros into the implementation

* fix: make superchainERC20 inherits from crosschainERC20
@agusduha
fix: superchain bridge rename (#86)
1b4317e
@agusduha
fix: fee vault compiler error (#87)
10038c3
@agusduha
Merge branch 'develop' into fix/crosschain-merge-conflicts
9f49b43
@agusduha
fix: remove unused imports
ab1e074
@agusduha
Merge pull request #88 from defi-wonderland/fix/crosschain-merge-conf…
a79bf4e 
…licts

fix: crosschain merge conflicts
@0xDiscotech
Merge branch 'sc-feat/crosschain-erc20' into chore/erc20-new-solady-v…
905ee60 
…ersion
@0xDiscotech
chore: run pre-pr and update vendor interface
bdcd7f1
@agusduha
fix: refactor common errors (#90)
af9694e 
* fix: refactor common errors

* fix: remove unused version
@0xDiscotech 0xDiscotech changed the title feat: support permit2 on optimism superchain erc20 and upgrade solady's erc20 implementation (#97) feat: support permit2 on optimism superchain erc20 and upgrade solady's erc20 implementation Oct 15, 2024
@gotzenx gotzenx requested review from mds1 and maurelian October 16, 2024 19:14
@maurelian maurelian self-assigned this Oct 17, 2024
@0xDiscotech 0xDiscotech mentioned this pull request Oct 18, 2024
Merged
maurelian
maurelian reviewed Oct 18, 2024
View reviewed changes
Copy link
Contributor

@maurelian maurelian left a comment

Choose a reason for hiding this comment

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

I have no further comments, and will push to run CI again, but @mds1's question about the security of the Solady impl are a blocker here.

@gotzenx gotzenx requested review from maurelian and mds1 October 22, 2024 14:23
@gotzenx gotzenx mentioned this pull request Oct 22, 2024
Open
@gotzenx
Copy link
Contributor

gotzenx commented Oct 22, 2024

It has been decided that for now we will go with the unaudited Solady version but this will have to be revisited between devnet and tesnet.

Issue: #12573

@gotzenx gotzenx changed the title feat: support permit2 on optimism superchain erc20 and upgrade solady's erc20 implementation feat: support permit2 on OptimismSuperchainERC20 + upgrade solady's erc20 implementation Oct 22, 2024
@maurelian maurelian added this pull request to the merge queue Oct 22, 2024
Merged via the queue into ethereum-optimism:develop with commit cd640b0 Oct 22, 2024
47 checks passed
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
@0xDiscotech @agusduha
@0xng @0xParticle @gotzenx @samlaf
feat: support permit2 on OptimismSuperchainERC20 + upgrade solady's e…
45ee97c 
…rc20 implementation (ethereum-optimism#12476)

* feat: add superchain erc20 bridge (ethereum-optimism#61)

* feat: add superchain erc20 bridge

* fix: interfaces and versions

* refactor: optimism superchain erc20 redesign (ethereum-optimism#62)

* refactor: use oz upgradeable erc20 as dependency

* chore: update interfaces

* fix: tests based on changes

* refactor: remove op as dependency

* feat: add check for supererc20 bridge on modifier

* chore: update tests and interfaces

* chore: update stack vars name on test

* chore: remove empty gitmodules file

* chore: update superchain weth errors

* test: add superchain erc20 bridge tests (ethereum-optimism#65)

* test: add superchain erc20 bridge tests

* test: add optimism superchain erc20 beacon tests

* test: remove unnecessary test

* test: tests fixes

* test: tests fixes

* chore: update missing bridge on natspec (ethereum-optimism#69)

* chore: update missing bridge on natspec

* fix: natspecs

---------

Co-authored-by: agusduha <[email protected]>

* fix: remove superchain erc20 base (ethereum-optimism#70)

* refactor: update isuperchainweth (ethereum-optimism#71)


---------

Co-authored-by: agusduha <[email protected]>

* feat: rename mint/burn and add SuperchainERC20 (ethereum-optimism#74)

* refactor: rename mint and burn functions on superchain erc20

* chore: rename optimism superchain erc20 to superchain erc20

* feat: create optimism superchain erc20 contract

* chore: update natspec and errors

* fix: superchain erc20 tests

* refactor: make superchain erc20 abstract

* refactor: move storage and erc20 metadata functions to implementation

* chore: update interfaces

* chore: update superchain erc20 events

* fix: tests

* fix: natspecs

* fix: add semmver lock and snapshots

* fix: remove unused imports

* fix: natspecs

---------

Co-authored-by: 0xDiscotech <[email protected]>

* fix: refactor zero check (ethereum-optimism#76)

* fix: pre pr

* chore: add new solady version and import it for erc20

* fix: undo forge std changes

* chore: re run pre pr script

* fix: semver natspec check failure (ethereum-optimism#79)

* fix: semver natspec check failure

* fix: ignore mock contracts in semver natspec script

* fix: error message

* feat: add crosschain erc20 interface (ethereum-optimism#80)

* feat: add crosschain erc20 interface

* fix: refactor interfaces

* fix: superchain bridge natspec (ethereum-optimism#83)

* fix: superchain weth natspec (ethereum-optimism#84)

Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>

* fix: stop inheriting superchain interfaces (ethereum-optimism#85)

* fix: stop inheriting superchain interfaces

* fix: move events and erros into the implementation

* fix: make superchainERC20 inherits from crosschainERC20

* fix: superchain bridge rename (ethereum-optimism#86)

* fix: fee vault compiler error (ethereum-optimism#87)

* fix: remove unused imports

* chore: run pre-pr and update vendor interface

* fix: refactor common errors (ethereum-optimism#90)

* fix: refactor common errors

* fix: remove unused version

* feat: add permit2 on optimism superchain erc20

* chore: run pre-pr script

* fix: reuse unauthorized error (ethereum-optimism#92)

* fix: superchain erc20 factory conflicts

* fix: rename crosschain functions (ethereum-optimism#94)

* chore: run pre-pr

* chore: run pre-pr

* chore: run pre-pr

* feat: add new tests on optimism superchain erc20

* fix: vars and params naming on newly added tests

* fix: var name

* feat: support permit2 on optimism superchain erc20 and upgrade solady's erc20 implementation (ethereum-optimism#97)


---
Co-Authored-by: AgusDuha <[email protected]>

* chore: use ierc20 alias for ierc20 solady interface (ethereum-optimism#108)

---------

Co-authored-by: AgusDuha <[email protected]>
Co-authored-by: agusduha <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@agusduha agusduha agusduha left review comments

@maurelian maurelian maurelian approved these changes

@mds1 mds1 Awaiting requested review from mds1

Assignees

@maurelian maurelian

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SuperchainERC20: Support permit2
5 participants
@0xDiscotech @gotzenx @mds1 @maurelian @agusduha