Merge branch 'main' into dev

Author: dadadave80

script/DeployDiamond.s.sol

@@ -67,6 +67,19 @@ contract DeployDiamond is Script, GetSelectors {
             functionSelectors: _getSelectors("OwnableFacet")
         });
 
+        // Build MultiInit arrays for granular initialization
+        address[] memory initAddresses = new address[](3);
+        bytes[] memory initData = new bytes[](3);
+
+        initAddresses[0] = diamondInit;
+        initData[0] = abi.encodeWithSignature("init()");
+
+        initAddresses[1] = erc165Init;
+        initData[1] = abi.encodeWithSignature("init()");
+
+        initAddresses[2] = ownableInit;
+        initData[2] = abi.encodeWithSignature("init(address)", ContextLib.msgSender());
+
         // Deploy the Diamond contract with the facets and initialization args
         MockDiamond diamond = new MockDiamond();
         diamond.initialize(cut, diamondInit, abi.encodeWithSignature("init(address)", ContextLib.msgSender()));