Skip to content

chore: bump dependency for slashing mags updates #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: [DO NOT MERGE] Slashing Release Branch Internal Security Review
merged 1 commit into from
Dec 10, 2024
Merged

chore: bump dependency for slashing mags updates #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/eigenlayer-contracts
Open in desktop
Submodule eigenlayer-contracts updated 38 files
+2 −2 docs/release/slashing/AllocationManager.md
+5 −11 script/deploy/devnet/deploy_from_scratch.s.sol
+5 −11 script/deploy/local/Deploy_From_Scratch.s.sol
+5 −9 script/deploy/local/deploy_from_scratch.slashing.s.sol
+11 −4 script/tasks/slash_operatorSet.s.sol
+0 −4 script/utils/ExistingDeploymentParser.sol
+1 −1 src/contracts/core/AVSDirectoryStorage.sol
+60 −48 src/contracts/core/AllocationManager.sol
+4 −0 src/contracts/core/AllocationManagerStorage.sol
+1 −8 src/contracts/core/DelegationManager.sol
+0 −8 src/contracts/core/DelegationManagerStorage.sol
+0 −13 src/contracts/interfaces/IAVSDirectory.sol
+18 −9 src/contracts/interfaces/IAllocationManager.sol
+0 −43 src/contracts/interfaces/IDelegationFaucet.sol
+2 −8 src/contracts/interfaces/IDelegationManager.sol
+0 −3 src/contracts/interfaces/IEigenPodManager.sol
+1 −0 src/contracts/interfaces/IRewardsCoordinator.sol
+0 −202 src/contracts/interfaces/ISlasher.sol
+0 −22 src/contracts/interfaces/ISocketUpdater.sol
+0 −2 src/contracts/interfaces/IStrategyManager.sol
+2 −6 src/contracts/permissions/PermissionController.sol
+1 −5 src/contracts/pods/EigenPodManager.sol
+1 −10 src/contracts/pods/EigenPodManagerStorage.sol
+21 −42 src/test/DevnetLifecycle.t.sol
+1 −2 src/test/harnesses/EigenPodManagerWrapper.sol
+26 −0 src/test/integration/IntegrationBase.t.sol
+10 −17 src/test/integration/IntegrationDeployer.t.sol
+2 −1 src/test/integration/tests/Deposit_Delegate_Allocate.t.sol
+0 −4 src/test/integration/tests/Upgrade_Setup.t.sol
+28 −17 src/test/integration/users/AVS.t.sol
+2 −2 src/test/integration/users/User.t.sol
+161 −54 src/test/unit/AllocationManagerUnit.t.sol
+9 −10 src/test/unit/DelegationUnit.t.sol
+0 −4 src/test/unit/EigenPodManagerUnit.t.sol
+1 −1 src/test/unit/PermissionControllerUnit.t.sol
+122 −7 src/test/utils/ArrayLib.sol
+4 −6 src/test/utils/EigenLayerUnitTestSetup.sol
+18 −2 src/test/utils/Random.sol
4 changes: 2 additions & 2 deletions src/interfaces/ISlasher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface ISlasherEvents {
uint256 indexed requestId,
address indexed operator,
uint32 indexed operatorSetId,
uint256 wadToSlash,
uint256[] wadsToSlash,
string description
);

Expand All @@ -20,7 +20,7 @@ interface ISlasherEvents {
uint256 indexed slashingRequestId,
address indexed operator,
uint32 indexed operatorSetId,
uint256 wadToSlash,
uint256[] wadsToSlash,
string description
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/slashers/VetoableSlasher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ contract VetoableSlashing is SlasherBase {
status: SlashingStatus.Requested
});

emit SlashingRequested(requestId, params.operator, params.operatorSetId, params.wadToSlash, params.description);
emit SlashingRequested(requestId, params.operator, params.operatorSetId, params.wadsToSlash, params.description);
}

function _cancelSlashingRequest(uint256 requestId) internal virtual {
Expand Down
2 changes: 1 addition & 1 deletion src/slashers/base/SlasherBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ abstract contract SlasherBase is Initializable, SlasherStorage {
IAllocationManager.SlashingParams memory _params
) internal virtual {
IServiceManager(serviceManager).slashOperator(_params);
emit OperatorSlashed(_requestId, _params.operator, _params.operatorSetId, _params.wadToSlash, _params.description);
emit OperatorSlashed(_requestId, _params.operator, _params.operatorSetId, _params.wadsToSlash, _params.description);
}

function _checkSlasher(address account) internal view virtual {
Expand Down
9 changes: 8 additions & 1 deletion test/integration/CoreRegistration.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ contract Test_CoreRegistration is MockAVSDeployer {

// Deploy New DelegationManager
PermissionController permissionController; // TODO: Fix
DelegationManager delegationManagerImplementation = new DelegationManager(avsDirectoryMock, IStrategyManager(address(strategyManagerMock)), eigenPodManagerMock, allocationManagerMock, pauserRegistry, permissionController, 0);
DelegationManager delegationManagerImplementation = new DelegationManager(
IStrategyManager(address(strategyManagerMock)),
eigenPodManagerMock,
allocationManagerMock,
pauserRegistry,
permissionController,
0
);
IStrategy[] memory initializeStrategiesToSetDelayBlocks = new IStrategy[](0);
uint256[] memory initializeWithdrawalDelayBlocks = new uint256[](0);
delegationManager = DelegationManager(
Expand Down
11 changes: 4 additions & 7 deletions test/integration/IntegrationDeployer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {

// Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
DelegationManager delegationImplementation =
new DelegationManager(avsDirectory, strategyManager, eigenPodManager, allocationManager, pauserRegistry, permissionController, 0);
new DelegationManager(strategyManager, eigenPodManager, allocationManager, pauserRegistry, permissionController, 0);
StrategyManager strategyManagerImplementation =
new StrategyManager(delegationManager, pauserRegistry);
EigenPodManager eigenPodManagerImplementation = new EigenPodManager(
ethPOSDeposit, eigenPodBeacon, strategyManager, delegationManager, pauserRegistry
ethPOSDeposit, eigenPodBeacon, delegationManager, pauserRegistry
);
console.log("HERE Impl");
AVSDirectory avsDirectoryImplementation = new AVSDirectory(delegationManager, pauserRegistry);
Expand Down Expand Up @@ -259,12 +259,9 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
)
);

proxyAdmin.upgradeAndCall(
proxyAdmin.upgrade(
TransparentUpgradeableProxy(payable(address(permissionController))),
address(permissionControllerImplementation),
abi.encodeWithSelector(
PermissionController.initialize.selector
)
address(permissionControllerImplementation)
);

proxyAdmin.upgradeAndCall(
Expand Down
5 changes: 5 additions & 0 deletions test/mocks/AllocationManagerMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ contract AllocationManagerIntermediate is IAllocationManager {
IStrategy[] memory strategies,
uint32 futureBlock
) external view virtual returns (uint256[][] memory slashableStake) {}

function isMemberOfOperatorSet(
address operator,
OperatorSet memory operatorSet
) external view virtual returns (bool) {}
}

contract AllocationManagerMock is AllocationManagerIntermediate {
Expand Down
Loading