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

Merge upstream #62

Merged
merged 778 commits into from
Oct 14, 2024
Merged

Merge upstream #62

merged 778 commits into from
Oct 14, 2024

Conversation

blockchaindevsh
Copy link
Collaborator

This PR merges monorepo commit 718b9b0.

Theburaka and others added 30 commits August 26, 2024 20:59
@Theburaka
Update shadow_compressor_test.go (ethereum-optimism#11601)
5c2bcaf
@codewaicher
remove unused import (ethereum-optimism#11599)
2b128c7
@ajsutton
op-geth: Update op-geth with single threaded fixes (ethereum-optimism…
a36291d 
…#11598)
@blmalone
fix: ci builder foundry version update. (ethereum-optimism#11610)
45e129c
@axelKingsley @protolambda
supervisor: APIs (ethereum-optimism#11586)
ced7889 
* implement CheckMessage

* Add CheckBlock API

* Cleanup and Unit Tests

* Add Invalid Safety Type

* Use *ChainsDB instead of ChainsDB for SafetyCheckers

---------

Co-authored-by: protolambda <[email protected]>
@protolambda
op-node,op-heartbeat: remove stale node heartbeat monitoring service (e…
0da4ba1 
…thereum-optimism#11622)
@axelKingsley @protolambda
Implement CheckMessages API (ethereum-optimism#11621)
ebdae42 
* Implement CheckMessages API

* Make AtLeastAsSafeAs a function of SafetyLevel

* op-supervisor: checkMessages bundle message identifier and payload-hash

---------

Co-authored-by: protolambda <[email protected]>
@smartcontracts
maint: add interfaces for cannon contracts (ethereum-optimism#11624)
4797ddb
@protolambda
op-chain-ops/script: cleanup and improve console logging (ethereum-op…
36f093a 
…timism#11629)
@Inphi @protolambda @mbaxter
cannon: Fix stack patching (ethereum-optimism#11632)
0dcccf6 
* cannon: Fix stack patching

And add `memprofilerate=0` to envp

* Update cannon/mipsevm/program/patch.go

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

* cleanup argv/envp string ptrs

* nit

* fix envar name

* Update cannon/mipsevm/program/patch.go

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

* align op-program arg0

---------

Co-authored-by: protolambda <[email protected]>
Co-authored-by: mbaxter <[email protected]>
@mslipper
Archive contract artifacts (ethereum-optimism#11626)
aebf669 
To demonstrate how we can make our deployments more modular, this PR proposes archiving smart contract artifacts as tarballs that get uploaded to GCS. This  allows deployment tools to use precompiled artifacts rather than generating them on-the fly.

The archives are named after the hash of all Solidity files in the contracts-bedrock folder, including those in `lib/`, plus some additional metadata files like `foundry.toml` and `semver-lock.json`. See `calculate-checksum.sh` for details on how the algorithm works. I'm open to feedback around what should make up the checksum.

Since the atifacts are content-addressable, this PR also updates the CI pipeline to download the artifacts from GCS prior to running `pnpm monorepo`. When the Solidity codebase doesn't change, this allows the `pnpm monorepo` job to skip compiling Solidity altogether. While this won't work as well when we're actively modifying the Solidity codebase, since the hash will change, it does provide a modest speedup in CI.
@mbaxter
cannon: Add MTCannon-specific differential tests (ethereum-optimism#1…
e53a86a 
…1605)

* cannon: Implement multithreaded clone fuzz test

* cannon: Add more clone evm tests

* cannon: Add evm test for GetTID syscall

* cannon: Add evm test for SysExit

* cannon: Add evm test for popping exited threads from the stack

* cannon: Fix futex wait handling, add evm test

* cannon: Add evm test for handling waiting thread

* cannon: Add test utils for defining / validating MTState expectations

* cannon: Add tests for futex wake, wake traversal

* cannon: Add test for SysYield

* cannon: Add SysOpen test, todos

* cannon: Add test for SchedQuantum preemption, fix inconsistency

* cannon: Add tests for noop, unsupported syscalls

* cannon: Remove duplicate constants

* cannon: Add tests for unsupported futex ops

* cannon: Group traversal tests, fix TestEVM_WakeupTraversalStep

* cannon: Add tests for nanosleep

* cannon: Add additional testcase for wakeup traversal

* cannon: Tweak futex wake tests

* cannon: Update mt fuzz test to use new test utils

* cannon: Rename contructor method for consistency

* cannon: Add some simple tests for ExpectedMTState util

* cannon: Add another validation test

* cannon: Move syscall lists to tests where they're used

* cannon: Add comment

* cannon: Extract some evm test helpers

* cannon: Cleanup - use require.Equalf for formatting

* cannon: Rename test util to AssertEVMReverts

* cannon: Add GetThreadStacks helper

* cannon: Add a few more traversal tests
@anacrolix @sebastianst
Conductor and sequencer p2p refactoring (ethereum-optimism#11455)
c7b91ab 
* Shutdown sequencer before stopping p2p

* Check p2p isn't also disabled

Co-authored-by: Sebastian Stammler <[email protected]>

* Remove missed time.Sleep

* Fix up use of SetupP2P.Disabled

* Revert error check after RPC boundary

* Add comment about context for StopSequencer

* Add Config.p2pEnabled

* op-node: Make Config.P2PEnabled public

---------

Co-authored-by: Sebastian Stammler <[email protected]>
@agusduha
test: fix standard bridge interop tests (ethereum-optimism#11668)
323e688 
* test: fix L2 standard bridge interop tests

* test: mock factory implementation instead of proxy
- make state publishing loop abort if the txpool state is not good (e…
7373ce7 
…thereum-optimism#11633)

- protect txpool state vars with a mutex so they can be automically updated to avoid potential race
  condition
@dependabot
dependabot(gomod): bump github.com/hashicorp/raft from 1.7.0 to 1.7.1 (…
db8154b 
…ethereum-optimism#11670)

Bumps [github.com/hashicorp/raft](https://github.com/hashicorp/raft) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/hashicorp/raft/releases)
- [Changelog](https://github.com/hashicorp/raft/blob/main/CHANGELOG.md)
- [Commits](hashicorp/raft@v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/raft
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@anacrolix @protolambda
Use context interrupts consistently in more places (ethereum-optimism…
d520441 
…#11511)

* Use context interrupts consistently in more places

* Fix CI lint errors

(cherry picked from commit 0410b7e)

* op-service/ctxinterrupt: address review comments

---------

Co-authored-by: protolambda <[email protected]>
@agusduha @0xDiscotech
test: fix superchain erc20 invariants (ethereum-optimism#11688)
f370113 
---------

Co-authored-by: 0xDiscotech <[email protected]>
@agusduha
feat: add createX preinstall (#29) (ethereum-optimism#11618)
814c9de 
* feat: add createX preinstall

* feat: change name from CreateXDeployer to CreateX
@mslipper
Update contracts publish job to use env vars rather than contexts (et…
3e68cf0 
…hereum-optimism#11687)

Contexts are scoped to a specific GitHub user group, which doesn't work with the GitHub merge queue or OSS contributors. This PR updates the packaging job to use raw project-level env vars instead (which are not user-scoped), and to only run on commits to `develop`.
@ajsutton
op-program: Prune L1 blocks after advancing origin (ethereum-optimism…
18f6453 
…#11530)

* op-program: Retry pruning L1 blocks when advancing origin to include the parent L1 origin

Add e2e test to reproduce corner case when deploying a chain at L1 genesis.

* Trim once, after any new origin is added.

* Add unit test.

* Add action test

* Review feedback.

* Improve test assertion
@tynes
npmrc: delete (ethereum-optimism#11699)
96ecb2e 
There is no longer any JS in the monorepo, we can remove
the `.npmrc` as its no longer used
@mslipper
Increase executor size on contract publisher (ethereum-optimism#11701)
c198a89
@clabby
feat(op-program): Use PebbleDB for DiskKV (ethereum-optimism#11705)
8ab4d3d 
* feat(op-program): Use `PebbleDB` for `DiskKV`

* close db

* fix `testFaultProofProgramScenario` tests

* switch to snappy compression

cockroachdb/pebble#3434

* fix tempdir

* update compat release

* defer k/v until preimage server and hinter have both exited
@ajsutton
Revert "feat(op-program): Use PebbleDB for DiskKV (ethereum-optim…
4c211fa 
…ism#11705)" (ethereum-optimism#11707)

This reverts commit 8ab4d3d.
@sebastianst
op-service/txmgr: multiple fixes / improvements (ethereum-optimism#11614
9452aa6 
)

* - make immediate nonce-too-low error abort send (since it could never succeed otherwise)

- make txmgr resubmit a transaction when fee bumping fails in case it has been dropped from the mempool

- only bump fees when they really should be bumped

- set txmgr overall default send timeout of 10 minutes. It was infinite, which led to permanently
  stuck transaction in combination with the other bugs fixed in this PR.

* Update op-service/txmgr/txmgr_test.go

---------

Co-authored-by: Sebastian Stammler <[email protected]>
@clabby
chore(op-service): Remove reth receipts source (ethereum-optimism#1…
42085ce 
…1706)
@samlaf
fix: op-challenger move.go cli command wasn't cancellable (ethereum-o…
375b976 
…ptimism#11716)
@mds1
feat: add ERC-5202 Blueprint library with initial tests (ethereum-opt…
957e13d 
…imism#11700)

https://eips.ethereum.org/EIPS/eip-5202
@ajsutton
chore: Fix lint error (ethereum-optimism#11714)
5b907dc 
golangci-lint v1.60.2 seems to report a new error when performing a nil check and length != 0 on maps. We're not using this version in CI yet but fix the error to simplify the code and provide for a future upgrade.
tremarkley and others added 4 commits September 23, 2024 21:17
@tremarkley
feat(L2ToL2CrossDomainMessenger): add successfulMessages and messageN…
9a12768 
…once to IL2ToL2CrossDomainMessenger (ethereum-optimism#12068)

* feat(L2ToL2CrossDomainMessenger): add successfulMessages and messageNonce to interface

* lint
@protolambda
op-supervisor: encode full hashes (ethereum-optimism#12071)
718b9b0
@blockchaindevsh
Merge remote-tracking branch 'origin/develop' into merge_upstream
594d450 
 Conflicts:
	go.mod
	go.sum
	op-batcher/batcher/driver.go
	op-chain-ops/genesis/config.go
	op-chain-ops/genesis/genesis.go
	op-e2e/actions/l2_verifier.go
	op-e2e/opgeth/op_geth.go
	op-e2e/system/e2esys/setup.go
	op-node/node/config.go
	op-node/node/node.go
	op-node/p2p/gossip.go
	op-node/p2p/node.go
	op-node/rollup/derive/blob_data_source.go
	op-node/rollup/derive/blob_data_source_test.go
	op-node/rollup/derive/calldata_source.go
	op-node/rollup/derive/engine_queue_test.go
	op-node/rollup/derive/engine_update.go
	op-node/rollup/driver/driver.go
	op-node/rollup/engine/engine_controller.go
	op-node/rollup/types.go
	op-node/service.go
	op-program/client/driver/driver.go
	op-service/predeploys/addresses.go
	op-service/txmgr/txmgr.go
	packages/contracts-bedrock/scripts/L2Genesis.s.sol
	packages/contracts-bedrock/src/libraries/Predeploys.sol
	packages/contracts-bedrock/test/Predeploys.t.sol
@blockchaindevsh
fix merge
8899640
@blockchaindevsh blockchaindevsh mentioned this pull request Sep 28, 2024
Closed
@blockchaindevsh blockchaindevsh mentioned this pull request Sep 28, 2024
Closed
@qzhodl
Copy link

qzhodl commented Oct 8, 2024

I’m a bit curious about how we picked the upstream commit 718b9b0, Was it related to a specific release version of the OP Stack here

@blockchaindevsh
Copy link
Collaborator Author

I’m a bit curious about how we picked the upstream commit 718b9b0, Was it related to a specific release version of the OP Stack here

It was the tip of the upstream's develop branch at the beginning of merge.

@qzhodl
Copy link

qzhodl commented Oct 8, 2024

I’m a bit curious about how we picked the upstream commit 718b9b0, Was it related to a specific release version of the OP Stack here

It was the tip of the upstream's develop branch at the beginning of merge.

Should we pick a specific release version to merge? I noticed that op-geth follows this method in practice here

@blockchaindevsh
Copy link
Collaborator Author

Should we pick a specific release version to merge? I noticed that op-geth follows this method in practice here

We'll merge with Holocene version when it's released. Before that, we'll just merge the latest code.

@qzhodl
Copy link

qzhodl commented Oct 8, 2024

Should we pick a specific release version to merge? I noticed that op-geth follows this method in practice here

We'll merge with Holocene version when it's released. Before that, we'll just merge the latest code.

The OP team releases minor versions quite frequently, as shown in the link, where both OP Stack v1.9.3 and v1.9.2 were released in September. I would suggest merging a specific release version for better code stability.

@blockchaindevsh
Copy link
Collaborator Author

The OP team releases minor versions quite frequently, as shown in the link, where both OP Stack v1.9.3 and v1.9.2 were released in September. I would suggest merging a specific release version for better code stability.

We can merge a release version in a separate PR, which will be small. But based on previous experience, the code quality of develop branch is also quite good.

@qizhou
Copy link

qizhou commented Oct 9, 2024

The OP team releases minor versions quite frequently, as shown in the link, where both OP Stack v1.9.3 and v1.9.2 were released in September. I would suggest merging a specific release version for better code stability.

We can merge a release version in a separate PR, which will be small. But based on previous experience, the code quality of develop branch is also quite good.

The tests (e.g., CI) sometimes fail at develop branch (as I experienced these days) so I think the recent release may be good merge point.

@blockchaindevsh
Copy link
Collaborator Author

blockchaindevsh commented Oct 9, 2024 •
edited
Loading

The OP team releases minor versions quite frequently, as shown in the link, where both OP Stack v1.9.3 and v1.9.2 were released in September. I would suggest merging a specific release version for better code stability.

We can merge a release version in a separate PR, which will be small. But based on previous experience, the code quality of develop branch is also quite good.

The tests (e.g., CI) sometimes fail at develop branch (as I experienced these days) so I think the recent release may be good merge point.

When we're ready to deploy the next testnet, I'll ensure to merge with latest release version(hopefully when Holocene version is released).

As this PR is already very big, the most important thing for this PR is to ensure our own logic remains in the correct places.

@qzhodl qzhodl mentioned this pull request Oct 13, 2024
Closed
@zhiqiangxu zhiqiangxu merged commit cd66e3a into op-es Oct 14, 2024
2 checks passed
@zhiqiangxu zhiqiangxu deleted the merge_upstream branch October 14, 2024 01:07
@qzhodl qzhodl mentioned this pull request Oct 14, 2024
Closed
qizhou pushed a commit that referenced this pull request Oct 17, 2024
@agusduha @0xDiscotech
@0xng @0xParticle @gotzenx
feat: introduce SuperchainERC20 redesign + ICrosschainERC20 (ethereum…
cb2066b 
…-optimism#12321)

* 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)

---------

Co-authored-by: Disco <[email protected]>
Co-authored-by: 0xng <[email protected]>
Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
qizhou pushed a commit that referenced this pull request Oct 23, 2024
@0xDiscotech @agusduha
@0xng @0xParticle @gotzenx
feat: add cross domain message context function (ethereum-optimism#12477
71ca0f1 
)

* 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

* feat: add cross domain context function

* fix: reuse unauthorized error (#92)

* fix: superchain erc20 factory conflicts

* fix: rename crosschain functions (#94)

* chore: run pre-pr

* chore: run pre-pr

* fix: mocked calls on tests

* feat: add cross domain message context function (#98)


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

---------

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]>
qizhou pushed a commit that referenced this pull request Oct 23, 2024
@gotzenx @agusduha
@0xDiscotech @0xng @0xParticle
feat: SuperchainWETH redesign (ethereum-optimism#12514)
574aba7 
* feat: SuperchainWETH redesign (#101)

* 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]>

* fix: SuperchainWETH redesign fixes (#110)

* fix: superchainWETH redesign fixes

* fix: withdraw arg

* fix: fix revert in SuperchainWETH tests (#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]>
qizhou pushed a commit that referenced this pull request Oct 23, 2024
@0xDiscotech @agusduha
@0xng @0xParticle @gotzenx
feat: support permit2 on OptimismSuperchainERC20 + upgrade solady's e…
cd640b0 
…rc20 implementation (ethereum-optimism#12476)

* 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

* 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 (#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

* chore: run pre-pr and update vendor interface

* fix: refactor common errors (#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 (#92)

* fix: superchain erc20 factory conflicts

* fix: rename crosschain functions (#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 (#97)


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

* chore: use ierc20 alias for ierc20 solady interface (#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

@dajuguan dajuguan dajuguan approved these changes

@qzhodl qzhodl qzhodl approved these changes

@qizhou qizhou qizhou approved these changes

@GrapeBaBa GrapeBaBa Awaiting requested review from GrapeBaBa

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.