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

Prevent DIV/0 revert calculating MOMP on a pool with no loans #712

Merged
merged 4 commits into from
Apr 3, 2023
Merged

Prevent DIV/0 revert calculating MOMP on a pool with no loans #712

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79a981e
prevent revert calculating MOMP when pool has no loans
EdNoepel Mar 28, 2023
e433d8c
define MOMP as HPB rather than MAX_PRICE when there are no borrowers
EdNoepel Mar 31, 2023
111ce68
pr feedback
EdNoepel Apr 3, 2023
54442af
Merge branch 'develop' into issue-702
EdNoepel Apr 3, 2023
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
11 changes: 9 additions & 2 deletions src/PoolInfoUtils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
_priceAt,
_reserveAuctionPrice,
MAX_FENWICK_INDEX,
MAX_PRICE,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was MAX_PRICE added? I don't see it used, suggest it is removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in 111ce68.

MIN_PRICE
} from './libraries/helpers/PoolHelper.sol';

Expand Down Expand Up @@ -318,10 +319,16 @@ contract PoolInfoUtils {
) external view returns (uint256) {
IPool pool = IPool(ajnaPool_);

(uint256 debt, , ) = pool.debtInfo();
( , , uint256 noOfLoans) = pool.loansInfo();
noOfLoans += pool.totalAuctionsInPool();
return _priceAt(pool.depositIndex(Maths.wdiv(debt, noOfLoans * 1e18)));
if (noOfLoans == 0) {
// if there are no borrowers, return the HPB
return _priceAt(pool.depositIndex(1));
} else {
// otherwise, calculate the MOMP
(uint256 debt, , ) = pool.debtInfo();
return _priceAt(pool.depositIndex(Maths.wdiv(debt, noOfLoans * 1e18)));
}
}

/**
Expand Down
13 changes: 13 additions & 0 deletions tests/forge/ERC20Pool/ERC20PoolInfoUtils.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pragma solidity 0.8.14;

import { ERC20HelperContract } from './ERC20DSTestPlus.sol';
import { Token } from '../utils/Tokens.sol';

import 'src/libraries/helpers/PoolHelper.sol';
import 'src/interfaces/pool/erc20/IERC20Pool.sol';
Expand Down Expand Up @@ -204,6 +205,18 @@ contract ERC20PoolInfoUtilsTest is ERC20HelperContract {

function testMomp() external {
assertEq(_poolUtils.momp(address(_pool)), 2_981.007422784467321543 * 1e18);

// ensure calculation does not revert on pools with no loans and no deposit
IERC20 otherCollateral = new Token("MompTestCollateral", "MTC");
IERC20Pool emptyPool = ERC20Pool(_poolFactory.deployPool(address(otherCollateral), address(_quote), 0.05 * 10**18));
assertEq(_poolUtils.momp(address(emptyPool)), MIN_PRICE);

// should return HPB on pools with liquidity but no loans
changePrank(_lender);
uint256 hpbIndex = 369;
_quote.approve(address(emptyPool), type(uint256).max);
emptyPool.addQuoteToken(0.0213 * 1e18, hpbIndex, type(uint256).max);
assertEq(_poolUtils.momp(address(emptyPool)), _priceAt(hpbIndex));
}

function testBorrowFeeRate() external {
Expand Down