feat: meta operator registry

Author: madlabman

AGENTS.md

@@ -6,8 +6,9 @@
 - `test/`: Forge tests (`*.t.sol`), plus `test/fork/*` for fork/integration and deployment tests.
 - `script/`: Forge scripts (deploy/verify, per-chain variants).
 - `artifacts/`, `broadcast/`, `out/`, `cache/`: build, deploy, and fork outputs.
-- `lib/`, `node_modules/`: dependencies; see `remappings.txt`.
-- `docs/`, `digest/`: documentation and design notes.
+- `gists/`: small code examples related to the module.
+- `node_modules/`: dependencies; see `remappings.txt`.
+- `docs/`: documentation and design notes.
 
 ## Build, Test, and Development Commands
 
@@ -18,21 +19,31 @@
 - `just test-local`: spins up anvil fork, deploys, runs deployment+integration tests.
 - `just coverage` | `just coverage-lcov`: coverage (LCOV saved; see `lcov.html`).
 - Linting: `yarn lint:check` (prettier + solhint), `yarn lint:fix`, `yarn lint:solhint`.
+- Diff: `git diff --no-ext-diff`
 
 ## Coding Style & Naming Conventions
 
 - Formatting: Prettier + `prettier-plugin-solidity` (Solidity `printWidth=80`, `tabWidth=4`, spaces only).
 - Linting: Solhint (`.solhint.json`) with `solhint:recommended` and `solhint-plugin-lido-csm`.
 - Versions: enforce `pragma solidity 0.8.33` (`compiler-version` rule).
 - Naming: contracts/libraries `CamelCase` (e.g., `CSModule`, `AssetRecovererLib`), interfaces `IName` (rule: `interface-starts-with-i`).
+- The if statement body should be enclosed in a block, for example: `if (cond) { do(); }`
+- Inline assembly should be well documented, preferably every non-trivial line with its own comment.
 - Conventions: prefer custom errors, calldata parameters, and struct packing (gas rules). Immutable vars styled as constants.
+- Keep things in one function unless composable or reusable.
+- Prefer short variable names where possible. Prefer same length variable names for related things.
+- Prefer early returns to else statements.
+- While refactoring keep comments added from existing implementations where applicable.
+- Make sure external functions in contracts and interfaces have proper natspec.
+- When last I looked, the year was 2026.
 
 ## Testing Guidelines
 
 - Framework: Foundry/Forge with fuzzing (`fuzz.runs=256`).
 - Structure: unit tests in `test/*.t.sol`; fork suites under `test/fork/*` (deployment/integration).
 - Run: `just test-unit` for fast cycles; `CHAIN`/`RPC_URL` required for fork tests. Example: `export CHAIN=hoodi && export RPC_URL=<https-url>`.
 - Coverage: `just coverage-lcov` produces LCOV output (commit if relevant).
+- After making changes to the source code make sure you've either ran build command or unit tests.
 
 ## Commit & Pull Request Guidelines
 

Justfile

@@ -48,7 +48,7 @@ import "curated.just"
 default: clean deps build test-all
 
 build *args:
-    forge build --skip test --force {{args}}
+    forge build --skip test --skip script {{args}}
 
 clean:
     forge clean

script/csm/DeployBase.s.sol

@@ -91,7 +91,6 @@ struct DeployParams {
     uint256 defaultAllowedExitDelay;
     uint256 defaultExitDelayFee;
     uint256 defaultMaxElWithdrawalRequestFee;
-    uint256 defaultDepositAllocationWeight;
     // VettedGate
     address identifiedCommunityStakersGateManager;
     uint256 identifiedCommunityStakersGateCurveId;
@@ -115,7 +114,6 @@ struct DeployParams {
     uint256 identifiedCommunityStakersGateAllowedExitDelay;
     uint256 identifiedCommunityStakersGateExitDelayFee;
     uint256 identifiedCommunityStakersGateMaxElWithdrawalRequestFee;
-    uint256 identifiedCommunityStakersGateDepositAllocationWeight;
     // GateSeal
     address gateSealFactory;
     address sealingCommittee;
@@ -268,9 +266,7 @@ abstract contract DeployBase is Script {
                     defaultAllowedExitDelay: config.defaultAllowedExitDelay,
                     defaultExitDelayFee: config.defaultExitDelayFee,
                     defaultMaxElWithdrawalRequestFee: config
-                        .defaultMaxElWithdrawalRequestFee,
-                    defaultDepositAllocationWeight: config
-                        .defaultDepositAllocationWeight
+                        .defaultMaxElWithdrawalRequestFee
                 })
             });
 
