Mixin Zrx Vault is ownable now
This commit is contained in:
@@ -39,11 +39,11 @@ contract Staking is
|
||||
MixinDeploymentConstants,
|
||||
MixinConstants,
|
||||
MixinStorage,
|
||||
MixinZrxVault,
|
||||
MixinOwnable,
|
||||
MixinExchangeManager,
|
||||
MixinScheduler,
|
||||
MixinStakingPoolRewardVault,
|
||||
MixinZrxVault,
|
||||
MixinStakingPool,
|
||||
MixinTimelockedStake,
|
||||
MixinStakeBalances,
|
||||
|
||||
@@ -37,10 +37,10 @@ contract MixinDelegatedStake is
|
||||
MixinDeploymentConstants,
|
||||
MixinConstants,
|
||||
MixinStorage,
|
||||
MixinZrxVault,
|
||||
MixinOwnable,
|
||||
MixinScheduler,
|
||||
MixinStakingPoolRewardVault,
|
||||
MixinZrxVault,
|
||||
MixinStakingPool,
|
||||
MixinTimelockedStake,
|
||||
MixinStakeBalances,
|
||||
|
||||
@@ -36,10 +36,10 @@ contract MixinStake is
|
||||
MixinDeploymentConstants,
|
||||
MixinConstants,
|
||||
MixinStorage,
|
||||
MixinZrxVault,
|
||||
MixinOwnable,
|
||||
MixinScheduler,
|
||||
MixinStakingPoolRewardVault,
|
||||
MixinZrxVault,
|
||||
MixinTimelockedStake,
|
||||
MixinStakeBalances
|
||||
{
|
||||
|
||||
@@ -140,6 +140,7 @@ contract MixinStakeBalances is
|
||||
/// @dev Returns the stake delegated to a specific staking pool, by a given owner.
|
||||
/// This stake is in the "Activated & Delegated" state.
|
||||
/// @param owner to query.
|
||||
/// @param poolId Unique Id of pool.
|
||||
/// @return Stake delegaated to pool by owner.
|
||||
function getStakeDelegatedToPoolByOwner(address owner, bytes32 poolId)
|
||||
public
|
||||
@@ -151,8 +152,8 @@ contract MixinStakeBalances is
|
||||
|
||||
/// @dev Returns the total stake delegated to a specific staking pool, across all members.
|
||||
/// This stake is in the "Activated & Delegated" state.
|
||||
/// @param owner to query.
|
||||
/// @return Stake delegaated to pool by owner.
|
||||
/// @param poolId Unique Id of pool.
|
||||
/// @return Total stake delegaated to pool.
|
||||
function getStakeDelegatedToPool(bytes32 poolId)
|
||||
public
|
||||
view
|
||||
|
||||
@@ -35,6 +35,10 @@ contract MixinTimelockedStake is
|
||||
MixinScheduler
|
||||
{
|
||||
|
||||
/// @dev This mixin contains logic for timelocking stake.
|
||||
/// **** Read MixinStake before continuing ****
|
||||
///
|
||||
|
||||
using LibSafeMath for uint256;
|
||||
|
||||
function forceTimelockSync(address owner)
|
||||
|
||||
@@ -20,17 +20,20 @@ pragma solidity ^0.5.5;
|
||||
|
||||
import "../interfaces/IZrxVault.sol";
|
||||
import "../immutable/MixinStorage.sol";
|
||||
import "../sys/MixinOwnable.sol";
|
||||
|
||||
|
||||
contract MixinZrxVault is
|
||||
IStakingEvents,
|
||||
MixinDeploymentConstants,
|
||||
MixinConstants,
|
||||
MixinStorage
|
||||
MixinStorage,
|
||||
MixinOwnable
|
||||
{
|
||||
|
||||
function setZrxVault(address _zrxVault)
|
||||
external
|
||||
// onlyOwner
|
||||
onlyOwner
|
||||
{
|
||||
zrxVault = IZrxVault(_zrxVault);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user