220: cleanup UserWithdrawlManager tests

.devcontainer/devcontainer.json

@@ -26,4 +26,4 @@
 		"HOLESKY_URL": "${localEnv:HOLESKY_URL}",
 		"ETHERSCAN_API_KEY": "${localEnv:ETHERSCAN_API_KEY}"
 	}
-}
+}

.dockerignore

@@ -0,0 +1,5 @@
+Dockerfile
+out/
+cache/
+cache_forge/
+artifacts/

.vscode/tasks.json

@@ -17,7 +17,7 @@
         {
             "label": "install",
             "type": "shell",
-            "command": "npm ci",
+            "command": "npm ci --frozen-lockfile",
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -116,4 +116,4 @@
             }
         }
     ]
-}
+}

Dockerfile

@@ -1,20 +1,30 @@
 FROM ghcr.io/collectivexyz/foundry:latest
 
+RUN python3 -m pip install slither-analyzer --break-system-packages
+
 ARG PROJECT=ethx
 WORKDIR /workspaces/${PROJECT}
-RUN chown -R foundry:foundry .
-COPY --chown=foundry:foundry . .
+
 ENV USER=foundry
 USER foundry
 ENV PATH=${PATH}:~/.cargo/bin:/usr/local/go/bin
 
-RUN python3 -m pip install slither-analyzer --break-system-packages
+RUN chown -R foundry:foundry .
 
-RUN yamlfmt -lint .github/workflows/*.yml
+COPY --chown=foundry:foundry package.json .
+COPY --chown=foundry:foundry package-lock.json .
+COPY --chown=foundry:foundry tsconfig.json .
+COPY --chown=foundry:foundry node_modules node_modules
 
 RUN npm ci --frozen-lockfile
+
+COPY --chown=foundry:foundry . .
+
+RUN yamlfmt -lint .github/workflows/*.yml
+
+RUN forge install
 RUN npm run prettier:check
 # RUN slither .
 # RUN npm run lint
 RUN forge test -v
-RUN forge geiger --check contracts/*.sol contracts/*/*.sol
+RUN forge geiger --check contracts/*.sol contracts/*/*.sol

