Skip to content

Commit 20df523

Browse files
authored
Merge pull request #517 from lidofinance/feat/archive-next-vote
Feat: Archive next vote
2 parents c562e06 + cd9c398 commit 20df523

File tree

5 files changed

+16
-29
lines changed

5 files changed

+16
-29
lines changed
File renamed without changes.

tests/snapshot/test_dsm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ def _snap(dsm):
139139
"getGuardianIndex(negative)": dsm.getGuardianIndex(accounts[0].address),
140140
"getGuardianIndex(changes)": dsm.getGuardianIndex(some_eoa.address),
141141
"getGuardianQuorum": dsm.getGuardianQuorum(),
142-
# NOTE: Uncomment line below after 23.09.2025 vote enacted
143-
# "getGuardians": dsm.getGuardians(),
142+
"getGuardians": dsm.getGuardians(),
144143
"isGuardian(positive)": dsm.isGuardian(guardian.address),
145144
"isGuardian(negative)": dsm.isGuardian(accounts[0].address),
146145
"isGuardian(changes)": dsm.isGuardian(some_eoa.address),

tests/snapshot/test_first_slots.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,13 @@ def _snap():
9090
res = {}
9191

9292
for contract in (
93-
# NOTE: Uncomment lines below after 23.09.2025 vote enacted
94-
# contracts.lido, # upgrade impl
95-
# contracts.node_operators_registry, # upgrade impl
93+
contracts.lido,
94+
contracts.node_operators_registry,
9695
contracts.legacy_oracle,
97-
# contracts.deposit_security_module, # rotate guardian
96+
contracts.deposit_security_module,
9897
contracts.execution_layer_rewards_vault,
99-
# contracts.withdrawal_vault, # upgrade impl
100-
# contracts.oracle_daemon_config, # upgrade impl
98+
contracts.withdrawal_vault,
99+
contracts.oracle_daemon_config,
101100
contracts.burner,
102101
contracts.relay_allowed_list,
103102
contracts.ldo_token,
@@ -106,14 +105,14 @@ def _snap():
106105
contracts.acl,
107106
contracts.agent,
108107
contracts.kernel,
109-
# contracts.easy_track, # add easy track fabrics
108+
contracts.easy_track,
110109
contracts.wsteth,
111-
# contracts.csm,
112-
# contracts.cs_accounting,
113-
# contracts.cs_fee_distributor,
114-
# contracts.cs_fee_oracle, # upgrade impl
110+
contracts.csm,
111+
contracts.cs_accounting,
112+
contracts.cs_fee_distributor,
113+
contracts.cs_fee_oracle,
115114
contracts.csm_hash_consensus,
116-
# contracts.cs_verifier, # upgrade impl
115+
contracts.cs_verifier,
117116
):
118117
res |= _get_slots(contract, block)
119118

tests/snapshot/test_node_operators_registry.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,7 @@ def assert_rewards_distribution(before, after):
255255
rewards_distribution_after = after["rewards_distribution"].dict()
256256

257257
for i in range(after["active_node_operators_count"]):
258-
if rewards_distribution_before["recipients"][i] == "0x237DeE529A47750bEcdFa8A59a1D766e3e7B5F91":
259-
assert rewards_distribution_after["recipients"][i] == "0x36201ed66DbC284132046ee8d99272F8eEeb24c8"
260-
else:
261-
assert rewards_distribution_before["recipients"][i] == rewards_distribution_after["recipients"][i]
258+
assert rewards_distribution_before["recipients"][i] == rewards_distribution_after["recipients"][i]
262259

263260
assert almost_eq(
264261
rewards_distribution_before["shares"][i],
@@ -273,14 +270,8 @@ def assert_node_operators(before: Dict[str, ReturnValue], after: Dict[str, Retur
273270
node_operator_before = node_operators_pair[0]
274271
node_operator_after = node_operators_pair[1]
275272
assert node_operator_before["active"] == node_operator_after["active"]
276-
if id == 25:
277-
assert node_operator_before["name"] == "Nethermind"
278-
assert node_operator_after["name"] == "Twinstake"
279-
assert node_operator_before["rewardAddress"] == "0x237DeE529A47750bEcdFa8A59a1D766e3e7B5F91"
280-
assert node_operator_after["rewardAddress"] == "0x36201ed66DbC284132046ee8d99272F8eEeb24c8"
281-
else:
282-
assert node_operator_before["name"] == node_operator_after["name"]
283-
assert node_operator_before["rewardAddress"] == node_operator_after["rewardAddress"]
273+
assert node_operator_before["name"] == node_operator_after["name"]
274+
assert node_operator_before["rewardAddress"] == node_operator_after["rewardAddress"]
284275
assert node_operator_before["totalDepositedValidators"] == node_operator_after["totalDepositedValidators"]
285276
assert node_operator_before["totalExitedValidators"] == node_operator_after["totalExitedValidators"]
286277
assert node_operator_before["totalAddedValidators"] == node_operator_after["totalAddedValidators"]

utils/dual_governance.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ def process_proposals(proposal_ids: Sequence[int]):
8787

8888
if len(scheduled_proposals):
8989
chain.sleep(after_schedule_delay + 1)
90-
# wait_for_noon_utc_to_satisfy_time_constrains()
91-
# 13 - 19 UTC is the time window for TW deploy
92-
wait_for_time_window(13, 19)
90+
wait_for_noon_utc_to_satisfy_time_constrains()
9391

9492
for proposal_id in scheduled_proposals:
9593
contracts.emergency_protected_timelock.execute(proposal_id, {"from": stranger})

0 commit comments

Comments
 (0)