Skip to content

Commit f9f3ffb

Browse files
rkolpakovrkolpakov
committed
chore: reuse constants & update vote title
1 parent ece4c7b commit f9f3ffb

File tree

2 files changed

+43
-26
lines changed

2 files changed

+43
-26
lines changed

‎scripts/before_pectra_upgrade_holesky.py‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
16. Grant CONFIG_MANAGER_ROLE on OracleDaemonConfig 0xC01fC1F2787687Bc656EAc0356ba9Db6e6b7afb7 to Aragon Agent
2020
17. Update the FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT parameter in the OracleDaemonConfig contract 0xC01fC1F2787687Bc656EAc0356ba9Db6e6b7afb7 to 0x08CA (2250)
2121
18. Revoke CONFIG_MANAGER_ROLE on OracleDaemonConfig 0xC01fC1F2787687Bc656EAc0356ba9Db6e6b7afb7 from Aragon Agent
22-
19. Grant PAUSE_ROLE on WithdrawalQueue 0xc7cc160b58F8Bb0baC94b80847E2CF2800565C50 for the new GateSeal 0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778
23-
20. Grant PAUSE_ROLE on ValidatorsExitBusOracle 0xffDDF7025410412deaa05E3E1cE68FE53208afcb for the new GateSeal 0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778
22+
19. Grant PAUSE_ROLE on WithdrawalQueue 0xc7cc160b58F8Bb0baC94b80847E2CF2800565C50 to the new GateSeal 0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778
23+
20. Grant PAUSE_ROLE on ValidatorsExitBusOracle 0xffDDF7025410412deaa05E3E1cE68FE53208afcb to the new GateSeal 0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778
2424
21. Revoke PAUSE_ROLE on WithdrawalQueue 0xc7cc160b58F8Bb0baC94b80847E2CF2800565C50 from the old GateSeal 0xA34d620EA9F3e86bf8B8a7699B4dE44CD9D3202d
2525
22. Revoke PAUSE_ROLE on ValidatorsExitBusOracle 0xffDDF7025410412deaa05E3E1cE68FE53208afcb from the old GateSeal 0xA34d620EA9F3e86bf8B8a7699B4dE44CD9D3202d
26-
23. Grant PAUSE_ROLE on CSModule 0x4562c3e63c2e586cD1651B958C22F88135aCAd4f for the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
27-
24. Grant PAUSE_ROLE on CSAccounting 0xc093e53e8F4b55A223c18A2Da6fA00e60DD5EFE1 for the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
28-
25. Grant PAUSE_ROLE on CSFeeOracle 0xaF57326C7d513085051b50912D51809ECC5d98Ee for the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
26+
23. Grant PAUSE_ROLE on CSModule 0x4562c3e63c2e586cD1651B958C22F88135aCAd4f to the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
27+
24. Grant PAUSE_ROLE on CSAccounting 0xc093e53e8F4b55A223c18A2Da6fA00e60DD5EFE1 to the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
28+
25. Grant PAUSE_ROLE on CSFeeOracle 0xaF57326C7d513085051b50912D51809ECC5d98Ee to the new CSM GateSeal 0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a
2929
26. Revoke PAUSE_ROLE on CSModule 0x4562c3e63c2e586cD1651B958C22F88135aCAd4f from the old CSM GateSeal 0x41F2677fae0222cF1f08Cd1c0AAa607B469654Ce
3030
27. Revoke PAUSE_ROLE on CSAccounting 0xc093e53e8F4b55A223c18A2Da6fA00e60DD5EFE1 from the old CSM GateSeal 0x41F2677fae0222cF1f08Cd1c0AAa607B469654Ce
3131
28. Revoke PAUSE_ROLE on CSFeeOracle 0xaF57326C7d513085051b50912D51809ECC5d98Ee from the old CSM GateSeal 0x41F2677fae0222cF1f08Cd1c0AAa607B469654Ce
@@ -94,6 +94,15 @@
9494
OLD_CSM_GATE_SEAL = "0x41F2677fae0222cF1f08Cd1c0AAa607B469654Ce"
9595
NEW_CSM_GATE_SEAL = "0xf1C03536dbC77B1bD493a2D1C0b1831Ea78B540a"
9696

