Skip to content

Commit 6d45145

Browse files
jac18281828jac18281828
committed
238: fixing lint issues with imports
1 parent 63dcd9e commit 6d45145

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+281
-288
lines changed

‎.solhint.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
"plugins": [],
44
"rules": {
55
"avoid-suicide": "error",
6-
"avoid-sha3": "warn"
6+
"avoid-sha3": "warn",
7+
"var-name-mixedcase": "off",
8+
"func-name-mixedcase": "off",
9+
"func-visibility": [
10+
"warn",
11+
{
12+
"ignoreConstructors": true
13+
}
14+
]
715
}
8-
}
16+
}

‎.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
{
6767
"label": "test",
6868
"type": "shell",
69-
"command": "forge test -vvv",
69+
"command": "forge test -v",
7070
"options": {
7171
"cwd": "${workspaceFolder}"
7272
},
@@ -116,4 +116,4 @@
116116
}
117117
}
118118
]
119-
}
119+
}

‎contracts/Auction.sol

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
6-
import "../contracts/interfaces/SDCollateral/IAuction.sol";
7-
import "../contracts/interfaces/IStaderStakePoolManager.sol";
8-
9-
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
10-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
11-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
4+
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
5+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7+
8+
import { UtilLib } from "./library/UtilLib.sol";
9+
import { IAuction } from "../contracts/interfaces/SDCollateral/IAuction.sol";
10+
import { IStaderStakePoolManager } from "../contracts/interfaces/IStaderStakePoolManager.sol";
11+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
1212

