CMv2 + CSMv3 + SRv3 factories by vgorkavenko · Pull Request #113 · lidofinance/easy-track

vgorkavenko · 2026-02-20T15:14:58Z

Fill in test fixtures before deployment

Hoodi Addresses

Mainnet Addresses

…e + SubmitWithdrawals factories (#96) * feat: add `maxValues` for `CSMSettleElStealingPenalty` * feat: rename factory. introduce curated v2 things * fix * feat: add `name` for factory * fix: name in scripts * fix: more renames * feat: add deployment script for CM * feat: add SubmitWithdrawals factory * chore: pin solidity 0.8.6 * chore: add name to the factory * feat: add deploy script for SubmitWithdrawals * test: add scenario/integration test for SubmitWithdrawals * feat: rename set vetted gate tree factory * feat: allowed gates registry * fix: review * chore: make allowedGates private variable * test: few tweaks to allowed gate registry * fix: use the updated method * refactor: rename the factory one more time * fix: `reportWithdrawnValidators` -> `reportSlashedWithdrawnValidators` * feat: settle general delayed penalty deploy script * feat: Create\Update MetaRegistry operator group factory * fix: review * feat: initial gates for registry, tests * fix: remove acceptance tests * fix: create or update group review * feat: add `name` for AllowedMerkleGateRegistry * feat: add `txHash` to artifacts --------- Co-authored-by: madlabman <10616301+madlabman@users.noreply.github.com>

…e share factories (#102) * feat: allow consolidation factory * chore: add comment * fix: review * fix: add `consolidationManager` * feat: UpdateStakingModuleShareLimits ET Factory (#99) * feat: UpdateStakingModuleShareLimits ET Factory * fixes for review * feat: add deployment and acceptance tests for UpdateStakingModuleShareLimits --------- Co-authored-by: Sergey Khomutinin <31664571+skhomuti@users.noreply.github.com>

contracts/EVMScriptFactories/AllowConsolidationPair.sol

contracts/EVMScriptFactories/ReportWithdrawalsForSlashedValidators.sol

contracts/EVMScriptFactories/AllowConsolidationPair.sol

Copilot

Pull request overview

Adds new Easy Track EVMScript factories and supporting infra for CMv2 / CSMv3 / SRv3 motions, plus scenarios/stubs/interfaces needed to test and deploy them across networks.

Changes:

Introduces new EVMScript factories for: updating staking module share limits, settling general delayed penalties, reporting slashed-withdrawn validators, creating/updating MetaRegistry operator groups, and allowing consolidation pairs.
Adds/updates supporting Solidity interfaces + test stubs (MetaRegistry, ConsolidationMigrator, CSModule node-operator stubs, StakingRouter updates) and expands scenario + unit test coverage.
Extends Python utils/fixtures to expose CM/CSM0x02 wiring and adds deployment scripts for the new factories/registry.

Reviewed changes

Copilot reviewed 59 out of 60 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
utils/lido.py	Adds optional `consolidation_migrator` address + optional contract wiring.
utils/dual_governance.py	Refactors contract lookup to resolve network dynamically via helper.
utils/csm0x02.py	Adds CSM0x02 address/contract helper module.
utils/csm.py	Extends CSM wiring with allowed merkle gates registry address/interface.
utils/config.py	Hard-fails if Brownie network cannot be resolved.
utils/cm.py	Adds CM (curated module) address/contract helper module.
tests/test_allowed_merkle_gates_registry.py	Adds unit tests for AllowedMerkleGatesRegistry behavior.
tests/scenario/test_update_staking_module_share_limits_scenario.py	Adds scenario test for SR module share limit update motion.
tests/scenario/test_settle_general_delayed_penalty_scenario.py	Adds scenario test for settling general delayed penalties via motion.
tests/scenario/test_report_withdrawals_for_slashed_validators_scenario.py	Adds scenario test for reporting slashed withdrawn validators via motion.
tests/scenario/test_merkle_gate_scenario.py	Adds scenario test for SetMerkleGateTree factory flow.
tests/scenario/test_csm_vetted_gate_scenario.py	Removes old vetted-gate scenario.
tests/scenario/test_create_or_update_operator_group_scenario.py	Adds scenario test for CMv2 MetaRegistry group create/update via motion.
tests/scenario/test_allow_consolidation_pair_scenario.py	Adds scenario test for allowing consolidation pairs via motion.
tests/scenario/conftest.py	Adds helpers/fixtures for “use deployed contracts” mode + impersonation utilities.
tests/evm_script_factories/test_update_staking_module_share_limits.py	Adds unit tests for UpdateStakingModuleShareLimits factory.
tests/evm_script_factories/test_settle_general_delayed_penalty.py	Adds unit tests for SettleGeneralDelayedPenalty factory.
tests/evm_script_factories/test_set_merkle_gate_tree.py	Adds unit tests for SetMerkleGateTree factory.
tests/evm_script_factories/test_report_withdrawals_for_slashed_validators.py	Adds unit tests for ReportWithdrawalsForSlashedValidators factory.
tests/evm_script_factories/test_csm_settle_el_stealing_penalty.py	Removes old EL stealing penalty factory tests.
tests/evm_script_factories/test_csm_set_vetted_gate_tree.py	Removes old vetted-gate factory tests.
tests/evm_script_factories/test_create_or_update_operator_group.py	Adds unit tests for CreateOrUpdateOperatorGroup factory.
tests/evm_script_factories/test_allow_consolidation_pair.py	Adds unit tests for AllowConsolidationPair factory.
tests/conftest.py	Adds CM/CSM0x02 fixtures + allowed registry/gate helpers + SR consolidation migrator fixture.
scripts/deploy_update_staking_module_share_limits_factory.py	Adds deployment script for UpdateStakingModuleShareLimits factory.
scripts/deploy_settle_general_delayed_penalty_factory.py	Adds deployment script for SettleGeneralDelayedPenalty factory.
scripts/deploy_set_merkle_gate_tree_factory.py	Adds deployment script for SetMerkleGateTree factory.
scripts/deploy_report_withdrawals_for_slashed_validator_factory.py	Adds deployment script for ReportWithdrawalsForSlashedValidators factory.
scripts/deploy_csm_settle_el_stealing_factory.py	Removes old EL stealing factory deployment script.
scripts/deploy_csm_set_vetted_gate_tree_factory.py	Removes old vetted gate factory deployment script.
scripts/deploy_create_or_update_operator_group_factory.py	Adds deployment script for CreateOrUpdateOperatorGroup factory.
scripts/deploy_allowed_merkle_gates_registry.py	Adds deployment script for AllowedMerkleGatesRegistry.
scripts/deploy_allow_consolidation_pair_factory.py	Adds deployment script for AllowConsolidationPair factory.
scripts/acceptance_test_csm_settle_el_stealing_setup.py	Removes old acceptance setup script.
scripts/acceptance_test_csm_set_vetted_gate_tree_setup.py	Removes old acceptance setup script.
interfaces/CSModule.json	Updates CSModule ABI to CSMv3 surface (node operators, penalties, withdrawals reporting).
contracts/test/StakingRouterStub.sol	Adds `updateModuleShares` + event + test helper setter.
contracts/test/NodeOperatorsRegistryStub.sol	Adds `canPerform` + reward address setter to support consolidation tests.
contracts/test/MetaRegistryStub.sol	Adds MetaRegistry stub used by operator-group factory tests.
contracts/test/MerkleGateStub.sol	Renames/adjusts stub to represent MerkleGate (not VettedGate).
contracts/test/ConsolidationMigratorStub.sol	Adds consolidation migrator stub used by consolidation pair tests.
contracts/test/CSModuleNodeOperatorsStub.sol	Adds minimal ICSModule implementation for node-operator activity checks.
contracts/test/CSLikeModuleStub.sol	Adds module-like stub supporting accounting + settle/report flows for tests.
contracts/interfaces/IVettedGate.sol	Removes old vetted gate interface.
contracts/interfaces/IStakingRouter.sol	Extends interface with `updateModuleShares`.
contracts/interfaces/IMetaRegistry.sol	Adds MetaRegistry interface used by CMv2 factory.
contracts/interfaces/IMerkleGate.sol	Adds MerkleGate interface used by SetMerkleGateTree factory.
contracts/interfaces/IConsolidationMigrator.sol	Adds ConsolidationMigrator interface used by consolidation pair factory/tests.
contracts/interfaces/ICSModule.sol	Updates ICSModule interface to “general delayed penalty” + withdrawals reporting + activity checks.
contracts/interfaces/ICSAccounting.sol	Adds accounting interface for locked bond reads.
contracts/interfaces/IAllowedMerkleGatesRegistry.sol	Adds registry interface for gate allowlist checks.
contracts/EVMScriptFactories/UpdateStakingModuleShareLimits.sol	New SR factory that validates deltas/current values and emits update call.
contracts/EVMScriptFactories/SettleGeneralDelayedPenalty.sol	New CSM factory to settle delayed penalties with max-amount validation.
contracts/EVMScriptFactories/SetMerkleGateTree.sol	Reworks gate-tree factory to support any allowed IMerkleGate via registry allowlist.
contracts/EVMScriptFactories/ReportWithdrawalsForSlashedValidators.sol	New CSM factory to report slashed withdrawn validators.
contracts/EVMScriptFactories/CreateOrUpdateOperatorGroup.sol	New CMv2 factory validating and encoding MetaRegistry operator group updates.
contracts/EVMScriptFactories/CSMSettleELStealingPenalty.sol	Removes old factory.
contracts/EVMScriptFactories/AllowConsolidationPair.sol	New SR factory to allow consolidation pairs with NOR permission checks.
contracts/AllowedMerkleGatesRegistry.sol	New registry contract to maintain allowed MerkleGate addresses.
.gitignore	Ignores typings/, direnv, tags, etc.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

utils/cm.py

utils/csm0x02.py

tests/evm_script_factories/test_allow_consolidation_pair.py

tests/test_allowed_merkle_gates_registry.py

contracts/AllowedMerkleGatesRegistry.sol

utils/csm.py

… _addGate, add tests Agent-Logs-Url: https://github.com/lidofinance/easy-track/sessions/a18fe8d1-6aff-4870-97df-51bfeacd5895 Co-authored-by: vgorkavenko <32727352+vgorkavenko@users.noreply.github.com>

mkurayan · 2026-04-13T11:56:49Z

contracts/EVMScriptFactories/AllowConsolidationPair.sol

+        sourceModuleId = sourceModuleId_;
+        targetModuleId = targetModuleId_;
+        consolidationMigrator = IConsolidationMigrator(_consolidationMigrator);
+        metaRegistry = ICuratedModule(sourceModuleAddress).META_REGISTRY();


@vgorkavenko The source module is legacy NOR module, it does not have META_REGISTRY

contracts/EVMScriptFactories/AllowConsolidationPair.sol

contracts/EVMScriptFactories/CreateOrUpdateOperatorGroup.sol

contracts/EVMScriptFactories/SettleGeneralDelayedPenalty.sol

…lass

contracts/EVMScriptFactories/AllowConsolidationPair.sol

+    function _validateInputData(
+        address creator,
+        AllowConsolidationPairInput memory input
+    ) private view {
+
+        INodeOperatorsRegistry sourceModule = INodeOperatorsRegistry(stakingRouter.getStakingModule(sourceModuleId).stakingModuleAddress);
+
+        uint256 sourceCount = sourceModule.getNodeOperatorsCount();
+        require(input.sourceOperatorId < sourceCount, ERROR_SOURCE_OPERATOR_ID_DOES_NOT_EXIST);
+
+        (bool active, , address rewardAddress, , , , ) = sourceModule.getNodeOperator(
+            input.sourceOperatorId,
+            false
+        );
+        require(active, ERROR_NODE_OPERATOR_IS_NOT_ACTIVE);
+
+        uint256[] memory roleParams = new uint256[](1);
+        roleParams[0] = input.sourceOperatorId;
+        require(
+            creator == rewardAddress ||
+                sourceModule.canPerform(creator, MANAGE_SIGNING_KEYS_ROLE, roleParams),
+            ERROR_CALLER_IS_NOT_SOURCE_OPERATOR_OWNER_OR_MANAGER
+        );
+
+        _validateOperatorIds(input.sourceOperatorId, input.targetOperatorIds);
+    }


vgorkavenko and others added 5 commits February 20, 2026 16:13

feat: tests, scripts

ad81f05

tests: prepare staking module fixtures

f0a6da9

tests: refactor scenario

2d04320

vgorkavenko marked this pull request as ready for review February 24, 2026 18:22

vgorkavenko requested a review from a team as a code owner February 24, 2026 18:22

mkurayan reviewed Mar 6, 2026

View reviewed changes

contracts/EVMScriptFactories/AllowConsolidationPair.sol Show resolved Hide resolved

contracts/EVMScriptFactories/AllowConsolidationPair.sol Outdated Show resolved Hide resolved

dgusakov reviewed Mar 13, 2026

View reviewed changes

contracts/EVMScriptFactories/ReportWithdrawalsForSlashedValidators.sol Show resolved Hide resolved

krogla and others added 3 commits March 14, 2026 03:22

fix: ConsolidationMigrator interface

13b7ca8

fix: _creator should be used

dbd1c62

Merge branch 'develop' into feat/cmv2-srv3-factories

6be2828

github-advanced-security AI found potential problems Mar 27, 2026

View reviewed changes

contracts/EVMScriptFactories/AllowConsolidationPair.sol Fixed Show fixed Hide fixed

vgorkavenko added 2 commits March 27, 2026 15:04

feat: check operator is active

40bd15d

fest: check slashing penalty

723f360

vgorkavenko requested review from Copilot, dgusakov and mkurayan March 27, 2026 14:15

Copilot started reviewing on behalf of vgorkavenko March 30, 2026 09:20 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

Copilot started work on behalf of vgorkavenko March 30, 2026 09:28 View session

Add zero address guards to AllowedMerkleGatesRegistry constructor and…

991549b

… _addGate, add tests Agent-Logs-Url: https://github.com/lidofinance/easy-track/sessions/a18fe8d1-6aff-4870-97df-51bfeacd5895 Co-authored-by: vgorkavenko <32727352+vgorkavenko@users.noreply.github.com>

Copilot finished work on behalf of vgorkavenko March 30, 2026 09:35

vgorkavenko and others added 5 commits March 30, 2026 11:51

fix: bunch of fixes

bb117d5

feat: consolidation motion with N targets. remove allowed check

52fddea

feat: more tests

deee6eb

fix for tests

3af4ac8

feat: check MetaRegistry group in AllowConsolidationPair

7ffe0a1

mkurayan reviewed Apr 13, 2026

View reviewed changes

fix: AllowConsolidationPair

7cb8ce4

github-advanced-security AI found potential problems Apr 13, 2026

View reviewed changes

contracts/EVMScriptFactories/AllowConsolidationPair.sol Fixed Show fixed Hide fixed

vgorkavenko commented Apr 14, 2026

View reviewed changes

contracts/EVMScriptFactories/CreateOrUpdateOperatorGroup.sol Outdated Show resolved Hide resolved

vgorkavenko commented Apr 14, 2026

View reviewed changes

contracts/EVMScriptFactories/SettleGeneralDelayedPenalty.sol Outdated Show resolved Hide resolved

vgorkavenko added 4 commits April 14, 2026 17:01

fix: update interfaces

5ab4c25

feat: add dups check in script. remove meta_registry from fixture c…

925684f

…lass

fix: migrator interface

fc8789c

fix: one more time

ae25902

github-advanced-security AI found potential problems Apr 15, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CMv2 + CSMv3 + SRv3 factories#113

CMv2 + CSMv3 + SRv3 factories#113
vgorkavenko wants to merge 21 commits intodevelopfrom
feat/cmv2-srv3-factories

vgorkavenko commented Feb 20, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mkurayan Apr 13, 2026

Uh oh!

vgorkavenko Apr 13, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

vgorkavenko commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mkurayan Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

vgorkavenko Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

vgorkavenko commented Feb 20, 2026 •

edited

Loading