Skip to content

Commit 913c0ba

Browse files
JuArcetaturosatiuri-99MarcosNicolauMauroToscano
authored
chore: add multisig support to upgrade ServiceManager (#516)
Co-authored-by: Tatu <[email protected]> Co-authored-by: Urix <[email protected]> Co-authored-by: Marcos Nicolau <[email protected]> Co-authored-by: MauroFab <[email protected]>
1 parent a70179d commit 913c0ba

36 files changed

+436
-62
lines changed

‎contracts/script/deploy/config/sepolia/aligned.sepolia.config.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"chainInfo": {
3+
"chainId": 11155111
4+
},
5+
"permissions" : {
6+
"owner": "<owner_address>",
7+
"aggregator": "<aggregator_address>",
8+
"upgrader": "<upgrader_address>",
9+
"churner": "<churner_address>",
10+
"ejector": "<ejector_address>",
11+
"deployer": "<deployer_address>",
12+
"initalPausedStatus": 0
13+
},
14+
"minimumStakes": [
15+
1
16+
],
17+
"strategyWeights": [
18+
[
19+
{
20+
"0_strategy": "0x80528D6e9A2BAbFc766965E0E26d5aB08D9CFaF9",
21+
"1_multiplier": 1e+18
22+
}
23+
]
24+
],
25+
"operatorSetParams": [
26+
{
27+
"0_maxOperatorCount": 200,
28+
"1_kickBIPsOfOperatorStake": 11000,
29+
"2_kickBIPsOfTotalStake": 50
30+
}
31+
],
32+
"uri": ""
33+
}

‎contracts/script/deploy/config/sepolia/batcher-payment-service.sepolia.config.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"address": {
3+
"batcherWallet": "<batcher_wallet_address>",
4+
"alignedLayerServiceManager": "<aligned_layer_service_manager_address>"
5+
},
6+
"permissions": {
7+
"owner": "<owner_address>"
8+
},
9+
"eip712": {
10+
"noncedVerificationDataTypeHash": "0x41817b5c5b0c3dcda70ccb43ba175fdcd7e586f9e0484422a2c6bba678fdf4a3"
11+
}
12+
}

‎contracts/script/output/sepolia/alignedlayer_deployment_output.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"addresses": {
3+
"alignedLayerProxyAdmin": "0x9c50f5054784d6c5523C79c3aFA82E3184430CaC",
4+
"alignedLayerServiceManager": "0xD0fAb108d175765f70Dd2e929b74ec107db6E0e8",
5+
"alignedLayerServiceManagerImplementation": "0xbC86427A646540cF78c92F6C7432716460b97a06",
6+
"blsApkRegistry": "0x9A5B215027F85319957a3a92205BFc18529d9309",
7+
"blsApkRegistryImplementation": "0xEAE702d667bD851C9cAa59e71b23765Bea04A5aF",
8+
"indexRegistry": "0xD316A01F902d0fDF169a53AB22daB38c06c6E60E",
9+
"indexRegistryImplementation": "0x8009D6A252a41bc8fb648F71F3aa78d08231221d",
10+
"operatorStateRetriever": "0xc24023c7e43Dc6A407b1B961A6602ee6d5408A75",
11+
"registryCoordinator": "0x9C04afc13D57608a867E61BD91a10d8689B24ff8",
12+
"registryCoordinatorImplementation": "0xFc326289eF3d5ba5E525e27530329727831E834B",
13+
"serviceManagerRouter": "0x074c28d7ff24c06ab747e08772ed582c3b7C887e",
14+
"stakeRegistry": "0x1888568D57Cf6834d74ef62A78e7EF1ADbd55582",
15+
"stakeRegistryImplementation": "0x05671b5B23d16B2e198729b9Ce94696780d384b9",
16+
"batcherPaymentService": "0x4a40a9F0D29B62a2852ed893B18fAD9CfEcB14FA",
17+
"batcherPaymentServiceImplementation": "0xc40562950D62e3DbFf881149cf07833Cd0A425A9"
18+
},
19+
"chainInfo": {
20+
"chainId": 11155111,
21+
"deploymentBlock": 6833988
22+
},
23+
"permissions": {
24+
"alignedLayerAggregator": "0x1380D03142156d8D9950b001A566dc5cc439dE81",
25+
"alignedLayerChurner": "0x1380D03142156d8D9950b001A566dc5cc439dE81",
26+
"alignedLayerEjector": "0x1380D03142156d8D9950b001A566dc5cc439dE81",
27+
"alignedLayerOwner": "0x1380D03142156d8D9950b001A566dc5cc439dE81",
28+
"alignedLayerUpgrader": "0x1380D03142156d8D9950b001A566dc5cc439dE81",
29+
"pauserRegistry": "0xC2316E03d0871f667e75C62181089988Eb4DB7Db"
30+
}
31+
}

