Feat: StrategyManager Unit testing

.github/workflows/certora-prover.yml

@@ -38,10 +38,10 @@ jobs:
           python-version: '3.10'
           cache: 'pip'
       - name: Install java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          java-package: 'jre'
+          distribution: temurin
+          java-version: '17'
       - name: Install certora
         run: pip install certora-cli
       - name: Install solc

certora/scripts/strategies/verifyStrategyBase.sh

@@ -3,7 +3,7 @@ then
     RULE="--rule $2"
 fi
 
-solc-select use 0.8.12 
+solc-select use 0.8.12
 
 certoraRun certora/munged/strategies/StrategyBase.sol \
     lib/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol \

script/whitelist/Whitelister.sol

@@ -111,19 +111,17 @@ contract Whitelister is IWhitelister, Ownable {
 
     function queueWithdrawal(
         address staker,
-        uint256[] calldata strategyIndexes,
         IStrategy[] calldata strategies,
         uint256[] calldata shares,
         address withdrawer
     ) public onlyOwner returns (bytes memory) {
-        // bytes memory data = abi.encodeWithSelector(
-        //         IStrategyManager.queueWithdrawal.selector,
-        //         strategyIndexes,
-        //         strategies,
-        //         shares,
-        //         withdrawer
-        //     );
-        // return Staker(staker).callAddress(address(strategyManager), data);
+        bytes memory data = abi.encodeWithSelector(
+                IDelegationManager.queueWithdrawal.selector,
+                strategies,
+                shares,
+                withdrawer
+            );
+        return Staker(staker).callAddress(address(delegation), data);
     }
 
     function completeQueuedWithdrawal(
@@ -133,15 +131,15 @@ contract Whitelister is IWhitelister, Ownable {
         uint256 middlewareTimesIndex,
         bool receiveAsTokens
     ) public onlyOwner returns (bytes memory) {
-        // bytes memory data = abi.encodeWithSelector(
-        //         IStrategyManager.completeQueuedWithdrawal.selector,
-        //         queuedWithdrawal,
-        //         tokens,
-        //         middlewareTimesIndex,
-        //         receiveAsTokens
-        // );
-
-        // return Staker(staker).callAddress(address(strategyManager), data);
+        bytes memory data = abi.encodeWithSelector(
+                IDelegationManager.completeQueuedWithdrawal.selector,
+                queuedWithdrawal,
+                tokens,
+                middlewareTimesIndex,
+                receiveAsTokens
+        );
+
+        return Staker(staker).callAddress(address(delegation), data);
     }
 
     function transfer(

src/contracts/interfaces/IWhitelister.sol

@@ -25,7 +25,6 @@ interface IWhitelister {
 
     function queueWithdrawal(
         address staker,
-        uint256[] calldata strategyIndexes,
         IStrategy[] calldata strategies,
         uint256[] calldata shares,
         address withdrawer

src/test/DelegationFaucet.t.sol

@@ -19,12 +19,7 @@ contract DelegationFaucetTests is EigenLayerTestHelper {
     address owner = cheats.addr(1000);
 
     /// @notice Emitted when a queued withdrawal is completed
-    event WithdrawalCompleted(
-        address indexed depositor,
-        uint256 nonce,
-        address indexed withdrawer,
-        bytes32 withdrawalRoot
-    );
+    event WithdrawalCompleted(bytes32 withdrawalRoot);
 
     function setUp() public virtual override {
         EigenLayerDeployer.setUp();
@@ -346,13 +341,8 @@ contract DelegationFaucetTests is EigenLayerTestHelper {
                 delegatedTo: strategyManager.delegation().delegatedTo(stakerContract)
             });
         }
-        cheats.expectEmit(true, true, true, true, address(strategyManager));
-        emit WithdrawalCompleted(
-            queuedWithdrawal.staker,
-            queuedWithdrawal.nonce,
-            queuedWithdrawal.withdrawer,
-            delegation.calculateWithdrawalRoot(queuedWithdrawal)
-        );
+        cheats.expectEmit(true, true, true, true, address(delegation));
+        emit WithdrawalCompleted(delegation.calculateWithdrawalRoot(queuedWithdrawal));
         uint256 middlewareTimesIndex = 0;
         bool receiveAsTokens = false;
         delegationFaucet.completeQueuedWithdrawal(
@@ -412,13 +402,8 @@ contract DelegationFaucetTests is EigenLayerTestHelper {
                 delegatedTo: strategyManager.delegation().delegatedTo(stakerContract)
             });
         }
-        cheats.expectEmit(true, true, true, true, address(strategyManager));
-        emit WithdrawalCompleted(
-            queuedWithdrawal.staker,
-            queuedWithdrawal.nonce,
-            queuedWithdrawal.withdrawer,
-            delegation.calculateWithdrawalRoot(queuedWithdrawal)
-        );
+        cheats.expectEmit(true, true, true, true, address(delegation));
+        emit WithdrawalCompleted(delegation.calculateWithdrawalRoot(queuedWithdrawal));
         uint256 middlewareTimesIndex = 0;
         bool receiveAsTokens = true;
         delegationFaucet.completeQueuedWithdrawal(

src/test/DepositWithdraw.t.sol

@@ -150,14 +150,14 @@ contract DepositWithdrawTests is EigenLayerTestHelper {
 
         {
         uint256 correctMiddlewareTimesIndex = 4;
-        cheats.expectRevert("StrategyManager.completeQueuedWithdrawal: shares pending withdrawal are still slashable");
+        cheats.expectRevert("DelegationManager.completeQueuedAction: pending action is still slashable");
         delegation.completeQueuedWithdrawal(queuedWithdrawal, tokensArray, correctMiddlewareTimesIndex, false);
         }
 
         //When called with a stale index the call should also revert.
         {
         uint256 staleMiddlewareTimesIndex = 2;
-        cheats.expectRevert("StrategyManager.completeQueuedWithdrawal: shares pending withdrawal are still slashable");
+        cheats.expectRevert("DelegationManager.completeQueuedAction: pending action is still slashable");
         delegation.completeQueuedWithdrawal(queuedWithdrawal, tokensArray, staleMiddlewareTimesIndex, false);
         }
 

src/test/Whitelister.t.sol

@@ -242,18 +242,13 @@ contract WhitelisterTests is EigenLayerTestHelper {
             emit log_named_uint("expectedTokensOut", expectedTokensOut);
         }
 
-        uint256[] memory strategyIndexes = new uint256[](1);
         IERC20[] memory tokensArray = new IERC20[](1);
-        {
-            // hardcoded values
-            strategyIndexes[0] = 0;
-            tokensArray[0] = dummyToken;
-        }
+        // hardcoded values
+        tokensArray[0] = dummyToken;
         _testQueueWithdrawal(
             staker,
             dataForTestWithdrawal.delegatorStrategies,
-            dataForTestWithdrawal.delegatorShares,
-            strategyIndexes
+            dataForTestWithdrawal.delegatorShares
         );
         {
             uint256 balanceBeforeWithdrawal = dummyToken.balanceOf(staker);
@@ -279,15 +274,13 @@ contract WhitelisterTests is EigenLayerTestHelper {
     function _testQueueWithdrawal(
         address staker,
         IStrategy[] memory strategyArray,
-        uint256[] memory shareAmounts,
-        uint256[] memory strategyIndexes
+        uint256[] memory shareAmounts
     )
         internal
     {
         cheats.startPrank(theMultiSig);
         whiteLister.queueWithdrawal(
             staker,
-            strategyIndexes,
             strategyArray,
             shareAmounts,
             staker