crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor bug fixes in staking + tests making progress

Browse Source
This commit is contained in:
Greg Hysen
2019-06-05 17:09:54 -07:00
parent b1d98a4183
commit cbf41e6ade
3 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contracts/staking/contracts/src/core/MixinStake.sol
View File

@@ -33,8 +33,8 @@ contract MixinStake is
IStakingEvents,
MixinConstants,
MixinStorage,
MixinStakeBalances,
MixinEpoch
MixinEpoch,
MixinStakeBalances
{
using LibZrxToken for uint256;
@@ -212,27 +212,4 @@ contract MixinStake is
}
timelockedStakeByOwner[owner] = ownerTimelock;
}
function _getSynchronizedTimelock(address owner)
private
returns (
Timelock memory ownerTimelock,
bool isOutOfSync
)
{
uint64 currentTimelockPeriod = _getCurrentTimelockPeriod();
ownerTimelock = timelockedStakeByOwner[owner];
isOutOfSync = false;
if (currentTimelockPeriod == _safeAdd(ownerTimelock.lockedAt, 1)) {
// shift n periods
ownerTimelock.pending = ownerTimelock.total;
isOutOfSync = true;
} else if(currentTimelockPeriod > ownerTimelock.lockedAt) {
// Timelock has expired - zero out
ownerTimelock.lockedAt = 0;
ownerTimelock.total = 0;
ownerTimelock.pending = 0;
}
return (ownerTimelock, isOutOfSync);
}
}

45
contracts/staking/contracts/src/core/MixinStakeBalances.sol
View File

@@ -23,12 +23,14 @@ import "../libs/LibZrxToken.sol";
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "./MixinStorage.sol";
import "./MixinConstants.sol";
import "./MixinEpoch.sol";
contract MixinStakeBalances is
SafeMath,
MixinConstants,
MixinStorage
MixinStorage,
MixinEpoch
{
function _getTotalStake(address owner)
@@ -71,14 +73,6 @@ contract MixinStakeBalances is
return _getActivatableStake(owner);
}
function _getTimelockedStake(address owner)
internal
view
returns (uint256)
{
return timelockedStakeByOwner[owner].total;
}
function _getStakeDelegatedByOwner(address owner)
internal
view
@@ -102,4 +96,37 @@ contract MixinStakeBalances is
{
return delegatedStakeByPoolId[poolId];
}
function _getTimelockedStake(address owner)
internal
view
returns (uint256)
{
(Timelock memory timelock,) = _getSynchronizedTimelock(owner);
return timelock.total;
}
function _getSynchronizedTimelock(address owner)
internal
view
returns (
Timelock memory ownerTimelock,
bool isOutOfSync
)
{
uint64 currentTimelockPeriod = _getCurrentTimelockPeriod();
ownerTimelock = timelockedStakeByOwner[owner];
isOutOfSync = false;
if (currentTimelockPeriod == _safeAdd(ownerTimelock.lockedAt, 1)) {
// shift n periods
ownerTimelock.pending = ownerTimelock.total;
isOutOfSync = true;
} else if(currentTimelockPeriod > ownerTimelock.lockedAt) {
// Timelock has expired - zero out
ownerTimelock.lockedAt = 0;
ownerTimelock.total = 0;
ownerTimelock.pending = 0;
}
return (ownerTimelock, isOutOfSync);
}
}

40
contracts/staking/test/core_test.ts
View File

