Temp new deploy script

Author: akshatmittal

script/DeployGPv2.s.sol

@@ -10,8 +10,16 @@ import { IVault } from "../contracts/interfaces/IVault.sol";
 
 string constant junkSeedPhrase = "test test test test test test test test test test test junk";
 
+interface Deployer {
+    function deploy(bytes32 _salt, bytes memory _initCode, bytes calldata _initializer)
+        external
+        payable
+        returns (address deployedAddress);
+}
+
 abstract contract GPv2DeployScript is Script {
     address internal constant BALANCER_VAULT = 0xBA12222222228d8Ba445958a75a0704d566BF2C8;
+    Deployer internal constant DEPLOYER = Deployer(0x0000000040293A1f6542ba004343F80669b5160a);
 
     struct Deployment {
         address deployer;
@@ -28,17 +36,27 @@ abstract contract GPv2DeployScript is Script {
     function deploy(uint256 expectedChainId) internal returns (Deployment memory deployment) {
         require(block.chainid == expectedChainId, "DeployGPv2: wrong chain");
 
-        deployment.deployer = walletAddress;
+        deployment.deployer = address(DEPLOYER);
         deployment.manager = walletAddress;
 
         vm.startBroadcast(privateKey);
 
-        // TODO: DO NOT USE THIS YET. Init should happen at the same time.
-        GPv2AllowListAuthentication authenticator = new GPv2AllowListAuthentication();
-        authenticator.initializeManager(deployment.manager);
-
-        GPv2Settlement settlement =
-            new GPv2Settlement(GPv2Authentication(address(authenticator)), IVault(BALANCER_VAULT));
+        address authenticatorAddress = DEPLOYER.deploy(
+            bytes32(0),
+            type(GPv2AllowListAuthentication).creationCode,
+            abi.encodeCall(GPv2AllowListAuthentication.initializeManager, (deployment.manager))
+        );
+        GPv2AllowListAuthentication authenticator = GPv2AllowListAuthentication(authenticatorAddress);
+
+        address settlementAddress = DEPLOYER.deploy(
+            bytes32(0),
+            abi.encodePacked(
+                type(GPv2Settlement).creationCode,
+                abi.encode(GPv2Authentication(address(authenticator)), IVault(BALANCER_VAULT))
+            ),
+            ""
+        );
+        GPv2Settlement settlement = GPv2Settlement(payable(settlementAddress));
 
         vm.stopBroadcast();