feat: Stakefish council deamon rotation

Author: hweawer

configs/config_mainnet.py

@@ -233,7 +233,7 @@
 DSM_GUARDIANS = [
     "0x5fd0dDbC3351d009eb3f88DE7Cd081a614C519F1",
     "0x7912Fa976BcDe9c2cf728e213e892AD7588E6AaF",
-    "0xd4EF84b638B334699bcf5AF4B0410B8CCD71943f",
+    "0x4B87F16B8d32cb5a859a4C48a88edB5adBe3498E",
     "0xf82D88217C249297C6037BA77CE34b3d8a90ab43",
     "0xa56b128Ea2Ea237052b0fA2a96a387C0E43157d8",
     "0x6d22aE126eB2c37F67a1391B37FF4f2863e61389",

scripts/_exec_vote.py

@@ -0,0 +1,4 @@
+from utils.mainnet_fork import pass_and_exec_dao_vote
+
+def main():
+    pass_and_exec_dao_vote(199)

scripts/vote_2026_04_08.py

@@ -25,6 +25,8 @@
 1.21. Decrease limit from 1000 to 150 stETH per 12 months on Gas Supply AllowedRecipientsRegistry 0x49d1363016aA899bba09ae972a1BF200dDf8C55F
 1.22. Set spent amount to 0 on Gas Supply AllowedRecipientsRegistry 0x49d1363016aA899bba09ae972a1BF200dDf8C55F
 1.23. Raise CSM (MODULE_ID = 3) stake share limit from 750 BP to 850 BP and priority exit threshold from 900 BP to 1020 BP in Staking Router 0xFdDf38947aFB03C621C71b06C9C70bce73f12999
+1.24. Remove Stakefish council daemon 0xd4EF84b638B334699bcf5AF4B0410B8CCD71943f from Deposit Security Module 0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD and keep quorum size as 4
+1.25. Add new Stakefish council daemon 0xPLACEHOLDER_NEW to Deposit Security Module 0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD and keep quorum size as 4
 
 === NON-DG ITEMS ===
 2. Remove old Simple DVT SubmitValidatorsExitRequestHashes factory 0xB7668B5485d0f826B86a75b0115e088bB9ee03eE from Easy Track 0xF0211b7660680B49De1A7E9f25C65660F0a13Fea
@@ -53,6 +55,7 @@
 from utils.mainnet_fork import pass_and_exec_dao_vote
 from utils.dual_governance import submit_proposals
 from utils.agent import agent_forward
+from utils.dsm import encode_remove_guardian, encode_add_guardian
 from utils.easy_track import add_evmscript_factory, remove_evmscript_factory, create_permissions
 from utils.node_operators import (
     deactivate_node_operator,
@@ -89,6 +92,12 @@
 CS_HASH_CONSENSUS = "0x71093efF8D8599b5fA340D665Ad60fA7C80688e4"
 HASH_CONSENSUS_FOR_VEBO = "0x7FaDB6358950c5fAA66Cb5EB8eE5147De3df355a"
 
+DEPOSIT_SECURITY_MODULE = "0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD"
+
+STAKEFISH_DSM_GUARDIAN_OLD = "0xd4EF84b638B334699bcf5AF4B0410B8CCD71943f"
+STAKEFISH_DSM_GUARDIAN_NEW = "0x4B87F16B8d32cb5a859a4C48a88edB5adBe3498E"
+DSM_QUORUM_SIZE = 4
+
 GAS_SUPPLY_ALLOWED_RECIPIENTS_REGISTRY = "0x49d1363016aA899bba09ae972a1BF200dDf8C55F"
 
 OLD_SDVT_SUBMIT_EXIT_HASHES_FACTORY = "0xB7668B5485d0f826B86a75b0115e088bB9ee03eE"
@@ -154,6 +163,7 @@
 # ================================ Main ======================================
 def get_dg_items() -> List[Tuple[str, str]]:
     staking_router = interface.StakingRouter(STAKING_ROUTER)
+    dsm = interface.DepositSecurityModule(DEPOSIT_SECURITY_MODULE)
     no_registry = interface.NodeOperatorsRegistry(CURATED_MODULE)
     hash_consensus_for_accounting_oracle = interface.HashConsensus(HASH_CONSENSUS_FOR_AO)
     cs_hash_consensus = interface.CSHashConsensus(CS_HASH_CONSENSUS)
@@ -367,6 +377,18 @@ def get_dg_items() -> List[Tuple[str, str]]:
                 )
             ]
         ),
