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

Force no-op when moving zero stake or moving from undelegated to undelegated.

Browse Source
This commit is contained in:
Greg Hysen
2019-10-22 11:53:00 -07:00
parent 39804fdc83
commit c676ecb8cf
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/staking/contracts/src/stake/MixinStake.sol
View File

@@ -111,6 +111,17 @@ contract MixinStake is
{
address staker = msg.sender;
// Sanity check: no-op if no stake is being moved.
if (amount == 0) {
return;
}
// Sanity check: no-op if moving stake from undelegated to undelegated.
if (from.status == IStructs.StakeStatus.UNDELEGATED &&
to.status == IStructs.StakeStatus.UNDELEGATED) {
return;
}
// handle delegation
if (from.status == IStructs.StakeStatus.DELEGATED) {
_undelegateStake(

18
contracts/staking/test/unit_tests/stake_test.ts
View File

@@ -373,7 +373,7 @@ blockchainTests.resets('MixinStake unit tests', env => {
expect(increaseNextBalanceEvents).to.be.length(0);
});
it('moves the owner stake between the same pointer when both are undelegated', async () => {
it('does nothing when moving the owner stake from undelegated to undelegated', async () => {
const amount = getRandomInteger(0, 100e18);
const { logs } = await testContract.moveStake.awaitTransactionSuccessAsync(
{ status: StakeStatus.Undelegated, poolId: VALID_POOL_IDS[0] },
@@ -381,10 +381,18 @@ blockchainTests.resets('MixinStake unit tests', env => {
amount,
);
const events = filterLogsToArguments<MoveStakeStorageEventArgs>(logs, StakeEvents.MoveStakeStorage);
expect(events).to.be.length(1);
expect(events[0].fromBalanceSlot).to.eq(stakerUndelegatedStakeSlot);
expect(events[0].toBalanceSlot).to.eq(stakerUndelegatedStakeSlot);
expect(events[0].amount).to.bignumber.eq(amount);
expect(events).to.be.length(0);
});
it('does nothing when moving zero stake', async () => {
const amount = new BigNumber(0);
const { logs } = await testContract.moveStake.awaitTransactionSuccessAsync(
{ status: StakeStatus.Delegated, poolId: VALID_POOL_IDS[0] },
{ status: StakeStatus.Delegated, poolId: VALID_POOL_IDS[1] },
amount,
);
const events = filterLogsToArguments<MoveStakeStorageEventArgs>(logs, StakeEvents.MoveStakeStorage);
expect(events).to.be.length(0);
});
it('moves the owner stake between the same pointer when both are delegated', async () => {