E2E EpochManager test + Epoch truffle migrations & Anvil L2 migration build fix

packages/protocol/contractPackages.ts

@@ -48,13 +48,24 @@ export const SOLIDITY_08_PACKAGE = {
   proxiesPath: '/', // Proxies are still with 0.5 contracts
   // Proxies shouldn't have to be added to a list manually
   // https://github.com/celo-org/celo-monorepo/issues/10555
-  contracts: ['GasPriceMinimum', 'FeeCurrencyDirectory', 'CeloUnreleasedTreasure', 'Validators'],
+  contracts: [
+    'GasPriceMinimum',
+    'FeeCurrencyDirectory',
+    'CeloUnreleasedTreasure',
+    'Validators',
+    'EpochManager',
+    'EpochManagerEnabler',
+    'ScoreManager',
+  ],
   proxyContracts: [
     'GasPriceMinimumProxy',
     'FeeCurrencyDirectoryProxy',
     'MentoFeeCurrencyAdapterV1',
     'CeloUnreleasedTreasureProxy',
     'ValidatorsProxy',
+    'EpochManagerProxy',
+    'EpochManagerEnablerProxy',
+    'ScoreManagerProxy',
   ],
   truffleConfig: 'truffle-config0.8.js',
 } satisfies ContractPackage

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

@@ -8,9 +8,7 @@ import "./UsingRegistry.sol";
 import "../common/IsL2Check.sol";
 
 import "../../contracts/common/Initializable.sol";
-import "../../contracts/common/interfaces/ICeloToken.sol";
 import "./interfaces/ICeloUnreleasedTreasureInitializer.sol";
-import "@openzeppelin/contracts8/token/ERC20/IERC20.sol";
 
 /**
  * @title Contract for unreleased Celo tokens.
@@ -49,8 +47,7 @@ contract CeloUnreleasedTreasure is UsingRegistry, ReentrancyGuard, Initializable
    */
   function release(address to, uint256 amount) external onlyEpochManager {
     require(address(this).balance >= amount, "Insufficient balance.");
-    IERC20 celoToken = IERC20(address(getCeloToken()));
-    celoToken.transfer(to, amount);
+    require(getCeloToken().transfer(to, amount), "CELO transfer failed.");
     emit Released(to, amount);
   }
 

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

@@ -11,6 +11,7 @@ import "../common/UsingRegistry.sol";
 import "../../contracts/common/Initializable.sol";
 import "../../contracts/common/interfaces/IEpochManager.sol";
 import "../../contracts/common/interfaces/ICeloVersionedContract.sol";
+import "../../contracts/common/interfaces/IEpochManager.sol";
 
 contract EpochManager is
   Initializable,
@@ -23,7 +24,6 @@ contract EpochManager is
     uint256 firstBlock;
     uint256 lastBlock;
     uint256 startTimestamp;
-    uint256 endTimestamp;
     uint256 rewardsBlock;
   }
 
@@ -59,7 +59,7 @@ contract EpochManager is
   mapping(address => uint256) public validatorPendingPayments;
 
   address public carbonOffsettingPartner;
-  address public epochManagerInitializer;
+  address public epochManagerEnabler;
 
   /**
    * @notice Event emited when epochProcessing has begun.
@@ -73,8 +73,8 @@ contract EpochManager is
    */
   event EpochProcessingEnded(uint256 indexed epochNumber);
 
-  modifier onlyEpochManagerInitializer() {
-    require(msg.sender == epochManagerInitializer, "msg.sender is not Initializer");
+  modifier onlyEpochManagerEnabler() {
+    require(msg.sender == epochManagerEnabler, "msg.sender is not Initializer");
     _;
   }
 
@@ -93,14 +93,23 @@ contract EpochManager is
     address registryAddress,
     uint256 newEpochDuration,
     address _carbonOffsettingPartner,
-    address _epochManagerInitializer
+    address _epochManagerEnabler
   ) external initializer {
-    require(_epochManagerInitializer != address(0), "EpochManagerInitializer address is required");
+    require(_epochManagerEnabler != address(0), "EpochManagerEnabler address is required");
     _transferOwnership(msg.sender);
     setRegistry(registryAddress);
     setEpochDuration(newEpochDuration);
     carbonOffsettingPartner = _carbonOffsettingPartner;
-    epochManagerInitializer = _epochManagerInitializer;
+    epochManagerEnabler = _epochManagerEnabler;
+  }
+
+  /**
+   * @notice Sets the address of the Epoch Manager Enabler.
+   * @param _epochManagerEnabler The address of the Epoch Manager Enabler.
+   */
+  function setEpochMangerEnabler(address _epochManagerEnabler) external onlyOwner {
+    require(_epochManagerEnabler != address(0), "EpochManagerEnabler address is required");
+    epochManagerEnabler = _epochManagerEnabler;
   }
 
   // DESIGNDESICION(XXX): we assume that the first epoch on the L2 starts as soon as the system is initialized
@@ -110,7 +119,12 @@ contract EpochManager is
     uint256 firstEpochNumber,
     uint256 firstEpochBlock,
     address[] memory firstElected
