Skip to content

Commit 452537c

Browse files
committed
chore: address rebase issues
test: increase burnable shares chore: add tests feat: simplify escrow delay chore: format chore: clarify natspec chore: fix typos feat: add convenience view functions (#1407) chore: remove commented code chore: format chore: format chore: add regression chore: naming chore: naming fix: build fix: slaky test chore: format chore: push chore: push test: passing redistribution upgrade test
1 parent 44ae0f8 commit 452537c

28 files changed

+745
-1543
lines changed

script/configs/mainnet/mainnet-addresses.config.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
{
2-
"lastUpdated": "v0.4.3-mainnet-foundation-incentives",
2+
"lastUpdated": "v1.4.1-mainnet-prooftra",
33
"addresses": {
4+
"allocationManager": "0x948a420b8CC1d6BFd0B6087C2E7c344a2CD0bc39",
5+
"allocationManagerImplementation": "0x740058839A1668Af5700e5d7B062007275e77D25",
46
"avsDirectory": "0x135dda560e946695d6f155dacafc6f1f25c1f5af",
5-
"avsDirectoryImplementation": "0xdabdb3cd346b7d5f5779b0b614ede1cc9dcba5b7",
7+
"avsDirectoryImplementation": "0xA396D855D70e1A1ec1A0199ADB9845096683B6A2",
68
"beaconOracle": "0x343907185b71aDF0eBa9567538314396aa985442",
79
"baseStrategyImplementation": "0xdfdA04f980bE6A64E3607c95Ca26012Ab9aA46d3",
810
"delayedWithdrawalRouter": "0x7Fe7E9CC0F274d2435AD5d56D5fa73E47F6A23D8",
911
"delayedWithdrawalRouterImplementation": "0x4bb6731b02314d40abbffbc4540f508874014226",
1012
"delegationManager": "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A",
11-
"delegationManagerImplementation": "0x1784be6401339fc0fedf7e9379409f5c1bfe9dda",
13+
"delegationManagerImplementation": "0xA75112d1df37FA53a431525CD47A7d7faCEA7E73",
1214
"eigenLayerPauserReg": "0x0c431C66F4dE941d089625E5B423D00707977060",
1315
"eigenLayerProxyAdmin": "0x8b9566AdA63B64d1E1dcF1418b43fd1433b72444",
1416
"eigenPodBeacon": "0x5a2a4F2F3C18f09179B6703e63D9eDD165909073",
15-
"eigenPodImplementation": "0x6D225e974Fa404D25Ffb84eD6E242Ffa18eF6430",
17+
"eigenPodImplementation": "0xe2E2dB234b0FFB9AFe41e52dB7d3c2B8585646c3",
1618
"eigenPodManager": "0x91E677b07F7AF907ec9a428aafA9fc14a0d3A338",
17-
"eigenPodManagerImplementation": "0x731A0aD160e407393Ff662231Add6Dd145AD3FEa",
19+
"eigenPodManagerImplementation": "0x8dB49233e3b7691D68745A31e4A0Cd9Cf924B7E9",
1820
"emptyContract": "0x1f96861fEFa1065a5A96F20Deb6D8DC3ff48F7f9",
21+
"permissionController": "0x25E5F8B1E7aDf44518d35D5B2271f114e081f0E5",
22+
"permissionControllerImplementation": "0xe7f3705c9Addf2DE14e03C345fA982CAb2c1C6B1",
1923
"rewardsCoordinator": "0x7750d328b314EfFa365A0402CcfD489B80B0adda",
20-
"rewardsCoordinatorImplementation": "0xb6738A8E7793D44c5895B6A6F2a62F6bF86Ba8d2",
24+
"rewardsCoordinatorImplementation": "0xa505c0116aD65071F0130061F94745b7853220aB",
2125
"slasher": "0xD92145c07f8Ed1D392c1B88017934E301CC1c3Cd",
2226
"slasherImplementation": "0xf3234220163a757edf1e11a8a085638d9b236614",
2327
"strategyManager": "0x858646372CC42E1A627fcE94aa7A7033e7CF075A",
24-
"strategyManagerImplementation": "0x70f44c13944d49a236e3cd7a94f48f5dab6c619b",
28+
"strategyManagerImplementation": "0xba4b2b8A076851A3044882493C2e36503d50b925",
2529
"strategyFactory": "0x5e4C39Ad7A3E881585e383dB9827EB4811f6F647",
26-
"strategyFactoryImplementation": "0x3e07cc2D34C8E0965f5BA45Ac1E960e535155c74",
30+
"strategyFactoryImplementation": "0x1b97d8F963179C0e17E5F3d85cdfd9a31A49bc66",
2731
"strategyFactoryBeacon": "0x0ed6703C298d28aE0878d1b28e88cA87F9662fE9",
28-
"strategyFactoryBeaconImplementation": "0xe9FA8F904d97854C7389b68923262ADCC6C27827",
32+
"strategyFactoryBeaconImplementation": "0x0EC17ef9c00F360DB28CA8008684a4796b11E456",
2933
"numStrategiesDeployed": 12,
3034
"strategies": {
3135
"stETH": "0x93c4b944D05dfe6df7645A86cd2206016c51564D",
@@ -62,20 +66,20 @@
6266
"EIGENImpl": "0x17f56E911C279bad67eDC08acbC9cf3DC4eF26A0",
6367
"bEIGENImpl": "0xF2b225815F70c9b327DC9db758A36c92A4279b17",
6468
"eigenStrategy": "0xaCB55C530Acdb2849e6d4f36992Cd8c9D50ED8F7",
65-
"eigenStrategyImpl": "0x27e7a3a81741b9fcc5ad7edcbf9f8a72a5c00428"
69+
"eigenStrategyImpl": "0x90B074DDD680bD06C72e28b09231A0F848205729"
6670
}
6771
},
6872
"numStrategies": 12,
6973
"chainInfo": {
7074
"chainId": 1,
71-
"deploymentBlock": 20571838
75+
"deploymentBlock": 22434239
7276
},
7377
"parameters": {
7478
"communityMultisig": "0xFEA47018D632A77bA579846c840d5706705Dc598",
7579
"executorMultisig": "0x369e6F597e22EaB55fFb173C6d9cD234BD699111",
7680
"operationsMultisig": "0xBE1685C81aA44FF9FB319dD389addd9374383e90",
7781
"pauserMultisig": "0x5050389572f2d220ad927CcbeA0D406831012390",
7882
"timelock": "0xA6Db1A8C5a981d1536266D2a393c5F8dDb210EAF",
79-
"semver": "v0.5.4"
83+
"semver": "v1.4.1"
8084
}
8185
}

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/contracts/core/SlashEscrow.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ contract SlashEscrow is ISlashEscrow {
1111
using SafeERC20 for IERC20;
1212

1313
/// @inheritdoc ISlashEscrow
14-
function burnOrRedistributeUnderlyingTokens(
14+
function releaseTokens(
1515
ISlashEscrowFactory slashEscrowFactory,
1616
ISlashEscrow slashEscrowImplementation,
1717
OperatorSet calldata operatorSet,

0 commit comments

Comments
 (0)