Implement new allocation mechanism #17
Merged
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
MerlinEgalite
commented
Sep 5, 2023
| @@ -1,8 +1,7 @@ | |||
| // SPDX-License-Identifier: GPL-2.0-or-later | |||
| pragma solidity 0.8.21; | |||
| pragma solidity 0.8.19; | |||
There was a problem hiding this comment.
Else tests can't be run because Morpho must be deployed
Jean-Grimal
reviewed
Sep 6, 2023
Comment on lines
+361
to
+370
| function _withdrawable(uint256 assets, Id id) | ||
| internal | ||
| view | ||
| returns (MarketParams memory marketParams, uint256 withdrawable) | ||
| { | ||
| marketParams = _config.at(_config.getMarket(id).rank); | ||
| (uint256 totalSupply,, uint256 totalBorrow,) = _MORPHO.expectedMarketBalances(marketParams); | ||
| uint256 available = totalBorrow - totalSupply; | ||
| withdrawable = UtilsLib.min(available, assets); | ||
| } |
There was a problem hiding this comment.
Suggested change
| function _withdrawable(uint256 assets, Id id) | |
| internal | |
| view | |
| returns (MarketParams memory marketParams, uint256 withdrawable) | |
| { | |
| marketParams = _config.at(_config.getMarket(id).rank); | |
| (uint256 totalSupply,, uint256 totalBorrow,) = _MORPHO.expectedMarketBalances(marketParams); | |
| uint256 available = totalBorrow - totalSupply; | |
| withdrawable = UtilsLib.min(available, assets); | |
| } | |
| function _withdrawable(uint256 assets, Id id) | |
| internal | |
| view | |
| returns (MarketParams memory marketParams, uint256 withdrawable) | |
| { | |
| marketParams = _config.at(_config.getMarket(id).rank); | |
| (uint256 totalSupply,, uint256 totalBorrow,) = _MORPHO.expectedMarketBalances(marketParams); | |
| uint256 liquidity = totalBorrow - totalSupply; | |
| uint256 withdrawableNoRevert = UtilsLib.min(liquidity, _supplyBalance(marketParams)); | |
| withdrawable = UtilsLib.min(withdrawableNoRevert, assets); | |
| } |
There was a problem hiding this comment.
and maybe, if the entire position is withdrawn on a market, the market might be placed at the end of the withdrawAllocationOrder (really not sure about this, but I think it is worth thinking about this).
Jean-Grimal
reviewed
Sep 6, 2023
Comment on lines
+299
to
+303
| if (cap > 0) { | ||
| uint256 currentSupply = _supplyBalance(marketParams); | ||
|
|
||
| toDeposit = UtilsLib.min(cap.zeroFloorSub(currentSupply), assets); | ||
| } |
There was a problem hiding this comment.
Same here, if cap is exceeded, we could think about putting the market at the end of supplyAllocationOrder
There was a problem hiding this comment.
I'm not sure we should modify the list like that
Jean-Grimal
reviewed
Sep 6, 2023
|
|
||
| _config.update(marketParams, marketConfig); | ||
| require(_config.update(marketParams, marketConfig), ErrorsLib.CONFIG_UDPATE_FAILED); |
There was a problem hiding this comment.
Suggested change
| require(_config.update(marketParams, marketConfig), ErrorsLib.CONFIG_UDPATE_FAILED); | |
| _config.update(marketParams, marketConfig); |
Otherwise it is only possible to add a new market to the config (so it is impossible to just update the cap of a market).
There was a problem hiding this comment.
Will be changed in #22
Jean-Grimal
reviewed
Sep 6, 2023
Comment on lines
+20
to
+21
|
|
||
| string internal constant CONFIG_UDPATE_FAILED = "config update failed"; |
There was a problem hiding this comment.
Suggested change
| string internal constant CONFIG_UDPATE_FAILED = "config update failed"; |
This error is not usefull then
Jean-Grimal
reviewed
Sep 6, 2023
Comment on lines
+327
to
+331
| bytes memory encodedCall = | ||
| abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | ||
| (bool success,) = address(_MORPHO).staticcall(encodedCall); | ||
|
|
||
| if (success) assets -= toWithdraw; |
There was a problem hiding this comment.
Suggested change
| bytes memory encodedCall = | |
| abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | |
| (bool success,) = address(_MORPHO).staticcall(encodedCall); | |
| if (success) assets -= toWithdraw; | |
| bytes memory encodedCall; | |
| if (toWithdraw >= assets) { | |
| uint256 totalShares = _MORPHO.supplyShares(marketParams.id(), address(this)); | |
| encodedCall = abi.encodeCall(_MORPHO.withdraw, (marketParams, 0, totalShares, address(this), address(this))); | |
| } else { | |
| encodedCall = abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | |
| } | |
| (bool success, bytes memory data) = address(_MORPHO).staticcall(encodedCall); | |
| (uint256 withdrawn,) = abi.decode(data); | |
| if (success) assets -= withdrawn; |
Jean-Grimal
reviewed
Sep 6, 2023
Comment on lines
+348
to
+352
| bytes memory encodedCall = | ||
| abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | ||
| (bool success,) = address(_MORPHO).call(encodedCall); | ||
|
|
||
| if (success) assets -= toWithdraw; |
There was a problem hiding this comment.
Suggested change
| bytes memory encodedCall = | |
| abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | |
| (bool success,) = address(_MORPHO).call(encodedCall); | |
| if (success) assets -= toWithdraw; | |
| bytes memory encodedCall; | |
| if (toWithdraw >= assets) { | |
| uint256 totalShares = _MORPHO.supplyShares(marketParams.id(), address(this)); | |
| encodedCall = abi.encodeCall(_MORPHO.withdraw, (marketParams, 0, totalShares, address(this), address(this))); | |
| } else { | |
| encodedCall = abi.encodeCall(_MORPHO.withdraw, (marketParams, toWithdraw, 0, address(this), address(this))); | |
| } | |
| (bool success, bytes memory data) = address(_MORPHO).call(encodedCall); | |
| (uint256 withdrawn,) = abi.decode(data); | |
| if (success) assets -= withdrawn; |
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.
Fixes #14
For now,
_withdrawOrderand_supplyOrderare not tested yet. I will but in a dedicated PR with tests for basic supply and withdraw on top later on.The PR also adds a basic test setup.