@@ -68,7 +68,7 @@ describe('Staking Core', () => {
await blockchainLifecycle.revertAsync();
});
describe('end-to-end tests', () => {
it.only('epochs & timelock periods', async () => {
it('epochs & timelock periods', async () => {
///// 0/3 Validate Assumptions /////
expect(await stakingWrapper.getEpochPeriodInSecondsAsync()).to.be.bignumber.equal(stakingConstants.EPOCH_PERIOD_IN_SECONDS);
expect(await stakingWrapper.getTimelockPeriodInEpochsAsync()).to.be.bignumber.equal(stakingConstants.TIMELOCK_PERIOD_IN_EPOCHS);
@@ -100,7 +100,7 @@ describe('Staking Core', () => {
expect(currentTimelockPeriod).to.be.bignumber.equal(stakingConstants.INITIAL_TIMELOCK_PERIOD.plus(1));
}
});
it.skip('staking/unstaking', async () => {
it.only('staking/unstaking', async () => {
///// 1/3 SETUP TEST PARAMETERS /////
const amountToStake = stakingWrapper.toBaseUnitAmount(10);
const amountToUnstake = stakingWrapper.toBaseUnitAmount(4);
@@ -111,9 +111,9 @@ describe('Staking Core', () => {
const zrxTokenBalanceOfStakerBeforeStaking = await stakingWrapper.getZrxTokenBalance(owner);
expect(zrxTokenBalanceOfStakerBeforeStaking).to.be.bignumber.gte(amountToStake);
///// 2/3 STAKE ZRX /////
// mint stake
await stakingWrapper.depositAndStakeAsync(owner, amountToStake);
{
// mint stake
await stakingWrapper.depositAndStakeAsync(owner, amountToStake);
// check stake balance after minting
const stakeBalance = await stakingWrapper.getTotalStakeAsync(owner);
expect(stakeBalance).to.be.bignumber.equal(amountToStake);
@@ -127,9 +127,9 @@ describe('Staking Core', () => {
expect(zrxTokenBalanceOfStakerAfterStaking).to.be.bignumber.equal(zrxTokenBalanceOfStakerBeforeStaking.minus(amountToStake));
}
///// 3/3 DEACTIVATE AND TIMELOCK STAKE /////
// unstake
await stakingWrapper.deactivateAndTimelockStakeAsync(owner, amountToUnstake);
{
// unstake
await stakingWrapper.deactivateAndTimelockStakeAsync(owner, amountToUnstake);
// check total stake balance didn't change
const totalStake = await stakingWrapper.getTotalStakeAsync(owner);
expect(totalStake).to.be.bignumber.equal(amountToStake);
@@ -149,11 +149,9 @@ describe('Staking Core', () => {
const activatableStakeBalance = await stakingWrapper.getActivatableStakeAsync(owner);
expect(activatableStakeBalance).to.be.bignumber.equal(0);
}
///// 4 SKIP TO NEXT EPOCH - NOTHING SHOULD HAVE CHANGED /////
await stakingWrapper.skipToNextEpochAsync();
///// 4 SKIP TO NEXT TIMELOCK PERIOD - NOTHING SHOULD HAVE CHANGED /////
await stakingWrapper.skipToNextTimelockPeriodAsync();
{
// unstake
await stakingWrapper.deactivateAndTimelockStakeAsync(owner, amountToUnstake);
// check total stake balance didn't change
const totalStake = await stakingWrapper.getTotalStakeAsync(owner);
expect(totalStake).to.be.bignumber.equal(amountToStake);
@@ -173,6 +171,28 @@ describe('Staking Core', () => {
const activatableStakeBalance = await stakingWrapper.getActivatableStakeAsync(owner);
expect(activatableStakeBalance).to.be.bignumber.equal(0);
}
///// 5 SKIP TO NEXT TIMELOCK PEIOD - SHOULD BE ABLE TO REACTIVATE/WITHDRAW TIMELOCKED STAKE /////
await stakingWrapper.skipToNextTimelockPeriodAsync();
{
// check total stake balance didn't change
const totalStake = await stakingWrapper.getTotalStakeAsync(owner);
expect(totalStake).to.be.bignumber.equal(amountToStake);
// check timelocked stake is no longer activated
const activatedStakeBalance = await stakingWrapper.getActivatedStakeAsync(owner);
expect(activatedStakeBalance).to.be.bignumber.equal(amountToStake.minus(amountToUnstake));
// check that timelocked stake is deactivated
const deactivatedStakeBalance = await stakingWrapper.getDeactivatedStakeAsync(owner);
expect(deactivatedStakeBalance).to.be.bignumber.equal(amountToUnstake);
// check amount that is timelocked
const timelockedStakeBalance = await stakingWrapper.getTimelockedStakeAsync(owner);
expect(timelockedStakeBalance).to.be.bignumber.equal(0);
// check that timelocked stake cannot be withdrawn
const withdrawableStakeBalance = await stakingWrapper.getWithdrawableStakeAsync(owner);
expect(withdrawableStakeBalance).to.be.bignumber.equal(amountToUnstake);
// check that timelocked stake cannot be reactivated
const activatableStakeBalance = await stakingWrapper.getActivatableStakeAsync(owner);
expect(activatableStakeBalance).to.be.bignumber.equal(amountToUnstake);
}
///// Stake a 0 amount to force an update //////