Add aggregator and task generator setters

contracts/evm/src/eth/SFFLTaskManager.sol

@@ -353,6 +353,22 @@ contract SFFLTaskManager is Initializable, OwnableUpgradeable, Pausable, BLSSign
  return (true, hashOfNonSigners);
  }
 
+ /**
+ * @notice Sets the aggregator address
+ * @param _aggregator New aggregator address
+ */
+ function setAggregator(address _aggregator) external onlyOwner {
+ aggregator = _aggregator;
+ }
+
+ /**
+ * @notice Sets the task generator address
+ * @param _generator New task generator address
+ */
+ function setGenerator(address _generator) external onlyOwner {
+ generator = _generator;
+ }
+
  function _validateChallenge(
  Checkpoint.Task calldata, /* task */
  Checkpoint.TaskResponse calldata /* taskResponse */

contracts/evm/src/rollup/SFFLRegistryRollup.sol

@@ -160,6 +160,14 @@ contract SFFLRegistryRollup is Initializable, OwnableUpgradeable, Pausable, SFFL
  _operatorSet.update(message.operators);
  }
 
+ /**
+ * @notice Sets the aggregator address
+ * @param _aggregator New aggregator address
+ */
+ function setAggregator(address _aggregator) external onlyOwner {
+ aggregator = _aggregator;
+ }
+
  /**
  * @notice Sets the operator set quorum weight threshold
  * @param newQuorumThreshold New quorum threshold, based on

contracts/evm/test/SFFLRegistryRollup.t.sol

@@ -461,4 +461,19 @@ contract SFFLRegistryRollupTest is TestUtils {
 
  registry.forceOperatorSetUpdate(message);
  }
+
+ function test_setAggregator() public {
+ address newAggregator = addr("newAggregator");
+
+ vm.prank(addr("owner"));
+ registry.setAggregator(newAggregator);
+
+ assertEq(registry.aggregator(), newAggregator);
+ }
+
+ function test_setAggregator_RevertWhen_CallerNotOwner() public {
+ vm.expectRevert("Ownable: caller is not the owner");
+
+ registry.setAggregator(addr("newAggregator"));
+ }
 }

contracts/evm/test/SFFLTaskManager.t.sol

@@ -38,6 +38,7 @@ contract SFFLTaskManagerTest is TestUtils {
  uint32 public constant TASK_RESPONSE_WINDOW_BLOCK = 30;
  address public aggregator;
  address public generator;
+ address owner;
  uint32 public thresholdDenominator;
 
  event CheckpointTaskCreated(uint32 indexed taskIndex, Checkpoint.Task task);
@@ -52,16 +53,15 @@ contract SFFLTaskManagerTest is TestUtils {
 
  aggregator = addr("aggregator");
  generator = addr("generator");
+ owner = addr("owner");
 
  address impl = address(new SFFLTaskManagerHarness(registryCoordinator, TASK_RESPONSE_WINDOW_BLOCK));
 
  taskManager = SFFLTaskManagerHarness(
  deployProxy(
  impl,
  address(proxyAdmin),
- abi.encodeWithSelector(
- taskManager.initialize.selector, pauserRegistry, registryCoordinatorOwner, aggregator, generator
- )
+ abi.encodeWithSelector(taskManager.initialize.selector, pauserRegistry, owner, aggregator, generator)
  )
  );
 
@@ -946,4 +946,34 @@ contract SFFLTaskManagerTest is TestUtils {
  assertFalse(success);
  assertEq(signatoryRecordHash, expectedSignatoryRecordHash);
  }
+
+ function test_setAggregator() public {
+ address newAggregator = addr("newAggregator");
+
+ vm.prank(owner);
+ taskManager.setAggregator(newAggregator);
+
+ assertEq(taskManager.aggregator(), newAggregator);
+ }
+
+ function test_setAggregator_RevertWhen_CallerNotOwner() public {
+ vm.expectRevert("Ownable: caller is not the owner");
+
+ taskManager.setAggregator(addr("newAggregator"));
+ }
+
+ function test_setGenerator() public {
+ address newGenerator = addr("newGenerator");
+
+ vm.prank(owner);
+ taskManager.setGenerator(newGenerator);
+
+ assertEq(taskManager.generator(), newGenerator);
+ }
+
+ function test_setGenerator_RevertWhen_CallerNotOwner() public {
+ vm.expectRevert("Ownable: caller is not the owner");
+
+ taskManager.setGenerator(addr("newGenerator"));
+ }
 }

tests/anvil/data/genesis.json

@@ -26,7 +26,7 @@
  }
  }
  },
- "number": "11",
+ "number": "9",
  "gasUsed": "0x0",
  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
  "config": {