Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add missing data in position modified events #1580

Merged
merged 1 commit into from
Nov 2, 2021
Merged

add missing data in position modified events #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions contracts/FuturesMarket.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,10 +987,10 @@ contract FuturesMarket is Owned, Proxyable, MixinFuturesMarketSettings, IFutures
}

Position storage position = positions[sender];
Position memory _position = position;
Position memory oldPosition = position;
artdgn marked this conversation as resolved.
Show resolved Hide resolved

// Determine new margin, ensuring that the result is positive.
(uint margin, Status status) = _realisedMargin(_position, fundingIndex, price, marginDelta);
(uint margin, Status status) = _realisedMargin(oldPosition, fundingIndex, price, marginDelta);
_revertIfError(status);

// Update the debt correction.
Expand Down Expand Up @@ -1024,16 +1024,7 @@ contract FuturesMarket is Owned, Proxyable, MixinFuturesMarketSettings, IFutures
if (marginDelta != 0) {
emitMarginTransferred(sender, marginDelta);
}
emitPositionModified(
position.id,
sender,
margin,
positionSize,
0,
positionSize != 0 ? price : position.lastPrice,
positionSize != 0 ? fundingIndex : position.fundingIndex,
0
);
emitPositionModified(position.id, sender, margin, positionSize, 0, price, fundingIndex, 0);
artdgn marked this conversation as resolved.
Show resolved Hide resolved
}

/*
Expand Down Expand Up @@ -1088,30 +1079,26 @@ contract FuturesMarket is Owned, Proxyable, MixinFuturesMarketSettings, IFutures
_applyDebtCorrection(newPosition, oldPosition);

// Record the trade
uint id = oldPosition.id;
if (newPosition.size == 0) {
// If the position is being closed, we no longer need to track these details.
delete position.id;
delete position.size;
delete position.lastPrice;
delete position.fundingIndex;
// Note we still emit the old position id in the event to indicate that it's closing.
emitPositionModified(oldPosition.id, sender, newPosition.margin, 0, sizeDelta, 0, 0, fee);
} else {
uint id;
if (oldPosition.size == 0) {
// New positions get new ids.
id = _nextPositionId;
_nextPositionId += 1;
position.id = id;
} else {
// If an existing position is just being modified, reuse the existing id.
id = newPosition.id;
}
position.id = id;
position.size = newPosition.size;
position.lastPrice = price;
position.fundingIndex = fundingIndex;
emitPositionModified(id, sender, newPosition.margin, newPosition.size, sizeDelta, price, fundingIndex, fee);
}
// emit the modification event
emitPositionModified(id, sender, position.margin, position.size, sizeDelta, price, fundingIndex, fee);
}

/*
Expand Down Expand Up @@ -1200,7 +1187,7 @@ contract FuturesMarket is Owned, Proxyable, MixinFuturesMarketSettings, IFutures
// Issue the reward to the liquidator.
_manager().issueSUSD(liquidator, liquidationFee);

emitPositionModified(positionId, account, 0, 0, 0, 0, 0, 0);
emitPositionModified(positionId, account, 0, 0, 0, price, fundingIndex, 0);
artdgn marked this conversation as resolved.
Show resolved Hide resolved
emitPositionLiquidated(positionId, account, liquidator, positionSize, lPrice, liquidationFee);
}

Expand Down
47 changes: 37 additions & 10 deletions test/contracts/FuturesMarket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,8 +935,8 @@ contract('FuturesMarket', accounts => {
toUnit('1000'),
toBN('0'),
toBN('0'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[3],
Expand Down Expand Up @@ -981,8 +981,8 @@ contract('FuturesMarket', accounts => {
toUnit('0'),
toBN('0'),
toBN('0'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[3],
Expand Down Expand Up @@ -1638,8 +1638,8 @@ contract('FuturesMarket', accounts => {
toUnit('2000'),
toBN('0'),
toUnit('-10'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[1],
Expand Down Expand Up @@ -1718,7 +1718,7 @@ contract('FuturesMarket', accounts => {
assert.bnEqual(positionId, toBN('1'));
});

it('closing a position deletes the id but emits in in the event', async () => {
it('closing a position deletes the id but emits it in the event', async () => {
await setPrice(baseAsset, toUnit('100'));
await futuresMarket.transferMargin(toUnit('1000'), { from: trader });
await futuresMarket.transferMargin(toUnit('1000'), { from: trader2 });
Expand Down Expand Up @@ -3432,7 +3432,16 @@ contract('FuturesMarket', accounts => {
decodedEventEqual({
event: 'PositionModified',
emittedFrom: proxyFuturesMarket.address,
args: [positionId, trader, toBN('0'), toBN('0'), toBN('0'), toBN('0'), toBN('0')],
args: [
positionId,
trader,
toBN('0'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[2],
});
decodedEventEqual({
Expand Down Expand Up @@ -3474,7 +3483,16 @@ contract('FuturesMarket', accounts => {
decodedEventEqual({
event: 'PositionModified',
emittedFrom: proxyFuturesMarket.address,
args: [positionId, trader3, toBN('0'), toBN('0'), toBN('0'), toBN('0'), toBN('0')],
args: [
positionId,
trader3,
toBN('0'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[2],
});
decodedEventEqual({
Expand Down Expand Up @@ -3511,7 +3529,16 @@ contract('FuturesMarket', accounts => {
decodedEventEqual({
event: 'PositionModified',
emittedFrom: proxyFuturesMarket.address,
args: [positionId, trader, toBN('0'), toBN('0'), toBN('0'), toBN('0'), toBN('0')],
args: [
positionId,
trader,
toBN('0'),
toBN('0'),
toBN('0'),
(await futuresMarket.assetPrice()).price,
await futuresMarket.fundingSequenceLength(),
toBN('0'),
],
log: decodedLogs[2],
});
decodedEventEqual({
Expand Down