-  ) external onlyEpochManagerInitializer {
+  ) external onlyEpochManagerEnabler {
+    require(
+      getCeloToken().balanceOf(registry.getAddressForOrDie(CELO_UNRELEASED_TREASURE_REGISTRY_ID)) >
+        0,
+      "CeloUnreleasedTreasury not yet funded."
+    );
     require(!systemAlreadyInitialized(), "Epoch system already initialized");
     require(firstEpochNumber > 0, "First epoch number must be greater than 0");
     require(firstEpochBlock > 0, "First epoch block must be greater than 0");
@@ -127,7 +141,7 @@ contract EpochManager is
     _currentEpoch.startTimestamp = block.timestamp;
 
     elected = firstElected;
-    epochManagerInitializer = address(0);
+    epochManagerEnabler = address(0);
   }
 
   // TODO maybe "freezeEpochRewards" "prepareForNextEpoch"
@@ -172,7 +186,6 @@ contract EpochManager is
     require(isOnEpochProcess(), "Epoch process is not started");
     // finalize epoch
     // TODO last block should be the block before and timestamp from previous block
-    epochs[currentEpochNumber].endTimestamp = block.timestamp;
     epochs[currentEpochNumber].lastBlock = block.number - 1;
     // start new epoch
     currentEpochNumber++;
@@ -218,16 +231,9 @@ contract EpochManager is
   }
 
   /// returns the current epoch Info
-  function getCurrentEpoch() external view returns (uint256, uint256, uint256, uint256, uint256) {
+  function getCurrentEpoch() external view returns (uint256, uint256, uint256, uint256) {
     Epoch storage _epoch = epochs[currentEpochNumber];
-
-    return (
-      _epoch.firstBlock,
-      _epoch.lastBlock,
-      _epoch.startTimestamp,
-      _epoch.endTimestamp,
-      _epoch.rewardsBlock
-    );
+    return (_epoch.firstBlock, _epoch.lastBlock, _epoch.startTimestamp, _epoch.rewardsBlock);
   }
 
   /// returns the current epoch number.
@@ -236,6 +242,21 @@ contract EpochManager is
     return currentEpochNumber;
   }
 
+  /// returns epoch processing state
+  function getEpochProcessingState()
+    external
+    view
+    returns (uint256, uint256, uint256, uint256, uint256)
+  {
+    return (
+      uint256(epochProcessing.status),
+      epochProcessing.perValidatorReward,
+      epochProcessing.totalRewardsVoter,
+      epochProcessing.totalRewardsCommunity,
+      epochProcessing.totalRewardsCarbonFund
+    );
+  }
+
   function getElected() external view returns (address[] memory) {
     return elected;
   }
@@ -285,7 +306,7 @@ contract EpochManager is
   }
 
   function systemAlreadyInitialized() public view returns (bool) {
-    return initialized && epochManagerInitializer == address(0);
+    return initialized && epochManagerEnabler == address(0);
   }
 
   function allocateValidatorsRewards() internal {
@@ -313,7 +334,6 @@ contract EpochManager is
     );
 
     uint256 CELOequivalent = (numerator * totalRewards) / denominator;