1313
contract Auction is IAuction, AccessControlUpgradeable, ReentrancyGuardUpgradeable {
1414
IStaderConfig public override staderConfig;

‎contracts/ETHx.sol

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
3-
import "./library/UtilLib.sol";
43

5-
import "./interfaces/IStaderConfig.sol";
4+
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5+
import { ERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
6+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
7+
import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
68

7-
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
8-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
9-
import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
9+
import { UtilLib } from "./library/UtilLib.sol";
10+
11+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
1012

1113
/**
1214
* @title ETHx token Contract

‎contracts/L2/ETHx.sol

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
5-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6-
import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
4+
import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5+
import { ERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
6+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
7+
import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
78

89
/**
910
* @title ETHx token Contract for L2s

‎contracts/NodeELRewardVault.sol

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
4+
import { UtilLib } from "./library/UtilLib.sol";
55

6-
import "./interfaces/IPoolUtils.sol";
7-
import "./interfaces/IVaultProxy.sol";
8-
import "./interfaces/INodeRegistry.sol";
9-
import "./interfaces/INodeELRewardVault.sol";
10-
import "./interfaces/IStaderStakePoolManager.sol";
11-
import "./interfaces/IOperatorRewardsCollector.sol";
6+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
7+
import { IPoolUtils } from "./interfaces/IPoolUtils.sol";
8+
import { IVaultProxy } from "./interfaces/IVaultProxy.sol";
9+
import { INodeELRewardVault } from "./interfaces/INodeELRewardVault.sol";
10+
import { IStaderStakePoolManager } from "./interfaces/IStaderStakePoolManager.sol";
11+
import { IOperatorRewardsCollector } from "./interfaces/IOperatorRewardsCollector.sol";
1212

1313
contract NodeELRewardVault is INodeELRewardVault {
14-
constructor() {}
15-
1614
/**
1715
* @notice Allows the contract to receive ETH
1816
* @dev execution layer rewards may be sent as plain ETH transfers

‎contracts/OperatorRewardsCollector.sol

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
6-
import "./interfaces/INodeRegistry.sol";
7-
import "./interfaces/INodeELRewardVault.sol";
8-
import "./interfaces/IPermissionlessNodeRegistry.sol";
9-
import "./interfaces/IOperatorRewardsCollector.sol";
10-
import "./interfaces/IStaderConfig.sol";
11-
import "./interfaces/ISDUtilityPool.sol";
12-
import "./interfaces/SDCollateral/ISDCollateral.sol";
13-
import "./interfaces/IWETH.sol";
14-
import "../contracts/interfaces/IStaderOracle.sol";
15-
16-
import "@openzeppelin/contracts/utils/math/Math.sol";
17-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
4+
import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
5+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6+
7+
import { UtilLib } from "./library/UtilLib.sol";
8+
9+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
10+
import { INodeRegistry } from "./interfaces/INodeRegistry.sol";
11+
import { INodeELRewardVault } from "./interfaces/INodeELRewardVault.sol";
12+
import { IPermissionlessNodeRegistry } from "./interfaces/IPermissionlessNodeRegistry.sol";
13+
import { IOperatorRewardsCollector } from "./interfaces/IOperatorRewardsCollector.sol";
14+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
15+
import { ISDUtilityPool, UserData, OperatorLiquidation } from "./interfaces/ISDUtilityPool.sol";
16+
import { ISDCollateral } from "./interfaces/SDCollateral/ISDCollateral.sol";
17+
import { IWETH } from "./interfaces/IWETH.sol";
18+
import { IStaderOracle } from "../contracts/interfaces/IStaderOracle.sol";
1819

1920
contract OperatorRewardsCollector is IOperatorRewardsCollector, AccessControlUpgradeable {
2021
IStaderConfig public staderConfig;
@@ -46,22 +47,15 @@ contract OperatorRewardsCollector is IOperatorRewardsCollector, AccessControlUpg
4647
emit DepositedFor(msg.sender, _receiver, msg.value);
4748
}
4849

49-
event log_uint256(string message, uint256 value);
50-
5150
/**
5251
* @notice Claims payouts for an operator, repaying any outstanding liquidations and transferring any remaining balance to the operator's rewards address.
5352
* @dev This function first checks for any unpaid liquidations for the operator and repays them if necessary. Then, it transfers any remaining balance to the operator's reward address.
5453
*/
5554
function claim() external {
5655
claimLiquidation(msg.sender);
57-
58-
emit log_uint256("withdrawableInEth(msg.sender)", withdrawableInEth(msg.sender));
59-
6056
uint256 amount = balances[msg.sender] > withdrawableInEth(msg.sender)
6157
? withdrawableInEth(msg.sender)
6258
: balances[msg.sender];
63-
64-
emit log_uint256("claim amount", amount);
6559
_claim(msg.sender, amount);
6660
}
6761

‎contracts/Penalty.sol

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
4+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
5+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
56

6-
import "./interfaces/IPenalty.sol";
7-
import "./interfaces/IRatedV1.sol";
8-
import "./interfaces/IStaderOracle.sol";
9-
import "./interfaces/IStaderConfig.sol";
7+
import { UtilLib } from "./library/UtilLib.sol";
108

11-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
12-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
9+
import { IPenalty } from "./interfaces/IPenalty.sol";
10+
import { IStaderOracle } from "./interfaces/IStaderOracle.sol";
11+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
12+
import { IRatedV1 } from "./interfaces/IRatedV1.sol";
1313

1414
contract Penalty is IPenalty, AccessControlUpgradeable, ReentrancyGuardUpgradeable {
1515
IStaderConfig public staderConfig;

‎contracts/PermissionedNodeRegistry.sol

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
6-
import "./library/ValidatorStatus.sol";
7-
import "./interfaces/IStaderConfig.sol";
8-
import "./interfaces/IVaultFactory.sol";
9-
import "./interfaces/IPoolUtils.sol";
10-
import "./interfaces/INodeRegistry.sol";
11-
import "./interfaces/IPermissionedPool.sol";
12-
import "./interfaces/IValidatorWithdrawalVault.sol";
13-
import "./interfaces/SDCollateral/ISDCollateral.sol";
14-
import "./interfaces/IPermissionedNodeRegistry.sol";
15-
16-
import "@openzeppelin/contracts/utils/math/Math.sol";
17-
import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
18-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
19-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
4+
import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
5+
import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
6+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
7+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
8+
9+
import { UtilLib } from "./library/UtilLib.sol";
10+
11+
import { ValidatorStatus } from "./library/ValidatorStatus.sol";
12+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
13+
import { IVaultFactory } from "./interfaces/IVaultFactory.sol";
14+
import { IPoolUtils } from "./interfaces/IPoolUtils.sol";
15+
import { Operator, Validator, INodeRegistry } from "./interfaces/INodeRegistry.sol";
16+
import { IPermissionedPool } from "./interfaces/IPermissionedPool.sol";
17+
import { IValidatorWithdrawalVault } from "./interfaces/IValidatorWithdrawalVault.sol";
18+
import { ISDCollateral } from "./interfaces/SDCollateral/ISDCollateral.sol";
19+
import { IPermissionedNodeRegistry } from "./interfaces/IPermissionedNodeRegistry.sol";
2020

2121
contract PermissionedNodeRegistry is
2222
INodeRegistry,

‎contracts/PermissionedPool.sol

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
6-
import "./library/ValidatorStatus.sol";
7-
8-
import "./interfaces/IStaderConfig.sol";
9-
import "./interfaces/IVaultFactory.sol";
10-
import "./interfaces/INodeRegistry.sol";
11-
import "./interfaces/IStaderPoolBase.sol";
12-
import "./interfaces/IDepositContract.sol";
13-
import "./interfaces/IStaderInsuranceFund.sol";
14-
import "./interfaces/IStaderStakePoolManager.sol";
15-
import "./interfaces/IPermissionedNodeRegistry.sol";
16-
17-
import "@openzeppelin/contracts/utils/math/Math.sol";
18-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
19-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
4+
import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
5+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7+
8+
import { UtilLib } from "./library/UtilLib.sol";
9+
10+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
11+
import { IVaultFactory } from "./interfaces/IVaultFactory.sol";
12+
import { INodeRegistry } from "./interfaces/INodeRegistry.sol";
13+
import { IStaderPoolBase } from "./interfaces/IStaderPoolBase.sol";
14+
import { IDepositContract } from "./interfaces/IDepositContract.sol";
15+
import { IStaderInsuranceFund } from "./interfaces/IStaderInsuranceFund.sol";
16+
import { IStaderStakePoolManager } from "./interfaces/IStaderStakePoolManager.sol";
17+
import { IPermissionedNodeRegistry } from "./interfaces/IPermissionedNodeRegistry.sol";
2018

2119
contract PermissionedPool is IStaderPoolBase, AccessControlUpgradeable, ReentrancyGuardUpgradeable {
2220
using Math for uint256;

‎contracts/PermissionlessNodeRegistry.sol

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
6-
import "./library/ValidatorStatus.sol";
7-
import "./interfaces/IStaderConfig.sol";
8-
import "./interfaces/IVaultFactory.sol";
9-
import "./interfaces/IPoolUtils.sol";
10-
import "./interfaces/INodeRegistry.sol";
11-
import "./interfaces/ISDUtilityPool.sol";
12-
import "./interfaces/IPermissionlessPool.sol";
13-
import "./interfaces/INodeELRewardVault.sol";
14-
import "./interfaces/IStaderInsuranceFund.sol";
15-
import "./interfaces/IValidatorWithdrawalVault.sol";
16-
import "./interfaces/SDCollateral/ISDCollateral.sol";
17-
import "./interfaces/IPermissionlessNodeRegistry.sol";
18-
import "./interfaces/IOperatorRewardsCollector.sol";
19-
20-
import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
21-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
22-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
4+
import { PausableUpgradeable } from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
5+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7+
8+
import { UtilLib } from "./library/UtilLib.sol";
9+
10+
import { ValidatorStatus } from "./library/ValidatorStatus.sol";
11+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
12+
import { IVaultFactory } from "./interfaces/IVaultFactory.sol";
13+
import { IPoolUtils } from "./interfaces/IPoolUtils.sol";
14+
import { Operator, Validator, INodeRegistry } from "./interfaces/INodeRegistry.sol";
15+
import { ISDUtilityPool } from "./interfaces/ISDUtilityPool.sol";
16+
import { IPermissionlessPool } from "./interfaces/IPermissionlessPool.sol";
17+
import { INodeELRewardVault } from "./interfaces/INodeELRewardVault.sol";
18+
import { IStaderInsuranceFund } from "./interfaces/IStaderInsuranceFund.sol";
19+
import { IValidatorWithdrawalVault } from "./interfaces/IValidatorWithdrawalVault.sol";
20+
import { ISDCollateral } from "./interfaces/SDCollateral/ISDCollateral.sol";
21+
import { IPermissionlessNodeRegistry } from "./interfaces/IPermissionlessNodeRegistry.sol";
22+
import { IOperatorRewardsCollector } from "./interfaces/IOperatorRewardsCollector.sol";
2323

2424
contract PermissionlessNodeRegistry is
2525
INodeRegistry,

‎contracts/PermissionlessPool.sol

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
5-
import "./library/ValidatorStatus.sol";
6-
7-
import "./interfaces/IStaderConfig.sol";
8-
import "./interfaces/IVaultFactory.sol";
9-
import "./interfaces/INodeRegistry.sol";
10-
import "./interfaces/IStaderPoolBase.sol";
11-
import "./interfaces/IDepositContract.sol";
12-
import "./interfaces/IStaderStakePoolManager.sol";
13-
import "./interfaces/IPermissionlessNodeRegistry.sol";
14-
15-
import "@openzeppelin/contracts/utils/math/Math.sol";
16-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
17-
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
4+
import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
5+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
6+
import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7+
8+
import { UtilLib } from "./library/UtilLib.sol";
9+
10+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
11+
import { IVaultFactory } from "./interfaces/IVaultFactory.sol";
12+
import { INodeRegistry } from "./interfaces/INodeRegistry.sol";
13+
import { IStaderPoolBase } from "./interfaces/IStaderPoolBase.sol";
14+
import { IDepositContract } from "./interfaces/IDepositContract.sol";
15+
import { IPermissionlessNodeRegistry } from "./interfaces/IPermissionlessNodeRegistry.sol";
1816

1917
contract PermissionlessPool is IStaderPoolBase, AccessControlUpgradeable, ReentrancyGuardUpgradeable {
2018
using Math for uint256;

‎contracts/PoolSelector.sol

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
4+
import { UtilLib } from "./library/UtilLib.sol";
55

6-
import "./interfaces/IStaderConfig.sol";
7-
import "./interfaces/IPoolSelector.sol";
8-
import "./interfaces/IPoolUtils.sol";
6+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
7+
import { IPoolSelector } from "./interfaces/IPoolSelector.sol";
8+
import { IPoolUtils } from "./interfaces/IPoolUtils.sol";
99

10-
import "@openzeppelin/contracts/utils/math/Math.sol";
11-
import "@openzeppelin/contracts/utils/math/SafeMath.sol";
12-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
10+
import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
11+
import { SafeMath } from "@openzeppelin/contracts/utils/math/SafeMath.sol";
12+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
1313

1414
contract PoolSelector is IPoolSelector, AccessControlUpgradeable {
1515
using Math for uint256;

‎contracts/PoolUtils.sol

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// SPDX-License-Identifier: GPL-3.0-or-later
22
pragma solidity 0.8.16;
33

4-
import "./library/UtilLib.sol";
4+
import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
55

6-
import "./interfaces/IPoolUtils.sol";
7-
import "./interfaces/IStaderPoolBase.sol";
8-
import "./interfaces/IStaderConfig.sol";
6+
import { UtilLib } from "./library/UtilLib.sol";
97

10-
import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
8+
import { IPoolUtils } from "./interfaces/IPoolUtils.sol";
9+
import { IStaderPoolBase } from "./interfaces/IStaderPoolBase.sol";
10+
import { INodeRegistry } from "./interfaces/INodeRegistry.sol";
11+
import { IStaderConfig } from "./interfaces/IStaderConfig.sol";
1112

1213
contract PoolUtils is IPoolUtils, AccessControlUpgradeable {
1314
uint64 private constant PUBKEY_LENGTH = 48;

0 commit comments

Comments
 (0)