97+
ECOSYSTEM_BORG_STABLE_FACTORY = "0x167caEDde0F3230eB18763270B11c970409F389e"
98+
ECOSYSTEM_BORG_STABLE_REGISTRY = "0x0214CEBDEc06dc2729382860603d01113F068388"
99+
ECOSYSTEM_BORG_STETH_FACTORY = "0x4F2dA002a7bD5F7C63B62d4C9e4b762c689Dd8Ac"
100+
ECOSYSTEM_BORG_STETH_REGISTRY = "0x193d0bA65cf3a2726e12c5568c068D1B3ea51740"
101+
LABS_BORG_STABLE_FACTORY = "0xf7304738E9d4F572b909FaEd32504F558E234cdB"
102+
LABS_BORG_STABLE_REGISTRY = "0x303F5b60e3cf6Ea11d8509A1546401e311A13B92"
103+
LABS_BORG_STETH_FACTORY = "0xef0Df040B76252cC7fa31a5fc2f36e85c1C8c4f9"
104+
LABS_BORG_STETH_REGISTRY = "0x02CD05c1cBa16113680648a8B3496A5aE312a935"
105+
97106
description = """
98107
"""
99108

@@ -305,7 +314,7 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
305314
encode_oz_grant_role(
306315
contract=contracts.withdrawal_queue,
307316
role_name="PAUSE_ROLE",
308-
grant_to="0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778",
317+
grant_to=NEW_GATE_SEAL,
309318
)
310319
]
311320
),
@@ -317,7 +326,7 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
317326
encode_oz_grant_role(
318327
contract=contracts.validators_exit_bus_oracle,
319328
role_name="PAUSE_ROLE",
320-
grant_to="0xAE6eCd77DCC656c5533c4209454Fd56fB46e1778",
329+
grant_to=NEW_GATE_SEAL,
321330
)
322331
]
323332
),
@@ -329,7 +338,7 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
329338
encode_oz_revoke_role(
330339
contract=contracts.withdrawal_queue,
331340
role_name="PAUSE_ROLE",
332-
revoke_from="0xA34d620EA9F3e86bf8B8a7699B4dE44CD9D3202d",
341+
revoke_from=OLD_GATE_SEAL,
333342
)
334343
]
335344
),
@@ -341,7 +350,7 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
341350
encode_oz_revoke_role(
342351
contract=contracts.validators_exit_bus_oracle,
343352
role_name="PAUSE_ROLE",
344-
revoke_from="0xA34d620EA9F3e86bf8B8a7699B4dE44CD9D3202d",
353+
revoke_from=OLD_GATE_SEAL,
345354
)
346355
]
347356
),
@@ -426,36 +435,36 @@ def start_vote(tx_params: Dict[str, str], silent: bool) -> Tuple[int, Optional[T
426435
(
427436
"29. Add a top-up EVM script factory for stablecoins 0x167caEDde0F3230eB18763270B11c970409F389e to Easy Track to fund the Lido Ecosystem BORG's Ops multisig (AllowedRecipientsRegistry 0x0214CEBDEc06dc2729382860603d01113F068388)",
428437
add_evmscript_factory(
429-
factory="0x167caEDde0F3230eB18763270B11c970409F389e",
438+
factory=ECOSYSTEM_BORG_STABLE_FACTORY,
430439
permissions=create_top_up_allowed_recipient_permission(
431-
registry_address="0x0214CEBDEc06dc2729382860603d01113F068388"
440+
registry_address=ECOSYSTEM_BORG_STABLE_REGISTRY
432441
),
433442
),
434443
),
435444
(
436445
"30. Add a top-up EVM script factory for stETH 0x4F2dA002a7bD5F7C63B62d4C9e4b762c689Dd8Ac to Easy Track to fund the Lido Ecosystem BORG's Ops multisig (AllowedRecipientsRegistry 0x193d0bA65cf3a2726e12c5568c068D1B3ea51740)",
437446
add_evmscript_factory(
438-
factory="0x4F2dA002a7bD5F7C63B62d4C9e4b762c689Dd8Ac",
447+
factory=ECOSYSTEM_BORG_STETH_FACTORY,
439448
permissions=create_top_up_allowed_recipient_permission(
440-
registry_address="0x193d0bA65cf3a2726e12c5568c068D1B3ea51740"
449+
registry_address=ECOSYSTEM_BORG_STETH_REGISTRY
441450
),
442451
),
443452
),
444453
(
445454
"31. Add a top-up EVM script factory for stablecoins 0xf7304738E9d4F572b909FaEd32504F558E234cdB to Easy Track to fund the Lido Labs BORG's Ops multisig (AllowedRecipientsRegistry 0x303F5b60e3cf6Ea11d8509A1546401e311A13B92)",
446455
add_evmscript_factory(
447-
factory="0xf7304738E9d4F572b909FaEd32504F558E234cdB",
456+
factory=LABS_BORG_STABLE_FACTORY,
448457
permissions=create_top_up_allowed_recipient_permission(
449-
registry_address="0x303F5b60e3cf6Ea11d8509A1546401e311A13B92"
458+
registry_address=LABS_BORG_STABLE_REGISTRY
450459
),
451460
),
452461
),
453462
(
454463
"32. Add a top-up EVM script factory for stETH 0xef0Df040B76252cC7fa31a5fc2f36e85c1C8c4f9 to Easy Track to fund the Lido Labs BORG's Ops multisig (AllowedRecipientsRegistry 0x02CD05c1cBa16113680648a8B3496A5aE312a935)",
455464
add_evmscript_factory(
456-
factory="0xef0Df040B76252cC7fa31a5fc2f36e85c1C8c4f9",
465+
factory=LABS_BORG_STETH_FACTORY,
457466
permissions=create_top_up_allowed_recipient_permission(
458-
registry_address="0x02CD05c1cBa16113680648a8B3496A5aE312a935"
467+
registry_address=LABS_BORG_STETH_REGISTRY
459468
),
460469
),
461470
),

‎tests/test_before_pectra_upgrade_holesky.py‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
OLD_CSM_GATE_SEAL,
77
NEW_VOTE_DURATION,
88
NEW_OBJECTION_PHASE_DURATION,
9+
ECOSYSTEM_BORG_STABLE_FACTORY,
10+
ECOSYSTEM_BORG_STABLE_REGISTRY,
11+
ECOSYSTEM_BORG_STETH_FACTORY,
12+
ECOSYSTEM_BORG_STETH_REGISTRY,
13+
LABS_BORG_STABLE_FACTORY,
14+
LABS_BORG_STABLE_REGISTRY,
15+
LABS_BORG_STETH_FACTORY,
16+
LABS_BORG_STETH_REGISTRY,
917
FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT_NEW_VALUE
1018
)
1119
from utils.config import contracts, LDO_HOLDER_ADDRESS_FOR_TESTS
@@ -48,18 +56,9 @@
4856
PAUSE_ROLE = "0x139c2898040ef16910dc9f44dc697df79363da767d8bc92f2e310312b816e46d"
4957

5058
# EasyTrack factories
51-
ECOSYSTEM_BORG_STABLE_FACTORY = "0x167caEDde0F3230eB18763270B11c970409F389e"
52-
ECOSYSTEM_BORG_STABLE_REGISTRY = "0x0214CEBDEc06dc2729382860603d01113F068388"
53-
ECOSYSTEM_BORG_STETH_FACTORY = "0x4F2dA002a7bD5F7C63B62d4C9e4b762c689Dd8Ac"
54-
ECOSYSTEM_BORG_STETH_REGISTRY = "0x193d0bA65cf3a2726e12c5568c068D1B3ea51740"
5559

5660
EASY_TRACK_RECEIVER = "0x96d2Ff1C4D30f592B91fd731E218247689a76915"
5761

58-
LABS_BORG_STABLE_FACTORY = "0xf7304738E9d4F572b909FaEd32504F558E234cdB"
59-
LABS_BORG_STABLE_REGISTRY = "0x303F5b60e3cf6Ea11d8509A1546401e311A13B92"
60-
LABS_BORG_STETH_FACTORY = "0xef0Df040B76252cC7fa31a5fc2f36e85c1C8c4f9"
61-
LABS_BORG_STETH_REGISTRY = "0x02CD05c1cBa16113680648a8B3496A5aE312a935"
62-
6362
# New values
6463

6564
# Accounting oracle
@@ -152,6 +151,15 @@ def test_vote(helpers, accounts, vote_ids_from_env, bypass_events_decoding, stra
152151
_check_role(contracts.cs_fee_oracle, "PAUSE_ROLE", OLD_CSM_GATE_SEAL)
153152
_check_no_role(contracts.cs_fee_oracle, "PAUSE_ROLE", NEW_CSM_GATE_SEAL)
154153

154+
# EasyTrack checks
155+
156+
evm_script_factories_before = contracts.easy_track.getEVMScriptFactories()
157+
158+
assert not ECOSYSTEM_BORG_STABLE_FACTORY in evm_script_factories_before
159+
assert not ECOSYSTEM_BORG_STETH_FACTORY in evm_script_factories_before
160+
assert not LABS_BORG_STABLE_FACTORY in evm_script_factories_before
161+
assert not LABS_BORG_STETH_FACTORY in evm_script_factories_before
162+
155163
# START VOTE
156164
if len(vote_ids_from_env) > 0:
157165
(vote_id,) = vote_ids_from_env

0 commit comments

Comments
 (0)