Skip to content

fix(PerpV2BasisTradingModule): Add external audit fixes #231

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

Closed
wants to merge 1 commit into from
Closed

fix(PerpV2BasisTradingModule): Add external audit fixes #231

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
17 changes: 10 additions & 7 deletions contracts/protocol/modules/PerpV2BasisTradingModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ contract PerpV2BasisTradingModule is PerpV2LeverageModuleV2 {
nonReentrant
onlyManagerAndValidSet(_setToken)
{
_updateSettledFunding(_setToken);
uint256 newSettledFunding = _updateSettledFunding(_setToken);

uint256 settledFundingInCollateralDecimals = settledFunding[_setToken].fromPreciseUnitToDecimals(collateralDecimals);
uint256 settledFundingInCollateralDecimals = newSettledFunding.fromPreciseUnitToDecimals(collateralDecimals);

if (_notionalFunding > settledFundingInCollateralDecimals) { _notionalFunding = settledFundingInCollateralDecimals; }

Expand Down Expand Up @@ -299,14 +299,14 @@ contract PerpV2BasisTradingModule is PerpV2LeverageModuleV2 {
if (!_setToken.hasExternalPosition(address(collateralToken))) return;

// Track funding before it is settled
_updateSettledFunding(_setToken);
uint256 newSettledFunding = _updateSettledFunding(_setToken);

int256 newExternalPositionUnit = _executePositionTrades(_setToken, _setTokenQuantity, false, false);

if (settledFunding[_setToken] > 0) {
if (newSettledFunding > 0) {
// Calculate performance fee unit
// Performance fee unit = (Tracked settled funding * Performance fee) / Set total supply
uint256 performanceFeeUnit = settledFunding[_setToken]
uint256 performanceFeeUnit = newSettledFunding
.preciseDiv(_setToken.totalSupply())
.preciseMulCeil(_performanceFeePercentage(_setToken))
.fromPreciseUnitToDecimals(collateralDecimals);
Expand Down Expand Up @@ -429,9 +429,12 @@ contract PerpV2BasisTradingModule is PerpV2LeverageModuleV2 {
* pending funding payment that is about to be settled due to subsequent logic in the external function.
*
* @param _setToken Instance of SetToken
* @return uint256 Returns the updated settled funding
*/
function _updateSettledFunding(ISetToken _setToken) internal {
settledFunding[_setToken] = _getUpdatedSettledFunding(_setToken);
function _updateSettledFunding(ISetToken _setToken) internal returns (uint256) {
uint256 newSettledFunding = _getUpdatedSettledFunding(_setToken);
settledFunding[_setToken] = newSettledFunding;
return newSettledFunding;
}

/**
Expand Down