Merge branch 'master' of https://github.com/Layr-Labs/eigenlayer-midd…

…leware into add-certora-rules

foundry.toml

@@ -2,5 +2,6 @@
 src = "src"
 out = "out"
 libs = ["lib"]
+fs_permissions = [{ access = "read-write", path = "./" }]
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

script/DeploySharedContracts.s.sol

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity =0.8.12;
+
+import "../src/BLSPublicKeyCompendium.sol";
+import "../src/BLSOperatorStateRetriever.sol";
+
+import "forge-std/Script.sol";
+import "forge-std/Test.sol";
+
+// # To load the variables in the .env file
+// source .env
+
+// # To deploy and verify our contract
+// forge script script/DeploySharedContracts.s.sol --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast
+contract DeploySharedContracts is Script, Test {
+    Vm cheats = Vm(HEVM_ADDRESS);
+
+    BLSPublicKeyCompendium public blsPublicKeyCompendium;
+    BLSOperatorStateRetriever public blsOperatorStateRetriever;
+
+    function run() external {
+        vm.startBroadcast();
+        blsPublicKeyCompendium = new BLSPublicKeyCompendium();
+        blsOperatorStateRetriever = new BLSOperatorStateRetriever();
+        vm.stopBroadcast();
+
+        string memory deployed_addresses = "addresses";
+        vm.serializeAddress(
+            deployed_addresses,
+            "blsOperatorStateRetriever",
+            address(blsOperatorStateRetriever)
+        );
+        string memory finalJson = vm.serializeAddress(
+            deployed_addresses,
+            "blsPublicKeyCompendium",
+            address(blsPublicKeyCompendium)
+        );
+        vm.writeJson(finalJson, outputFileName());
+    }
+
+    function outputFileName() internal view returns (string memory) {
+        return
+            string.concat(
+                vm.projectRoot(),
+                "/script/output/",
+                vm.toString(block.chainid),
+                "/shared_contracts_deployment_data.json"
+            );
+    }
+}

script/output/31337/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

src/BLSPublicKeyCompendium.sol

@@ -63,7 +63,7 @@ contract BLSPublicKeyCompendium is IBLSPublicKeyCompendium {
             BN254.negGeneratorG2(),
             messageHash.plus(BN254.generatorG1().scalar_mul(gamma)),
             pubkeyG2
-        ), "BLSPublicKeyCompendium.registerBLSPublicKey: G1 and G2 private key do not match");
+        ), "BLSPublicKeyCompendium.registerBLSPublicKey: either the G1 signature is wrong, or G1 and G2 private key do not match");
 
         operatorToPubkeyHash[msg.sender] = pubkeyHash;
         pubkeyHashToOperator[pubkeyHash] = msg.sender;

src/StakeRegistry.sol

@@ -7,6 +7,7 @@ import "src/interfaces/IServiceManager.sol";
 import "src/interfaces/IStakeRegistry.sol";
 import "src/interfaces/IRegistryCoordinator.sol";
 import "src/StakeRegistryStorage.sol";
+import {VoteWeigherBase} from "src/VoteWeigherBase.sol";
 
 /**
  * @title A `Registry` that keeps track of stakes of operators for up to 256 quorums.
@@ -17,7 +18,7 @@ import "src/StakeRegistryStorage.sol";
  * It allows an additional functionality (in addition to registering and deregistering) to update the stake of an operator.
  * @author Layr Labs, Inc.
  */
-contract StakeRegistry is StakeRegistryStorage {
+contract StakeRegistry is VoteWeigherBase, StakeRegistryStorage {
     /// @notice requires that the caller is the RegistryCoordinator
     modifier onlyRegistryCoordinator() {
         require(
@@ -31,12 +32,7 @@ contract StakeRegistry is StakeRegistryStorage {
         IRegistryCoordinator _registryCoordinator,
         IStrategyManager _strategyManager,
         IServiceManager _serviceManager
-    )
-        StakeRegistryStorage(_registryCoordinator, _strategyManager, _serviceManager)
-    // solhint-disable-next-line no-empty-blocks
-    {
-
-    }
+    ) VoteWeigherBase(_strategyManager, _serviceManager) StakeRegistryStorage(_registryCoordinator) {}
 
     /**
      * @notice Sets the minimum stake for each quorum and adds `_quorumStrategiesConsideredAndMultipliers` for each

src/StakeRegistryStorage.sol

@@ -5,14 +5,13 @@ import {IStrategyManager} from "eigenlayer-contracts/src/contracts/interfaces/IS
 import {IServiceManager} from "src/interfaces/IServiceManager.sol";
 import {IStakeRegistry} from  "src/interfaces/IStakeRegistry.sol";
 import {IRegistryCoordinator} from "src/interfaces/IRegistryCoordinator.sol";
-import {VoteWeigherBase} from "src/VoteWeigherBase.sol";
 
 /**
  * @title Storage variables for the `StakeRegistry` contract.
  * @author Layr Labs, Inc.
  * @notice This storage contract is separate from the logic to simplify the upgrade process.
  */
-abstract contract StakeRegistryStorage is VoteWeigherBase, IStakeRegistry {
+abstract contract StakeRegistryStorage is IStakeRegistry {
     /// @notice the coordinator contract that this registry is associated with
     IRegistryCoordinator public immutable registryCoordinator;
 
@@ -26,13 +25,7 @@ abstract contract StakeRegistryStorage is VoteWeigherBase, IStakeRegistry {
     /// @notice mapping from operator's operatorId to the history of their stake updates
     mapping(bytes32 => mapping(uint8 => OperatorStakeUpdate[])) internal operatorIdToStakeHistory;
 
-    constructor(
-        IRegistryCoordinator _registryCoordinator,
-        IStrategyManager _strategyManager,
-        IServiceManager _serviceManager
-    ) VoteWeigherBase(_strategyManager, _serviceManager)
-    // solhint-disable-next-line no-empty-blocks
-    {
+    constructor(IRegistryCoordinator _registryCoordinator) {
         registryCoordinator = _registryCoordinator;
     }
 

src/interfaces/IBLSPublicKeyCompendium.sol

@@ -11,8 +11,8 @@ import {BN254}from"eigenlayer-contracts/src/contracts/libraries/BN254.sol";
 interface IBLSPublicKeyCompendium {
 
     // EVENTS
-    /// @notice Emitted when `operator` registers with the public key `pk`.
-    event NewPubkeyRegistration(address operator, BN254.G1Point pubkeyG1, BN254.G2Point pubkeyG2);
+    /// @notice Emitted when `operator` registers with the public keys `pubkeyG1` and `pubkeyG2`.
+    event NewPubkeyRegistration(address indexed operator, BN254.G1Point pubkeyG1, BN254.G2Point pubkeyG2);
 
     /**
      * @notice mapping from operator address to pubkey hash.