Merge pull request #1260 from ProjectOpenSea/horsefacts/add-initcode-…

…to-deploy-script Add salts + initcode to deploy script
ProjectOpenSea · Jun 16, 2023 · 4a719dc · 4a719dc
2 parents 9d4f697 + d43e792
commit 4a719dc
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 38 deletions.
diff --git a/contracts/helpers/navigator/lib/ExecutionsHelper.sol b/contracts/helpers/navigator/lib/ExecutionsHelper.sol
@@ -12,7 +12,7 @@ contract ExecutionsHelper is HelperInterface {
 
     function prepare(
         NavigatorContext memory context
-    ) public view returns (NavigatorContext memory) {
+    ) public pure returns (NavigatorContext memory) {
         return context.withExecutions();
     }
 }
diff --git a/lib/seaport-sol b/lib/seaport-sol
diff --git a/script/NavigatorDeployer.s.sol b/script/NavigatorDeployer.s.sol
@@ -4,6 +4,8 @@ pragma solidity ^0.8.4;
 import "forge-std/Script.sol";
 import "forge-std/console.sol";
 
+import { LibString } from "solady/src/utils/LibString.sol";
+
 import {
     ReadOnlyOrderValidator
 } from "../contracts/helpers/order-validator/lib/ReadOnlyOrderValidator.sol";
@@ -61,45 +63,20 @@ contract NavigatorDeployer is Script {
     address private constant CONDUIT_CONTROLLER =
         0x00000000F9490004C11Cef243f5400493c00Ad63;
 
-    bytes32 private constant SALT = bytes32(uint256(0x1));
+    bytes32 private constant DEFAULT_SALT = bytes32(uint256(0x1));
+    bytes32 private constant SEAPORT_VALIDATOR_SALT =
+        bytes32(uint256(0x459b42ee5b5e5000d96491ce));
+    bytes32 private constant SEAPORT_NAVIGATOR_SALT =
+        bytes32(uint256(0x9237ec96f90d12013e58e484));
 
-    function deploy(
-        string memory name,
-        bytes memory initCode
-    ) internal returns (address) {
-        address deploymentAddress = address(
-            uint160(
-                uint256(
-                    keccak256(
-                        abi.encodePacked(
-                            hex"ff",
-                            address(IMMUTABLE_CREATE2_FACTORY),
-                            SALT,
-                            keccak256(initCode)
-                        )
-                    )
-                )
-            )
-        );
-        bool deployed;
-        if (!IMMUTABLE_CREATE2_FACTORY.hasBeenDeployed(deploymentAddress)) {
-            deploymentAddress = IMMUTABLE_CREATE2_FACTORY.safeCreate2(
-                SALT,
-                initCode
-            );
-            deployed = true;
-        }
+    function run() public {
         console.log(
-            _pad(deployed ? "Deploying" : "Found", 10),
-            _pad(name, 23),
-            deploymentAddress
+            pad("State", 10),
+            pad("Name", 23),
+            pad("Address", 43),
+            "Initcode hash"
         );
-        return deploymentAddress;
-    }
-
-    function run() public {
         vm.startBroadcast();
-
         address seaportValidatorHelper = deploy(
             "SeaportValidatorHelper",
             type(SeaportValidatorHelper).creationCode
@@ -110,6 +87,7 @@ contract NavigatorDeployer is Script {
         );
         deploy(
             "SeaportValidator",
+            SEAPORT_VALIDATOR_SALT,
             bytes.concat(
                 type(SeaportValidator).creationCode,
                 abi.encode(
@@ -151,6 +129,7 @@ contract NavigatorDeployer is Script {
 
         deploy(
             "SeaportNavigator",
+            SEAPORT_NAVIGATOR_SALT,
             bytes.concat(
                 type(SeaportNavigator).creationCode,
                 abi.encode(
@@ -166,7 +145,51 @@ contract NavigatorDeployer is Script {
         );
     }
 
-    function _pad(
+    function deploy(
+        string memory name,
+        bytes memory initCode
+    ) internal returns (address) {
+        return deploy(name, DEFAULT_SALT, initCode);
+    }
+
+    function deploy(
+        string memory name,
+        bytes32 salt,
+        bytes memory initCode
+    ) internal returns (address) {
+        bytes32 initCodeHash = keccak256(initCode);
+        address deploymentAddress = address(
+            uint160(
+                uint256(
+                    keccak256(
+                        abi.encodePacked(
+                            hex"ff",
+                            address(IMMUTABLE_CREATE2_FACTORY),
+                            salt,
+                            initCodeHash
+                        )
+                    )
+                )
+            )
+        );
+        bool deploying;
+        if (!IMMUTABLE_CREATE2_FACTORY.hasBeenDeployed(deploymentAddress)) {
+            deploymentAddress = IMMUTABLE_CREATE2_FACTORY.safeCreate2(
+                salt,
+                initCode
+            );
+            deploying = true;
+        }
+        console.log(
+            pad(deploying ? "Deploying" : "Found", 10),
+            pad(name, 23),
+            pad(LibString.toHexString(deploymentAddress), 43),
+            LibString.toHexString(uint256(initCodeHash))
+        );
+        return deploymentAddress;
+    }
+
+    function pad(
         string memory name,
         uint256 n
     ) internal pure returns (string memory) {
+320 −141		src/executions/ExecutionHelper.sol
+3 −18		src/fulfillments/lib/FulfillmentLib.sol