Merge branch 'main' into feat/claim-with-nft

lidofinance · Oct 26, 2023 · 02d2720 · 02d2720
2 parents 27a2c3f + d2e0c25
commit 02d2720
Show file tree

Hide file tree

Showing 23 changed files with 1,067 additions and 879 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -6,10 +6,10 @@ pragma solidity 0.8.21;
 import "forge-std/Script.sol";
 
 import { ILidoLocator } from "../src/interfaces/ILidoLocator.sol";
-import { CommunityStakingModule } from "../src/CommunityStakingModule.sol";
-import { CommunityStakingBondManager, IWstETH } from "../src/CommunityStakingBondManager.sol";
-import { FeeDistributor } from "../src/FeeDistributor.sol";
-import { FeeOracle } from "../src/FeeOracle.sol";
+import { CSModule } from "../src/CSModule.sol";
+import { CSAccounting, IWstETH } from "../src/CSAccounting.sol";
+import { CSFeeDistributor } from "../src/CSFeeDistributor.sol";
+import { CSFeeOracle } from "../src/CSFeeOracle.sol";
 
 contract Deploy is Script {
     ILidoLocator public locator;
@@ -35,37 +35,37 @@ contract Deploy is Script {
         vm.startBroadcast(deployerPrivateKey);
         locator = ILidoLocator(LIDO_LOCATOR_ADDRESS);
         wstETH = IWstETH(WSTETH_ADDRESS);
-        CommunityStakingModule csm = new CommunityStakingModule(
+        CSModule csm = new CSModule(
             "community-staking-module",
             address(locator)
         );
-        CommunityStakingBondManager bondManager = new CommunityStakingBondManager({
-                _commonBondSize: 2 ether,
-                _admin: deployerAddress,
-                _lidoLocator: address(locator),
-                _communityStakingModule: address(csm),
-                _wstETH: address(wstETH),
-                _penalizeRoleMembers: penalizers
-            });
-        FeeOracle feeOracle = new FeeOracle({
+        CSAccounting accounting = new CSAccounting({
+            _commonBondSize: 2 ether,
+            _admin: deployerAddress,
+            _lidoLocator: address(locator),
+            _communityStakingModule: address(csm),
+            _wstETH: address(wstETH),
+            _penalizeRoleMembers: penalizers
+        });
+        CSFeeOracle feeOracle = new CSFeeOracle({
             secondsPerBlock: 12,
             blocksPerEpoch: 32,
             genesisTime: uint64(CL_GENESIS_TIME)
         });
-        FeeDistributor feeDistributor = new FeeDistributor({
+        CSFeeDistributor feeDistributor = new CSFeeDistributor({
             _CSM: address(csm),
             _stETH: locator.lido(),
             _oracle: address(feeOracle),
-            _bondManager: address(bondManager)
+            _accounting: address(accounting)
         });
         feeOracle.initialize({
             _initializationEpoch: uint64(INITIALIZATION_EPOCH),
             reportInterval: 6300, // 28 days
             _feeDistributor: address(feeDistributor),
             admin: deployerAddress
         });
-        bondManager.setFeeDistributor(address(feeDistributor));
-        // TODO: csm.setBondManager(address(bondManager));
+        accounting.setFeeDistributor(address(feeDistributor));
+        // TODO: csm.setBondManager(address(accounting));
 
         vm.stopBroadcast();
     }