refactor: opset ds

Author: eigenmikem

src/contracts/interfaces/IDurationVaultStrategy.sol

@@ -6,6 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "./IStrategy.sol";
 import "./IDelegationManager.sol";
 import "./IAllocationManager.sol";
+import "../libraries/OperatorSetLib.sol";
 
 /**
  * @title Interface for time-bound EigenLayer vault strategies.
@@ -26,8 +27,7 @@ interface IDurationVaultStrategy is IStrategy {
         uint256 maxPerDeposit;
         uint256 stakeCap;
         string metadataURI;
-        address operatorSetAVS;
-        uint32 operatorSetId;
+        OperatorSet operatorSet;
         bytes operatorSetRegistrationData;
         address delegationApprover;
         uint32 operatorAllocationDelay;

src/contracts/strategies/DurationVaultStrategy.sol

@@ -191,19 +191,19 @@ contract DurationVaultStrategy is DurationVaultStrategyStorage, StrategyBaseTVLL
     function _configureOperatorIntegration(
         VaultConfig memory config
     ) internal {
-        if (config.operatorSetAVS == address(0) || config.operatorSetId == 0) {
+        if (config.operatorSet.avs == address(0) || config.operatorSet.id == 0) {
             revert OperatorIntegrationInvalid();
         }
-        _operatorSet = OperatorSet({avs: config.operatorSetAVS, id: config.operatorSetId});
+        _operatorSet = config.operatorSet;
 
         delegationManager.registerAsOperator(
             config.delegationApprover, config.operatorAllocationDelay, config.operatorMetadataURI
         );
 
         IAllocationManager.RegisterParams memory params;
-        params.avs = config.operatorSetAVS;
+        params.avs = config.operatorSet.avs;
         params.operatorSetIds = new uint32[](1);
-        params.operatorSetIds[0] = config.operatorSetId;
+        params.operatorSetIds[0] = config.operatorSet.id;
         params.data = config.operatorSetRegistrationData;
         allocationManager.registerForOperatorSets(address(this), params);
         operatorSetRegistered = true;

src/contracts/strategies/StrategyFactory.sol

@@ -200,8 +200,8 @@ contract StrategyFactory is StrategyFactoryStorage, OwnableUpgradeable, Pausable
             config.maxPerDeposit,
             config.stakeCap,
             config.metadataURI,
-            config.operatorSetAVS,
-            config.operatorSetId
+            config.operatorSet.avs,
+            config.operatorSet.id
         );
     }
 }

src/test/unit/DurationVaultStrategyUnit.t.sol

@@ -6,6 +6,7 @@ import "../../contracts/strategies/DurationVaultStrategy.sol";
 import "../../contracts/interfaces/IDurationVaultStrategy.sol";
 import "../../contracts/interfaces/IDelegationManager.sol";
 import "../../contracts/interfaces/IAllocationManager.sol";
+import "../../contracts/libraries/OperatorSetLib.sol";
 import "../mocks/DelegationManagerMock.sol";
 import "../mocks/AllocationManagerMock.sol";
 
@@ -45,8 +46,7 @@ contract DurationVaultStrategyUnitTests is StrategyBaseTVLLimitsUnitTests {
             maxPerDeposit: maxPerDeposit,
             stakeCap: maxTotalDeposits,
             metadataURI: "ipfs://duration-vault",
-            operatorSetAVS: OPERATOR_SET_AVS,
-            operatorSetId: OPERATOR_SET_ID,
+            operatorSet: OperatorSet({avs: OPERATOR_SET_AVS, id: OPERATOR_SET_ID}),
             operatorSetRegistrationData: REGISTRATION_DATA,
             delegationApprover: DELEGATION_APPROVER,
             operatorAllocationDelay: OPERATOR_ALLOCATION_DELAY,

src/test/unit/StrategyFactoryUnit.t.sol

@@ -9,6 +9,7 @@ import "src/contracts/strategies/DurationVaultStrategy.sol";
 import "../../contracts/interfaces/IDurationVaultStrategy.sol";
 import "../../contracts/interfaces/IDelegationManager.sol";
 import "../../contracts/interfaces/IAllocationManager.sol";
+import "../../contracts/libraries/OperatorSetLib.sol";
 import "src/test/utils/EigenLayerUnitTestSetup.sol";
 import "../../contracts/permissions/PauserRegistry.sol";
 
@@ -146,8 +147,7 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
             maxPerDeposit: 10 ether,
             stakeCap: 100 ether,
             metadataURI: "ipfs://duration",
-            operatorSetAVS: OPERATOR_SET_AVS,
-            operatorSetId: OPERATOR_SET_ID,
+            operatorSet: OperatorSet({avs: OPERATOR_SET_AVS, id: OPERATOR_SET_ID}),
             operatorSetRegistrationData: REGISTRATION_DATA,
             delegationApprover: DELEGATION_APPROVER,
             operatorAllocationDelay: OPERATOR_ALLOCATION_DELAY,
@@ -172,8 +172,7 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
             maxPerDeposit: 10 ether,
             stakeCap: 100 ether,
             metadataURI: "ipfs://duration",
-            operatorSetAVS: OPERATOR_SET_AVS,
-            operatorSetId: OPERATOR_SET_ID,
+            operatorSet: OperatorSet({avs: OPERATOR_SET_AVS, id: OPERATOR_SET_ID}),
             operatorSetRegistrationData: REGISTRATION_DATA,
             delegationApprover: DELEGATION_APPROVER,
             operatorAllocationDelay: OPERATOR_ALLOCATION_DELAY,
@@ -195,8 +194,7 @@ contract StrategyFactoryUnitTests is EigenLayerUnitTestSetup {
             maxPerDeposit: 5 ether,
             stakeCap: 50 ether,
             metadataURI: "ipfs://duration",
-            operatorSetAVS: OPERATOR_SET_AVS,
-            operatorSetId: OPERATOR_SET_ID,
+            operatorSet: OperatorSet({avs: OPERATOR_SET_AVS, id: OPERATOR_SET_ID}),
             operatorSetRegistrationData: REGISTRATION_DATA,
             delegationApprover: DELEGATION_APPROVER,
             operatorAllocationDelay: OPERATOR_ALLOCATION_DELAY,

src/test/unit/StrategyManagerDurationUnit.t.sol

@@ -11,6 +11,7 @@ import "src/contracts/interfaces/IDurationVaultStrategy.sol";
 import "src/contracts/interfaces/IStrategy.sol";
 import "src/contracts/interfaces/IDelegationManager.sol";
 import "src/contracts/interfaces/IAllocationManager.sol";
+import "src/contracts/libraries/OperatorSetLib.sol";
 import "src/test/utils/EigenLayerUnitTestSetup.sol";
 
 contract StrategyManagerDurationUnitTests is EigenLayerUnitTestSetup, IStrategyManagerEvents {
@@ -65,8 +66,7 @@ contract StrategyManagerDurationUnitTests is EigenLayerUnitTestSetup, IStrategyM
             maxPerDeposit: 1_000_000 ether,
             stakeCap: 10_000_000 ether,
             metadataURI: "ipfs://duration-vault-test",
-            operatorSetAVS: OPERATOR_SET_AVS,
-            operatorSetId: OPERATOR_SET_ID,
+            operatorSet: OperatorSet({avs: OPERATOR_SET_AVS, id: OPERATOR_SET_ID}),
             operatorSetRegistrationData: REGISTRATION_DATA,
             delegationApprover: DELEGATION_APPROVER,
             operatorAllocationDelay: OPERATOR_ALLOCATION_DELAY,