Fix borrowing balance structure & cToken conversion #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MathisGD
force-pushed
the
feat/morpho-rewards
branch
from
f93dd92
to
8983c32
Compare
MathisGD
changed the title
MathisGD
force-pushed
the
feat/morpho-rewards
branch
from
8983c32
to
b5a8915
Compare
MerlinEgalite
requested changes
Jul 25, 2021
contracts/CompoundModuleETH.sol
Outdated
| uint256 remainingToBorrowOnComp = (_moveLendersFromCompToMorpho( | ||
| amountInCDai, | ||
| msg.sender | ||
| ) * cDaiExchangeRate) / 1e18; // In underlying. | ||
| borrowingBalanceOf[msg.sender].onMorpho += | ||
| ((amountInCDai - remainingToBorrowOnComp) / cDaiExchangeRate) * |
There was a problem hiding this comment.
remainingToBorrowOnComp is not in cDAI here
contracts/CompoundModuleETH.sol
Outdated
| require( | ||
| borrowedAssetPriceMantissa != 0 && | ||
| collateralAssetPriceMantissa != 0, | ||
| "Oracle failed" | ||
| ); | ||
| uint256 numerator = _borrowedAmount * | ||
| uint256 totalBorrowedAmount = _borrowedAmountOnCompound + | ||
| _borrowedAmountOnMorpho; // in underlying |
contracts/CompoundModuleETH.sol
Outdated
| @@ -435,6 +447,9 @@ contract CompoundModuleETH is ReentrancyGuard { | |||
| borrowingBalanceOf[_borrower].onComp; | |||
| uint256 remainingAmountToMoveInCDai = (remainingToSupplyToComp * | |||
| 1e18) / cDaiToken.exchangeRateCurrent(); // In cToken. | |||
| borrowingBalanceOf[_borrower].onMorpho -= | |||
There was a problem hiding this comment.
This is equal to remainingToSupplyToComp
fixup! fix: borrower balance on Morpho
MathisGD
force-pushed
the
feat/morpho-rewards
branch
from
b5a8915
to
0c351b8
Compare
|
@MerlinEgalite I made the changes you suggested, and removed the cToken conversions commit |
pakim249CAL
added a commit
that referenced
this pull request
Dec 13, 2022
Remove set as collateral (Spearbit #25)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#26