feat: new system contracts #537
Merged
Conversation
This file contains 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
renamed from setChainId event
| pragma solidity ^0.8.20; | ||
|
|
||
| import {SlotDerivation} from "./SlotDerivation.sol"; | ||
| import {StorageSlot} from "@openzeppelin/contracts/utils/StorageSlot.sol"; |
There was a problem hiding this comment.
most certainly it is safe to use v4 OZ library here in addition to copied v5 OZ library, but this should be warned about in the comments near the import
There was a problem hiding this comment.
This importing issue should not be pushed to main, we only need this while we did not import OZ-v5 and v4 in parallel. Once we merge that it will be removed
l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol
Outdated
Show resolved
Hide resolved
...tracts/test/foundry/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol
Outdated
Show resolved
Hide resolved
…bs/era-contracts into kl/more-system-contracts
kelemeno
changed the base branch from
kl/custom-asset-bridging
to
kl/sync-layer-reorg
…a-contracts into kl/more-system-contracts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What ❔
Why ❔
Checklist