Skip to content

Commit 1d302d8

Browse files
committed
Rename DeployerWrapper to ConditionalDeployer
1 parent e7aab12 commit 1d302d8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

protocol/l2-contract-upgrades.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ The NUT file will be stored in the monorepo, and tracked by git. It will be upda
7474

7575
A given set of upgrade transactions will typically perform the following actions:
7676

77-
1. deploy new `DeployerWrapper` contract
78-
2. deploy new implementations
77+
1. deploy new `ConditionalDeployer` contract
78+
2. deploy new implementations via the `ConditionalDeployer`
7979
2. deploy a new `L2ContractsManager`
8080
3. update the `ProxyAdmin` (This step will only be needed the first time this scheme is used)
8181
4. execute a call to `ProxyAdmin.upgradePredeploys()`
8282
1. This function will `DELEGATECALL` the new `L2ContractsManager`'s `upgrade()` function.
8383
2. For all predeploys being upgrade, `L2ContractsManager.upgrade()` will make a call to that predeploy's `upgradeTo()` function
8484

85-
### New DeployerWrapper
85+
### New ConditionalDeployer
8686

87-
A new `DeployerWrapper` contract is needed to ensure that step 2 "deploy new implementations" can preserve the following properties of the L1 OPCM system:
87+
A new `ConditionalDeployer` contract is needed to ensure that step 2 "deploy new implementations" can preserve the following properties of the L1 OPCM system:
8888

8989
1. If a contract's bytecode is unchanged, then the implementation address will be unchanged. This
9090
is achieved on L1 in the DeployImplemenations script's [use](https://github.com/ethereum-optimism/optimism/blob/60f0c8d0beb2ea22f0ebc11416a22978b182dbfa/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol#L260) of [`createDeterministic`](https://github.com/ethereum-optimism/optimism/blob/60f0c8d0beb2ea22f0ebc11416a22978b182dbfa/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol#L145).
@@ -94,12 +94,12 @@ A new `DeployerWrapper` contract is needed to ensure that step 2 "deploy new imp
9494
regardless the upgrade call will always be included in the `L2ContractsManager` so that it need not
9595
be edited between upgrades.
9696

97-
The `DeployerWrapper` contract will be very minimal contract which will receive the initcode and then:
97+
The `ConditionalDeployer` contract will be very minimal contract which will receive the initcode and then:
9898
1. determine whether a create2 collision will occur
9999
2. if not: forward the initcode to the [determinstic-deployer](https://github.com/Arachnid/deterministic-deployment-proxy/blob/master/source/deterministic-deployment-proxy.yul#L13) contract.
100100
3. if yes: return
101101

102-
The `DeployerWrapper` should not revert if called with properly formed inputs.
102+
The `ConditionalDeployer` should not revert if called with properly formed inputs.
103103

104104

105105
### New L2 ProxyAdmin

0 commit comments

Comments
 (0)