feat(contracts): auto activate validator when deposit

kroma-network · Jul 31, 2024 · 3d51fd6 · 3d51fd6
1 parent 5583cf9
commit 3d51fd6
Show file tree

Hide file tree

Showing 10 changed files with 225 additions and 125 deletions.
diff --git a/kroma-bindings/bindings/assetmanager.go b/kroma-bindings/bindings/assetmanager.go
diff --git a/kroma-bindings/bindings/assetmanager_more.go b/kroma-bindings/bindings/assetmanager_more.go
diff --git a/kroma-bindings/bindings/validatormanager.go b/kroma-bindings/bindings/validatormanager.go
diff --git a/kroma-bindings/bindings/validatormanager_more.go b/kroma-bindings/bindings/validatormanager_more.go
diff --git a/packages/contracts/.gas-snapshot b/packages/contracts/.gas-snapshot
diff --git a/packages/contracts/contracts/L1/AssetManager.sol b/packages/contracts/contracts/L1/AssetManager.sol
@@ -303,6 +303,8 @@ contract AssetManager is ISemver, IERC721Receiver, IAssetManager {
 
  _deposit(msg.sender, assets, true);
  emit Deposited(msg.sender, assets);
+
+ VALIDATOR_MANAGER.tryActivateValidator(msg.sender);
  }
 
  /**

diff --git a/packages/contracts/contracts/L1/ValidatorManager.sol b/packages/contracts/contracts/L1/ValidatorManager.sol
@@ -145,6 +145,14 @@ contract ValidatorManager is ISemver, IValidatorManager {
  _;
  }
 
+ /**
+ * @notice A modifier that only allows AssetManager contract to call.
+ */
+ modifier onlyAssetManager() {
+ if (msg.sender != address(ASSET_MANAGER)) revert NotAllowedCaller();
+ _;
+ }
+
  /**
  * @notice Semantic version.
  * @custom:semver 1.0.0
@@ -213,6 +221,14 @@ contract ValidatorManager is ISemver, IValidatorManager {
  _activateValidator(msg.sender);
  }
 
+ /**
+ * @inheritdoc IValidatorManager
+ */
+ function tryActivateValidator(address validator) external onlyAssetManager {
+ if (getStatus(validator) == ValidatorStatus.READY && !inJail(validator))
+ _activateValidator(validator);
+ }
+
  /**
  * @inheritdoc IValidatorManager
  */
