@rev-net/core-v6 0.0.67 → 0.0.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/script/Deploy.s.sol +6 -3
package/package.json
CHANGED
package/script/Deploy.s.sol
CHANGED
|
@@ -475,9 +475,9 @@ contract DeployScript is Script, Sphinx {
|
|
|
475
475
|
address(revOwner)
|
|
476
476
|
)
|
|
477
477
|
});
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
478
|
+
// Deploy `REVDeployer` (or pick up the existing bytecode) BEFORE binding it on `revOwner`. `setDeployer`
|
|
479
|
+
// reads `CONTROLLER()` / `PERMISSIONS()` / `PROJECTS()` off the bound contract, so binding a CREATE2
|
|
480
|
+
// prediction that has no code yet would revert the whole deploy on a fresh chain.
|
|
481
481
|
REVDeployer _basicDeployer = _deployerIsDeployed
|
|
482
482
|
? REVDeployer(payable(_deployerAddr))
|
|
483
483
|
: new REVDeployer{salt: _DEPLOYER_SALT}({
|
|
@@ -493,6 +493,9 @@ contract DeployScript is Script, Sphinx {
|
|
|
493
493
|
trustedForwarder: trustedForwarder,
|
|
494
494
|
owner: address(revOwner)
|
|
495
495
|
});
|
|
496
|
+
if (address(revOwner.deployer()) == address(0)) {
|
|
497
|
+
revOwner.setDeployer(IREVDeployer(address(_basicDeployer)));
|
|
498
|
+
}
|
|
496
499
|
|
|
497
500
|
// Only configure the fee project if it doesn't already have a controller.
|
|
498
501
|
// This handles both fresh deploys and restarts where singletons exist but the fee project
|