Merge branch 'm2-mainnet' into stevennevins-patch-1

Layr-Labs · Dec 8, 2023 · 51443d2 · 51443d2
2 parents 4fe9799 + 7cb2d09
commit 51443d2
Show file tree

Hide file tree

Showing 21 changed files with 258 additions and 265 deletions.
diff --git a/script/DeploySharedContracts.s.sol b/script/DeploySharedContracts.s.sol
@@ -2,7 +2,7 @@
 pragma solidity =0.8.12;
 
 import "../src/BLSPublicKeyCompendium.sol";
-import "../src/BLSOperatorStateRetriever.sol";
+import "../src/OperatorStateRetriever.sol";
 
 import "forge-std/Script.sol";
 import "forge-std/Test.sol";
@@ -16,12 +16,12 @@ contract DeploySharedContracts is Script, Test {
     Vm cheats = Vm(HEVM_ADDRESS);
 
     BLSPublicKeyCompendium public blsPublicKeyCompendium;
-    BLSOperatorStateRetriever public blsOperatorStateRetriever;
+    OperatorStateRetriever public blsOperatorStateRetriever;
 
     function run() external {
         vm.startBroadcast();
         blsPublicKeyCompendium = new BLSPublicKeyCompendium();
-        blsOperatorStateRetriever = new BLSOperatorStateRetriever();
+        blsOperatorStateRetriever = new OperatorStateRetriever();
         vm.stopBroadcast();
 
         string memory deployed_addresses = "addresses";

diff --git a/src/BLSPubkeyRegistry.sol → src/BLSApkRegistry.sol b/src/BLSPubkeyRegistry.sol → src/BLSApkRegistry.sol
@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {BLSPubkeyRegistryStorage} from "src/BLSPubkeyRegistryStorage.sol";
+import {BLSApkRegistryStorage} from "src/BLSApkRegistryStorage.sol";
 
 import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol";
 import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
 
 import {BN254} from "src/libraries/BN254.sol";
 
-contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
+contract BLSApkRegistry is BLSApkRegistryStorage {
     using BN254 for BN254.G1Point;
 
     /// @notice when applied to a function, only allows the RegistryCoordinator to call it
     modifier onlyRegistryCoordinator() {
         require(
             msg.sender == address(registryCoordinator),
-            "BLSPubkeyRegistry.onlyRegistryCoordinator: caller is not the registry coordinator"
+            "BLSApkRegistry.onlyRegistryCoordinator: caller is not the registry coordinator"
         );
         _;
     }
@@ -24,7 +24,7 @@ contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
     constructor(
         IRegistryCoordinator _registryCoordinator, 
         IBLSPublicKeyCompendium _pubkeyCompendium
-    ) BLSPubkeyRegistryStorage(_registryCoordinator, _pubkeyCompendium) {}
+    ) BLSApkRegistryStorage(_registryCoordinator, _pubkeyCompendium) {}
 
     /*******************************************************************************
                       EXTERNAL FUNCTIONS - REGISTRY COORDINATOR
@@ -86,7 +86,7 @@ contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
      * @param quorumNumber The number of the new quorum
      */
     function initializeQuorum(uint8 quorumNumber) public virtual onlyRegistryCoordinator {
-        require(apkHistory[quorumNumber].length == 0, "BLSPubkeyRegistry.initializeQuorum: quorum already exists");
+        require(apkHistory[quorumNumber].length == 0, "BLSApkRegistry.initializeQuorum: quorum already exists");
 
         apkHistory[quorumNumber].push(ApkUpdate({
             apkHash: bytes24(0),
@@ -106,7 +106,7 @@ contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
             // Validate quorum exists and get history length
             uint8 quorumNumber = uint8(quorumNumbers[i]);
             uint256 historyLength = apkHistory[quorumNumber].length;
-            require(historyLength != 0, "BLSPubkeyRegistry._processQuorumApkUpdate: quorum does not exist");
+            require(historyLength != 0, "BLSApkRegistry._processQuorumApkUpdate: quorum does not exist");
 
             // Update aggregate public key for this quorum
             newApk = currentApk[quorumNumber].plus(point);
@@ -133,15 +133,15 @@ contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
     function _validateApkHashAtBlockNumber(ApkUpdate memory apkUpdate, uint32 blockNumber) internal pure {
         require(
             blockNumber >= apkUpdate.updateBlockNumber,
-            "BLSPubkeyRegistry._validateApkHashAtBlockNumber: index too recent"
+            "BLSApkRegistry._validateApkHashAtBlockNumber: index too recent"
         );
         /**
          * if there is a next update, check that the blockNumber is before the next update or if
          * there is no next update, then apkUpdate.nextUpdateBlockNumber is 0.
          */
         require(
             apkUpdate.nextUpdateBlockNumber == 0 || blockNumber < apkUpdate.nextUpdateBlockNumber,
-            "BLSPubkeyRegistry._validateApkHashAtBlockNumber: not latest apk update"
+            "BLSApkRegistry._validateApkHashAtBlockNumber: not latest apk update"
         );
     }
 
@@ -164,7 +164,7 @@ contract BLSPubkeyRegistry is BLSPubkeyRegistryStorage {
 
             if (quorumApkUpdatesLength == 0 || blockNumber < apkHistory[quorumNumber][0].updateBlockNumber) {
                 revert(
-                    "BLSPubkeyRegistry.getApkIndicesAtBlockNumber: blockNumber is before the first update"
+                    "BLSApkRegistry.getApkIndicesAtBlockNumber: blockNumber is before the first update"
                 );
             }
 

diff --git a/src/BLSPubkeyRegistryStorage.sol → src/BLSApkRegistryStorage.sol b/src/BLSPubkeyRegistryStorage.sol → src/BLSApkRegistryStorage.sol
@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
+import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
 import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
 import {IBLSPublicKeyCompendium} from "src/interfaces/IBLSPublicKeyCompendium.sol";
-import {BN254} from "src/libraries/BN254.sol";
+
 import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
 
-abstract contract BLSPubkeyRegistryStorage is Initializable, IBLSPubkeyRegistry {
+import {BN254} from "src/libraries/BN254.sol";
+
+abstract contract BLSApkRegistryStorage is Initializable, IBLSApkRegistry {
     /// @notice the registry coordinator contract
     IRegistryCoordinator public immutable registryCoordinator;
     /// @notice the BLSPublicKeyCompendium contract against which pubkey ownership is checked

diff --git a/src/BLSSignatureChecker.sol b/src/BLSSignatureChecker.sol
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
 import {IBLSSignatureChecker} from "src/interfaces/IBLSSignatureChecker.sol";
 import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
+import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
 import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
 
 import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
@@ -26,12 +25,12 @@ contract BLSSignatureChecker is IBLSSignatureChecker {
 
     IRegistryCoordinator public immutable registryCoordinator;
     IStakeRegistry public immutable stakeRegistry;
-    IBLSPubkeyRegistry public immutable blsPubkeyRegistry;
+    IBLSApkRegistry public immutable blsApkRegistry;
 
-    constructor(IBLSRegistryCoordinatorWithIndices _registryCoordinator) {
+    constructor(IRegistryCoordinator _registryCoordinator) {
         registryCoordinator = IRegistryCoordinator(_registryCoordinator);
         stakeRegistry = _registryCoordinator.stakeRegistry();
-        blsPubkeyRegistry = _registryCoordinator.blsPubkeyRegistry();
+        blsApkRegistry = _registryCoordinator.blsApkRegistry();
     }
 
     /**
@@ -75,7 +74,7 @@ contract BLSSignatureChecker is IBLSSignatureChecker {
         for (uint i = 0; i < quorumNumbers.length; i++) {
             require(
                 bytes24(nonSignerStakesAndSignature.quorumApks[i].hashG1Point()) == 
-                    IBLSPubkeyRegistry(blsPubkeyRegistry).getApkHashAtBlockNumberAndIndex(
+                    blsApkRegistry.getApkHashAtBlockNumberAndIndex(
                         uint8(quorumNumbers[i]), 
                         referenceBlockNumber, 
                         nonSignerStakesAndSignature.quorumApkIndices[i]

diff --git a/src/BLSOperatorStateRetriever.sol → src/OperatorStateRetriever.sol b/src/BLSOperatorStateRetriever.sol → src/OperatorStateRetriever.sol
@@ -1,18 +1,18 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity =0.8.12;
 
-import {IBLSRegistryCoordinatorWithIndices} from "src/interfaces/IBLSRegistryCoordinatorWithIndices.sol";
-import {IBLSPubkeyRegistry} from "src/interfaces/IBLSPubkeyRegistry.sol";
+import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
+import {IBLSApkRegistry} from "src/interfaces/IBLSApkRegistry.sol";
 import {IStakeRegistry} from "src/interfaces/IStakeRegistry.sol";
 import {IIndexRegistry} from "src/interfaces/IIndexRegistry.sol";
 
 import {BitmapUtils} from "src/libraries/BitmapUtils.sol";
 
 /**
- * @title BLSOperatorStateRetriever with view functions that allow to retrieve the state of an AVSs registry system.
+ * @title OperatorStateRetriever with view functions that allow to retrieve the state of an AVSs registry system.
  * @author Layr Labs Inc.
  */
-contract BLSOperatorStateRetriever {
+contract OperatorStateRetriever {
     struct Operator {
         bytes32 operatorId;
         uint96 stake;
@@ -37,7 +37,7 @@ contract BLSOperatorStateRetriever {
      *            was a part of at `blockNumber`, an ordered list of operators.
      */
     function getOperatorState(
-        IBLSRegistryCoordinatorWithIndices registryCoordinator, 
+        IRegistryCoordinator registryCoordinator, 
         bytes32 operatorId, 
         uint32 blockNumber
     ) external view returns (uint256, Operator[][] memory) {
@@ -61,7 +61,7 @@ contract BLSOperatorStateRetriever {
      * @return 2d array of operators. For each quorum, an ordered list of operators
      */
     function getOperatorState(
-        IBLSRegistryCoordinatorWithIndices registryCoordinator, 
+        IRegistryCoordinator registryCoordinator, 
         bytes memory quorumNumbers, 
         uint32 blockNumber
     ) public view returns(Operator[][] memory) {
@@ -100,7 +100,7 @@ contract BLSOperatorStateRetriever {
      *         4) the indices of the quorum apks for each of the provided quorums at the given blocknumber
      */
     function getCheckSignaturesIndices(
-        IBLSRegistryCoordinatorWithIndices registryCoordinator,
+        IRegistryCoordinator registryCoordinator,
         uint32 referenceBlockNumber, 
         bytes calldata quorumNumbers, 
         bytes32[] calldata nonSignerOperatorIds
@@ -148,9 +148,9 @@ contract BLSOperatorStateRetriever {
             checkSignaturesIndices.nonSignerStakeIndices[quorumNumberIndex] = nonSignerStakeIndicesForQuorum;
         }
 
-        IBLSPubkeyRegistry blsPubkeyRegistry = registryCoordinator.blsPubkeyRegistry();
+        IBLSApkRegistry blsApkRegistry = registryCoordinator.blsApkRegistry();
         // get the indices of the quorum apks for each of the provided quorums at the given blocknumber
-        checkSignaturesIndices.quorumApkIndices = blsPubkeyRegistry.getApkIndicesAtBlockNumber(quorumNumbers, referenceBlockNumber);
+        checkSignaturesIndices.quorumApkIndices = blsApkRegistry.getApkIndicesAtBlockNumber(quorumNumbers, referenceBlockNumber);
 
         return checkSignaturesIndices;
     }