@@ -146,7 +146,7 @@ abstract contract DeployBase is Script {
146146 Verifier public verifier;
147147 HashConsensus public hashConsensus;
148148 ParametersRegistry public parametersRegistry;
149- MetaOperatorRegistry public metaOperatorsRegistry ;
149+ MetaOperatorRegistry public metaRegistry ;
150150 CuratedGateFactory public curatedGateFactory;
151151 address [] public curatedGateInstances;
152152 address internal curatedGateImpl;
@@ -215,20 +215,10 @@ abstract contract DeployBase is Script {
215215 );
216216
217217 accounting = Accounting (_deployProxy (deployer, address (dummyImpl)));
218-
219- MetaOperatorRegistry metaOperatorsRegistryImpl = new MetaOperatorRegistry (
220- address (curatedModule),
221- locator.stakingRouter ()
222- );
223- metaOperatorsRegistry = MetaOperatorRegistry (
224- _deployProxy (
225- config.proxyAdmin,
226- address (metaOperatorsRegistryImpl)
227- )
228- );
229- metaOperatorsRegistry.initialize (deployer);
230-
231218 oracle = FeeOracle (_deployProxy (deployer, address (dummyImpl)));
219+ metaRegistry = MetaOperatorRegistry (
220+ _deployProxy (deployer, address (dummyImpl))
221+ );
232222
233223 FeeDistributor feeDistributorImpl = new FeeDistributor ({
234224 stETH: locator.lido (),
@@ -409,7 +399,7 @@ abstract contract DeployBase is Script {
409399 parametersRegistry: address (parametersRegistry),
410400 accounting: address (accounting),
411401 exitPenalties: address (exitPenalties),
412- metaOperatorsRegistry: address (metaOperatorsRegistry )
402+ metaOperatorsRegistry: address (metaRegistry )
413403 });
414404
415405 {
@@ -422,6 +412,20 @@ abstract contract DeployBase is Script {
422412
423413 curatedModule.initialize ({ admin: deployer });
424414
415+ MetaOperatorRegistry metaRegistryImpl = new MetaOperatorRegistry (
416+ address (curatedModule),
417+ locator.stakingRouter ()
418+ );
419+
420+ {
421+ OssifiableProxy metaRegistryProxy = OssifiableProxy (
422+ payable (address (metaRegistry))
423+ );
424+ metaRegistryProxy.proxy__upgradeTo (address (metaRegistryImpl));
425+ metaRegistryProxy.proxy__changeAdmin (config.proxyAdmin);
426+ }
427+ metaRegistry.initialize ({ admin: deployer });
428+
425429 ValidatorStrikes strikesImpl = new ValidatorStrikes ({
426430 module: address (curatedModule),
427431 oracle: address (oracle),
@@ -460,7 +464,7 @@ abstract contract DeployBase is Script {
460464 new CuratedGate (
461465 config.stakingModuleId,
462466 address (curatedModule),
463- address (metaOperatorsRegistry )
467+ address (metaRegistry )
464468 )
465469 );
466470
@@ -632,12 +636,12 @@ abstract contract DeployBase is Script {
632636 gate.revokeRole (gate.DEFAULT_ADMIN_ROLE (), deployer);
633637 }
634638
635- metaOperatorsRegistry .grantRole (
636- metaOperatorsRegistry .DEFAULT_ADMIN_ROLE (),
639+ metaRegistry .grantRole (
640+ metaRegistry .DEFAULT_ADMIN_ROLE (),
637641 config.aragonAgent
638642 );
639- metaOperatorsRegistry .revokeRole (
640- metaOperatorsRegistry .DEFAULT_ADMIN_ROLE (),
643+ metaRegistry .revokeRole (
644+ metaRegistry .DEFAULT_ADMIN_ROLE (),
641645 deployer
642646 );
643647
@@ -681,13 +685,10 @@ abstract contract DeployBase is Script {
681685 deployJson.set ("ChainId " , chainId);
682686 deployJson.set ("CuratedModule " , address (curatedModule));
683687 deployJson.set ("CuratedModuleImpl " , address (curatedModuleImpl));
684- deployJson.set (
685- "MetaOperatorRegistry " ,
686- address (metaOperatorsRegistry)
687- );
688+ deployJson.set ("MetaOperatorRegistry " , address (metaRegistry));
688689 deployJson.set (
689690 "MetaOperatorRegistryImpl " ,
690- address (metaOperatorsRegistryImpl )
691+ address (metaRegistryImpl )
691692 );
692693 deployJson.set ("ParametersRegistry " , address (parametersRegistry));
693694 deployJson.set (
@@ -766,8 +767,8 @@ abstract contract DeployBase is Script {
766767 address (gate)
767768 );
768769 }
769- metaOperatorsRegistry .grantRole (
770- metaOperatorsRegistry .SET_OPERATOR_INFO_ROLE (),
770+ metaRegistry .grantRole (
771+ metaRegistry .SET_OPERATOR_INFO_ROLE (),
771772 address (gate)
772773 );
773774 gate.grantRole (gate.PAUSE_ROLE (), config.resealManager);
@@ -850,8 +851,8 @@ abstract contract DeployBase is Script {
850851 parametersRegistry.DEFAULT_ADMIN_ROLE (),
851852 config.secondAdminAddress
852853 );
853- metaOperatorsRegistry .grantRole (
854- metaOperatorsRegistry .DEFAULT_ADMIN_ROLE (),
854+ metaRegistry .grantRole (
855+ metaRegistry .DEFAULT_ADMIN_ROLE (),
855856 config.secondAdminAddress
856857 );
857858 for (uint256 i = 0 ; i < curatedGateInstances.length ; i++ ) {
0 commit comments