-    // this is not a mint anymore
     getCeloUnreleasedTreasure().release(
       registry.getAddressForOrDie(RESERVE_REGISTRY_ID),
       CELOequivalent

packages/protocol/contracts-0.8/common/EpochManagerInitializer.sol → packages/protocol/contracts-0.8/common/EpochManagerEnabler.sol

@@ -6,9 +6,10 @@ import "../common/UsingPrecompiles.sol";
 
 import "../../contracts/common/Initializable.sol";
 import "../../contracts/common/interfaces/ICeloVersionedContract.sol";
+import "../../contracts/common/interfaces/IEpochManagerEnabler.sol";
 import "../../contracts/governance/interfaces/IEpochRewards.sol";
 
-contract EpochManagerInitializer is Initializable, UsingPrecompiles, UsingRegistry {
+contract EpochManagerEnabler is Initializable, UsingPrecompiles, UsingRegistry {
   /**
    * @notice Sets initialized == true on implementation contracts
    * @param test Set to true to skip implementation initialization

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

@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.8.7 <0.8.20;
+
+import "@openzeppelin/contracts8/utils/math/SafeMath.sol";
+import "@openzeppelin/contracts8/access/Ownable.sol";
+
+import "../../contracts/common/interfaces/IRegistry.sol";
+import "../../contracts/common/interfaces/IRegistryInitializer.sol";
+import "../../contracts/common/Initializable.sol";
+
+/**
+ * @title Routes identifiers to addresses.
+ */
+contract Registry08 is IRegistry, IRegistryInitializer, Ownable, Initializable {
+  using SafeMath for uint256;
+
+  mapping(bytes32 => address) public registry;
+
+  event RegistryUpdated(string identifier, bytes32 indexed identifierHash, address indexed addr);
+
+  /**
+   * @notice Sets initialized == true on implementation contracts
+   * @param test Set to true to skip implementation initialization
+   */
+  constructor(bool test) public Initializable(test) {}
+
+  /**
+   * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
+   */
+  function initialize() external initializer {
+    _transferOwnership(msg.sender);
+  }
+
+  /**
+   * @notice Associates the given address with the given identifier.
+   * @param identifier Identifier of contract whose address we want to set.
+   * @param addr Address of contract.
+   */
+  function setAddressFor(string calldata identifier, address addr) external onlyOwner {
+    bytes32 identifierHash = keccak256(abi.encodePacked(identifier));
+    registry[identifierHash] = addr;
+    emit RegistryUpdated(identifier, identifierHash, addr);
+  }
+
+  /**
+   * @notice Gets address associated with the given identifierHash.
+   * @param identifierHash Identifier hash of contract whose address we want to look up.
+   * @dev Throws if address not set.
+   */
+  function getAddressForOrDie(bytes32 identifierHash) external view returns (address) {
+    require(registry[identifierHash] != address(0), "identifier has no registry entry");
+    return registry[identifierHash];
+  }
+
+  /**
+   * @notice Gets address associated with the given identifierHash.
+   * @param identifierHash Identifier hash of contract whose address we want to look up.
+   */
+  function getAddressFor(bytes32 identifierHash) external view returns (address) {
+    return registry[identifierHash];
+  }
+
+  /**
+   * @notice Gets address associated with the given identifier.
+   * @param identifier Identifier of contract whose address we want to look up.
+   * @dev Throws if address not set.
+   */
+  function getAddressForStringOrDie(string calldata identifier) external view returns (address) {
+    bytes32 identifierHash = keccak256(abi.encodePacked(identifier));
+    require(registry[identifierHash] != address(0), "identifier has no registry entry");
+    return registry[identifierHash];
+  }
+
+  /**
+   * @notice Gets address associated with the given identifier.
+   * @param identifier Identifier of contract whose address we want to look up.
+   */
+  function getAddressForString(string calldata identifier) external view returns (address) {
+    bytes32 identifierHash = keccak256(abi.encodePacked(identifier));
+    return registry[identifierHash];
+  }
+
+  /**
+   * @notice Iterates over provided array of identifiers, getting the address for each.
+   *         Returns true if `sender` matches the address of one of the provided identifiers.
+   * @param identifierHashes Array of hashes of approved identifiers.
+   * @param sender Address in question to verify membership.
+   * @return True if `sender` corresponds to the address of any of `identifiers`
+   *         registry entries.
+   */
+  function isOneOf(
+    bytes32[] calldata identifierHashes,
+    address sender
+  ) external view returns (bool) {
+    for (uint256 i = 0; i < identifierHashes.length; i = i.add(1)) {
+      if (registry[identifierHashes[i]] == sender) {
+        return true;
+      }
+    }
+    return false;
+  }
+}

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

@@ -16,10 +16,8 @@ contract ScoreManager is Initializable, Ownable {
 
   /**
    * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
-   * @param registryAddress The address of the registry core smart contract.
-   * @param newEpochDuration The duration of an epoch in seconds.
    */
-  function initialize(address registryAddress, uint256 newEpochDuration) external initializer {
+  function initialize() external initializer {
     _transferOwnership(msg.sender);
   }
 

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

@@ -12,19 +12,18 @@ import "../../contracts/common/interfaces/IAccounts.sol";
 import "../../contracts/common/interfaces/IEpochManager.sol";
 import "../../contracts/common/interfaces/IFreezer.sol";
 import "../../contracts/common/interfaces/ICeloUnreleasedTreasure.sol";
+import "../../contracts/common/interfaces/IFeeCurrencyWhitelist.sol";
+import "../../contracts/common/interfaces/IFeeHandlerSeller.sol";
+import "../../contracts/common/interfaces/IEpochManager.sol";
 import "../../contracts/governance/interfaces/IGovernance.sol";
 import "../../contracts/governance/interfaces/ILockedGold.sol";
 import "../../contracts/governance/interfaces/ILockedCelo.sol";
 import "../../contracts/governance/interfaces/IValidators.sol";
 import "../../contracts/governance/interfaces/IElection.sol";
 import "../../contracts/governance/interfaces/IEpochRewards.sol";
 import "../../contracts/stability/interfaces/ISortedOracles.sol";
-import "../../contracts/common/interfaces/IFeeCurrencyWhitelist.sol";
-import "./interfaces/IScoreReader.sol";
 
-import "../../contracts/governance/interfaces/IElection.sol";
-import "../../contracts/common/interfaces/IFeeHandlerSeller.sol";
-import "../../contracts/governance/interfaces/IEpochRewards.sol";
+import "./interfaces/IScoreReader.sol";
 
 contract UsingRegistry is Ownable {
   // solhint-disable state-visibility

packages/protocol/contracts-0.8/common/interfaces/IEpochManagerEnablerInitializer.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.5.13 <0.9.0;
+
+interface IEpochManagerEnablerInitializer {
+  function initialize(address registryAddress) external;
+}