Martinvol/return account instead of signer

packages/protocol/contracts-0.8/common/EpochManager.sol

@@ -238,7 +238,7 @@ contract EpochManager is
       epochProcessing.totalRewardsCarbonFund
     );
     // run elections
-    elected = getElection().electValidatorSigners();
+    elected = getElection().electValidatorAccounts();
     // TODO check how to nullify stuct
     epochProcessing.status = EpochProcessStatus.NotStarted;
   }
@@ -248,14 +248,11 @@ contract EpochManager is
    *   delegation beneficiary.
    * @param validator Account of the validator.
    */
-  function sendValidatorPayment(address validator) external nonReentrant {
-    IAccounts accounts = IAccounts(getAccounts());
-    address signer = accounts.getValidatorSigner(validator);
-
+  function sendValidatorPayment(address validator) external {
     FixidityLib.Fraction memory totalPayment = FixidityLib.newFixed(
-      validatorPendingPayments[signer]
+      validatorPendingPayments[validator]
     );
-    validatorPendingPayments[signer] = 0;
+    validatorPendingPayments[validator] = 0;
 
     IValidators validators = getValidators();
     address group = validators.getValidatorsGroup(validator);
@@ -376,6 +373,9 @@ contract EpochManager is
     return initialized && elected.length > 0;
   }
 
+  /**
+   * @notice Allocates rewards to elected validator accounts.
+   */
   function allocateValidatorsRewards() internal {
     uint256 totalRewards = 0;
     IScoreReader scoreReader = getScoreReader();

packages/protocol/contracts-0.8/governance/Validators.sol

@@ -18,6 +18,8 @@ import "../../contracts/common/interfaces/ICeloVersionedContract.sol";
 import "../../contracts/common/libraries/ReentrancyGuard.sol";
 import "../common/interfaces/IStableToken.sol";
 
+import "../../contracts/common/interfaces/IAccounts.sol";
+
 /**
  * @title A contract for registering and electing Validator Groups and Validators.
  */
@@ -712,20 +714,32 @@ contract Validators is
    * @notice Returns the top n group members for a particular group.
    * @param account The address of the validator group.
    * @param n The number of members to return.
-   * @return The top n group members for a particular group.
+   * @return The signers of the top n group members for a particular group.
+   * @dev Returns the account instead of signer on L2.
    */
   function getTopGroupValidators(
     address account,
     uint256 n
   ) external view returns (address[] memory) {
     address[] memory topAccounts = groups[account].members.headN(n);
     address[] memory topValidators = new address[](n);
+
+    IAccounts accounts = getAccounts();
+
     for (uint256 i = 0; i < n; i = i.add(1)) {
-      topValidators[i] = getAccounts().getValidatorSigner(topAccounts[i]);
+      topValidators[i] = accounts.getValidatorSigner(topAccounts[i]);
     }
     return topValidators;
   }
 
+  function getTopGroupValidatorsAccounts(
+    address account,
+    uint256 n
+  ) external view returns (address[] memory) {
+    address[] memory topAccounts = groups[account].members.headN(n);
+    return topAccounts;
+  }
+
   /**
    * @notice Returns the number of members in the provided validator groups.
    * @param accounts The addresses of the validator groups.
@@ -890,7 +904,7 @@ contract Validators is
 
   /**
    * @notice Computes epoch payments to the account
-   * @param account The validator signer of the validator to distribute the epoch payment to.
+   * @param account The validator account of the validator to distribute the epoch payment to.
    * @param maxPayment The maximum payment to the validator. Actual payment is based on score and
    *   group commission.
    * @return The total payment paid to the validator and their group.

packages/protocol/contracts/governance/Election.sol

@@ -486,14 +486,23 @@ contract Election is
   }
 
   /**
-   * @notice Returns a list of elected validators with seats allocated to groups via the D'Hondt
+   * @notice Returns a list of elected validator signers with seats allocated to groups via the D'Hondt
    *   method.
-   * @return The list of elected validators.
+   * @return The list of elected validator signers.
    */
   function electValidatorSigners() external view returns (address[] memory) {
     return electNValidatorSigners(electableValidators.min, electableValidators.max);
   }
 
+  /**
+   * @notice Returns a list of elected validators with seats allocated to groups via the D'Hondt
+   *   method.
+   * @return The list of elected validators.
+   */
+  function electValidatorAccounts() external view returns (address[] memory) {
+    return electNValidatorAccounts(electableValidators.min, electableValidators.max);
+  }
+
   /**
    * @notice Returns the total number of votes cast by an account.
    * @param account The address of the account.
@@ -789,16 +798,35 @@ contract Election is
     return votes.active.total;
   }
 
+  function electNValidatorSigners(
+    uint256 minElectableValidators,
+    uint256 maxElectableValidators
+  ) public view returns (address[] memory) {
+    bool accounts = false;
+    return
+      _electNValidatorSignerOrAccount(minElectableValidators, maxElectableValidators, accounts);
+  }
+
+  function electNValidatorAccounts(
+    uint256 minElectableValidators,
+    uint256 maxElectableValidators
+  ) public view returns (address[] memory) {
+    bool accounts = true;
+    return
+      _electNValidatorSignerOrAccount(minElectableValidators, maxElectableValidators, accounts);
+  }
+
   /**
-   * @notice Returns a list of elected validators with seats allocated to groups via the D'Hondt
+   * @notice Returns a list of elected validator with seats allocated to groups via the D'Hondt
    *   method.
-   * @return The list of elected validators.
+   * @return The list of elected validator signers or accounts depending on input.
    * @dev See https://en.wikipedia.org/wiki/D%27Hondt_method#Allocation for more information.
    */
-  function electNValidatorSigners(
+  function _electNValidatorSignerOrAccount(
     uint256 minElectableValidators,
-    uint256 maxElectableValidators
-  ) public view returns (address[] memory) {
+    uint256 maxElectableValidators,
+    bool accounts // accounts or signers
+  ) internal view returns (address[] memory) {
     // Groups must have at least `electabilityThreshold` proportion of the total votes to be
     // considered for the election.
     uint256 requiredVotes = electabilityThreshold
@@ -810,6 +838,7 @@ contract Election is
       requiredVotes,
       maxElectableValidators
     );
+
     address[] memory electionGroups = votes.total.eligible.headN(numElectionGroups);
     uint256[] memory numMembers = getValidators().getGroupsNumMembers(electionGroups);
     // Holds the number of members elected for each of the eligible validator groups.
@@ -851,12 +880,23 @@ contract Election is
     // Grab the top validators from each group that won seats.
     address[] memory electedValidators = new address[](totalNumMembersElected);
     totalNumMembersElected = 0;
+
+    IValidators validators = getValidators();
+
     for (uint256 i = 0; i < electionGroups.length; i = i.add(1)) {
       // We use the validating delegate if one is set.
-      address[] memory electedGroupValidators = getValidators().getTopGroupValidators(
-        electionGroups[i],
-        numMembersElected[i]
-      );
+      address[] memory electedGroupValidators;
+      if (accounts) {
+        electedGroupValidators = validators.getTopGroupValidatorsAccounts(
+          electionGroups[i],
+          numMembersElected[i]
+        );
+      } else {
+        electedGroupValidators = validators.getTopGroupValidators(
+          electionGroups[i],
+          numMembersElected[i]
+        );
+      }
       for (uint256 j = 0; j < electedGroupValidators.length; j = j.add(1)) {
         electedValidators[totalNumMembersElected] = electedGroupValidators[j];
         totalNumMembersElected = totalNumMembersElected.add(1);

packages/protocol/contracts/governance/interfaces/IElection.sol

@@ -29,7 +29,9 @@ interface IElection {
 
   // view functions
   function electValidatorSigners() external view returns (address[] memory);
+  function electValidatorAccounts() external view returns (address[] memory);
   function electNValidatorSigners(uint256, uint256) external view returns (address[] memory);
+  function electNValidatorAccounts(uint256, uint256) external view returns (address[] memory);
   function getElectableValidators() external view returns (uint256, uint256);
   function getElectabilityThreshold() external view returns (uint256);
   function getNumVotesReceivable(address) external view returns (uint256);

packages/protocol/contracts/governance/interfaces/IValidators.sol

@@ -76,6 +76,7 @@ interface IValidators {
     returns (address[] memory, uint256, uint256, uint256, uint256[] memory, uint256, uint256);
   function getGroupNumMembers(address) external view returns (uint256);
   function getTopGroupValidators(address, uint256) external view returns (address[] memory);
+  function getTopGroupValidatorsAccounts(address, uint256) external view returns (address[] memory);
   function getGroupsNumMembers(
     address[] calldata accounts
   ) external view returns (uint256[] memory);

packages/protocol/contracts/governance/test/MockElection.sol

@@ -37,7 +37,7 @@ contract MockElection is IsL2Check {
     return true;
   }
 
-  function activate(address) external onlyL1 returns (bool) {
+  function activate(address) external returns (bool) {
     return true;
   }
 
@@ -76,7 +76,10 @@ contract MockElection is IsL2Check {
     return 0;
   }
 
-  function electValidatorSigners() external view returns (address[] memory) {
+  function electValidatorSigners() external view onlyL1 returns (address[] memory) {
+    return electedValidators;
+  }
+  function electValidators() external view onlyL2 returns (address[] memory) {
     return electedValidators;
   }