@@ -469,15 +465,6 @@ abstract contract DeployBase is Script {
                 identifiedCommunityStakersGateBondCurveId,
                 config.identifiedCommunityStakersGateMaxElWithdrawalRequestFee
             );
-            if (
-                config.identifiedCommunityStakersGateDepositAllocationWeight !=
-                0
-            ) {
-                parametersRegistry.setDepositAllocationWeight(
-                    identifiedCommunityStakersGateBondCurveId,
-                    config.identifiedCommunityStakersGateDepositAllocationWeight
-                );
-            }
 
             feeDistributor.initialize({
                 admin: address(deployer),

script/curated/DeployBase.s.sol

@@ -16,7 +16,7 @@ import { FeeOracle } from "../../src/FeeOracle.sol";
 import { Verifier } from "../../src/Verifier.sol";
 import { ParametersRegistry } from "../../src/ParametersRegistry.sol";
 import { ExitPenalties } from "../../src/ExitPenalties.sol";
-import { OperatorsData } from "../../src/OperatorsData.sol";
+import { MetaOperatorRegistry } from "../../src/MetaOperatorRegistry.sol";
 import { CuratedGate } from "../../src/CuratedGate.sol";
 import { CuratedGateFactory } from "../../src/CuratedGateFactory.sol";
 
@@ -51,7 +51,6 @@ struct GateCurveParams {
     uint256 allowedExitDelay;
     uint256 exitDelayFee;
     uint256 maxElWithdrawalRequestFee;
-    uint256 depositAllocationWeight;
 }
 
 struct CuratedGateConfig {
@@ -115,8 +114,6 @@ struct CuratedDeployParams {
     uint256 defaultAllowedExitDelay;
     uint256 defaultExitDelayFee;
     uint256 defaultMaxElWithdrawalRequestFee;
-    uint256 defaultDepositAllocationWeight;
-    uint256 identifiedCommunityStakersGateDepositAllocationWeight;
     // Curated gates
     CuratedGateConfig[] curatedGates;
     // GateSeal
@@ -149,7 +146,7 @@ abstract contract DeployBase is Script {
     Verifier public verifier;
     HashConsensus public hashConsensus;
     ParametersRegistry public parametersRegistry;
-    OperatorsData public operatorsData;
+    MetaOperatorRegistry public metaOperatorsRegistry;
     CuratedGateFactory public curatedGateFactory;
     address[] public curatedGateInstances;
     address internal curatedGateImpl;
@@ -219,6 +216,18 @@ abstract contract DeployBase is Script {
 
             accounting = Accounting(_deployProxy(deployer, address(dummyImpl)));
 
+            MetaOperatorRegistry metaOperatorsRegistryImpl = new MetaOperatorRegistry(
+                    address(curatedModule),
+                    locator.stakingRouter()
+                );
+            metaOperatorsRegistry = MetaOperatorRegistry(
+                _deployProxy(
+                    config.proxyAdmin,
+                    address(metaOperatorsRegistryImpl)
+                )
+            );
+            metaOperatorsRegistry.initialize(deployer);
+
             oracle = FeeOracle(_deployProxy(deployer, address(dummyImpl)));
 
             FeeDistributor feeDistributorImpl = new FeeDistributor({
@@ -277,9 +286,7 @@ abstract contract DeployBase is Script {
                     defaultAllowedExitDelay: config.defaultAllowedExitDelay,
                     defaultExitDelayFee: config.defaultExitDelayFee,
                     defaultMaxElWithdrawalRequestFee: config
-                        .defaultMaxElWithdrawalRequestFee,
-                    defaultDepositAllocationWeight: config
-                        .defaultDepositAllocationWeight
+                        .defaultMaxElWithdrawalRequestFee
                 })
             });
 
@@ -386,12 +393,6 @@ abstract contract DeployBase is Script {
                     curveId,
                     params.maxElWithdrawalRequestFee
                 );
-                if (params.depositAllocationWeight != 0) {
-                    parametersRegistry.setDepositAllocationWeight(
-                        curveId,
-                        params.depositAllocationWeight
-                    );
-                }
             }
             accounting.revokeRole(
                 accounting.MANAGE_BOND_CURVES_ROLE(),
@@ -407,7 +408,8 @@ abstract contract DeployBase is Script {
                 lidoLocator: config.lidoLocatorAddress,
                 parametersRegistry: address(parametersRegistry),
                 accounting: address(accounting),
-                exitPenalties: address(exitPenalties)
+                exitPenalties: address(exitPenalties),
+                metaOperatorsRegistry: address(metaOperatorsRegistry)
             });
 
             {
@@ -454,19 +456,11 @@ abstract contract DeployBase is Script {
 
             strikes.initialize(deployer, address(ejector));
 
-            address operatorsDataImpl = address(
-                new OperatorsData(locator.stakingRouter())
-            );
-            operatorsData = OperatorsData(
-                _deployProxy(config.proxyAdmin, operatorsDataImpl)
-            );
-            operatorsData.initialize(deployer);
-
             curatedGateImpl = address(
                 new CuratedGate(
-                    address(curatedModule),
                     config.stakingModuleId,
-                    address(operatorsData)
+                    address(curatedModule),
+                    address(metaOperatorsRegistry)
                 )
             );
 
@@ -638,12 +632,12 @@ abstract contract DeployBase is Script {
                 gate.revokeRole(gate.DEFAULT_ADMIN_ROLE(), deployer);
             }
 
-            operatorsData.grantRole(
-                operatorsData.DEFAULT_ADMIN_ROLE(),
+            metaOperatorsRegistry.grantRole(
+                metaOperatorsRegistry.DEFAULT_ADMIN_ROLE(),
                 config.aragonAgent
             );
-            operatorsData.revokeRole(
-                operatorsData.DEFAULT_ADMIN_ROLE(),
+            metaOperatorsRegistry.revokeRole(
+                metaOperatorsRegistry.DEFAULT_ADMIN_ROLE(),
                 deployer
             );
 
@@ -687,6 +681,14 @@ abstract contract DeployBase is Script {
             deployJson.set("ChainId", chainId);
             deployJson.set("CuratedModule", address(curatedModule));
             deployJson.set("CuratedModuleImpl", address(curatedModuleImpl));
+            deployJson.set(
+                "MetaOperatorRegistry",
+                address(metaOperatorsRegistry)
+            );
+            deployJson.set(
+                "MetaOperatorRegistryImpl",
+                address(metaOperatorsRegistryImpl)
+            );
             deployJson.set("ParametersRegistry", address(parametersRegistry));
             deployJson.set(
                 "ParametersRegistryImpl",
@@ -705,8 +707,6 @@ abstract contract DeployBase is Script {
             deployJson.set("ValidatorStrikesImpl", address(strikesImpl));
             deployJson.set("HashConsensus", address(hashConsensus));
             deployJson.set("Verifier", address(verifier));
-            deployJson.set("OperatorsData", address(operatorsData));
-            deployJson.set("OperatorsDataImpl", address(operatorsDataImpl));
             deployJson.set("CuratedGateFactory", address(curatedGateFactory));
             deployJson.set("CuratedGates", curatedGateInstances);
             deployJson.set("LidoLocator", config.lidoLocatorAddress);
@@ -766,7 +766,10 @@ abstract contract DeployBase is Script {
                     address(gate)
                 );
             }
-            operatorsData.grantRole(operatorsData.SETTER_ROLE(), address(gate));
+            metaOperatorsRegistry.grantRole(
+                metaOperatorsRegistry.SET_OPERATOR_INFO_ROLE(),
+                address(gate)
+            );
             gate.grantRole(gate.PAUSE_ROLE(), config.resealManager);
             gate.grantRole(gate.RESUME_ROLE(), config.resealManager);
             gate.grantRole(
@@ -847,8 +850,8 @@ abstract contract DeployBase is Script {
             parametersRegistry.DEFAULT_ADMIN_ROLE(),
             config.secondAdminAddress
         );
-        operatorsData.grantRole(
-            operatorsData.DEFAULT_ADMIN_ROLE(),
+        metaOperatorsRegistry.grantRole(
+            metaOperatorsRegistry.DEFAULT_ADMIN_ROLE(),
             config.secondAdminAddress
         );
         for (uint256 i = 0; i < curatedGateInstances.length; i++) {

script/fork-helpers/SimulateVote.s.sol

@@ -195,14 +195,6 @@ contract SimulateVote is Script, ForkHelpersCommon {
             );
             vm.stopBroadcast();
         }
-        {
-            vm.startBroadcast(parametersRegistryAdmin);
-            parametersRegistry.setDefaultDepositAllocationWeight(
-                deployParams.defaultDepositAllocationWeight
-            );
-            vm.stopBroadcast();
-        }
-
         {
             OssifiableProxy oracleProxy = OssifiableProxy(
                 payable(deploymentConfig.oracle)

src/Accounting.sol

@@ -182,7 +182,7 @@ contract Accounting is
     ) external onlyRole(SET_BOND_CURVE_ROLE) {
         _onlyExistingNodeOperator(nodeOperatorId);
         BondCurve._setBondCurve(nodeOperatorId, curveId);
-        MODULE.updateDepositableValidatorsCount(nodeOperatorId);
+        MODULE.onNodeOperatorBondCurveUpdated(nodeOperatorId);
     }
 
     /// @inheritdoc IAccounting

src/CSModule.sol

@@ -385,6 +385,16 @@ contract CSModule is ICSModule, BaseModule {
         // the actual balances.
     }
 
+    /// @inheritdoc IBaseModule
+    function onNodeOperatorBondCurveUpdated(
+        uint256 nodeOperatorId
+    ) external override(IBaseModule) {
+        _updateDepositableValidatorsCount({
+            nodeOperatorId: nodeOperatorId,
+            incrementNonceIfUpdated: true
+        });
+    }
+
     /// @inheritdoc IStakingModule
     function getStakingModuleSummary()
         external
@@ -457,8 +467,8 @@ contract CSModule is ICSModule, BaseModule {
         uint256 nodeOperatorId,
         uint256 newCount,
         bool incrementNonceIfUpdated
-    ) internal override {
-        super._applyDepositableValidatorsCount(
+    ) internal override returns (bool changed) {
+        changed = super._applyDepositableValidatorsCount(
             no,
             nodeOperatorId,
             newCount,

src/CuratedGate.sol

@@ -13,7 +13,7 @@ import { ICuratedModule } from "./interfaces/ICuratedModule.sol";
 import { IMerkleGate } from "./interfaces/IMerkleGate.sol";
 import { ICuratedGate } from "./interfaces/ICuratedGate.sol";
 import { NodeOperatorManagementProperties } from "./interfaces/IBaseModule.sol";
-import { IOperatorsData, OperatorInfo } from "./interfaces/IOperatorsData.sol";
+import { IMetaOperatorRegistry, OperatorInfo } from "./interfaces/IMetaOperatorRegistry.sol";
 import { IAccounting } from "./interfaces/IAccounting.sol";
 
 /// @notice Merkle gate for Curated Module v2
@@ -38,7 +38,7 @@ contract CuratedGate is
     IAccounting public immutable ACCOUNTING;
 
     /// @inheritdoc ICuratedGate
-    IOperatorsData public immutable OPERATORS_DATA;
+    IMetaOperatorRegistry public immutable META_OPERATOR_REGISTRY;
 
     /// @inheritdoc IMerkleGate
     bytes32 public treeRoot;
@@ -54,14 +54,26 @@ contract CuratedGate is
     /// @dev Tracks whether an address already consumed its eligibility
     mapping(address => bool) internal _consumedAddresses;
 
-    constructor(address module, uint256 moduleId, address operatorsData) {
-        if (module == address(0)) revert ZeroModuleAddress();
-        if (moduleId == 0) revert ZeroModuleId();
-        if (operatorsData == address(0)) revert ZeroOperatorsDataAddress();
+    constructor(
+        uint256 moduleId,
+        address module,
+        address metaOperatorRegistry
+    ) {
+        if (moduleId == 0) {
+            revert ZeroModuleId();
+        }
+        if (module == address(0)) {
+            revert ZeroModuleAddress();
+        }
+        if (metaOperatorRegistry == address(0)) {
+            revert ZeroMetaOperatorRegistryAddress();
+        }
+
         MODULE = ICuratedModule(module);
         MODULE_ID = moduleId;
         ACCOUNTING = MODULE.ACCOUNTING();
-        OPERATORS_DATA = IOperatorsData(operatorsData);
+        META_OPERATOR_REGISTRY = IMetaOperatorRegistry(metaOperatorRegistry);
+
         _disableInitializers();
     }
 
@@ -128,7 +140,11 @@ contract CuratedGate is
             ownerEditsRestricted: false
         });
 
-        OPERATORS_DATA.set(MODULE_ID, nodeOperatorId, metadata);
+        META_OPERATOR_REGISTRY.setOperatorMetadataAsAdmin(
+            MODULE_ID,
+            nodeOperatorId,
+            metadata
+        );
     }
 
     /// @inheritdoc IMerkleGate