merge from optimism develop #25
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* contracts-bedrock: L1Block interop Ports the `L1Block` contract from the `feat/interop` branch to develop using a pattern where we can extend the contracts. This sort of pattern may not always work but is an experiment in reducing feature branches. * contracts-bedrock: reorder params for func in L1BlockInterop * contracts-bedrock: add missing test for L1Block * contracts-bedrock: refactor tests for L1BlockInterop * contracts-bedrock: add L1BlockInterop to differential-testing.go * contracts-bedrock: add test for testDiff_encodeSetL1BlockValuesInterop_succeeds in Encoding tests * op-node: add L1BlockInterop to derive l1_block_info * op-node: add FuzzL1InfoInteropRoundTrip * op-node: add tests for L1Block to l1_block_info * contracts-bedrock: update snapshots for L1Block, L1BlockInterop * contracts-bedrock: update semver-lock for L1Block, L1BlockInterop * Revert "op-node: add tests for L1Block to l1_block_info" This reverts commit d2e599e. * Revert "op-node: add FuzzL1InfoInteropRoundTrip" This reverts commit e14007c. * Revert "op-node: add L1BlockInterop to derive l1_block_info" This reverts commit 4bb279b. * Revert "contracts-bedrock: add test for testDiff_encodeSetL1BlockValuesInterop_succeeds in Encoding tests" This reverts commit 12f9a07. * Revert "contracts-bedrock: add L1BlockInterop to differential-testing.go" This reverts commit 209669d. * contracts-bedrock: drop redundant test in tests for L1BlockInterop * contracts-bedrock: fix order of function args in L1Block * contracts-bedrock: update semver-lock for L1Block --------- Co-authored-by: Diego <105765223+0xfuturistic@users.noreply.github.com>
* ctb: Enable setting custom names in deploySafe() * Fix formatting * ctb: fix spacing on deploySafe log
* feat: Squash libraries in dispute contracts Reorganizes the libraries in the dispute contracts to remove circular dependencies. The existing dependency structure resolves within the monorepo's environment, but not when the monorepo's contracts are imported as a forge project dependency. This unblocks our ability to use these contracts for post-checks in `superchain-ops`. * Remove `IDisputeGame` dep in `LibUDT` * semver lock
* fix(op-dispute-mon): remove the delays calculator * fix(op-challenger): resolution import
* feat: log bond amount in dispute mon honest actor loss * Update op-dispute-mon/mon/claims.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Ensures that the commit hash is logged as part of the deploy script's execution so its easier to help debug issues with it.
blockchaindevsh
pushed a commit
that referenced
this pull request
Sep 26, 2024
* test: add L2 standard bridge interop unit tests (#13) * test: add L2 standard bridge interop unit tests * fix: add tests natspec * fix: unit tests fixes * fix: super to legacy tests failing * fix: mock and expect mint and burn * fix: add generic factory interface (#14) * test: add L2 standard bridge interop unit tests * fix: add tests natspec * fix: add generic factory interface * feat: modify OptimismMintableERC20Factory for convert (#17) * test: add L2 standard bridge interop unit tests * fix: add tests natspec * fix: add generic factory interface * feat: modify OptimismMintableERC20Factory for convert * fix: use only a public function for create3 * feat: rollback interop factory, modify legacy one * fix: delete local token return variable * fix: PR fixes * feat: add superchain erc20 factory implementation (#23) * feat: add superchain erc20 factory implementation * fix: remove createX comments * test: add superchain erc20 factory tests (#25) * test: add superchain erc20 factory tests * test: add erc20 asserts * test: fix expect emit * fix: remove comments * feat: add constructor to superchain ERC20 beacon (#34) * test: remove factory predeploy etch ---------- Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> * fix: set an arbitrary address for superchain erc20 impl * fix: deploy a proxy for the beacon on genesis (#45) --------- Co-authored-by: 0xng <ng@defi.sucks> * fix: conflicts and imports * fix: interfaces * chore: add .testdata * fix: adding back .testdata to gitignore * fix: new conflicts from ci improvements --------- Co-authored-by: 0xng <ng@defi.sucks> Co-authored-by: 0xParticle <particle@defi.sucks> Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com> Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.