test: fork test fix 2

Author: eigenmikem

script/deploy/devnet/deploy_from_scratch.s.sol

@@ -344,7 +344,8 @@ contract DeployFromScratch is Script, Test {
                 StrategyFactory.initialize.selector,
                 executorMultisig,
                 0, // initial paused status
-                IBeacon(strategyBeacon)
+                IBeacon(strategyBeacon),
+                IBeacon(address(0))
             )
         );
 

script/releases/TestUtils.sol

@@ -967,7 +967,7 @@ library TestUtils {
         StrategyFactory strategyFactory
     ) internal {
         vm.expectRevert(errInit);
-        strategyFactory.initialize(address(0), 0, UpgradeableBeacon(address(0)));
+        strategyFactory.initialize(address(0), 0, UpgradeableBeacon(address(0)), UpgradeableBeacon(address(0)));
     }
 
     /// multichain/

src/contracts/strategies/StrategyFactory.sol

@@ -32,11 +32,15 @@ contract StrategyFactory is StrategyFactoryStorage, OwnableUpgradeable, Pausable
     function initialize(
         address _initialOwner,
         uint256 _initialPausedStatus,
-        IBeacon _strategyBeacon
+        IBeacon _strategyBeacon,
+        IBeacon _durationVaultBeacon
     ) public virtual initializer {
         _transferOwnership(_initialOwner);
         _setPausedStatus(_initialPausedStatus);
         _setStrategyBeacon(_strategyBeacon);
+        if (address(_durationVaultBeacon) != address(0)) {
+            _setDurationVaultBeacon(_durationVaultBeacon);
+        }
     }
 
     /// @notice Deploy a new StrategyBase contract for the ERC20 token, using a beacon proxy

src/test/integration/IntegrationDeployer.t.sol

@@ -276,7 +276,6 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
         _deployProxies(); // deploy proxies (if undeployed)
         _deployImplementations();
         _upgradeProxies();
-        strategyFactory.setDurationVaultBeacon(durationVaultBeacon);
         cheats.stopPrank();
     }
 
@@ -460,7 +459,12 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
 
         allocationManager.initialize({initialPausedStatus: 0});
 
-        strategyFactory.initialize({_initialOwner: executorMultisig, _initialPausedStatus: 0, _strategyBeacon: strategyBeacon});
+        strategyFactory.initialize({
+            _initialOwner: executorMultisig,
+            _initialPausedStatus: 0,
+            _strategyBeacon: strategyBeacon,
+            _durationVaultBeacon: durationVaultBeacon
+        });
 
         rewardsCoordinator.initialize({
             initialOwner: executorMultisig,
@@ -469,10 +473,6 @@ abstract contract IntegrationDeployer is ExistingDeploymentParser {
             _activationDelay: 0,
             _defaultSplitBips: 5000
         });
-
-        cheats.startPrank(executorMultisig);
-        strategyFactory.setDurationVaultBeacon(durationVaultBeacon);
-        cheats.stopPrank();
     }
 
     /// @dev Deploy a strategy and its underlying token, push to global lists of tokens/strategies, and whitelist

src/test/unit/StrategyFactoryUnit.t.sol

@@ -78,12 +78,12 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
                 new TransparentUpgradeableProxy(
                     address(strategyFactoryImplementation),
                     address(eigenLayerProxyAdmin),
-                    abi.encodeWithSelector(StrategyFactory.initialize.selector, initialOwner, initialPausedStatus, strategyBeacon)
+                    abi.encodeWithSelector(
+                        StrategyFactory.initialize.selector, initialOwner, initialPausedStatus, strategyBeacon, durationVaultBeacon
+                    )
                 )
             )
         );
-
-        strategyFactory.setDurationVaultBeacon(durationVaultBeacon);
     }
 
     function test_initialization() public view {
@@ -117,7 +117,8 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
         strategyFactory.initialize({
             _initialOwner: initialOwner,
             _initialPausedStatus: initialPausedStatus,
-            _strategyBeacon: strategyBeacon
+            _strategyBeacon: strategyBeacon,
+            _durationVaultBeacon: durationVaultBeacon
         });
     }