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: SuperchainWETH redesign #12514

Merged
merged 5 commits into from
Oct 22, 2024
Merged

feat: SuperchainWETH redesign #12514

merged 5 commits into from
Oct 22, 2024

Conversation

gotzenx
Copy link
Contributor

@gotzenx gotzenx commented Oct 17, 2024

Description

Implement the ICrosschainERC20 interface in the SuperchainWETH contract. This will enable the SuperchainTokenBridge to call crosschainMint and crosschainBurn, facilitating crosschain transfers, similar to how it's done with SuperchainERC20. Additionally, the send/relay functionality used in the previous standard will be removed.

Tests

  • Adjust SuperchainWETH tests

Metadata

Additional Context
SuperchainTokenBridge will be the only one allowed to call crosschainMint and crosschainBurn

agusduha and others added 3 commits October 17, 2024 13:52
@agusduha @0xDiscotech
@0xng @0xParticle @gotzenx
feat: SuperchainWETH redesign (#101)
79dd15c 
* feat: add superchain erc20 bridge (#61)

* feat: add superchain erc20 bridge

* fix: interfaces and versions

* refactor: optimism superchain erc20 redesign (#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 (#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 (#69)

* chore: update missing bridge on natspec

* fix: natspecs

---------

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

* fix: remove superchain erc20 base (#70)

* refactor: update isuperchainweth (#71)


---------

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

* feat: rename mint/burn and add SuperchainERC20 (#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 (#76)

* fix: pre pr

* fix: semver natspec check failure (#79)

* fix: semver natspec check failure

* fix: ignore mock contracts in semver natspec script

* fix: error message

* feat: add crosschain erc20 interface (#80)

* feat: add crosschain erc20 interface

* fix: refactor interfaces

* fix: superchain bridge natspec (#83)

* fix: superchain weth natspec (#84)

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

* fix: stop inheriting superchain interfaces (#85)

* fix: stop inheriting superchain interfaces

* fix: move events and erros into the implementation

* fix: make superchainERC20 inherits from crosschainERC20

* fix: superchain bridge rename (#86)

* fix: fee vault compiler error (#87)

* fix: remove unused imports

* fix: refactor common errors (#90)

* fix: refactor common errors

* fix: remove unused version

* fix: reuse unauthorized error (#92)

* fix: superchain erc20 factory conflicts

* fix: rename crosschain functions (#94)

* feat: superweth redesign

* fix: pr fixes

* fix: fixes post merge

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
@agusduha
Merge branch 'develop' into fix/merge-develop-to-superchainweth-pr
f5e119b
@agusduha
Merge develop
a34e8a1 
fix: merge develop to superchainweth pr
@gotzenx gotzenx requested review from mds1 and maurelian October 17, 2024 22:18
@gotzenx gotzenx self-assigned this Oct 17, 2024
@tremarkley tremarkley mentioned this pull request Oct 17, 2024
Merged
@gotzenx gotzenx changed the title Sc feat/superchainweth redesign feat: SuperchainWETH redesign Oct 18, 2024
@agusduha agusduha mentioned this pull request Oct 18, 2024
Merged
@agusduha
fix: SuperchainWETH redesign fixes (#110)
1797bbb 
* fix: superchainWETH redesign fixes

* fix: withdraw arg
@gotzenx gotzenx mentioned this pull request Oct 21, 2024
Closed
@gotzenx
Copy link
Contributor Author

gotzenx commented Oct 21, 2024

Because of some changes on this PR related to removing the onlySuperchainTokenBridge modifier, we will have to remove it also from SuperchainERC20 contract.
This will be done on a separated PR.
Issue for this task: #12553

tynes
tynes approved these changes Oct 22, 2024
View reviewed changes
Copy link
Contributor

@tynes tynes left a comment

Choose a reason for hiding this comment

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

Looks good to me given the event names are updated to match the spec

@tynes tynes enabled auto-merge October 22, 2024 04:34
@tynes tynes added this pull request to the merge queue Oct 22, 2024
Merged via the queue into ethereum-optimism:develop with commit 574aba7 Oct 22, 2024
47 checks passed
@agusduha agusduha mentioned this pull request Oct 22, 2024
Merged
@op-aaron op-aaron mentioned this pull request Oct 29, 2024
Open
samlaf pushed a commit to samlaf/optimism that referenced this pull request Nov 10, 2024
@gotzenx @agusduha
@0xDiscotech @0xng @0xParticle @samlaf
feat: SuperchainWETH redesign (ethereum-optimism#12514)
e28db69 
* feat: SuperchainWETH redesign (ethereum-optimism#101)

* 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

* 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

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

* fix: refactor common errors

* fix: remove unused version

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

* fix: superchain erc20 factory conflicts

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

* feat: superweth redesign

* fix: pr fixes

* fix: fixes post merge

---------

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

* fix: SuperchainWETH redesign fixes (ethereum-optimism#110)

* fix: superchainWETH redesign fixes

* fix: withdraw arg

* fix: fix revert in SuperchainWETH tests (ethereum-optimism#112)

---------

Co-authored-by: AgusDuha <[email protected]>
Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: agusduha <[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

@mds1 mds1 mds1 left review comments

@tynes tynes tynes approved these changes

@maurelian maurelian maurelian approved these changes

Assignees

@gotzenx gotzenx

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SuperchainWETH implements ICrosschainERC20
5 participants
@gotzenx @tynes @mds1 @maurelian @agusduha