Skip to content

Commit 1fbeb57

Browse files
ypatil12ypatil12
committed
fix: compile
1 parent 57feae3 commit 1fbeb57

File tree

8 files changed

+25
-47
lines changed

8 files changed

+25
-47
lines changed

‎src/RegistryCoordinator.sol‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,7 @@ contract RegistryCoordinator is SlashingRegistryCoordinator, RegistryCoordinator
289289
* @notice Returns the version of the contract
290290
* @return The version string
291291
*/
292-
function version()
293-
public
294-
view
295-
virtual
296-
override(ISemVerMixin, SemVerMixin)
297-
returns (string memory)
298-
{
292+
function version() public view virtual override(SemVerMixin) returns (string memory) {
299293
return "v0.0.1";
300294
}
301295
}

‎test/integration/IntegrationDeployer.t.sol‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
191191
);
192192

193193
// Deploy EigenPod Contracts
194-
pod = new EigenPod(ethPOSDeposit, eigenPodManager, "v0.0.1");
194+
pod = new EigenPod(ethPOSDeposit, eigenPodManager);
195195

196196
eigenPodBeacon = new UpgradeableBeacon(address(pod));
197197

198-
PermissionController permissionControllerImplementation = new PermissionController("v0.0.1");
198+
PermissionController permissionControllerImplementation = new PermissionController();
199199

200200
// Second, deploy the *implementation* contracts, using the *proxy contracts* as inputs
201201
DelegationManager delegationImplementation = new DelegationManager(
@@ -209,9 +209,8 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
209209
);
210210
StrategyManager strategyManagerImplementation =
211211
new StrategyManager(allocationManager, delegationManager, pauserRegistry, "v0.0.1");
212-
EigenPodManager eigenPodManagerImplementation = new EigenPodManager(
213-
ethPOSDeposit, eigenPodBeacon, delegationManager, pauserRegistry, "v0.0.1"
214-
);
212+
EigenPodManager eigenPodManagerImplementation =
213+
new EigenPodManager(ethPOSDeposit, eigenPodBeacon, delegationManager, pauserRegistry);
215214
AVSDirectory avsDirectoryImplementation =
216215
new AVSDirectory(delegationManager, pauserRegistry, "v0.0.1");
217216

@@ -226,13 +225,11 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
226225
MAX_REWARDS_DURATION: MAX_REWARDS_DURATION,
227226
MAX_RETROACTIVE_LENGTH: MAX_RETROACTIVE_LENGTH,
228227
MAX_FUTURE_LENGTH: MAX_FUTURE_LENGTH,
229-
GENESIS_REWARDS_TIMESTAMP: GENESIS_REWARDS_TIMESTAMP,
230-
version: "v0.0.1"
228+
GENESIS_REWARDS_TIMESTAMP: GENESIS_REWARDS_TIMESTAMP
231229
})
232230
);
233231

234-
IStrategy eigenStrategy =
235-
IStrategy(new EigenStrategy(strategyManager, pauserRegistry, "v0.0.1"));
232+
IStrategy eigenStrategy = IStrategy(new EigenStrategy(strategyManager, pauserRegistry));
236233

237234
AllocationManagerView allocationManagerView = new AllocationManagerView(
238235
delegationManager, eigenStrategy, uint32(7 days), uint32(1 days)
@@ -245,8 +242,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
245242
pauserRegistry,
246243
permissionController,
247244
uint32(7 days), // DEALLOCATION_DELAY
248-
uint32(1 days), // ALLOCATION_CONFIGURATION_DELAY
249-
"v0.0.1" // Added config parameter
245+
uint32(1 days) // ALLOCATION_CONFIGURATION_DELAY
250246
);
251247

252248
// Third, upgrade the proxy contracts to point to the implementations
@@ -322,7 +318,7 @@ abstract contract IntegrationDeployer is Test, IUserDeployer {
322318
);
323319

