Skip to content

Commit

Permalink
fix: borrower balance on Morpho
Browse files Browse the repository at this point in the history 
fixup! fix: borrower balance on Morpho
  • Loading branch information
@MathisGD
MathisGD committed Jul 25, 2021
1 parent 74f3be9 commit 0c351b8
Showing 1 changed file with 34 additions and 16 deletions.
50 changes: 34 additions & 16 deletions contracts/CompoundModuleETH.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ contract CompoundModuleETH is ReentrancyGuard {
}

struct BorrowingBalance {
uint256 total; // In underlying.
uint256 onMorpho; // In underlying.
uint256 onComp; // In underlying.
}

Expand Down Expand Up @@ -151,11 +151,14 @@ contract CompoundModuleETH is ReentrancyGuard {
);
uint256 cDaiExchangeRate = cDaiToken.exchangeRateCurrent();
uint256 amountInCDai = (_amount * 1e18) / cDaiExchangeRate;
borrowingBalanceOf[msg.sender].total += _amount; // In underlying.
uint256 remainingToBorrowOnComp = (_moveLendersFromCompToMorpho(
amountInCDai,
msg.sender
) * cDaiExchangeRate) / 1e18; // In underlying.
borrowingBalanceOf[msg.sender].onMorpho +=
((amountInCDai) / cDaiExchangeRate) *
1e18 -
remainingToBorrowOnComp; // In underlying.
// If not enough cTokens on Morpho, we must borrow it on Compound.
if (remainingToBorrowOnComp > 0) {
cDaiToken.borrow(remainingToBorrowOnComp); // Revert on error.
Expand Down Expand Up @@ -288,7 +291,8 @@ contract CompoundModuleETH is ReentrancyGuard {
"Must redeem less than collateral."
);
uint256 collateralRequiredInEth = getCollateralRequired(
borrowingBalanceOf[msg.sender].total,
borrowingBalanceOf[msg.sender].onComp,
borrowingBalanceOf[msg.sender].onMorpho,
collateralFactor,
CETH_ADDRESS,
CDAI_ADDRESS
Expand Down Expand Up @@ -321,6 +325,7 @@ contract CompoundModuleETH is ReentrancyGuard {
uint256 collateralInEth,
uint256 collateralRequiredInEth
) = getAccountLiquidity(_borrower);
uint256 cDaiExchangeRate = cDaiToken.exchangeRateCurrent();
require(
collateralInEth < collateralRequiredInEth,
"Borrower position cannot be liquidated."
Expand All @@ -341,7 +346,10 @@ contract CompoundModuleETH is ReentrancyGuard {
daiPriceMantissa *
collateralInEth *
liquidationIncentive;
uint256 denominator = borrowingBalanceOf[_borrower].total *
uint256 totalBorrowingBalance = borrowingBalanceOf[_borrower].onMorpho +
(borrowingBalanceOf[_borrower].onComp * cDaiExchangeRate) /
1e18;
uint256 denominator = totalBorrowingBalance *
ethPriceMantissa *
DENOMINATOR;
uint256 ethAmountToSeize = numerator / denominator;
Expand Down Expand Up @@ -374,7 +382,8 @@ contract CompoundModuleETH is ReentrancyGuard {
returns (uint256 collateralInEth, uint256 collateralRequiredInEth)
{
collateralRequiredInEth = getCollateralRequired(
borrowingBalanceOf[_borrower].total,
borrowingBalanceOf[_borrower].onComp,
borrowingBalanceOf[_borrower].onMorpho,
collateralFactor,
CDAI_ADDRESS,
CETH_ADDRESS
Expand All @@ -385,14 +394,16 @@ contract CompoundModuleETH is ReentrancyGuard {
}

/** @dev Returns the collateral required for the given parameters.
* @param _borrowedAmount The amount of tokens borrowed.
* @param _borrowedAmountOnCompound The amount of tokens borrowed that are on Compound.
* @param _borrowedAmountOnMorpho The amount of token borrowed that are on Morpho.
* @param _collateralFactor The collateral factor linked to the token borrowed.
* @param _borrowedCTokenAddress The address of the cToken linked to the token borrowed.
* @param _collateralCTokenAddress The address of the cToken linked to the token in collateral.
* @return collateralRequired The collateral required of the `_borrower`.
*/
function getCollateralRequired(
uint256 _borrowedAmount,
uint256 _borrowedAmountOnCompound,
uint256 _borrowedAmountOnMorpho,
uint256 _collateralFactor,
address _borrowedCTokenAddress,
address _collateralCTokenAddress
Expand All @@ -401,13 +412,15 @@ contract CompoundModuleETH is ReentrancyGuard {
ICToken(_borrowedCTokenAddress)
);
uint256 collateralAssetPriceMantissa = compoundOracle
.getUnderlyingPrice(ICToken(_collateralCTokenAddress));
.getUnderlyingPrice(ICToken(_collateralCTokenAddress));
require(
borrowedAssetPriceMantissa != 0 &&
collateralAssetPriceMantissa != 0,
"Oracle failed"
);
uint256 numerator = _borrowedAmount *
uint256 totalBorrowedAmount = _borrowedAmountOnCompound +
_borrowedAmountOnMorpho; // In underlying
uint256 numerator = totalBorrowedAmount *
borrowedAssetPriceMantissa *
_collateralFactor;
uint256 denominator = collateralAssetPriceMantissa * 1e18;
Expand Down Expand Up @@ -435,6 +448,8 @@ contract CompoundModuleETH is ReentrancyGuard {
borrowingBalanceOf[_borrower].onComp;
uint256 remainingAmountToMoveInCDai = (remainingToSupplyToComp *
1e18) / cDaiToken.exchangeRateCurrent(); // In cToken.
borrowingBalanceOf[_borrower]
.onMorpho -= remainingToSupplyToComp;
borrowingBalanceOf[_borrower].onComp = 0;
borrowersOnComp.remove(_borrower);
_moveLendersFromMorphoToComp(
Expand All @@ -448,11 +463,13 @@ contract CompoundModuleETH is ReentrancyGuard {
(_amount * 1e18) / cDaiToken.exchangeRateCurrent(),
_borrower
);
borrowingBalanceOf[_borrower].onMorpho -= _amount;
_supplyDaiToComp(_amount);
}
borrowingBalanceOf[_borrower].total -= _amount;
if (borrowingBalanceOf[_borrower].total == 0)
borrowersOnMorpho.remove(_borrower);
if (
borrowingBalanceOf[_borrower].onMorpho == 0 &&
borrowingBalanceOf[_borrower].onComp == 0
) borrowersOnMorpho.remove(_borrower);
}

/** @dev Supplies ETH to Compound.
Expand Down Expand Up @@ -581,11 +598,12 @@ contract CompoundModuleETH is ReentrancyGuard {
uint256 i;
while (remainingToMatch > 0 && i < borrowersOnMorpho.length()) {
address borrower = borrowersOnMorpho.at(i);
uint256 onMorpho = borrowingBalanceOf[borrower].total -
borrowingBalanceOf[borrower].onComp;

if (onMorpho > 0) {
uint256 toMatch = min(onMorpho, remainingToMatch);
if (borrowingBalanceOf[borrower].onMorpho > 0) {
uint256 toMatch = min(
borrowingBalanceOf[borrower].onMorpho,
remainingToMatch
);
remainingToMatch -= toMatch;
borrowingBalanceOf[borrower].onComp += toMatch;
borrowersOnComp.add(borrower);
Expand Down

0 comments on commit 0c351b8

Please sign in to comment.