blocking is correct

celo-org · Nov 28, 2024 · c05e551 · c05e551
1 parent 3c58a09
commit c05e551
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/protocol/contracts-0.8/common/EpochManager.sol b/packages/protocol/contracts-0.8/common/EpochManager.sol
@@ -273,10 +273,7 @@ contract EpochManager is
    */
   function processGroup(address group, address lesser, address greater) public {
     EpochProcessState storage _epochProcessing = epochProcessing;
-    require(
-      _epochProcessing.status == EpochProcessStatus.IndivudualGroupsProcessing,
-      "Indivudual epoch process is not started"
-    );
+    require(isIndividualProcessing(), "Indivudual epoch process is not started");
     require(toProcessGroups > 0, "no more groups to process");
 
     uint256 epochRewards = processedGroups[group];
@@ -452,7 +449,7 @@ contract EpochManager is
    * @return Whether or not the blockable functions are blocked.
    */
   function isBlocked() external view returns (bool) {
-    return isOnEpochProcess();
+    return isOnEpochProcess() || isIndividualProcessing();
   }
 
   /**
@@ -599,6 +596,11 @@ contract EpochManager is
     emit OracleAddressSet(newOracleAddress);
   }
 
+  function isIndividualProcessing() public view returns (bool) {
+    EpochProcessState storage _epochProcessing = epochProcessing;
+    return _epochProcessing.status == EpochProcessStatus.IndivudualGroupsProcessing;
+  }
+
   /**
    * @return Whether or not the next epoch can be processed.
    */

diff --git a/packages/protocol/test-sol/unit/common/EpochManager.t.sol b/packages/protocol/test-sol/unit/common/EpochManager.t.sol
@@ -698,6 +698,12 @@ contract EpochManagerTest_setToProcessGroups is EpochManagerTest {
     assertEq(EpochManager(address(epochManager)).toProcessGroups(), groups.length);
   }
 
+  function test_blocksChilds() public {
+    epochManager.startNextEpochProcess();
+    epochManager.setToProcessGroups();
+    assertTrue(epochManager.isBlocked());
+  }
+
   function test_setsGroupRewards() public {
     (address[] memory groups, , ) = getGroupsWithLessersAndGreaters();
     epochManager.startNextEpochProcess();