👷 Odos integration #56
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
Flocqst
requested changes
Nov 2, 2024
src/Zap.sol
Outdated
| @@ -510,7 +505,7 @@ contract Zap is Reentrancy, Errors, Flush(msg.sender) { | |||
| // whatever collateral amount is remaining is returned to the caller | |||
| unwound -= _collateral == USDC | |||
| ? _flashloan | |||
| : _swapFor(_collateral, _path, _flashloan, _swapMaxAmountIn); | |||
| : odosSwap(_collateral, _swapAmountIn, _path); | |||
There was a problem hiding this comment.
odosSwap returns USDC amount out, when in this case we need the collateral amount spent in the swap (in this case _swapAmountIn), otherwise this incorrectly subtracts from unwound balance the USDC amount instead of spent collateral amount
* 👷 fix: odos unwind swap return * fix * ✨ fmt --------- Co-authored-by: Moss <[email protected]>
* 👷 refund logic * ✅ unwind test
* 📚 first round of fixes * 👷 fix 2
* 👷 fix leftovers * fmt --------- Co-authored-by: Moss <[email protected]>
* 👷 zapOut when unwinding USDC * fix make deploy_base * 👷 adjust minAmountOut to match usdc 6 decimal precision when unwinding udsc
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.
changed swap logic from Uniswap to Odos