324320
// Deploy and whitelist strategies
325-
baseStrategyImplementation = new StrategyBase(strategyManager, pauserRegistry, "v0.0.1");
321+
baseStrategyImplementation = new StrategyBase(strategyManager, pauserRegistry);
326322
for (uint256 i = 0; i < MAX_STRATEGY_COUNT; i++) {
327323
string memory number = uint256(i).toString();
328324
string memory stratName = string.concat("StrategyToken", number);

‎test/mocks/PermissionControllerMock.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ contract PermissionControllerIntermediate is IPermissionController {
5050
address caller,
5151
address target,
5252
bytes4 selector
53-
) external virtual returns (bool) {}
53+
) external view virtual returns (bool) {}
5454

5555
function getAppointeePermissions(
5656
address account,
@@ -90,7 +90,7 @@ contract PermissionControllerMock is PermissionControllerIntermediate {
9090
address caller,
9191
address target,
9292
bytes4 selector
93-
) external override returns (bool) {
93+
) external view override returns (bool) {
9494
if (account == caller) return true;
9595
return _canCall[account][caller][target][selector];
9696
}

‎test/unit/ServiceManagerBase.t.sol‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ contract ServiceManagerBase_UnitTests is MockAVSDeployer, IServiceManagerBaseEve
7878
MAX_REWARDS_DURATION: MAX_REWARDS_DURATION,
7979
MAX_RETROACTIVE_LENGTH: MAX_RETROACTIVE_LENGTH,
8080
MAX_FUTURE_LENGTH: MAX_FUTURE_LENGTH,
81-
GENESIS_REWARDS_TIMESTAMP: GENESIS_REWARDS_TIMESTAMP,
82-
version: "v0.0.1"
81+
GENESIS_REWARDS_TIMESTAMP: GENESIS_REWARDS_TIMESTAMP
8382
})
8483
);
8584