+        # 1.24. Remove Stakefish council daemon 0xPLACEHOLDER_OLD from Deposit Security Module 0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD and keep quorum size as 4
+        agent_forward(
+            [
+                encode_remove_guardian(dsm=dsm, guardian_address=STAKEFISH_DSM_GUARDIAN_OLD, quorum_size=DSM_QUORUM_SIZE),
+            ]
+        ),
+        # 1.25. Add new Stakefish council daemon 0xPLACEHOLDER_NEW to Deposit Security Module 0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD and keep quorum size as 4
+        agent_forward(
+            [
+                encode_add_guardian(dsm=dsm, guardian_address=STAKEFISH_DSM_GUARDIAN_NEW, quorum_size=DSM_QUORUM_SIZE),
+            ]
+        ),
     ]
 
 
@@ -380,14 +402,14 @@ def get_vote_items() -> Tuple[List[str], List[Tuple[str, str]]]:
         [
             (
                 dg_items,
-                "Deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold",
+                "Deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold, rotate Stakefish council daemon in DSM",
             )
         ]
     )
 
     vote_desc_items, call_script_items = zip(
         (
-            "1. Submit a Dual Governance proposal to deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold",
+            "1. Submit a Dual Governance proposal to deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold, rotate Stakefish council daemon in DSM",
             dg_call_script[0],
         ),
         (

tests/test_2026_04_08.py

@@ -105,6 +105,12 @@
 STAKEFISH_ORACLE_MEMBER_OLD = "0x946D3b081ed19173dC83Cd974fC69e1e760B7d78"
 STAKEFISH_ORACLE_MEMBER_NEW = "0x042a9e5acCfa17e28300F1b5967f20891E973922"
 
+# Stakefish DSM council daemon rotation
+DEPOSIT_SECURITY_MODULE = "0xfFA96D84dEF2EA035c7AB153D8B991128e3d72fD"
+STAKEFISH_DSM_GUARDIAN_OLD = "0xd4EF84b638B334699bcf5AF4B0410B8CCD71943f"
+STAKEFISH_DSM_GUARDIAN_NEW = "0x4B87F16B8d32cb5a859a4C48a88edB5adBe3498E"
+DSM_QUORUM_SIZE = 4
+
 # Node operators
 A41_NO_ID = 32
 A41_NAME = "A41"
@@ -178,10 +184,10 @@
 EXPECTED_VOTE_ID = 199
 EXPECTED_DG_PROPOSAL_ID = 9
 EXPECTED_VOTE_EVENTS_COUNT = 11  # 1 DG submit + 5 factory removes + 5 factory adds
-EXPECTED_DG_EVENTS_FROM_AGENT = 23
-EXPECTED_DG_EVENTS_COUNT = 23
+EXPECTED_DG_EVENTS_FROM_AGENT = 25
+EXPECTED_DG_EVENTS_COUNT = 25
 IPFS_DESCRIPTION_HASH = "bafkreic2fhcjelgdwpiiy7vxm7kf4g3kuhmmbaerfyoxkns2x5jzovqvaa"
-DG_PROPOSAL_METADATA = "Deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold"
+DG_PROPOSAL_METADATA = "Deactivate A41, change name and reward address for Stakin, upgrade Lazy Oracle, Vault Hub and ZKSync Bridge, rotate addresses for Chorus One and Stakefish oracle set members, set Chorus One target validators limit, decrease Gas Supply ET limit and reset spent amount, raise CSM stake share limit and priority exit threshold, rotate Stakefish council daemon in DSM"
 
 
 @pytest.fixture(scope="module")
@@ -489,6 +495,7 @@ def test_vote(helpers, accounts, ldo_holder, vote_ids_from_env, stranger, dual_g
     gas_supply_registry = interface.AllowedRecipientRegistry(GAS_SUPPLY_ALLOWED_RECIPIENTS_REGISTRY)
     staking_router = interface.StakingRouter(STAKING_ROUTER)
     vebo = interface.ValidatorsExitBusOracle(VEBO)
+    dsm = interface.DepositSecurityModule(DEPOSIT_SECURITY_MODULE)
 
     # =========================================================================
     # ======================== Identify or Create vote ========================
@@ -728,6 +735,12 @@ def test_vote(helpers, accounts, ldo_holder, vote_ids_from_env, stranger, dual_g
             assert csm_module_before["maxDepositsPerBlock"] == CSM_MAX_DEPOSITS_PER_BLOCK
             assert csm_module_before["minDepositBlockDistance"] == CSM_MIN_DEPOSIT_BLOCK_DISTANCE
 
+            # 1.24-1.25. Stakefish DSM guardian rotation before
+            assert dsm.isGuardian(STAKEFISH_DSM_GUARDIAN_OLD)
+            assert not dsm.isGuardian(STAKEFISH_DSM_GUARDIAN_NEW)
+            dsm_guardians_before = dsm.getGuardians()
+            dsm_quorum_before = dsm.getGuardianQuorum()
+
             ao_quorum_before = hash_consensus_for_ao.getQuorum()
             ao_members_before = len(hash_consensus_for_ao.getMembers()[0])
             csm_quorum_before = cs_hash_consensus.getQuorum()
@@ -936,6 +949,16 @@ def test_vote(helpers, accounts, ldo_holder, vote_ids_from_env, stranger, dual_g
                     emitted_by=STAKING_ROUTER,
                 )
 
+                # 1.24. Remove Stakefish council daemon from DSM
+                assert "GuardianRemoved" in dg_events[23]
+                assert dg_events[23]["GuardianRemoved"]["guardian"].lower() == STAKEFISH_DSM_GUARDIAN_OLD.lower()
+                assert dg_events[23]["GuardianRemoved"]["_emitted_by"].lower() == DEPOSIT_SECURITY_MODULE.lower()
+
+                # 1.25. Add new Stakefish council daemon to DSM
+                assert "GuardianAdded" in dg_events[24]
+                assert dg_events[24]["GuardianAdded"]["guardian"].lower() == STAKEFISH_DSM_GUARDIAN_NEW.lower()
+                assert dg_events[24]["GuardianAdded"]["_emitted_by"].lower() == DEPOSIT_SECURITY_MODULE.lower()
+
         # =========================================================================
         # ==================== After DG proposal executed checks ==================
         # =========================================================================
@@ -1015,6 +1038,13 @@ def test_vote(helpers, accounts, ldo_holder, vote_ids_from_env, stranger, dual_g
         assert csm_module_after["maxDepositsPerBlock"] == CSM_MAX_DEPOSITS_PER_BLOCK
         assert csm_module_after["minDepositBlockDistance"] == CSM_MIN_DEPOSIT_BLOCK_DISTANCE
 
+        # 1.24-1.25. Stakefish DSM guardian rotation after
+        assert not dsm.isGuardian(STAKEFISH_DSM_GUARDIAN_OLD)
+        assert dsm.isGuardian(STAKEFISH_DSM_GUARDIAN_NEW)
+        assert len(dsm.getGuardians()) == len(dsm_guardians_before)
+        assert dsm.getGuardianQuorum() == dsm_quorum_before
+        assert dsm.getGuardianQuorum() == DSM_QUORUM_SIZE
+
         ao_quorum_after = hash_consensus_for_ao.getQuorum()
         ao_members_after = len(hash_consensus_for_ao.getMembers()[0])
         csm_quorum_after = cs_hash_consensus.getQuorum()