‎contracts/script/output/sepolia/eigenlayer_deployment_output.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"addresses": {
3+
"avsDirectory": "0x2f1F293185c7b57E1E8e07B95C9f04D33418854c",
4+
"avsDirectoryImplementation": "0x6DC4C39E3e6FC3bdbb054C6Cf87FEf8E33DBBCa9",
5+
"baseStrategyImplementation": "0x942CfD2F80f517D6e6129277b027750D01Aa3Eb1",
6+
"beaconOracle": "0x0000000000000000000000000000000000000000",
7+
"delayedWithdrawalRouter": "0x02eE8752d9d6ee1B366BD04d24Bbaa3547ABc0c1",
8+
"delayedWithdrawalRouterImplementation": "0x5FC324E99fb6db1859225C3E53b2688ce7FbF5E1",
9+
"delegationManager": "0x7F250FA1f844Ae88eAdF919ca3a95e327B639d8F",
10+
"delegationManagerImplementation": "0x77E8329dc5290Ef8BA61A997132316a39f731968",
11+
"eigenLayerPauserReg": "0xC2316E03d0871f667e75C62181089988Eb4DB7Db",
12+
"eigenLayerProxyAdmin": "0x3b9b847F251260d6681E2dF937E84Ae4Db1191e5",
13+
"eigenPodBeacon": "0x879Fce476F58b5691a6AF29C2895e9fDF956642C",
14+
"eigenPodImplementation": "0x953F32aE91ec538eBAD2110b3276dEDe9a886519",
15+
"eigenPodManager": "0x1c49661c978c587d98a4dF730CfBaAeE8836d813",
16+
"eigenPodManagerImplementation": "0xE3A2b29e35E878f24bcf46b3d53004aBD5105d99",
17+
"emptyContract": "0xCf334DbB9bEefC53e3e9Fa0feb7319B702155408",
18+
"rewardsCoordinator": "0x420324e8834D2bfF217319D497DDB2B221dea46C",
19+
"rewardsCoordinatorImplementation": "0xF2Fdf5cDBd262DAE8aCF77f85fc1A7546B5FBa3D",
20+
"slasher": "0xF953eDdb64b624FcEbb133f3D991BA05B122bEC8",
21+
"slasherImplementation": "0xB4Fe2669dA4ee0A67E292F1f09d2b83E07C0fb26",
22+
"strategies": {
23+
"MOCK": "0x3eb924d928c138898FC089328f840105969bD6a0"
24+
},
25+
"strategyManager": "0xAcd358E6CCdE1634A1e80F143cF467Bf40fac4BA",
26+
"strategyManagerImplementation": "0x7A7122D7a5194217Be6181c76484dCc10E8BFf83"
27+
},
28+
"chainInfo": {
29+
"chainId": 11155111,
30+
"deploymentBlock": 6200286
31+
},
32+
"numStrategies": 1,
33+
"parameters": {
34+
"executorMultisig": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D",
35+
"operationsMultisig": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D",
36+
"pauserMultisig": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D"
37+
}
38+
}

‎contracts/script/upgrade/AlignedLayerUpgrader.s.sol‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,8 @@ contract AlignedLayerUpgrader is Script {
8080
)
8181
);
8282

83-
vm.startBroadcast();
84-
85-
alignedLayerProxyAdmin.upgrade(
86-
TransparentUpgradeableProxy(
87-
payable(address(alignedLayerServiceManager))
88-
),
89-
address(alignedLayerServiceManagerImplementation)
90-
);
91-
92-
vm.stopBroadcast();
83+
// Not link the new implementation to the proxy
84+
// Because this must be executed in the multisig
9385

9486
return (
9587
address(alignedLayerServiceManager),

‎contracts/script/upgrade/BLSApkRegistryUpgrader.s.sol‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,8 @@ contract BLSApkRegistryUpgrader is Script {
5757
);
5858
vm.stopBroadcast();
5959

60-
vm.startBroadcast();
61-
alignedLayerProxyAdmin.upgrade(
62-
blsApkRegistry,
63-
address(blsApkRegistryImplementation)
64-
);
65-
vm.stopBroadcast();
60+
// Not link the new implementation to the proxy
61+
// Because this must be executed in the multisig
6662

6763
return (
6864
address(blsApkRegistry),

‎contracts/script/upgrade/BatcherPaymentServiceUpgrader.s.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ contract BatcherPaymentServiceUpgrader is Script {
2424
);
2525

2626
BatcherPaymentService newBatcherPaymentServiceImplementation = new BatcherPaymentService();
27-
BatcherPaymentServiceProxy.upgradeToAndCall(address(newBatcherPaymentServiceImplementation), "");
2827

28+
// Not link the new implementation to the proxy
29+
// Because this must be executed in the multisig
30+
2931
vm.stopBroadcast();
3032

3133
return (address(BatcherPaymentServiceProxy), address(newBatcherPaymentServiceImplementation));

‎contracts/script/upgrade/IndexRegistryUpgrader.s.sol‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@ contract IndexRegistryUpgrader is Script {
5353
);
5454
vm.stopBroadcast();
5555

56-
vm.startBroadcast();
57-
alignedLayerProxyAdmin.upgrade(
58-
indexRegistry,
59-
address(indexRegistryImplementation)
60-
);
61-
vm.stopBroadcast();
56+
// Not link the new implementation to the proxy
57+
// Because this must be executed in the multisig
6258

6359
return (
6460
address(indexRegistry),

‎contracts/script/upgrade/RegistryCoordinatorUpgrader.s.sol‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,8 @@ contract RegistryCoordinatorUpgrader is Script {
8282
);
8383
vm.stopBroadcast();
8484

85-
vm.startBroadcast();
86-
alignedLayerProxyAdmin.upgrade(
87-
registryCoordinator,
88-
address(registryCoordinatorImplementation)
89-
);
90-
vm.stopBroadcast();
85+
// Not link the new implementation to the proxy
86+
// Because this must be executed in the multisig
9187

9288
return (
9389
address(registryCoordinator),

‎contracts/script/upgrade/StakeRegistryUpgrader.s.sol‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,8 @@ contract StakeRegistryUpgrader is Script {
6464
);
6565
vm.stopBroadcast();
6666

67-
vm.startBroadcast();
68-
alignedLayerProxyAdmin.upgrade(
69-
stakeRegistry,
70-
address(stakeRegistryImplementation)
71-
);
72-
vm.stopBroadcast();
67+
// Not link the new implementation to the proxy
68+
// Because this must be executed in the multisig
7369

7470
return (
7571
address(stakeRegistry),

0 commit comments

Comments
 (0)