contracts/L2/ETHx.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol';
-import '@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol';
-import '@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol';
+import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 
 /**
  * @title ETHx token Contract for L2s
@@ -13,17 +13,17 @@ import '@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol';
 contract ETHx is Initializable, ERC20Upgradeable, PausableUpgradeable, AccessControlUpgradeable {
     error ZeroAddress();
 
-    bytes32 public constant MINTER_ROLE = keccak256('MINTER_ROLE');
-    bytes32 public constant BURNER_ROLE = keccak256('BURNER_ROLE');
-    bytes32 public constant PAUSER_ROLE = keccak256('PAUSER_ROLE');
+    bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
+    bytes32 public constant BURNER_ROLE = keccak256("BURNER_ROLE");
+    bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");
 
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
     }
 
     function initialize(address _admin) external initializer onlyNonZeroAddress(_admin) {
-        __ERC20_init('ETHx', 'ETHx');
+        __ERC20_init("ETHx", "ETHx");
         __Pausable_init();
         __AccessControl_init();
 

contracts/factory/VaultFactory.sol

@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '../library/UtilLib.sol';
-import '../VaultProxy.sol';
-import '../interfaces/IVaultFactory.sol';
-import '../interfaces/IStaderConfig.sol';
+import "../library/UtilLib.sol";
+import "../VaultProxy.sol";
+import "../interfaces/IVaultFactory.sol";
+import "../interfaces/IStaderConfig.sol";
 
-import '@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol';
-import '@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol';
+import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 
 contract VaultFactory is IVaultFactory, AccessControlUpgradeable {
     IStaderConfig public staderConfig;
     address public vaultProxyImplementation;
 
-    bytes32 public constant override NODE_REGISTRY_CONTRACT = keccak256('NODE_REGISTRY_CONTRACT');
+    bytes32 public constant override NODE_REGISTRY_CONTRACT = keccak256("NODE_REGISTRY_CONTRACT");
 
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
@@ -45,12 +45,10 @@ contract VaultFactory is IVaultFactory, AccessControlUpgradeable {
         return withdrawVaultAddress;
     }
 
-    function deployNodeELRewardVault(uint8 _poolId, uint256 _operatorId)
-        external
-        override
-        onlyRole(NODE_REGISTRY_CONTRACT)
-        returns (address)
-    {
+    function deployNodeELRewardVault(
+        uint8 _poolId,
+        uint256 _operatorId
+    ) external override onlyRole(NODE_REGISTRY_CONTRACT) returns (address) {
         bytes32 salt = sha256(abi.encode(_poolId, _operatorId));
         address nodeELRewardVaultAddress = ClonesUpgradeable.cloneDeterministic(vaultProxyImplementation, salt);
         VaultProxy(payable(nodeELRewardVaultAddress)).initialise(false, _poolId, _operatorId, address(staderConfig));
@@ -68,12 +66,10 @@ contract VaultFactory is IVaultFactory, AccessControlUpgradeable {
         return ClonesUpgradeable.predictDeterministicAddress(vaultProxyImplementation, salt);
     }
 
-    function computeNodeELRewardVaultAddress(uint8 _poolId, uint256 _operatorId)
-        external
-        view
-        override
-        returns (address)
-    {
+    function computeNodeELRewardVaultAddress(
+        uint8 _poolId,
+        uint256 _operatorId
+    ) external view override returns (address) {
         bytes32 salt = sha256(abi.encode(_poolId, _operatorId));
         return ClonesUpgradeable.predictDeterministicAddress(vaultProxyImplementation, salt);
     }

contracts/interfaces/INodeELRewardVault.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import './IStaderConfig.sol';
+import "./IStaderConfig.sol";
 
 interface INodeELRewardVault {
     // errors

contracts/interfaces/INodeRegistry.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '../library/ValidatorStatus.sol';
+import "../library/ValidatorStatus.sol";
 
 struct Validator {
     ValidatorStatus status; // status of validator
@@ -68,7 +68,9 @@ interface INodeRegistry {
     ) external;
 
     // return validator struct for a validator Id
-    function validatorRegistry(uint256)
+    function validatorRegistry(
+        uint256
+    )
         external
         view
         returns (
@@ -83,7 +85,9 @@ interface INodeRegistry {
         );
 
     // returns the operator struct given operator Id
-    function operatorStructById(uint256)
+    function operatorStructById(
+        uint256
+    )
         external
         view
         returns (

contracts/interfaces/IPermissionedNodeRegistry.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '../library/ValidatorStatus.sol';
-import './INodeRegistry.sol';
+import "../library/ValidatorStatus.sol";
+import "./INodeRegistry.sol";
 
 interface IPermissionedNodeRegistry {
     // Errors
@@ -38,19 +38,20 @@ interface IPermissionedNodeRegistry {
 
     function whitelistPermissionedNOs(address[] calldata _permissionedNOs) external;
 
-    function onboardNodeOperator(string calldata _operatorName, address payable _operatorRewardAddress)
-        external
-        returns (address mevFeeRecipientAddress);
+    function onboardNodeOperator(
+        string calldata _operatorName,
+        address payable _operatorRewardAddress
+    ) external returns (address mevFeeRecipientAddress);
 
     function addValidatorKeys(
         bytes[] calldata _pubkey,
         bytes[] calldata _preDepositSignature,
         bytes[] calldata _depositSignature
     ) external;
 
-    function allocateValidatorsAndUpdateOperatorId(uint256 _numValidators)
-        external
-        returns (uint256[] memory selectedOperatorCapacity);
+    function allocateValidatorsAndUpdateOperatorId(
+        uint256 _numValidators
+    ) external returns (uint256[] memory selectedOperatorCapacity);
 
     function activateNodeOperator(uint256 _operatorId) external;
 

contracts/interfaces/IPermissionlessNodeRegistry.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '../library/ValidatorStatus.sol';
-import './INodeRegistry.sol';
+import "../library/ValidatorStatus.sol";
+import "./INodeRegistry.sol";
 
 interface IPermissionlessNodeRegistry {
     // Errors
@@ -79,9 +79,9 @@ interface IPermissionlessNodeRegistry {
 
     function updateOperatorName(string calldata _operatorName) external;
 
-    function changeSocializingPoolState(bool _optInForSocializingPool)
-        external
-        returns (address mevFeeRecipientAddress);
+    function changeSocializingPoolState(
+        bool _optInForSocializingPool
+    ) external returns (address mevFeeRecipientAddress);
 
     function pause() external;
 

contracts/interfaces/IPermissionlessPool.sol

@@ -11,8 +11,8 @@ interface IPermissionlessPool {
 
     function receiveRemainingCollateralETH() external payable;
 
-    function getAllSocializingPoolOptOutOperators(uint256 _pageNumber, uint256 _pageSize)
-        external
-        view
-        returns (address[] memory);
+    function getAllSocializingPoolOptOutOperators(
+        uint256 _pageNumber,
+        uint256 _pageSize
+    ) external view returns (address[] memory);
 }

contracts/interfaces/IPoolUtils.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import './INodeRegistry.sol';
+import "./INodeRegistry.sol";
 
 // Interface for the PoolUtils contract
 interface IPoolUtils {
@@ -85,12 +85,8 @@ interface IPoolUtils {
         bytes calldata _depositSignature
     ) external;
 
-    function calculateRewardShare(uint8 _poolId, uint256 _totalRewards)
-        external
-        view
-        returns (
-            uint256 userShare,
-            uint256 operatorShare,
-            uint256 protocolShare
-        );
+    function calculateRewardShare(
+        uint8 _poolId,
+        uint256 _totalRewards
+    ) external view returns (uint256 userShare, uint256 operatorShare, uint256 protocolShare);
 }

contracts/interfaces/ISDIncentiveController.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import './IStaderConfig.sol';
+import "./IStaderConfig.sol";
 
 interface ISDIncentiveController {
     //errors

contracts/interfaces/ISDUtilityPool.sol

@@ -113,11 +113,7 @@ interface ISDUtilityPool {
 
     function utilize(uint256 utilizeAmount) external;
 
-    function utilizeWhileAddingKeys(
-        address operator,
-        uint256 utilizeAmount,
-        uint256 nonTerminalKeyCount
-    ) external;
+    function utilizeWhileAddingKeys(address operator, uint256 utilizeAmount, uint256 nonTerminalKeyCount) external;
 
     function repayFullAmount() external returns (uint256, uint256);
 
@@ -200,16 +196,12 @@ interface ISDUtilityPool {
 
     function getOperatorLiquidation(address) external view returns (OperatorLiquidation memory);
 
-    function delegatorWithdrawRequests(uint256)
+    function delegatorWithdrawRequests(
+        uint256
+    )
         external
         view
-        returns (
-            address owner,
-            uint256 amountOfCToken,
-            uint256 sdExpected,
-            uint256 sdFinalized,
-            uint256 requestBlock
-        );
+        returns (address owner, uint256 amountOfCToken, uint256 sdExpected, uint256 sdFinalized, uint256 requestBlock);
 
     function requestIdsByDelegatorAddress(address, uint256) external view returns (uint256);
 

contracts/interfaces/ISocializingPool.sol

@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.16;
 
-import './IStaderConfig.sol';
+import "./IStaderConfig.sol";
 
 /// @title RewardsData
 /// @notice This struct holds rewards merkleRoot and rewards split
@@ -100,11 +100,7 @@ interface ISocializingPool {
     function getRewardDetails()
         external
         view
-        returns (
-            uint256 currentIndex,
-            uint256 currentStartBlock,
-            uint256 currentEndBlock
-        );
+        returns (uint256 currentIndex, uint256 currentStartBlock, uint256 currentEndBlock);
 
     function getRewardCycleDetails(uint256 _index) external view returns (uint256 _startBlock, uint256 _endBlock);
 }

contracts/interfaces/IStaderOracle.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.16;
 
-import '../library/ValidatorStatus.sol';
+import "../library/ValidatorStatus.sol";
 
-import './ISocializingPool.sol';
-import './IStaderConfig.sol';
+import "./ISocializingPool.sol";
+import "./IStaderConfig.sol";
 
 struct SDPriceData {
     uint256 reportingBlockNumber;
@@ -240,8 +240,9 @@ interface IStaderOracle {
      *  and if the submission count reaches the required threshold, it updates the markValidatorReadyToDeposit (NodeRegistry).
      * @param _validatorVerificationDetail validator verification data, containing valid pubkeys, front run and invalid signature
      */
-    function submitValidatorVerificationDetail(ValidatorVerificationDetail calldata _validatorVerificationDetail)
-        external;
+    function submitValidatorVerificationDetail(
+        ValidatorVerificationDetail calldata _validatorVerificationDetail
+    ) external;
 
     /**
      * @notice store the missed attestation penalty strike on validator