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: introduce SharedLockbox #14199

Merged
merged 62 commits into from
Feb 6, 2025
Merged

feat: introduce SharedLockbox #14199

merged 62 commits into from
Feb 6, 2025
+5,037 −4,354

Conversation

mslipper
Copy link
Collaborator

@mslipper mslipper commented Feb 6, 2025

Replaces #13144.

0xDiscotech and others added 30 commits November 20, 2024 18:24
@0xDiscotech
feat: add shared lockbox (#126)
bf3278f 
* feat: create shared lockbox contract with its interface and unit tests

* chore: polish tests and interfaces

* chore: run pre-pr

* chore: improve natspec

* chore: run pre-pr

* chore: update compiler version
@agusduha
Merge pull request #136 from defi-wonderland/chore/sync-develop
0324436 
chore: sync develop
@agusduha
feat: integrate portal to lockbox (#139)
27a4515 
* feat: integrate portal to lockbox

* fix: pr fixes

* test: refactor assert
@0xDiscotech
feat: add liquidity migrator contract with its unit test and interface (
9476989 
#128)

* feat: create shared lockbox contract with its interface and unit tests

* chore: polish tests and interfaces

* chore: run pre-pr

* chore: improve natspec

* chore: run pre-pr

* feat: add liqudity migrator contract with its unit test and interface

* chore: remove underscore on stack var

* chore: add todo

* chore: run pre-pr

* chore: add contract title natspec and proxied

* refactor: integrate testing suite with common test

* chore: pre-pr

* chore: add spec test
@agusduha
feat: integrate system config with superchain config (#140)
b240094 
* feat: integrate portal to lockbox

* fix: pr fixes

* test: refactor assert

* feat: integrate system config with superchain config

* fix: remove OPCM interop

* test: add dependency counter test
@0xDiscotech
feat: manage dependency set on superchain config (#138)
3254d14
@0xDiscotech
chore: add zero dependencies check (#142)
2c7d996
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox
7111d13
@agusduha
fix: pre pr
4a45ed2
@agusduha
Merge pull request #143 from defi-wonderland/fix/merge-conflict-lockbox
cae605e 
fix: merge conflict lockbox
@agusduha @0xParticle
@gotzenx @Joxess
feat: Add pause check (#145)
37dccaf 
* feat: Add pause check

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

* test: add tests natspecs

---------

Co-authored-by: 0xParticle <[email protected]>
Co-authored-by: gotzenx <[email protected]>
Co-authored-by: Joxess <[email protected]>
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-2
8bef762
@agusduha
fix: pre pr and interfaces imports
036b1d5
@agusduha
Merge pull request #147 from defi-wonderland/fix/merge-conflict-lockb…
9163c9c 
…ox-2

fix: merge conflicts in lockbox
@agusduha
feat: add upgrader role to superchain config (#163)
6f5c86d
@agusduha
feat: use superchain config lockbox in portal (#164)
85d49dc 
* feat: use superchain config lockbox in portal

* test: add new sharedlockbox test
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-3
078bb36
@agusduha
fix: pre pr
657c97b
@agusduha
Merge pull request #165 from defi-wonderland/fix/merge-conflict-lockb…
36a8897 
…ox-3

fix: merge conflict in develop sync
@agusduha
feat: liquidity migrator deployment (#166)
3b9eba9 
* feat: liquidity migrator deployment

* test: fix comment

* test: fix internal variables names
@agusduha
feat: dependency set refactor (#170)
4183809 
* feat: dependency set refactor

* fix: deploy script variable name

* fix: pr

* fix: pr
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-4
0160192
@agusduha
fix: pre pr
f632210
@agusduha
fix: semgrep
2c371fd
@agusduha
Merge pull request #172 from defi-wonderland/fix/merge-conflict-lockb…
ebb669a 
…ox-4

fix: merge conflict lockbox
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-5
9bc299a
@agusduha
fix: merge conflict
4f53489
@agusduha
Merge pull request #190 from defi-wonderland/fix/merge-conflict-lockb…
44be452 
…ox-5

fix: merge conflict lockbox 5
@agusduha @skeletor-spaceman
[WIP] feat: new lockbox (#192)
18bd71e 
* chore: partial implementation comments

* feat: new lockbox

* feat: introduce dependency manager predeploy

* feat: remove timestamp check from CrossL2Inbox

* feat: introduce cluster manager role and remove immutables

* fix: remove unnecessary code, fix tests and setup

* feat: use unstructured storage and OZ v5

* fix: L2ToL2CDM dependency set check

* fix: dependency manager gas limit

* feat: refactor interop feature contracts (#200)

* feat: refactor interop feature contracts

* fix: add noops comment

* feat: adds OptimismPortal migrated flag

* test: add missing tests

* fix: portal interop storage naming

---------

Co-authored-by: Skeletor Spaceman <[email protected]>
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-6
64e1ded
agusduha and others added 17 commits January 28, 2025 17:52
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-9
12d76d1
@agusduha
fix: semver lock
c222b04
@agusduha
Merge pull request #229 from defi-wonderland/fix/merge-conflict-lockb…
f805e78 
…ox-9

fix: sync develop
@agusduha
feat: descope dependency manager (#242)
56b927a 
* feat: descope dependency manager

* test: fix tests

* test: fix tests
@0xDiscotech
chore: improve eth liquidity test (#248)
9a28526
@agusduha
fix: internal review fixes (#243)
2dda88d 
* fix: I-0

* fix: I-1

* fix: I-2

* fix: I-3

* fix: I-6

* fix: I-7

* fix: I-9

* fix: pre pr
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-10
31da5ed
@agusduha
fix: pre pr
92576f1
@agusduha
Merge pull request #253 from defi-wonderland/fix/merge-conflict-lockb…
7770ff2 
…ox-10

fix: sync develop
@agusduha
fix: portal withdrawal checks (#255)
2860621 
* fix: portal withdrawal checks

* fix: include current withdrawal check
@agusduha
fix: remove unused interop contracts (#256)
d1e7d79
@agusduha
test: fix flake tests (#257)
24476ae
@agusduha
fix: adjust op-deployer interop scripts (#262)
2b0abfe
@agusduha
Merge branch 'develop' into fix/merge-conflict-lockbox-11
37f0dc8
@agusduha
fix: pre pr
9c582f4
@agusduha
Merge pull request #264 from defi-wonderland/fix/merge-conflict-lockb…
d0d7c1e 
…ox-11

fix: sync develop
@mslipper
fix op-deployer tests
5d871c7
@mslipper mslipper requested review from a team as code owners February 6, 2025 00:50
@mslipper mslipper changed the base branch from develop to feat/interop-stable-devnet February 6, 2025 00:50
@mslipper mslipper mentioned this pull request Feb 6, 2025
Closed
@codecov Codecov
Copy link

codecov bot commented Feb 6, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 84.29752% with 19 lines in your changes missing coverage. Please review.

Project coverage is 94.11%. Comparing base (db62b8f) to head (4a318ed).
Report is 1 commits behind head on feat/interop-stable-devnet.

Files with missing lines Patch % Lines
...ges/contracts-bedrock/src/L2/DependencyManager.sol 0.00% 12 Missing ⚠️
...ackages/contracts-bedrock/src/L1/SharedLockbox.sol 88.88% 2 Missing ⚠️
...ages/contracts-bedrock/src/L1/SuperchainConfig.sol 50.00% 2 Missing ⚠️
...ntracts-bedrock/src/L1/SuperchainConfigInterop.sol 95.00% 2 Missing ⚠️
...ckages/contracts-bedrock/src/L2/L1BlockInterop.sol 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@                       Coverage Diff                       @@
##           feat/interop-stable-devnet   #14199       +/-   ##
===============================================================
+ Coverage                       46.46%   94.11%   +47.64%     
===============================================================
  Files                             997      109      -888     
  Lines                           84494     4688    -79806     
===============================================================
- Hits                            39264     4412    -34852     
+ Misses                          42245      276    -41969     
+ Partials                         2985        0     -2985
Flag Coverage Δ
cannon-go-tests-32 ?
cannon-go-tests-64 ?
contracts-bedrock-tests 94.11% <84.29%> (-0.29%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...kages/contracts-bedrock/src/L1/OptimismPortal2.sol 98.21% <100.00%> (+0.15%) ⬆️
...contracts-bedrock/src/L1/OptimismPortalInterop.sol 100.00% <100.00%> (ø)
packages/contracts-bedrock/src/L2/CrossL2Inbox.sol 100.00% <ø> (+24.00%) ⬆️
...acts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol 100.00% <100.00%> (ø)
...ges/contracts-bedrock/src/libraries/Predeploys.sol 97.82% <100.00%> (+0.04%) ⬆️
...ackages/contracts-bedrock/src/universal/WETH98.sol 100.00% <ø> (ø)
...ckages/contracts-bedrock/src/L2/L1BlockInterop.sol 81.81% <0.00%> (-11.74%) ⬇️
...ackages/contracts-bedrock/src/L1/SharedLockbox.sol 88.88% <88.88%> (ø)
...ages/contracts-bedrock/src/L1/SuperchainConfig.sol 92.59% <50.00%> (-7.41%) ⬇️
...ntracts-bedrock/src/L1/SuperchainConfigInterop.sol 95.00% <95.00%> (ø)
... and 1 more

... and 890 files with indirect coverage changes

@mslipper mslipper merged commit 31a9c29 into feat/interop-stable-devnet Feb 6, 2025
42 of 45 checks passed
@mslipper mslipper deleted the sc-feat/add-shared-lockbox branch February 6, 2025 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ControlCplusControlV ControlCplusControlV Awaiting requested review from ControlCplusControlV ControlCplusControlV is a code owner automatically assigned from ethereum-optimism/contract-reviewers

@protolambda protolambda Awaiting requested review from protolambda protolambda is a code owner automatically assigned from ethereum-optimism/op-stack

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

Successfully merging this pull request may close these issues.
3 participants
@mslipper @0xDiscotech @agusduha