EpochManager e2e tests add/remove validators between ecpochs

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

@@ -196,6 +196,8 @@ contract EpochManager is
     epochs[currentEpochNumber].firstBlock = block.number;
     epochs[currentEpochNumber].startTimestamp = block.timestamp;
 
+    epochProcessing.toProcessGroups = 0;
+
     for (uint i = 0; i < elected.length; i++) {
       address group = getValidators().getValidatorsGroup(elected[i]);
       if (!processedGroups[group].processed) {
@@ -213,9 +215,7 @@ contract EpochManager is
 
     require(epochProcessing.toProcessGroups == groups.length, "number of groups does not match");
 
-    // since we are adding values it makes sense to start from the end
-    for (uint ii = groups.length; ii > 0; ii--) {
-      uint256 i = ii - 1;
+    for (uint i = 0; i < groups.length; i++) {
       ProcessedGroup storage processedGroup = processedGroups[groups[i]];
       // checks that group is actually from elected group
       require(processedGroup.processed, "group not processed");
@@ -226,7 +226,6 @@ contract EpochManager is
         greaters[i]
       );
 
-      epochProcessing.toProcessGroups = 0;
       delete processedGroups[groups[i]];
     }
     getCeloUnreleasedTreasure().release(

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

@@ -345,7 +345,6 @@ contract Validators is
    * @dev De-affiliates with the previously affiliated group if present.
    */
   function affiliate(address group) external nonReentrant returns (bool) {
-    allowOnlyL1();
     address account = getAccounts().validatorSignerToAccount(msg.sender);
     require(isValidator(account), "Not a validator");
     require(isValidatorGroup(group), "Not a validator group");
@@ -509,7 +508,6 @@ contract Validators is
    * @dev Fails if the group has zero members.
    */
   function addMember(address validator) external nonReentrant returns (bool) {
-    allowOnlyL1();
     address account = getAccounts().validatorSignerToAccount(msg.sender);
     require(groups[account].members.numElements > 0, "Validator group empty");
     return _addMember(account, validator, address(0), address(0));
@@ -529,7 +527,6 @@ contract Validators is
     address lesser,
     address greater
   ) external nonReentrant returns (bool) {
-    allowOnlyL1();
     address account = getAccounts().validatorSignerToAccount(msg.sender);
     require(groups[account].members.numElements == 0, "Validator group not empty");
     return _addMember(account, validator, lesser, greater);

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

@@ -67,4 +67,5 @@ interface IElection {
   function hasActivatablePendingVotes(address, address) external view returns (bool);
   function validatorSignerAddressFromCurrentSet(uint256 index) external view returns (address);
   function numberValidatorsInCurrentSet() external view returns (uint256);
+  function owner() external view returns (address);
 }

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

@@ -20,6 +20,7 @@ interface ILockedCelo {
   ) external;
   function addSlasher(string calldata slasherIdentifier) external;
 
+  function getAccountNonvotingLockedGold(address account) external view returns (uint256);
   function getAccountTotalLockedCelo(address) external view returns (uint256);
   function getTotalLockedCelo() external view returns (uint256);
   function getPendingWithdrawals(

packages/protocol/scripts/foundry/constants.sh

@@ -59,7 +59,8 @@ export LIBRARY_DEPENDENCIES_PATH=(
     "lib/openzeppelin-contracts/contracts/math/SafeMath.sol"
     "lib/openzeppelin-contracts8/contracts/utils/math/SafeMath.sol"
     "lib/openzeppelin-contracts/contracts/math/Math.sol"
-    "lib/openzeppelin-contracts/contracts/cryptography/ECDSA.sol"   
+    "lib/openzeppelin-contracts/contracts/cryptography/ECDSA.sol"
     "lib/openzeppelin-contracts/contracts/utils/Address.sol"
     "lib/solidity-bytes-utils/contracts/BytesLib.sol"
+    "lib/celo-foundry/lib/forge-std/src/console.sol"
 )

packages/protocol/scripts/foundry/create_and_migrate_anvil_devchain.sh

@@ -60,6 +60,21 @@ forge script \
   $LIBRARY_FLAGS \
   --rpc-url $ANVIL_RPC_URL || { echo "Migration script failed"; exit 1; }
 
+CELO_EPOCH_REWARDS_ADDRESS=$(
+  cast call \
+    $REGISTRY_ADDRESS \
+    "getAddressForStringOrDie(string calldata identifier)(address)" \
+    "EpochRewards" \
+    --rpc-url $ANVIL_RPC_URL
+)
+
+echo "Setting storage of EpochRewards start time to same value as on mainnet"
+# Storage slot of start time is 2 and the value is 1587587214 which is identical to mainnet
+cast rpc \
+anvil_setStorageAt \
+$CELO_EPOCH_REWARDS_ADDRESS 2 "0x000000000000000000000000000000000000000000000000000000005ea0a88e" \
+--rpc-url $ANVIL_RPC_URL
+
 # Keeping track of the finish time to measure how long it takes to run the script entirely
 ELAPSED_TIME=$(($SECONDS - $START_TIME))
 echo "Migration script total elapsed time: $ELAPSED_TIME seconds"