L2 Staking and Voting

.github/workflows/protocol_tests.yml

@@ -88,8 +88,7 @@ jobs:
         if: success() || failure()
         run: | 
           forge test -vvv \
-          --match-path "test-sol/unit/governance/voting/*" \
-          --block-gas-limit 50000000
+          --match-path "test-sol/unit/governance/voting/*"
 
       - name: Run unit tests stability
         if: success() || failure()

packages/protocol/contracts/common/UsingPrecompiles.sol

@@ -2,8 +2,9 @@ pragma solidity ^0.5.13;
 
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
+import "../../contracts-0.8/common/IsL2Check.sol";
 
-contract UsingPrecompiles {
+contract UsingPrecompiles is IsL2Check {
   using SafeMath for uint256;
 
   address constant TRANSFER = address(0xff - 2);
@@ -16,6 +17,7 @@ contract UsingPrecompiles {
   address constant HASH_HEADER = address(0xff - 9);
   address constant GET_PARENT_SEAL_BITMAP = address(0xff - 10);
   address constant GET_VERIFIED_SEAL_BITMAP = address(0xff - 11);
+  uint256 constant DAY = 86400;
 
   /**
    * @notice calculate a * b^x for fractions a, b to `decimals` precision
@@ -55,11 +57,15 @@ contract UsingPrecompiles {
    * @return The current epoch size in blocks.
    */
   function getEpochSize() public view returns (uint256) {
-    bytes memory out;
-    bool success;
-    (success, out) = EPOCH_SIZE.staticcall(abi.encodePacked(true));
-    require(success, "error calling getEpochSize precompile");
-    return getUint256FromBytes(out, 0);
+    if (isL2()) {
+      return DAY.div(5);
+    } else {
+      bytes memory out;
+      bool success;
+      (success, out) = EPOCH_SIZE.staticcall(abi.encodePacked(true));
+      require(success, "error calling getEpochSize precompile");
+      return getUint256FromBytes(out, 0);
+    }
   }
 
   /**

packages/protocol/contracts/governance/BlockchainParameters.sol

@@ -5,12 +5,10 @@ import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
 import "../common/Initializable.sol";
 import "../common/UsingPrecompiles.sol";
 
-import "../../contracts-0.8/common/IsL2Check.sol";
-
 /**
  * @title Contract for storing blockchain parameters that can be set by governance.
  */
-contract BlockchainParameters is Ownable, Initializable, UsingPrecompiles, IsL2Check {
+contract BlockchainParameters is Ownable, Initializable, UsingPrecompiles {
   using SafeMath for uint256;
 
   // obsolete

packages/protocol/contracts/governance/Election.sol

@@ -15,7 +15,6 @@ import "../common/UsingRegistry.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
 import "../common/libraries/Heap.sol";
 import "../common/libraries/ReentrancyGuard.sol";
-import "../../contracts-0.8/common/IsL2Check.sol";
 
 contract Election is
   IElection,
@@ -25,8 +24,7 @@ contract Election is
   Initializable,
   UsingRegistry,
   UsingPrecompiles,
-  CalledByVm,
-  IsL2Check
+  CalledByVm
 {
   using AddressSortedLinkedList for SortedLinkedList.List;
   using FixidityLib for FixidityLib.Fraction;
@@ -198,7 +196,7 @@ contract Election is
     uint256 value,
     address lesser,
     address greater
-  ) external nonReentrant onlyL1 returns (bool) {
+  ) external nonReentrant returns (bool) {
     require(votes.total.eligible.contains(group), "Group not eligible");
     require(0 < value, "Vote value cannot be zero");
     require(canReceiveVotes(group, value), "Group cannot receive votes");
@@ -231,7 +229,7 @@ contract Election is
    * @return True upon success.
    * @dev Pending votes cannot be activated until an election has been held.
    */
-  function activate(address group) external nonReentrant onlyL1 returns (bool) {
+  function activate(address group) external nonReentrant returns (bool) {
     address account = getAccounts().voteSignerToAccount(msg.sender);
     return _activate(group, account);
   }
@@ -243,10 +241,7 @@ contract Election is
    * @return True upon success.
    * @dev Pending votes cannot be activated until an election has been held.
    */
-  function activateForAccount(
-    address group,
-    address account
-  ) external nonReentrant onlyL1 returns (bool) {
+  function activateForAccount(address group, address account) external nonReentrant returns (bool) {
     return _activate(group, account);
   }
 
@@ -369,7 +364,7 @@ contract Election is
     address group,
     address lesser,
     address greater
-  ) external onlyL1 onlyRegisteredContract(VALIDATORS_REGISTRY_ID) {
+  ) external onlyRegisteredContract(VALIDATORS_REGISTRY_ID) {
     uint256 value = getTotalVotesForGroup(group);
     votes.total.eligible.insert(group, value, lesser, greater);
     emit ValidatorGroupMarkedEligible(group);
@@ -544,7 +539,7 @@ contract Election is
     address group,
     uint256 totalEpochRewards,
     uint256[] calldata uptimes
-  ) external view returns (uint256) {
+  ) external view onlyL1 returns (uint256) {
     IValidators validators = getValidators();
     // The group must meet the balance requirements for their voters to receive epoch rewards.
     if (!validators.meetsAccountLockedGoldRequirements(group) || votes.active.total <= 0) {
@@ -577,10 +572,7 @@ contract Election is
    * @return Whether or not `account` has activatable votes for `group`.
    * @dev Pending votes cannot be activated until an election has been held.
    */
-  function hasActivatablePendingVotes(
-    address account,
-    address group
-  ) external view onlyL1 returns (bool) {
+  function hasActivatablePendingVotes(address account, address group) external view returns (bool) {
     PendingVote storage pendingVote = votes.pending.forGroup[group].byAccount[account];
     return pendingVote.epoch < getEpochNumber() && pendingVote.value > 0;
   }
@@ -619,7 +611,7 @@ contract Election is
    * @param max The maximum number of validators that can be elected.
    * @return True upon success.
    */
-  function setElectableValidators(uint256 min, uint256 max) public onlyOwner onlyL1 returns (bool) {
+  function setElectableValidators(uint256 min, uint256 max) public onlyOwner returns (bool) {
     require(0 < min, "Minimum electable validators cannot be zero");
     require(min <= max, "Maximum electable validators cannot be smaller than minimum");
     require(
@@ -636,9 +628,7 @@ contract Election is
    * @param _maxNumGroupsVotedFor The maximum number of groups an account can vote for.
    * @return True upon success.
    */
-  function setMaxNumGroupsVotedFor(
-    uint256 _maxNumGroupsVotedFor
-  ) public onlyOwner onlyL1 returns (bool) {
+  function setMaxNumGroupsVotedFor(uint256 _maxNumGroupsVotedFor) public onlyOwner returns (bool) {
     require(_maxNumGroupsVotedFor != maxNumGroupsVotedFor, "Max groups voted for not changed");
     maxNumGroupsVotedFor = _maxNumGroupsVotedFor;
     emit MaxNumGroupsVotedForSet(_maxNumGroupsVotedFor);
@@ -650,7 +640,7 @@ contract Election is
    * @param threshold Electability threshold as unwrapped Fraction.
    * @return True upon success.
    */
-  function setElectabilityThreshold(uint256 threshold) public onlyOwner onlyL1 returns (bool) {
+  function setElectabilityThreshold(uint256 threshold) public onlyOwner returns (bool) {
     electabilityThreshold = FixidityLib.wrap(threshold);
     require(
       electabilityThreshold.lt(FixidityLib.fixed1()),
@@ -681,7 +671,7 @@ contract Election is
    * If not run, voting power of account will not reflect rewards awarded.
    * @param flag The on/off flag.
    */
-  function setAllowedToVoteOverMaxNumberOfGroups(bool flag) public onlyL1 {
+  function setAllowedToVoteOverMaxNumberOfGroups(bool flag) public {
     address account = getAccounts().voteSignerToAccount(msg.sender);
     IValidators validators = getValidators();
     require(
@@ -822,7 +812,7 @@ contract Election is
    * @notice Returns get current validator signers using the precompiles.
    * @return List of current validator signers.
    */
-  function getCurrentValidatorSigners() public view returns (address[] memory) {
+  function getCurrentValidatorSigners() public view onlyL1 returns (address[] memory) {
     uint256 n = numberValidatorsInCurrentSet();
     address[] memory res = new address[](n);
     for (uint256 i = 0; i < n; i = i.add(1)) {

packages/protocol/contracts/governance/EpochRewards.sol

@@ -10,7 +10,6 @@ import "../common/Initializable.sol";
 import "../common/UsingRegistry.sol";
 import "../common/UsingPrecompiles.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
-import "../../contracts-0.8/common/IsL2Check.sol";
 
 /**
  * @title Contract for calculating epoch rewards.
@@ -22,8 +21,7 @@ contract EpochRewards is
   UsingPrecompiles,
   UsingRegistry,
   Freezable,
-  CalledByVm,
-  IsL2Check
+  CalledByVm
 {
   using FixidityLib for FixidityLib.Fraction;
   using SafeMath for uint256;

packages/protocol/contracts/governance/Governance.sol

@@ -941,7 +941,7 @@ contract Governance is
    * @return Patch version of the contract.
    */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 4, 1, 1);
+    return (1, 4, 2, 0);
   }
 
   /**

packages/protocol/contracts/governance/SlasherUtil.sol

@@ -7,9 +7,8 @@ import "../common/Initializable.sol";
 import "../common/UsingRegistry.sol";
 import "../common/UsingPrecompiles.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
-import "../../contracts-0.8/common/IsL2Check.sol";
 
-contract SlasherUtil is Ownable, Initializable, UsingRegistry, UsingPrecompiles, IsL2Check {
+contract SlasherUtil is Ownable, Initializable, UsingRegistry, UsingPrecompiles {
   using SafeMath for uint256;
 
   struct SlashingIncentives {

packages/protocol/contracts/governance/Validators.sol

@@ -15,7 +15,6 @@ import "../common/UsingRegistry.sol";
 import "../common/UsingPrecompiles.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
 import "../common/libraries/ReentrancyGuard.sol";
-import "../../contracts-0.8/common/IsL2Check.sol";
 
 /**
  * @title A contract for registering and electing Validator Groups and Validators.
@@ -28,8 +27,7 @@ contract Validators is
   Initializable,
   UsingRegistry,
   UsingPrecompiles,
-  CalledByVm,
-  IsL2Check
+  CalledByVm
 {
   using FixidityLib for FixidityLib.Fraction;
   using AddressLinkedList for LinkedList.List;
@@ -531,7 +529,6 @@ contract Validators is
     address lesserMember,
     address greaterMember
   ) external nonReentrant returns (bool) {
-    allowOnlyL1();
     address account = getAccounts().validatorSignerToAccount(msg.sender);
     require(isValidatorGroup(account), "Not a group");
     require(isValidator(validator), "Not a validator");
@@ -560,6 +557,7 @@ contract Validators is
     group.nextCommissionBlock = block.number.add(commissionUpdateDelay);
     emit ValidatorGroupCommissionUpdateQueued(account, commission, group.nextCommissionBlock);
   }
+
   /**
    * @notice Updates a validator group's commission based on the previously queued update
    */
@@ -583,7 +581,6 @@ contract Validators is
    * @param validatorAccount The validator to deaffiliate from their affiliated validator group.
    */
   function forceDeaffiliateIfValidator(address validatorAccount) external nonReentrant onlySlasher {
-    allowOnlyL1();
     if (isValidator(validatorAccount)) {
       Validator storage validator = validators[validatorAccount];
       if (validator.affiliation != address(0)) {
@@ -597,7 +594,6 @@ contract Validators is
    *         the last time the group was slashed.
    */
   function resetSlashingMultiplier() external nonReentrant {
-    allowOnlyL1();
     address account = getAccounts().validatorSignerToAccount(msg.sender);
     require(isValidatorGroup(account), "Not a validator group");
     ValidatorGroup storage group = groups[account];
@@ -755,7 +751,6 @@ contract Validators is
    * @param account The group to fetch slashing multiplier for.
    */
   function getValidatorGroupSlashingMultiplier(address account) external view returns (uint256) {
-    allowOnlyL1();
     require(isValidatorGroup(account), "Not a validator group");
     ValidatorGroup storage group = groups[account];
     return group.slashInfo.multiplier.unwrap();
@@ -1032,6 +1027,7 @@ contract Validators is
    * @return Fixidity representation of the epoch score between 0 and 1.
    */
   function calculateEpochScore(uint256 uptime) public view returns (uint256) {
+    allowOnlyL1();
     require(uptime <= FixidityLib.fixed1().unwrap(), "Uptime cannot be larger than one");
     uint256 numerator;
     uint256 denominator;

packages/protocol/contracts/identity/Random.sol

@@ -8,7 +8,6 @@ import "../common/CalledByVm.sol";
 import "../common/Initializable.sol";
 import "../common/UsingPrecompiles.sol";
 import "../common/interfaces/ICeloVersionedContract.sol";
-import "../../contracts-0.8/common/IsL2Check.sol";
 
 /**
  * @title Provides randomness for verifier selection
@@ -19,8 +18,7 @@ contract Random is
   Ownable,
   Initializable,
   UsingPrecompiles,
-  CalledByVm,
-  IsL2Check
+  CalledByVm
 {
   using SafeMath for uint256;