Split diamond and HostIt deployment

Author: dadadave80

script/DeployHostItTickets.s.sol

@@ -5,7 +5,7 @@ import {DiamondCutFacet} from "@diamond/facets/DiamondCutFacet.sol";
 import {DiamondLoupeFacet} from "@diamond/facets/DiamondLoupeFacet.sol";
 import {OwnableRolesFacet} from "@diamond/facets/OwnableRolesFacet.sol";
 import {DiamondInit} from "@diamond/initializers/DiamondInit.sol";
-import {MultiInit} from "@diamond/initializers/MultiInit.sol";
+import {IDiamondCut} from "@diamond/interfaces/IDiamondCut.sol";
 import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 import {DeployHostItTicketsHelper} from "@ticket-script/helper/DeployHostItTicketsHelper.sol";
 import {LibAddressesAndFees} from "@ticket-script/helper/LibAddressesAndFees.sol";
@@ -21,24 +21,40 @@ import {Script} from "forge-std/Script.sol";
 contract DeployHostItTicketsTest is Script, DeployHostItTicketsHelper {
     function run() public returns (address hostIt_) {
         vm.startBroadcast();
-        // Deploy facets
-        address diamondCutFacet = address(new DiamondCutFacet());
-        address diamondLoupeFacet = address(new DiamondLoupeFacet());
-        address ownableRolesFacet = address(new OwnableRolesFacet());
+        // Facets
+        address diamondCutFacet = address(new DiamondCutFacet{salt: vm.envBytes32("DIAMOND_CUT_SALT")}());
+        address diamondLoupeFacet = address(new DiamondLoupeFacet{salt: vm.envBytes32("DIAMOND_LOUPE_SALT")}());
+        address ownableRolesFacet = address(new OwnableRolesFacet{salt: vm.envBytes32("OWNABLE_ROLES_SALT")}());
+
+        // Initializer
+        address diamondInit = address(new DiamondInit{salt: vm.envBytes32("DIAMOND_INIT_SALT")}());
+
+        // Deploy HostItTickets diamond
+        hostIt_ = address(
+            new HostItTickets{
+                salt: vm.envBytes32("HOST_IT_SALT")
+            }(
+                _createInitFacetCuts(diamondCutFacet, diamondLoupeFacet, ownableRolesFacet),
+                diamondInit,
+                abi.encodeWithSignature("initDiamond(address)", _msgSender())
+            )
+        );
+        vm.stopBroadcast();
+    }
+
+    function init(address _hostIt) public {
+        vm.startBroadcast();
         address factoryFacet = address(new FactoryFacet());
-        address checkInFacet = address(new CheckInFacet());
         address marketplaceFacet = address(new MarketplaceFacet());
+        address checkInFacet = address(new CheckInFacet());
 
-        // Deploy initializers
-        address multiInit = address(new MultiInit());
-        address diamondInit = address(new DiamondInit());
+        // Deploy initializer
         address hostItInit = address(new HostItInit());
-
         // Deploy Ticket Impl
         address ticketImpl = address(new Ticket());
 
         // Deploy Ticket Beacon
-        address ticketBeacon = address(new UpgradeableBeacon(ticketImpl, _msgSender()));
+        address ticketBeacon = address(new UpgradeableBeacon(ticketImpl, _hostIt));
 
         // Deploy Ticket Proxy
         address ticketProxy = address(new TicketProxy(ticketBeacon));
@@ -47,18 +63,13 @@ contract DeployHostItTicketsTest is Script, DeployHostItTicketsHelper {
         (address[] memory addresses, uint8[] memory feeTypes) =
             LibAddressesAndFees._getAddressesAndFeesByChainId(block.chainid);
 
-        // Deploy HostItTickets diamond
-        hostIt_ = address(
-            new HostItTickets{
-                salt: vm.envBytes32("HOST_IT_SALT")
-            }(
-                _createFacetCuts(
-                    diamondCutFacet, diamondLoupeFacet, ownableRolesFacet, factoryFacet, checkInFacet, marketplaceFacet
-                ),
-                multiInit,
-                _createInitCalldata(diamondInit, hostItInit, ticketProxy, feeTypes, addresses)
-            )
-        );
+        // Initialize HostItTickets
+        IDiamondCut(_hostIt)
+            .diamondCut(
+                _createHostItFacetCuts(factoryFacet, marketplaceFacet, checkInFacet),
+                hostItInit,
+                abi.encodeWithSelector(HostItInit.initHostIt.selector, ticketProxy, feeTypes, addresses)
+            );
         vm.stopBroadcast();
     }
 }

script/helper/DeployHostItTicketsHelper.sol

@@ -6,15 +6,12 @@ import {GetSelectors} from "@diamond-test/helpers/GetSelectors.sol";
 import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 
 abstract contract DeployHostItTicketsHelper is GetSelectors, Context {
-    function _createFacetCuts(
-        address _diamondCutFacet,
-        address _diamondLoupeFacet,
-        address _ownableRolesFacet,
-        address _factoryFacet,
-        address _checkInFacet,
-        address _marketplaceFacet
-    ) internal view returns (FacetCut[] memory cuts_) {
-        cuts_ = new FacetCut[](6);
+    function _createInitFacetCuts(address _diamondCutFacet, address _diamondLoupeFacet, address _ownableRolesFacet)
+        internal
+        view
+        returns (FacetCut[] memory cuts_)
+    {
+        cuts_ = new FacetCut[](3);
 
         cuts_[0] = FacetCut({
             facetAddress: _diamondCutFacet,
@@ -33,38 +30,27 @@ abstract contract DeployHostItTicketsHelper is GetSelectors, Context {
             action: FacetCutAction.Add,
             functionSelectors: _getSelectors("OwnableRolesFacet")
         });
+    }
 
-        cuts_[3] = FacetCut({
-            facetAddress: _factoryFacet, action: FacetCutAction.Add, functionSelectors: _getSelectors("FactoryFacet")
-        });
+    function _createHostItFacetCuts(address _factoryFacet, address _marketplaceFacet, address _checkInFacet)
+        internal
+        view
+        returns (FacetCut[] memory cuts_)
+    {
+        cuts_ = new FacetCut[](3);
 
-        cuts_[4] = FacetCut({
-            facetAddress: _checkInFacet, action: FacetCutAction.Add, functionSelectors: _getSelectors("CheckInFacet")
+        cuts_[0] = FacetCut({
+            facetAddress: _factoryFacet, action: FacetCutAction.Add, functionSelectors: _getSelectors("FactoryFacet")
         });
 
-        cuts_[5] = FacetCut({
+        cuts_[1] = FacetCut({
             facetAddress: _marketplaceFacet,
             action: FacetCutAction.Add,
             functionSelectors: _getSelectors("MarketplaceFacet")
         });
-    }
-
-    function _createInitCalldata(
-        address _diamondInit,
-        address _hostItInit,
-        address _ticketProxy,
-        uint8[] memory _feeTypes,
-        address[] memory _addresses
-    ) internal view returns (bytes memory calldata_) {
-        address[] memory initAddr = new address[](2);
-        initAddr[0] = _diamondInit;
-        initAddr[1] = _hostItInit;
-
-        bytes[] memory initData = new bytes[](2);
-        initData[0] = abi.encodeWithSignature("initDiamond(address)", _msgSender());
-        initData[1] =
-            abi.encodeWithSignature("initHostIt(address,uint8[],address[])", _ticketProxy, _feeTypes, _addresses);
 
-        calldata_ = abi.encodeWithSignature("multiInit(address[],bytes[])", initAddr, initData);
+        cuts_[2] = FacetCut({
+            facetAddress: _checkInFacet, action: FacetCutAction.Add, functionSelectors: _getSelectors("CheckInFacet")
+        });
     }
 }

test/states/DeployedHostItTickets.sol

@@ -50,6 +50,7 @@ abstract contract DeployedHostItTickets is Test {
     function setUp() public virtual {
         deployHostItTickets = new DeployHostItTicketsTest();
         hostIt = deployHostItTickets.run();
+        deployHostItTickets.init(hostIt);
 
         diamondCut = IDiamondCut(hostIt);
         diamondLoupe = IDiamondLoupe(hostIt);