Skip to content

Commit 618279c

Browse files
authored
Factor out base module and interfaces (#641)
## Description All modules now inherit from the `Module` contract, implementing the shared `IBaseModule` interface. Satellite contracts rely on the shared interface. ## Checklist - [x] Appropriate PR labels applied - [x] Test coverage maintained (`just coverage`) - [x] No need to add/update tests - [ ] Tests are added/updated - [ ] Documentation maintained - [ ] No need to update - [ ] Updated
1 parent e5de6e1 commit 618279c

Some content is hidden

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

54 files changed

+3089
-2961
lines changed

script/curated/DeployBase.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ abstract contract DeployBase is Script {
395395
moduleType: config.moduleType,
396396
lidoLocator: config.lidoLocatorAddress,
397397
parametersRegistry: address(parametersRegistry),
398-
_accounting: address(accounting),
398+
accounting: address(accounting),
399399
exitPenalties: address(exitPenalties)
400400
});
401401

script/fork-helpers/NodeOperators.s.sol

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
pragma solidity 0.8.24;
55

66
import { Script } from "forge-std/Script.sol";
7+
8+
import { IVEBO } from "src/interfaces/IVEBO.sol";
9+
import { IStakingRouter } from "src/interfaces/IStakingRouter.sol";
10+
import { NodeOperator, WithdrawnValidatorInfo } from "src/interfaces/IBaseModule.sol";
11+
712
import { DeploymentFixtures } from "test/helpers/Fixtures.sol";
13+
import { Utilities } from "test/helpers/Utilities.sol";
14+
815
import { ForkHelpersCommon } from "./Common.sol";
9-
import { IVEBO } from "../../src/interfaces/IVEBO.sol";
10-
import { Utilities } from "../../test/helpers/Utilities.sol";
11-
import { IStakingRouter } from "../../src/interfaces/IStakingRouter.sol";
12-
import { NodeOperator, WithdrawnValidatorInfo } from "../../src/interfaces/ICSModule.sol";
1316

1417
contract NodeOperators is
1518
Script,

src/Accounting.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { AssetRecovererLib } from "./lib/AssetRecovererLib.sol";
1414
import { FeeSplits } from "./lib/FeeSplits.sol";
1515

1616
import { IStakingModule } from "./interfaces/IStakingModule.sol";
17-
import { ICSModule, NodeOperatorManagementProperties } from "./interfaces/ICSModule.sol";
17+
import { IBaseModule, NodeOperatorManagementProperties } from "./interfaces/IBaseModule.sol";
1818
import { IAccounting } from "./interfaces/IAccounting.sol";
1919
import { IFeeDistributor } from "./interfaces/IFeeDistributor.sol";
2020
import { IERC20Permit } from "./interfaces/IERC20Permit.sol";
@@ -39,7 +39,7 @@ contract Accounting is
3939
keccak256("SET_BOND_CURVE_ROLE");
4040
bytes32 public constant RECOVERER_ROLE = keccak256("RECOVERER_ROLE");
4141

42-
ICSModule public immutable MODULE;
42+
IBaseModule public immutable MODULE;
4343
IFeeDistributor public immutable FEE_DISTRIBUTOR;
4444
/// @dev DEPRECATED
4545
/// @custom:oz-renamed-from feeDistributor
@@ -77,7 +77,7 @@ contract Accounting is
7777
revert ZeroFeeDistributorAddress();
7878
}
7979

80-
MODULE = ICSModule(module);
80+
MODULE = IBaseModule(module);
8181
FEE_DISTRIBUTOR = IFeeDistributor(feeDistributor);
8282

8383
_disableInitializers();

0 commit comments

Comments
 (0)