posm: CLEAR_OR_TAKE #252
Merged
posm: CLEAR_OR_TAKE #252
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
saucepoint
commented
Aug 2, 2024
src/PositionManager.sol
Outdated
Comment on lines
214
to
216
| int256 currencyDelta = poolManager.currencyDelta(address(this), currency); | ||
| if (uint256(currencyDelta) > amountMax) revert ClearExceedsMaxAmount(currency, currencyDelta, amountMax); | ||
| poolManager.clear(currency, uint256(currencyDelta)); | ||
| if (currencyDelta < 0) revert CannotClearNegativeDelta(currency); | ||
| uint256 delta = uint256(currencyDelta); // safe since we know its positive |
There was a problem hiding this comment.
wonder if this should be replaced with _getFullTakeAmount? the error might need to be updated
function _getFullTakeAmount(Currency currency) internal view returns (uint256 amount) {
int256 _amount = poolManager.currencyDelta(address(this), currency);
// If the amount is negative, it should be settled not taken.
if (_amount < 0) revert IncorrectUseOfTake();
amount = uint256(_amount);
}
There was a problem hiding this comment.
Yeah we could change both of those functions to be instead
_getFullNegativeDelta and _getFullPositiveDelta and the error be more general like DeltaIsNotNegative()/DeltaIsNotPositive()
snreynolds
reviewed
Aug 2, 2024
hensha256
reviewed
Aug 2, 2024
src/base/DeltaResolver.sol
Outdated
| amount = uint256(-_amount); | ||
| } | ||
|
|
||
| function _getFullTakeAmount(Currency currency) internal view returns (uint256 amount) { | ||
| function _getFullNegativeDelta(Currency currency) internal view returns (uint256 amount) { |
There was a problem hiding this comment.
we did a bettttter rename i promise
snreynolds
reviewed
Aug 2, 2024
src/PositionManager.sol
Outdated
| } | ||
|
|
||
| /// @dev uses this addresses balance to settle a negative delta | ||
| function _settleWithBalance(Currency currency) internal { |
src/PositionManager.sol
Outdated
| } | ||
|
|
||
| function _settlePair(Currency currency0, Currency currency1) internal { | ||
| // the locker is the payer when settling | ||
| address caller = msgSender(); | ||
| _settle(currency0, caller, _getFullSettleAmount(currency0)); | ||
| _settle(currency1, caller, _getFullSettleAmount(currency1)); | ||
| _settle(currency0, caller, _getFullDebit(currency0)); |
snreynolds
approved these changes
Aug 2, 2024
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.
Related Issue
Closes #248
Description of changes
Refactor CLEAR to use
_take()if the delta exceeds the user's limit