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

Refactor open interest and oi shares reduction #120

Merged
merged 12 commits into from
Jan 18, 2024
Merged

Refactor open interest and oi shares reduction #120

Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
169d5c4
Refactor open interest and oi shares reduction
magnetto90 Jan 2, 2024
788c5b1
Refactor _reduceOIAndOIShares to include additional parameters
magnetto90 Jan 2, 2024
b161f87
Refactor _reduceOIAndOIShares function
magnetto90 Jan 4, 2024
14faf65
Merge branch 'staging' into liquidate-refactor
magnetto90 Jan 13, 2024
b28099e
Fix parameter formatting in _reduceOIAndOIShares function
magnetto90 Jan 13, 2024
f33d521
Merge branch 'chainlink-feeds' into liquidate-refactor
magnetto90 Jan 15, 2024
95dc476
Merge branch 'staging' into liquidate-refactor
magnetto90 Jan 16, 2024
4b1f89a
Merge branch 'chainlink-feeds' into liquidate-refactor
magnetto90 Jan 16, 2024
b4e69a3
Fix assert
magnetto90 Jan 16, 2024
5828c55
Merge branch 'staging' into liquidate-refactor
magnetto90 Jan 16, 2024
bc88cdc
Merge branch 'chainlink-feeds' into liquidate-refactor
magnetto90 Jan 17, 2024
3d4420e
Merge branch 'staging' into liquidate-refactor
magnetto90 Jan 18, 2024
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
42 changes: 18 additions & 24 deletions contracts/OverlayV1Market.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,18 +343,7 @@ contract OverlayV1Market is IOverlayV1Market, Pausable {

// subtract unwound open interest from the side's aggregate oi value
// and decrease number of oi shares issued
// NOTE: use subFloor to avoid reverts with oi rounding issues
if (pos.isLong) {
oiLong = oiLong.subFloor(
pos.oiCurrent(fraction, oiTotalOnSide, oiTotalSharesOnSide)
);
oiLongShares -= pos.oiSharesCurrent(fraction);
} else {
oiShort = oiShort.subFloor(
pos.oiCurrent(fraction, oiTotalOnSide, oiTotalSharesOnSide)
);
oiShortShares -= pos.oiSharesCurrent(fraction);
}
_reduceOIAndOIShares(pos, fraction);

// register the amount to be minted/burned
// capPayoff prevents overflow reverts with int256 cast
Expand Down Expand Up @@ -445,18 +434,7 @@ contract OverlayV1Market is IOverlayV1Market, Pausable {

// subtract liquidated open interest from the side's aggregate oi value
// and decrease number of oi shares issued
// NOTE: use subFloor to avoid reverts with oi rounding issues
if (pos.isLong) {
oiLong = oiLong.subFloor(
pos.oiCurrent(fraction, oiTotalOnSide, oiTotalSharesOnSide)
);
oiLongShares -= pos.oiSharesCurrent(fraction);
} else {
oiShort = oiShort.subFloor(
pos.oiCurrent(fraction, oiTotalOnSide, oiTotalSharesOnSide)
);
oiShortShares -= pos.oiSharesCurrent(fraction);
}
_reduceOIAndOIShares(pos, fraction);

// register the amount to be burned
_registerMintOrBurn(int256(value) - int256(cost) - int256(marginToBurn));
Expand Down Expand Up @@ -749,6 +727,22 @@ contract OverlayV1Market is IOverlayV1Market, Pausable {
return minted;
}

/// @notice subtract open interest from the side's aggregate oi value
/// @notice and decrease number of oi shares issued
function _reduceOIAndOIShares(
Position.Info memory pos,
uint256 fraction
) internal {
// NOTE: use subFloor to avoid reverts with oi rounding issues
if (pos.isLong) {
oiLong = oiLong.subFloor(pos.oiCurrent(fraction, oiLong, oiLongShares));
oiLongShares -= pos.oiSharesCurrent(fraction);
} else {
oiShort = oiShort.subFloor(pos.oiCurrent(fraction, oiShort, oiShortShares));
oiShortShares -= pos.oiSharesCurrent(fraction);
}
}

/// @notice Updates the market for funding changes to open interest
/// @notice since last time market was interacted with
function _payFunding() private {
Expand Down