logos-co/staking
1
0
Fork 0
mirror of https://github.com/logos-co/staking.git synced 2025-02-09 09:14:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

add upgradability

Browse Source
This commit is contained in:
Ricardo Guilherme Schmidt 2023-06-23 18:38:55 -03:00
parent ff3a7b09ea
commit 26da805fd9
No known key found for this signature in database
GPG Key ID: 3F95A3AD0B607030
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contracts/StakeManager.sol
View File

@ -3,8 +3,9 @@
pragma solidity 0.8.19; pragma solidity 0.8.19;
import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
contract StakeManager is Controlled { contract StakeManager is Ownable {
struct Account { struct Account {
uint256 lockUntil; uint256 lockUntil;
@ -33,6 +34,8 @@ contract StakeManager is Controlled {
uint256 currentEpoch; uint256 currentEpoch;
uint256 pendingReward; uint256 pendingReward;
uint256 public totalSupply; uint256 public totalSupply;
StakeManager public migration;
StakeManager public oldManager;
modifier onlyVault { modifier onlyVault {
require(isVault[msg.sender.codehash], "Not a vault") require(isVault[msg.sender.codehash], "Not a vault")
@ -48,7 +51,7 @@ contract StakeManager is Controlled {
* @param _amount Amount of balance to be decreased. * @param _amount Amount of balance to be decreased.
* @param _time Seconds from now() to lock balance. * @param _time Seconds from now() to lock balance.
*/ */
function increaseBalance(uint256 _amount, uint256 _time) external { function join(uint256 _amount, uint256 _time) external {
Account storage account = accounts[msg.sender]; Account storage account = accounts[msg.sender];
uint256 increasedMultiplier = _amount * (_time + 1); uint256 increasedMultiplier = _amount * (_time + 1);
account.balance += _amount; account.balance += _amount;
@ -64,7 +67,7 @@ contract StakeManager is Controlled {
* Decreases balance of msg.sender; * Decreases balance of msg.sender;
* @param _amount Amount of balance to be decreased * @param _amount Amount of balance to be decreased
*/ */
function decreaseBalance(uint256 _amount) external { function leave(uint256 _amount) external {
Account storage account = accounts[msg.sender]; Account storage account = accounts[msg.sender];
uint256 reducedMultiplier = (_amount * account.multiplier) / account.balance; uint256 reducedMultiplier = (_amount * account.multiplier) / account.balance;
account.multiplier -= reducedMultiplier; account.multiplier -= reducedMultiplier;
@ -78,7 +81,7 @@ contract StakeManager is Controlled {
* @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 _time amount of time to lock from now.
*/ */
function balanceLock(uint256 _time) external { function lock(uint256 _time) external {
Account storage account = accounts[msg.sender]; Account storage account = accounts[msg.sender];
require(now() + _time > account.lockUntil, "Cannot decrease lock time"); require(now() + _time > account.lockUntil, "Cannot decrease lock time");
@ -146,10 +149,25 @@ contract StakeManager is Controlled {
* @notice Enables a contract class to interact with staking functions * @notice Enables a contract class to interact with staking functions
* @param _codehash bytecode hash of contract * @param _codehash bytecode hash of contract
*/ */
function setVault(bytes32 _codehash) external onlyController { function setVault(bytes32 _codehash) external onlyOwner {
isVault[_codehash] = true; isVault[_codehash] = true;
} }
function migrate() external onlyVault returns (address migration) {
require(migration != address(0), "Migration not available");
Account storage account = accounts[msg.sender];
stakedToken.approve(migration, account.balance);
migration.migrate(msg.sender, account);
delete account;
}
function migrate(address _vault, Account memory _account) external {
require(msg.sender == oldManager, "Unauthorized");
stakedToken.transferFrom(oldManager, _account.balance, _amount);
accounts[_vault] = _account
; }
function checkMaxMultiplier(uint256 _increasedMultiplier, uint256 _currentMp) private view returns(uint256 _maxToIncrease) { function checkMaxMultiplier(uint256 _increasedMultiplier, uint256 _currentMp) private view returns(uint256 _maxToIncrease) {
uint256 newMp = _increasedMultiplier + _currentMp; uint256 newMp = _increasedMultiplier + _currentMp;
return newMp > MAX_MP ? MAX_MP - newMp : _increasedMultiplier; return newMp > MAX_MP ? MAX_MP - newMp : _increasedMultiplier;

25
contracts/StakeVault.sol
View File

@ -3,31 +3,38 @@
pragma solidity 0.8.19; pragma solidity 0.8.19;
import "./StakeManager.sol"; import "./StakeManager.sol";
import "@openzeppelin/contracts/access/Ownable.sol";
/** /**
* @title StakeVault * @title StakeVault
* @author Ricardo Guilherme Schmidt <ricardo3@status.im> * @author Ricardo Guilherme Schmidt <ricardo3@status.im>
* @notice Secures user stake * @notice Secures user stake
*/ */
contract StakeVault { contract StakeVault is Ownable {
address owner;
StakeManager stakeManager; StakeManager stakeManager;
ERC20 stakedToken; ERC20 stakedToken;
constructor(address _owner) public { constructor(address _owner) public {
owner = _owner; owner = _owner;
} }
function join(uint256 _amount, uint256 _time) external { function join(uint256 _amount, uint256 _time) external onlyOwner {
stakedToken.transferFrom(msg.sender, address(this), amount); stakedToken.transferFrom(msg.sender, address(this), amount);
stakeManager.increaseBalance(amount, 0); stakeManager.join(amount, _time);
} }
function leave(uint256 _amount) external { function lock(uint256 _time) external onlyOwner {
stakeManager.decreaseBalance(amount); stakeManager.lock(_time);
}
function leave(uint256 _amount) external onlyOwner {
stakeManager.leave(amount);
stakedToken.transferFrom(address(this), msg.sender, amount); stakedToken.transferFrom(address(this), msg.sender, amount);
} }
function updateManager() external onlyOwner {
address migrated = stakeManager.migrate();
require(migrated != address(0), "Migration not available.");
stakeManager = migrated;
}
} }