Skip to content

Commit 4a887cb

Browse files
committed
chore: push
1 parent 75b723e commit 4a887cb

File tree

2 files changed

+39
-43
lines changed

2 files changed

+39
-43
lines changed

script/utils/ExistingDeploymentParser.sol

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -229,25 +229,9 @@ contract ExistingDeploymentParser is Script, Logger {
229229
)
230230
);
231231

232-
allocationManagerImplementation = new AllocationManager(
233-
delegationManager,
234-
eigenLayerPauserReg,
235-
permissionController,
236-
DEALLOCATION_DELAY,
237-
ALLOCATION_CONFIGURATION_DELAY,
238-
SEMVER
239-
);
240-
allocationManager = AllocationManager(
241-
address(
242-
new TransparentUpgradeableProxy(
243-
address(allocationManagerImplementation), address(eigenLayerProxyAdmin), ""
244-
)
245-
)
246-
);
247-
248-
// // AllocationManager
249-
// allocationManager = AllocationManager(json.readAddress(".addresses.allocationManager"));
250-
// allocationManagerImplementation = json.readAddress(".addresses.allocationManagerImplementation");
232+
// AllocationManager
233+
allocationManager = AllocationManager(json.readAddress(".addresses.allocationManager"));
234+
allocationManagerImplementation = AllocationManager(json.readAddress(".addresses.allocationManagerImplementation"));
251235

252236
// AVSDirectory
253237
avsDirectory = AVSDirectory(json.readAddress(".addresses.avsDirectory"));
@@ -258,9 +242,9 @@ contract ExistingDeploymentParser is Script, Logger {
258242
delegationManagerImplementation =
259243
DelegationManager(json.readAddress(".addresses.delegationManagerImplementation"));
260244

261-
// // PermissionController
262-
// permissionController = PermissionController(json.readAddress(".addresses.permissionController"));
263-
// permissionControllerImplementation = json.readAddress(".addresses.permissionControllerImplementation");
245+
// PermissionController
246+
permissionController = PermissionController(json.readAddress(".addresses.permissionController"));
247+
permissionControllerImplementation = PermissionController(json.readAddress(".addresses.permissionControllerImplementation"));
264248

265249
// RewardsCoordinator
266250
rewardsCoordinator = RewardsCoordinator(json.readAddress(".addresses.rewardsCoordinator"));

src/test/integration/tests/upgrade/Redistribution.t.sol

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,49 @@ contract Integration_Upgrade_Redistribution_Base is UpgradeTest {
4141
// 3. Create an operator set and register an operator.
4242
operatorSet = avs.createOperatorSet(strategies);
4343

44-
bool isOperatorSet = allocationManager.isOperatorSet(operatorSet);
45-
console.log("isOperatorSet", isOperatorSet);
46-
4744
// 4. Operator allocates to operator set
48-
// allocateParams = _genAllocation_AllAvailable(operator, operatorSet);
49-
// operator.modifyAllocations(allocateParams);
45+
allocateParams = _genAllocation_AllAvailable(operator, operatorSet);
46+
operator.modifyAllocations(allocateParams);
5047

51-
// _rollBlocksForCompleteAllocation(operator, operatorSet, strategies);
48+
_rollBlocksForCompleteAllocation(operator, operatorSet, strategies);
5249

5350
// 5. Operator registers for operator set
5451
operator.registerForOperatorSet(operatorSet);
5552

56-
// // 6. Operator is randomly slashed by the operatorSet
57-
// slashParams = _genSlashing_Rand(operator, operatorSet);
58-
// avs.slashOperator(slashParams);
53+
// 6. Operator is randomly slashed by the operatorSet
54+
slashParams = _genSlashing_Rand(operator, operatorSet);
55+
avs.slashOperator(slashParams);
5956
}
6057
}
6158

6259
contract Integration_Upgrade_Redistribution is Integration_Upgrade_Redistribution_Base {
6360
function testFuzz_upgrade_burn(uint24 r) public rand(r) {
64-
// // 1. Upgrade contracts
65-
// _upgradeEigenLayerContracts();
66-
67-
// // 2. Burn shares
68-
// (address[] memory strategiesWithBurnableShares,) = strategyManager.getStrategiesWithBurnableShares();
69-
// for (uint i = 0; i < strategiesWithBurnableShares.length; i++) {
70-
// strategyManager.burnShares(IStrategy(strategiesWithBurnableShares[i]));
71-
// }
72-
73-
// // Assert that there are no strategies with burned shares
74-
// (address[] memory strategiesWithBurnedShares,) = strategyManager.getStrategiesWithBurnableShares();
75-
// assertEq(strategiesWithBurnedShares.length, 0);
61+
// 1. Upgrade contracts
62+
_upgradeEigenLayerContracts();
63+
64+
// 2. Burn shares
65+
(address[] memory strategiesWithBurnableShares,) = strategyManager.getStrategiesWithBurnableShares();
66+
for (uint i = 0; i < strategiesWithBurnableShares.length; i++) {
67+
strategyManager.burnShares(IStrategy(strategiesWithBurnableShares[i]));
68+
}
69+
70+
// Assert that there are no strategies with burned shares
71+
(address[] memory strategiesWithBurnedShares,) = strategyManager.getStrategiesWithBurnableShares();
72+
assertEq(strategiesWithBurnedShares.length, 0);
7673
}
74+
75+
// function testFuzz_burn_update_operatorSet(uint24 r) public rand(r) {
76+
// // 1. Burn shares
77+
// (address[] memory strategiesWithBurnableShares,) = strategyManager.getStrategiesWithBurnableShares();
78+
// for (uint i = 0; i < strategiesWithBurnableShares.length; i++) {
79+
// strategyManager.burnShares(IStrategy(strategiesWithBurnableShares[i]));
80+
// }
81+
82+
// // 2. Upgrade contracts
83+
// _upgradeEigenLayerContracts();
84+
85+
// // Assert that there are no strategies with burned shares
86+
// (address[] memory strategiesWithBurnedShares,) = strategyManager.getStrategiesWithBurnableShares();
87+
// assertEq(strategiesWithBurnedShares.length, 0);
88+
// }
7789
}

0 commit comments

Comments
 (0)