From 17380a2aca6f1ee492d4c263ebdf4286a81daa36 Mon Sep 17 00:00:00 2001 From: Noel <103109678+neutiyoo@users.noreply.github.com> Date: Wed, 16 Oct 2024 23:43:48 +0900 Subject: [PATCH] feat: eigenlayer-middleware v0.2.1 (#88) --- contracts/lib/eigenlayer-middleware | 2 +- contracts/script/IncredibleSquaringDeployer.s.sol | 8 ++++++-- contracts/src/IncredibleSquaringServiceManager.sol | 10 ++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware index deebd4ba..74438b79 160000 --- a/contracts/lib/eigenlayer-middleware +++ b/contracts/lib/eigenlayer-middleware @@ -1 +1 @@ -Subproject commit deebd4bafb14fffea54e15c7ba0b3cb95945e7db +Subproject commit 74438b7915c35ca5a0d312654716160c2499169d diff --git a/contracts/script/IncredibleSquaringDeployer.s.sol b/contracts/script/IncredibleSquaringDeployer.s.sol index 9271a169..fc5e9cd2 100644 --- a/contracts/script/IncredibleSquaringDeployer.s.sol +++ b/contracts/script/IncredibleSquaringDeployer.s.sol @@ -17,7 +17,7 @@ import {BLSApkRegistry} from "@eigenlayer-middleware/src/BLSApkRegistry.sol"; import {IndexRegistry} from "@eigenlayer-middleware/src/IndexRegistry.sol"; import {StakeRegistry} from "@eigenlayer-middleware/src/StakeRegistry.sol"; import "@eigenlayer-middleware/src/OperatorStateRetriever.sol"; - +import {IRewardsCoordinator} from "@eigenlayer/contracts/interfaces/IRewardsCoordinator.sol"; import {IncredibleSquaringServiceManager, IServiceManager} from "../src/IncredibleSquaringServiceManager.sol"; import {IncredibleSquaringTaskManager} from "../src/IncredibleSquaringTaskManager.sol"; import {IIncredibleSquaringTaskManager} from "../src/IIncredibleSquaringTaskManager.sol"; @@ -86,6 +86,8 @@ contract IncredibleSquaringDeployer is Script, Utils { StrategyBaseTVLLimits baseStrategyImplementation = StrategyBaseTVLLimits( stdJson.readAddress(eigenlayerDeployedContracts, ".addresses.baseStrategyImplementation") ); + IRewardsCoordinator rewardsCoordinator = + IRewardsCoordinator(stdJson.readAddress(eigenlayerDeployedContracts, ".addresses.rewardsCoordinator")); address credibleSquaringCommunityMultisig = msg.sender; address credibleSquaringPauser = msg.sender; @@ -97,6 +99,7 @@ contract IncredibleSquaringDeployer is Script, Utils { _deployCredibleSquaringContracts( delegationManager, avsDirectory, + rewardsCoordinator, erc20MockStrategy, credibleSquaringCommunityMultisig, credibleSquaringPauser @@ -138,6 +141,7 @@ contract IncredibleSquaringDeployer is Script, Utils { function _deployCredibleSquaringContracts( IDelegationManager delegationManager, IAVSDirectory avsDirectory, + IRewardsCoordinator rewardsCoordinator, IStrategy strat, address incredibleSquaringCommunityMultisig, address credibleSquaringPauser @@ -265,7 +269,7 @@ contract IncredibleSquaringDeployer is Script, Utils { } incredibleSquaringServiceManagerImplementation = new IncredibleSquaringServiceManager( - avsDirectory, registryCoordinator, stakeRegistry, incredibleSquaringTaskManager + avsDirectory, rewardsCoordinator, registryCoordinator, stakeRegistry, incredibleSquaringTaskManager ); // Third, upgrade the proxy contracts to use the correct implementation contracts and initialize them. incredibleSquaringProxyAdmin.upgrade( diff --git a/contracts/src/IncredibleSquaringServiceManager.sol b/contracts/src/IncredibleSquaringServiceManager.sol index c0877056..00b261b5 100644 --- a/contracts/src/IncredibleSquaringServiceManager.sol +++ b/contracts/src/IncredibleSquaringServiceManager.sol @@ -25,17 +25,11 @@ contract IncredibleSquaringServiceManager is ServiceManagerBase { constructor( IAVSDirectory _avsDirectory, + IRewardsCoordinator _rewardsCoordinator, IRegistryCoordinator _registryCoordinator, IStakeRegistry _stakeRegistry, IIncredibleSquaringTaskManager _incredibleSquaringTaskManager - ) - ServiceManagerBase( - _avsDirectory, - IPaymentCoordinator(address(0)), // inc-sq doesn't need to deal with payments - _registryCoordinator, - _stakeRegistry - ) - { + ) ServiceManagerBase(_avsDirectory, _rewardsCoordinator, _registryCoordinator, _stakeRegistry) { incredibleSquaringTaskManager = _incredibleSquaringTaskManager; }