logos-co
/
staking
mirror of https://github.com/logos-co/staking.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(StakeManager): lock function checks for MIN_LOCKUP_PERIOD

This commit is contained in:
Ricardo Guilherme Schmidt 2024-03-04 12:27:40 -03:00
parent 694608a629
commit cbd40aef8a
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
contracts/StakeManager.sol
View File

@ -128,14 +128,11 @@ contract StakeManager is Ownable {
/** /**
* Increases balance of msg.sender; * Increases balance of msg.sender;
* @param _amount Amount of balance to be decreased. * @param _amount Amount of balance to be decreased.
* @param _time Seconds from block.timestamp to lock balance. * @param _timeToIncrease Seconds to increase in locked time. If stake is unlocked, increases from block.timestamp.
* *
* @dev Reverts when `_time` is not in range of [MIN_LOCKUP_PERIOD, MAX_LOCKUP_PERIOD] * @dev Reverts when resulting locked time is not in range of [MIN_LOCKUP_PERIOD, MAX_LOCKUP_PERIOD]
*/ */
function stake(uint256 _amount, uint256 _time) external onlyVault noMigration processEpoch { function stake(uint256 _amount, uint256 _timeToIncrease) external onlyVault noMigration processEpoch {
if (_time > 0 && (_time < MIN_LOCKUP_PERIOD || _time > MAX_LOCKUP_PERIOD)) {
revert StakeManager__InvalidLockTime();
}
Account storage account = accounts[msg.sender]; Account storage account = accounts[msg.sender];
if (account.lockUntil == 0) { if (account.lockUntil == 0) {
// account not initialized // account not initialized
@ -145,11 +142,22 @@ contract StakeManager is Ownable {
} else { } else {
_processAccount(account, currentEpoch); _processAccount(account, currentEpoch);
} }
_mintIntialMP(account, _time, _amount); uint256 deltaTime = 0;
if (_timeToIncrease > 0) {
uint256 lockUntil = account.lockUntil + _timeToIncrease;
if (lockUntil < block.timestamp) {
revert StakeManager__InvalidLockTime();
}
deltaTime = lockUntil - block.timestamp;
if (deltaTime < MIN_LOCKUP_PERIOD || deltaTime > MAX_LOCKUP_PERIOD) {
revert StakeManager__InvalidLockTime();
}
}
_mintIntialMP(account, deltaTime, _amount);
//update storage //update storage
totalSupplyBalance += _amount; totalSupplyBalance += _amount;
account.balance += _amount; account.balance += _amount;
account.lockUntil += _time; account.lockUntil += _timeToIncrease;
} }
/** /**
@ -178,23 +186,28 @@ contract StakeManager is Ownable {
/** /**
* @notice Locks entire balance for more amount of time. * @notice Locks entire balance for more amount of time.
* @param _time amount of time to lock from now. * @param _timeToIncrease Seconds to increase in locked time. If stake is unlocked, increases from block.timestamp.
* *
* @dev Reverts when `_time` is bigger than `MAX_LOCKUP_PERIOD` * @dev Reverts when resulting locked time is not in range of [MIN_LOCKUP_PERIOD, MAX_LOCKUP_PERIOD]
* @dev Reverts when `_time + block.timestamp` is smaller than current lock time.
*/ */
function lock(uint256 _time) external onlyVault onlyInitialized(msg.sender) noMigration processEpoch { function lock(uint256 _timeToIncrease) external onlyVault onlyInitialized(msg.sender) noMigration processEpoch {
if (_time > MAX_LOCKUP_PERIOD) {
revert StakeManager__InvalidLockTime();
}
Account storage account = accounts[msg.sender]; Account storage account = accounts[msg.sender];
_processAccount(account, currentEpoch); _processAccount(account, currentEpoch);
if (account.lockUntil + _time < block.timestamp) { uint256 lockUntil = account.lockUntil;
uint256 deltaTime;
if (lockUntil < block.timestamp) {
lockUntil = block.timestamp + _timeToIncrease;
deltaTime = _timeToIncrease;
} else {
lockUntil += _timeToIncrease;
deltaTime = lockUntil - block.timestamp;
}
if (deltaTime < MIN_LOCKUP_PERIOD || deltaTime > MAX_LOCKUP_PERIOD) {
revert StakeManager__InvalidLockTime(); revert StakeManager__InvalidLockTime();
} }
_mintIntialMP(account, _time, 0); _mintIntialMP(account, _timeToIncrease, 0);
//update account storage //update account storage
account.lockUntil += _time; account.lockUntil = lockUntil;
} }
/** /**

6
test/StakeManager.t.sol
View File

@ -68,11 +68,11 @@ contract StakeTest is StakeManagerTest {
ERC20(stakeToken).approve(address(userVault), 100); ERC20(stakeToken).approve(address(userVault), 100);
uint256 lockTime = stakeManager.MIN_LOCKUP_PERIOD() - 1; uint256 lockTime = stakeManager.MIN_LOCKUP_PERIOD() - 1;
vm.expectRevert(StakeManager.StakeManager__InvalidLockupPeriod.selector); vm.expectRevert(StakeManager.StakeManager__InvalidLockTime.selector);
userVault.stake(100, lockTime); userVault.stake(100, lockTime);
lockTime = stakeManager.MAX_LOCKUP_PERIOD() + 1; lockTime = stakeManager.MAX_LOCKUP_PERIOD() + 1;
vm.expectRevert(StakeManager.StakeManager__InvalidLockupPeriod.selector); vm.expectRevert(StakeManager.StakeManager__InvalidLockTime.selector);
userVault.stake(100, lockTime); userVault.stake(100, lockTime);
} }
@ -214,7 +214,7 @@ contract LockTest is StakeManagerTest {
ERC20(stakeToken).approve(address(userVault), 100); ERC20(stakeToken).approve(address(userVault), 100);
uint256 lockTime = stakeManager.MAX_LOCKUP_PERIOD() + 1; uint256 lockTime = stakeManager.MAX_LOCKUP_PERIOD() + 1;
vm.expectRevert(StakeManager.StakeManager__InvalidLockupPeriod.selector); vm.expectRevert(StakeManager.StakeManager__InvalidLockTime.selector);
userVault.stake(100, lockTime); userVault.stake(100, lockTime);
} }
} }