👷 fix: odos unwind swap return #57
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
Merged
moss-eth
requested changes
Nov 2, 2024
src/Zap.sol
Outdated
Comment on lines
506
to
508
| unwound -= _collateral == USDC | ||
| ? _flashloan | ||
| : odosSwap(_collateral, _swapAmountIn, _path); | ||
| : odosSwapForUnwind(_collateral, _swapAmountIn, _path); |
There was a problem hiding this comment.
we can change this to an if else block, and just subtract _swapAmountIn directly without using the return value from odosSwap.
src/Zap.sol
Outdated
Comment on lines
675
to
680
| /// @dev wrapper around odosSwap that returns input amount instead of output | ||
| /// amount | ||
| /// @param _tokenFrom address of token being swapped | ||
| /// @param _amountIn amount of token being swapped | ||
| /// @param _swapPath bytes from odos assemble api containing the swap | ||
| function odosSwapForUnwind( |
There was a problem hiding this comment.
we can delete this function, see the above comment
moss-eth
approved these changes
Nov 4, 2024
moss-eth
approved these changes
Nov 4, 2024
moss-eth
added a commit
that referenced
this pull request
Dec 5, 2024
* 👷 wip odos swap * forge install: surl * ⚙️ add ffi to foundry.toml * 👷 added odos router to zap constructor * ✅ successful odos quote using SURL * ✅ arb quote test and fmt * ✅ successfully calling odosAssemble * ✅ wip odos testing * ✨ Lint * ✅ blocked on testing * ✅ test failing in the odos swap * ✅ latest block on base fixed odos test * ✅ swap for tests + docs * ✅ asserts on swap for tests * ✅ fork tests take current block * ✨ removed all uniswap logic / mentions, renamed odos vars, updated docs * 👷 replaced ternary logic in unwind * ✨ removed unused constants * ✨ fmt * 📚 docs + fmt * ✨ renamed swapFrom test * fmt * ✅ added new bootstrap with current block forking * ✨ fmt * burn test * ✨fmt * 👷 fix: odos unwind swap return (#57) * 👷 fix: odos unwind swap return * fix * ✨ fmt --------- Co-authored-by: Moss <moss@cc.snxdao.io> * 👷🏻♂️ Odos refund + Unwind Test (#58) * 👷 refund logic * ✅ unwind test * 👷 Odos audit fix (#59) * 📚 first round of fixes * 👷 fix 2 * some test fixes * 👷 fix leftovers (#60) * 👷 fix leftovers * fmt --------- Co-authored-by: Moss <moss@cc.snxdao.io> * audit remidiations 23/11 * 👷 zapOut when unwinding USDC (#64) * 👷 zapOut when unwinding USDC * fix make deploy_base * 👷 adjust minAmountOut to match usdc 6 decimal precision when unwinding udsc * 👷 test fix * ✨ fmt
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.
Fix for
odosSwapreturn value design when called during unwind process.