change in struct

Layr-Labs · Jul 27, 2023 · f748c0f · f748c0f
1 parent 0919623
commit f748c0f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/contracts/interfaces/IBLSPublicKeyCompendium.sol b/src/contracts/interfaces/IBLSPublicKeyCompendium.sol
@@ -49,5 +49,5 @@ interface IBLSPublicKeyCompendium {
     /**
      * @notice called to get the BN254 public keys that has been registered by an operator.
      */
-    function getRegisteredBN254Pubkeys(bytes32 pubkeyHash) external view returns (BN254.G1Point memory, BN254.G2Point memory);
+    function getRegisteredBN254Pubkeys(bytes32 pubkeyHash) external view returns (BN254Pubkeys memory);
 }
diff --git a/src/contracts/middleware/BLSOperatorStateRetriever.sol b/src/contracts/middleware/BLSOperatorStateRetriever.sol
@@ -19,8 +19,7 @@ contract BLSOperatorStateRetriever {
     struct Operator {
         bytes32 operatorId;
         uint96 stake;
-        BN254.G1Point pubkeyG1;
-        BN254.G2Point pubkeyG2;
+        IBLSPublicKeyCompendium.BN254Pubkeys pubkeys;
     }
 
     struct CheckSignaturesIndices {
@@ -72,12 +71,10 @@ contract BLSOperatorStateRetriever {
             operators[i] = new Operator[](operatorIds.length);
             for (uint256 j = 0; j < operatorIds.length; j++) {
                 bytes32 operatorId = bytes32(operatorIds[j]);
-                (BN254.G1Point memory pubkeyG1, BN254.G2Point memory pubkeyG2) = BLSPubkeyRegistry(address(registryCoordinator.blsPubkeyRegistry())).pubkeyCompendium().getRegisteredBN254Pubkeys(operatorId);
                 operators[i][j] = Operator({
                     operatorId: operatorId,
                     stake: stakeRegistry.getStakeForOperatorIdForQuorumAtBlockNumber(operatorId, quorumNumber, blockNumber),
-                    pubkeyG1: pubkeyG1,
-                    pubkeyG2: pubkeyG2
+                    pubkeys: BLSPubkeyRegistry(address(registryCoordinator.blsPubkeyRegistry())).pubkeyCompendium().getRegisteredBN254Pubkeys(operatorId)
                 });
             }
         }

diff --git a/src/contracts/middleware/BLSPublicKeyCompendium.sol b/src/contracts/middleware/BLSPublicKeyCompendium.sol
@@ -76,7 +76,8 @@ contract BLSPublicKeyCompendium is IBLSPublicKeyCompendium {
         emit NewPubkeyRegistration(msg.sender, pubkeyG1, pubkeyG2);
     }
 
-    function getRegisteredBN254Pubkeys(bytes32 pubkeyHash) external view returns (BN254.G1Point memory, BN254.G2Point memory) {
-        return (_operatorIDToPubkeys[pubkeyHash].BN254pubkeys.pubkeyG1, _operatorIDToPubkeys[pubkeyHash].BN254pubkeys.pubkeyG2);
+    function getRegisteredBN254Pubkeys(bytes32 pubkeyHash) external view returns (BN254Pubkeys memory) {
+        return _operatorIDToPubkeys[pubkeyHash].BN254pubkeys;
     }
+
 }
diff --git a/src/test/mocks/BLSPublicKeyCompendiumMock.sol b/src/test/mocks/BLSPublicKeyCompendiumMock.sol
@@ -16,6 +16,8 @@ contract BLSPublicKeyCompendiumMock is IBLSPublicKeyCompendium, DSTest {
     mapping(address => bytes32) public operatorToPubkeyHash;
     /// @notice mapping from pubkey hash to operator address
     mapping(bytes32 => address) public pubkeyHashToOperator;
+    /// @notice mapping from operatorID to pubkey
+    mapping(bytes32 => Pubkeys) internal _operatorIDToPubkeys;
 
     /**
      * @notice Called by an operator to register themselves as the owner of a BLS public key and reveal their G1 and G2 public key.
@@ -26,6 +28,9 @@ contract BLSPublicKeyCompendiumMock is IBLSPublicKeyCompendium, DSTest {
     function registerBLSPublicKey(BN254.G1Point memory signedMessageHash, BN254.G1Point memory pubkeyG1, BN254.G2Point memory pubkeyG2) external {
     }
 
+    function getRegisteredBN254Pubkeys(bytes32 pubkeyHash) external view returns (BN254Pubkeys memory) {
+    }
+
     function registerPublicKey(BN254.G1Point memory pk) external {
 
         bytes32 pubkeyHash = BN254.hashG1Point(pk);