@@ -169,9 +168,8 @@ contract ServiceManagerBase_UnitTests is MockAVSDeployer, IServiceManagerBaseEve
169168
IERC20 token3 = new ERC20PresetFixedSupply(
170169
"pepe wif avs", "MOCK3", mockTokenInitialSupply, address(this)
171170
);
172-
strategyImplementation = new StrategyBase(
173-
IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v0.0.1"
174-
);
171+
strategyImplementation =
172+
new StrategyBase(IStrategyManager(address(strategyManagerMock)), pauserRegistry);
175173
strategyMock1 = StrategyBase(
176174
address(
177175
new TransparentUpgradeableProxy(

‎test/unit/Utils.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ contract Utils {
1212
IPauserRegistry pauserRegistry,
1313
address admin
1414
) public returns (StrategyBase) {
15-
StrategyBase newStrategy = new StrategyBase(strategyManager, pauserRegistry, "v0.0.1");
15+
StrategyBase newStrategy = new StrategyBase(strategyManager, pauserRegistry);
1616
newStrategy = StrategyBase(
1717
address(new TransparentUpgradeableProxy(address(newStrategy), address(admin), ""))
1818
);

‎test/unit/middlewareV2/MockDeployer.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ abstract contract MockEigenLayerDeployer is Test {
6060
keyRegistrarMock = new KeyRegistrarMock();
6161

6262
// Deploy the actual PermissionController & KeyRegistrar implementations
63-
permissionControllerImplementation = new PermissionController("9.9.9");
63+
permissionControllerImplementation = new PermissionController();
6464
permissionController = PermissionController(
6565
address(
6666
new TransparentUpgradeableProxy(

‎test/utils/CoreDeployLib.sol‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ library CoreDeployLib {
169169
DeploymentConfigData memory config
170170
) internal {
171171
// Deploy core implementations
172-
address permissionControllerImpl = address(new PermissionController("1.0.0"));
172+
address permissionControllerImpl = address(new PermissionController());
173173

174174
address strategyManagerImpl = address(
175175
new StrategyManager(
@@ -197,8 +197,7 @@ library CoreDeployLib {
197197
IPauserRegistry(deployments.pauserRegistry),
198198
IPermissionController(deployments.permissionController),
199199
config.allocationManager.deallocationDelay,
200-
config.allocationManager.allocationConfigurationDelay,
201-
"1.0.0"
200+
config.allocationManager.allocationConfigurationDelay
202201
)
203202
);
204203

@@ -273,9 +272,7 @@ library CoreDeployLib {
273272

274273
address eigenPodImpl = address(
275274
new EigenPod(
276-
IETHPOSDeposit(ethPOSDeposit),
277-
IEigenPodManager(deployments.eigenPodManager),
278-
"1.0.0"
275+
IETHPOSDeposit(ethPOSDeposit), IEigenPodManager(deployments.eigenPodManager)
279276
)
280277
);
281278

@@ -287,8 +284,7 @@ library CoreDeployLib {
287284
IETHPOSDeposit(ethPOSDeposit),
288285
IBeacon(deployments.eigenPodBeacon),
289286
IDelegationManager(deployments.delegationManager),
290-
IPauserRegistry(deployments.pauserRegistry),
291-
"1.0.0"
287+
IPauserRegistry(deployments.pauserRegistry)
292288
)
293289
);
294290

@@ -308,8 +304,7 @@ library CoreDeployLib {
308304
address baseStrategyImpl = address(
309305
new StrategyBase(
310306
IStrategyManager(deployments.strategyManager),
311-
IPauserRegistry(deployments.pauserRegistry),
312-
"1.0.0"
307+
IPauserRegistry(deployments.pauserRegistry)
313308
)
314309
);
315310

@@ -318,8 +313,7 @@ library CoreDeployLib {
318313
address strategyFactoryImpl = address(
319314
new StrategyFactory(
320315
IStrategyManager(deployments.strategyManager),
321-
IPauserRegistry(deployments.pauserRegistry),
322-
"1.0.0"
316+
IPauserRegistry(deployments.pauserRegistry)
323317
)
324318
);
325319

@@ -352,8 +346,7 @@ library CoreDeployLib {
352346
MAX_REWARDS_DURATION: config.rewardsCoordinator.maxRewardsDuration,
353347
MAX_RETROACTIVE_LENGTH: config.rewardsCoordinator.maxRetroactiveLength,
354348
MAX_FUTURE_LENGTH: config.rewardsCoordinator.maxFutureLength,
355-
GENESIS_REWARDS_TIMESTAMP: config.rewardsCoordinator.genesisRewardsTimestamp,
356-
version: "1.0.0"
349+
GENESIS_REWARDS_TIMESTAMP: config.rewardsCoordinator.genesisRewardsTimestamp
357350
})
358351
)
359352
);

‎test/utils/MockAVSDeployer.sol‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ contract MockAVSDeployer is Test {
279279
);
280280

281281
IStrategy eigenStrategy = IStrategy(
282-
new EigenStrategy(
283-
IStrategyManager(address(strategyManagerMock)), pauserRegistry, "v0.0.1"
284-
)
282+
new EigenStrategy(IStrategyManager(address(strategyManagerMock)), pauserRegistry)
285283
);
286284

287285
allocationManagerView =
@@ -294,8 +292,7 @@ contract MockAVSDeployer is Test {
294292
pauserRegistry,
295293
permissionControllerMock,
296294
uint32(7 days), // DEALLOCATION_DELAY
297-
uint32(1 days), // ALLOCATION_CONFIGURATION_DELAY
298-
"v0.0.1" // Added config parameter
295+
uint32(1 days) // ALLOCATION_CONFIGURATION_DELAY
299296
);
300297
proxyAdmin.upgrade(
301298
ITransparentUpgradeableProxy(payable(address(allocationManager))),

0 commit comments

Comments
 (0)