@@ -262,8 +278,9 @@ contract ValidatorManager is ISemver, IValidatorManager {
  if (getStatus(msg.sender) < ValidatorStatus.REGISTERED || inJail(msg.sender))
  revert ImproperValidatorStatus();
 
- if (block.timestamp < canFinalizeCommissionChangeAt(msg.sender))
- revert NotElapsedCommissionChangeDelay();
+ uint128 canFinalizeAt = canFinalizeCommissionChangeAt(msg.sender);
+ if (canFinalizeAt == COMMISSION_CHANGE_DELAY_SECONDS) revert NotInitiatedCommissionChange();
+ if (block.timestamp < canFinalizeAt) revert NotElapsedCommissionChangeDelay();
 
  Validator storage validatorInfo = _validatorInfo[msg.sender];
  uint8 oldCommissionRate = validatorInfo.commissionRate;

diff --git a/packages/contracts/contracts/L1/interfaces/IValidatorManager.sol b/packages/contracts/contracts/L1/interfaces/IValidatorManager.sol
@@ -240,6 +240,11 @@ interface IValidatorManager {
  */
  error SameCommissionRate();
 
+ /**
+ * @notice Reverts when the commission rate change has not been initiated.
+ */
+ error NotInitiatedCommissionChange();
+
  /**
  * @notice Reverts when the delay of commission rate change finalization has not elapsed.
  */
@@ -276,6 +281,15 @@ interface IValidatorManager {
  */
  function activateValidator() external;
 
+ /**
+ * @notice Tries to activate a validator and adds the validator to validator tree. To submit
+ * outputs, the validator should be activated. This function can only be called by
+ * AssetManager.
+ *
+ * @param validator Address of the validator.
+ */
+ function tryActivateValidator(address validator) external;
+
  /**
  * @notice Handles some essential actions such as reward distribution, jail handling, next
  * priority validator selection after output submission. This function can only be

diff --git a/packages/contracts/contracts/test/AssetManager.t.sol b/packages/contracts/contracts/test/AssetManager.t.sol
@@ -225,6 +225,42 @@ contract AssetManagerTest is ValidatorSystemUpgrade_Initializer {
  assertEq(assetToken.balanceOf(validator), beforeBalance - bondAmount);
  }
 
+ function test_deposit_activate_succeeds() external {
+ _registerValidator(minActivateAmount - 1);
+ assertEq(valMgr.getWeight(validator), 0);
+
+ vm.startPrank(validator);
+ assetToken.approve(address(assetMgr), 1);
+ assetMgr.deposit(1);
+
+ assertEq(valMgr.getWeight(validator), minActivateAmount);
+ }
+
+ function test_deposit_notActivate_succeeds() external {
+ _registerValidator(minActivateAmount - 2);
+ assertEq(valMgr.getWeight(validator), 0);
+
+ vm.startPrank(validator);
+ assetToken.approve(address(assetMgr), 1);
+ assetMgr.deposit(1);
+
+ assertEq(valMgr.getWeight(validator), 0);
+ }
+
+ function test_deposit_inJailNotActivate_succeeds() external {
+ _registerValidator(minActivateAmount - 1);
+ assertEq(valMgr.getWeight(validator), 0);
+
+ mockValMgr.sendToJail(validator);
+ assertTrue(valMgr.inJail(validator));
+
+ vm.startPrank(validator);
+ assetToken.approve(address(assetMgr), 1);
+ assetMgr.deposit(1);
+
+ assertEq(valMgr.getWeight(validator), 0);
+ }
+
  function test_deposit_zeroAsset_reverts() external {
  vm.expectRevert(IAssetManager.NotAllowedZeroInput.selector);
  assetMgr.deposit(0);

diff --git a/packages/contracts/contracts/test/ValidatorManager.t.sol b/packages/contracts/contracts/test/ValidatorManager.t.sol
@@ -273,26 +273,6 @@ contract ValidatorManagerTest is ValidatorSystemUpgrade_Initializer {
  valMgr.registerValidator(assets, 10, address(0));
  }
 
- function test_activateValidator_succeeds() external {
- uint32 count = valMgr.activatedValidatorCount();
-
- _registerValidator(trusted, minActivateAmount - 1);
- assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.REGISTERED);
- vm.startPrank(trusted);
- assetToken.approve(address(assetMgr), 1);
- assetMgr.deposit(1);
- assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.READY);
-
- vm.expectEmit(true, false, false, true, address(valMgr));
- emit ValidatorActivated(trusted, block.timestamp);
- valMgr.activateValidator();
- vm.stopPrank();
-
- assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.ACTIVE);
- assertEq(valMgr.activatedValidatorCount(), count + 1);
- assertEq(valMgr.getWeight(trusted), minActivateAmount);
- }
-
  function test_activateValidator_notValidator_reverts() external {
  assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.NONE);
 
@@ -350,6 +330,24 @@ contract ValidatorManagerTest is ValidatorSystemUpgrade_Initializer {
  valMgr.activateValidator();
  }
 
+ function test_tryActivateValidator_succeeds() external {
+ uint32 count = valMgr.activatedValidatorCount();
+
+ _registerValidator(trusted, minActivateAmount - 1);
+ assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.REGISTERED);
+
+ vm.startPrank(trusted);
+ assetToken.approve(address(assetMgr), 1);
+ vm.expectEmit(true, false, false, true, address(valMgr));
+ emit ValidatorActivated(trusted, block.timestamp);
+ assetMgr.deposit(1);
+ vm.stopPrank();
+
+ assertTrue(valMgr.getStatus(trusted) == IValidatorManager.ValidatorStatus.ACTIVE);
+ assertEq(valMgr.activatedValidatorCount(), count + 1);
+ assertEq(valMgr.getWeight(trusted), minActivateAmount);
+ }
+
  function test_afterSubmitL2Output_distributeReward_succeeds() external {
  // Register validator with commission rate 10%
  _registerValidator(trusted, minActivateAmount);
@@ -624,6 +622,14 @@ contract ValidatorManagerTest is ValidatorSystemUpgrade_Initializer {
  valMgr.finalizeCommissionChange();
  }
 
+ function test_finalizeCommissionChange_notInitiated_reverts() external {
+ _registerValidator(trusted, minActivateAmount);
+
+ vm.prank(trusted);
+ vm.expectRevert(IValidatorManager.NotInitiatedCommissionChange.selector);
+ valMgr.finalizeCommissionChange();
+ }
+
  function test_tryUnjail_succeeds() external {
  test_afterSubmitL2Output_tryJail_succeeds();
  assertTrue(valMgr.getStatus(asserter) == IValidatorManager.ValidatorStatus.READY);