Skip to content

Comments

feat: Add Conditional L2 Deployer#18864

Merged
maurelian merged 15 commits intoethereum-optimism:developfrom
defi-wonderland:sc-feat/l2cm-conditional-deployer
Feb 13, 2026
Merged

feat: Add Conditional L2 Deployer#18864
maurelian merged 15 commits intoethereum-optimism:developfrom
defi-wonderland:sc-feat/l2cm-conditional-deployer

Conversation

@0xiamflux
Copy link
Contributor

@0xiamflux 0xiamflux commented Jan 20, 2026

Add Conditional Deployer

Adds a wrapper around Create2Deployer to be used during Network Upgrade Transactions, allowing for non-reverting deterministic deployments even when address collisions occur.

Changes

ConditionalDeployer.sol

  • A wrapper around Create2Deployer for conditional deployment of contracts, in case of an address collision simply returns the address without reverting.

Reopening #18295

Reference Issue: #18828

@opgitgovernance opgitgovernance added the S-stale Status: Will be closed unless there is activity label Feb 4, 2026
@opgitgovernance
Copy link
Contributor

This pr has been automatically marked as stale and will be closed in 5 days if no updates

…lag (#836)

* refactor: replace create2 deployer for arachnid

* feat: add ConditionalDeployer as predeploy and add L2CM dev flag

* fix: add pre-pr fix

* fix: remove unnecessary auth in conditional deployer

* feat: add custom error for deployment revert

* test: add l2cm e2e apply test case
@0xniha
Copy link
Contributor

0xniha commented Feb 6, 2026

/ci authorize 8c1fa94

* fix: remove fork test

* feat: add common test to cond deployer test

* fix: follow constant style guide
@0xniha
Copy link
Contributor

0xniha commented Feb 6, 2026

/ci authorize c3dfb71

0xniha and others added 3 commits February 9, 2026 15:07
* fix: conditional deployer comment in apply test

* fix: arachnid reference comment

* fix: add msg.value to conditional deployer

* fix: deterministic deployment proxy comment
@0xOneTony
Copy link
Contributor

/ci authorize 290addb

@0xiamflux 0xiamflux marked this pull request as ready for review February 9, 2026 19:01
@0xiamflux 0xiamflux requested review from a team as code owners February 9, 2026 19:01
@0xiamflux 0xiamflux requested review from op-will and tynes February 9, 2026 19:01
* fix: add code length check after deploy

* fix: pre pr fix
@0xniha
Copy link
Contributor

0xniha commented Feb 9, 2026

/ci authorize fe7f6b3

* fix: make deploy non payable

* test: add missing getters test

* fix: add missing natspec

* feat: add todo issue for devfeatures cyclic import

* chore: pre pr run
@almanax-ai
Copy link
Contributor

almanax-ai bot commented Feb 11, 2026

Plan expired

Your subscription has expired. Please renew your subscription to continue using CI/CD integration and other features.

@0xniha
Copy link
Contributor

0xniha commented Feb 11, 2026

/ci authorize 014acf1

@0xniha
Copy link
Contributor

0xniha commented Feb 11, 2026

/ci authorize d6321df

@0xniha
Copy link
Contributor

0xniha commented Feb 11, 2026

/ci authorize 5fd13a7

* fix: remove underscore from local variable

* fix: remove address payable from deterministicDeploymentProxy

* refactor: rename dummy storage variable in test and add internal getExpectedImplementation helper
@0xniha
Copy link
Contributor

0xniha commented Feb 12, 2026

/ci authorize b223a44

Copy link
Contributor

@0xOneTony 0xOneTony left a comment

Choose a reason for hiding this comment

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

lgtm!

@maurelian maurelian enabled auto-merge February 12, 2026 20:04
@maurelian maurelian added this pull request to the merge queue Feb 12, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 12, 2026
@maurelian maurelian added this pull request to the merge queue Feb 12, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Feb 12, 2026
@maurelian maurelian added this pull request to the merge queue Feb 13, 2026
Merged via the queue into ethereum-optimism:develop with commit 75071b9 Feb 13, 2026
209 of 210 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-stale Status: Will be closed unless there is activity

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants