feat: add clProofVerifier to lido locator

lidofinance · Feb 24, 2025 · 5d646fa · 5d646fa
1 parent 50f8045
commit 5d646fa
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 76 deletions.
diff --git a/contracts/0.8.9/LidoLocator.sol b/contracts/0.8.9/LidoLocator.sol
@@ -28,6 +28,7 @@ contract LidoLocator is ILidoLocator {
         address withdrawalQueue;
         address withdrawalVault;
         address oracleDaemonConfig;
+        address clProofVerifier;
     }
 
     error ZeroAddress();
@@ -46,6 +47,7 @@ contract LidoLocator is ILidoLocator {
     address public immutable withdrawalQueue;
     address public immutable withdrawalVault;
     address public immutable oracleDaemonConfig;
+    address public immutable clProofVerifier;
 
     /**
      * @notice declare service locations
@@ -67,35 +69,18 @@ contract LidoLocator is ILidoLocator {
         withdrawalQueue = _assertNonZero(_config.withdrawalQueue);
         withdrawalVault = _assertNonZero(_config.withdrawalVault);
         oracleDaemonConfig = _assertNonZero(_config.oracleDaemonConfig);
+        clProofVerifier = _assertNonZero(_config.clProofVerifier);
     }
 
-    function coreComponents() external view returns(
-        address,
-        address,
-        address,
-        address,
-        address,
-        address
-    ) {
-        return (
-            elRewardsVault,
-            oracleReportSanityChecker,
-            stakingRouter,
-            treasury,
-            withdrawalQueue,
-            withdrawalVault
-        );
+    function coreComponents() external view returns (address, address, address, address, address, address) {
+        return (elRewardsVault, oracleReportSanityChecker, stakingRouter, treasury, withdrawalQueue, withdrawalVault);
     }
 
-    function oracleReportComponentsForLido() external view returns(
-        address,
-        address,
-        address,
-        address,
-        address,
-        address,
-        address
-    ) {
+    function oracleReportComponentsForLido()
+        external
+        view
+        returns (address, address, address, address, address, address, address)
+    {
         return (
             accountingOracle,
             elRewardsVault,

diff --git a/contracts/common/interfaces/ILidoLocator.sol b/contracts/common/interfaces/ILidoLocator.sol
@@ -6,35 +6,42 @@
 pragma solidity >=0.4.24 <0.9.0;
 
 interface ILidoLocator {
-    function accountingOracle() external view returns(address);
-    function depositSecurityModule() external view returns(address);
-    function elRewardsVault() external view returns(address);
-    function legacyOracle() external view returns(address);
-    function lido() external view returns(address);
-    function oracleReportSanityChecker() external view returns(address);
-    function burner() external view returns(address);
-    function stakingRouter() external view returns(address);
-    function treasury() external view returns(address);
-    function validatorsExitBusOracle() external view returns(address);
-    function withdrawalQueue() external view returns(address);
-    function withdrawalVault() external view returns(address);
-    function postTokenRebaseReceiver() external view returns(address);
-    function oracleDaemonConfig() external view returns(address);
-    function coreComponents() external view returns(
-        address elRewardsVault,
-        address oracleReportSanityChecker,
-        address stakingRouter,
-        address treasury,
-        address withdrawalQueue,
-        address withdrawalVault
-    );
-    function oracleReportComponentsForLido() external view returns(
-        address accountingOracle,
-        address elRewardsVault,
-        address oracleReportSanityChecker,
-        address burner,
-        address withdrawalQueue,
-        address withdrawalVault,
-        address postTokenRebaseReceiver
-    );
+    function accountingOracle() external view returns (address);
+    function depositSecurityModule() external view returns (address);
+    function elRewardsVault() external view returns (address);
+    function legacyOracle() external view returns (address);
+    function lido() external view returns (address);
+    function oracleReportSanityChecker() external view returns (address);
+    function burner() external view returns (address);
+    function stakingRouter() external view returns (address);
+    function treasury() external view returns (address);
+    function validatorsExitBusOracle() external view returns (address);
+    function withdrawalQueue() external view returns (address);
+    function withdrawalVault() external view returns (address);
+    function postTokenRebaseReceiver() external view returns (address);
+    function oracleDaemonConfig() external view returns (address);
+    function clProofVerifier() external view returns (address);
+    function coreComponents()
+        external
+        view
+        returns (
+            address elRewardsVault,
+            address oracleReportSanityChecker,
+            address stakingRouter,
+            address treasury,
+            address withdrawalQueue,
+            address withdrawalVault
+        );
+    function oracleReportComponentsForLido()
+        external
+        view
+        returns (
+            address accountingOracle,
+            address elRewardsVault,
+            address oracleReportSanityChecker,
+            address burner,
+            address withdrawalQueue,
+            address withdrawalVault,
+            address postTokenRebaseReceiver
+        );
 }
diff --git a/lib/deploy.ts b/lib/deploy.ts
@@ -246,6 +246,7 @@ async function getLocatorConfig(locatorAddress: string) {
     "withdrawalQueue",
     "withdrawalVault",
     "oracleDaemonConfig",
+    "clProofVerifier",
   ] as (keyof LidoLocator.ConfigStruct)[];
 
   const configPromises = addresses.map((name) => locator[name]());

diff --git a/lib/state-file.ts b/lib/state-file.ts
@@ -86,6 +86,7 @@ export enum Sk {
   chainSpec = "chainSpec",
   scratchDeployGasUsed = "scratchDeployGasUsed",
   minFirstAllocationStrategy = "minFirstAllocationStrategy",
+  clProofVerifier = "clProofVerifier",
 }
 
 export function getAddress(contractKey: Sk, state: DeploymentState): string {

diff --git a/scripts/scratch/deployed-testnet-defaults.json b/scripts/scratch/deployed-testnet-defaults.json
@@ -147,5 +147,15 @@
       "symbol": "unstETH",
       "baseUri": null
     }
+  },
+  "clProofVerifier": {
+    "deployParameters": {
+      "gIFirstValidatorPrev": "0x0000000000000000000000000000000000000000000000000096000000000028",
+      "gIFirstValidatorCurr": "0x0000000000000000000000000000000000000000000000000096000000000028",
+      "gIHistoricalSummariesPrev": "0x0000000000000000000000000000000000000000000000000000000000005b00",
+      "gIHistoricalSummariesCurr": "0x0000000000000000000000000000000000000000000000000000000000005b00",
+      "firstSupportedSlot": 1,
+      "pivotSlot": 1
+    }
   }
 }
diff --git a/scripts/scratch/steps/0090-deploy-non-aragon-contracts.ts b/scripts/scratch/steps/0090-deploy-non-aragon-contracts.ts
@@ -28,6 +28,7 @@ export async function main() {
   const hashConsensusForExitBusParams = state[Sk.hashConsensusForValidatorsExitBusOracle].deployParameters;
   const withdrawalQueueERC721Params = state[Sk.withdrawalQueueERC721].deployParameters;
   const minFirstAllocationStrategyAddress = state[Sk.minFirstAllocationStrategy].address;
+  const clProofVerifierParams = state[Sk.clProofVerifier].deployParameters;
 
   const proxyContractsOwner = deployer;
   const admin = deployer;
@@ -191,6 +192,15 @@ export async function main() {
     burnerParams.totalNonCoverSharesBurnt,
   ]);
 
+  const clProofVerifier = await deployWithoutProxy(Sk.clProofVerifier, "CLProofVerifier", deployer, [
+    clProofVerifierParams.gIFirstValidatorPrev,
+    clProofVerifierParams.gIFirstValidatorCurr,
+    clProofVerifierParams.gIHistoricalSummariesPrev,
+    clProofVerifierParams.gIHistoricalSummariesCurr,
+    clProofVerifierParams.firstSupportedSlot,
+    clProofVerifierParams.pivotSlot,
+  ]);
+
   // Update LidoLocator with valid implementation
   const locatorConfig: string[] = [
     accountingOracle.address,
@@ -207,6 +217,7 @@ export async function main() {
     withdrawalQueueERC721.address,
     withdrawalVaultAddress,
     oracleDaemonConfig.address,
+    clProofVerifier.address,
   ];
   await updateProxyImplementation(Sk.lidoLocator, "LidoLocator", locator.address, proxyContractsOwner, [locatorConfig]);
 }
diff --git a/test/0.8.9/contracts/LidoLocator__MockForSanityChecker.sol b/test/0.8.9/contracts/LidoLocator__MockForSanityChecker.sol
@@ -22,6 +22,7 @@ contract LidoLocator__MockForSanityChecker is ILidoLocator {
         address withdrawalVault;
         address postTokenRebaseReceiver;
         address oracleDaemonConfig;
+        address clProofVerifier;
     }
 
     address public immutable lido;
@@ -38,10 +39,9 @@ contract LidoLocator__MockForSanityChecker is ILidoLocator {
     address public immutable withdrawalVault;
     address public immutable postTokenRebaseReceiver;
     address public immutable oracleDaemonConfig;
+    address public immutable clProofVerifier;
 
-    constructor (
-        ContractAddresses memory addresses
-    ) {
+    constructor(ContractAddresses memory addresses) {
         lido = addresses.lido;
         depositSecurityModule = addresses.depositSecurityModule;
         elRewardsVault = addresses.elRewardsVault;
@@ -56,28 +56,18 @@ contract LidoLocator__MockForSanityChecker is ILidoLocator {
         withdrawalVault = addresses.withdrawalVault;
         postTokenRebaseReceiver = addresses.postTokenRebaseReceiver;
         oracleDaemonConfig = addresses.oracleDaemonConfig;
+        clProofVerifier = addresses.clProofVerifier;
     }
 
     function coreComponents() external view returns (address, address, address, address, address, address) {
-        return (
-            elRewardsVault,
-            oracleReportSanityChecker,
-            stakingRouter,
-            treasury,
-            withdrawalQueue,
-            withdrawalVault
-        );
+        return (elRewardsVault, oracleReportSanityChecker, stakingRouter, treasury, withdrawalQueue, withdrawalVault);
     }
 
-    function oracleReportComponentsForLido() external view returns (
-        address,
-        address,
-        address,
-        address,
-        address,
-        address,
-        address
-    ) {
+    function oracleReportComponentsForLido()
+        external
+        view
+        returns (address, address, address, address, address, address, address)
+    {
         return (
             accountingOracle,
             elRewardsVault,

diff --git a/test/0.8.9/lidoLocator.test.ts b/test/0.8.9/lidoLocator.test.ts
@@ -21,6 +21,7 @@ const services = [
   "withdrawalQueue",
   "withdrawalVault",
   "oracleDaemonConfig",
+  "clProofVerifier",
 ] as const;
 
 type ArrayToUnion<A extends readonly unknown[]> = A[number];

diff --git a/test/0.8.9/sanityChecker/oracleReportSanityChecker.misc.test.ts b/test/0.8.9/sanityChecker/oracleReportSanityChecker.misc.test.ts
@@ -92,6 +92,7 @@ describe("OracleReportSanityChecker.sol:misc", () => {
         withdrawalVault: withdrawalVault,
         postTokenRebaseReceiver: deployer.address,
         oracleDaemonConfig: deployer.address,
+        clProofVerifier: deployer.address,
       },
     ]);
     managersRoster = {

diff --git a/test/0.8.9/sanityChecker/oracleReportSanityChecker.negative-rebase.test.ts b/test/0.8.9/sanityChecker/oracleReportSanityChecker.negative-rebase.test.ts
@@ -83,6 +83,7 @@ describe("OracleReportSanityChecker.sol:negative-rebase", () => {
         withdrawalVault: deployer.address,
         postTokenRebaseReceiver: deployer.address,
         oracleDaemonConfig: deployer.address,
+        clProofVerifier: deployer.address,
       },
     ]);
 

diff --git a/test/deploy/locator.ts b/test/deploy/locator.ts
@@ -28,6 +28,7 @@ async function deployDummyLocator(config?: Partial<LidoLocator.ConfigStruct>, de
     validatorsExitBusOracle: certainAddress("dummy-locator:validatorsExitBusOracle"),
     withdrawalQueue: certainAddress("dummy-locator:withdrawalQueue"),
     withdrawalVault: certainAddress("dummy-locator:withdrawalVault"),
+    clProofVerifier: certainAddress("dummy-locator:clProofVerifier"),
     ...config,
   });