Add split route support in all adapters #103
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
@thal0x Don't we have to change interfaces for all swap adapters no matter what? How would this be called by the entrypoint without a change in interface? |
| minimum_receive: None, | ||
| }; | ||
|
|
||
| // let denom_in = route.operations.first().unwrap().denom_in.clone(); |
The interface was already updated this PR just changes the logic to not error on multiple routes |
|
|
||
| // validate that the one coin is the same as the first swap operation's denom in | ||
| if coin.denom != operations.first().unwrap().denom_in { |
There was a problem hiding this comment.
Do we do validation elsewhere that makes the validations you deleted no longer be relevant? I don't seem to see any validation but may be missing it
There was a problem hiding this comment.
Oh we do validation in entrypoint so we shouldn't need this... I see
| @@ -159,22 +145,40 @@ fn execute_swap( | |||
| return Err(ContractError::Unauthorized); | |||
| } | |||
|
|
|||
| // reset the pre swap out asset amount | |||
| PRE_SWAP_OUT_ASSET_AMOUNT.save(deps.storage, &Uint128::new(0))?; | |||
There was a problem hiding this comment.
Same comment I had on the astroport version
thal0x
added a commit
that referenced
this pull request
May 7, 2024
* Revert "Add split route support in all adapters (#103)" This reverts commit 1fa4f21. * Revert "Support multiple routes in astroport adapter (#99)" This reverts commit a95f17d. * Revert "Support split routes in entry point contract (#101)" This reverts commit 94c3bbf. * Revert "Update contract types to support route splitting (#98)" This reverts commit ec1fd57. * Revert "add interface field to SwapOperation (#96)" This reverts commit eb37618.
thal0x
added a commit
that referenced
this pull request
May 8, 2024
* add SmartSwapExactAssetIn swap type * Revert "Add split route support in all adapters (#103)" This reverts commit 1fa4f21. * Revert "Support multiple routes in astroport adapter (#99)" This reverts commit a95f17d. * Revert "Support split routes in entry point contract (#101)" This reverts commit 94c3bbf. * Revert "Update contract types to support route splitting (#98)" This reverts commit ec1fd57. * Revert "add interface field to SwapOperation (#96)" This reverts commit eb37618. * remove deployed test contracts * fix fmt issue * update schema * since user_swap is mutatable, we can mutate in place * swap excess funds * update schema * lint change * fix test * add optional interface field to SwapOperation (#108) * return error for largest_route_index --------- Co-authored-by: Jeremy Liu <31809888+NotJeremyLiu@users.noreply.github.com>
thal0x
added a commit
that referenced
this pull request
May 8, 2024
* add SmartSwapExactAssetIn swap type * Revert "Add split route support in all adapters (#103)" This reverts commit 1fa4f21. * Revert "Support multiple routes in astroport adapter (#99)" This reverts commit a95f17d. * Revert "Support split routes in entry point contract (#101)" This reverts commit 94c3bbf. * Revert "Update contract types to support route splitting (#98)" This reverts commit ec1fd57. * Revert "add interface field to SwapOperation (#96)" This reverts commit eb37618. * remove deployed test contracts * fix fmt issue * update schema * since user_swap is mutatable, we can mutate in place * swap excess funds * update schema * lint change * fix test * add optional interface field to SwapOperation (#108) * return error for largest_route_index * [API-2792] Add hallswap adapter (#102) * feat: add hallswap adapter * chore: add readme * pr fixes * add optional interface field to SwapOperation * update hallswap adapter to implement updated interface * remove get_hallswap_routes_from_skip_routes --------- Co-authored-by: thal0x <thal0x.eth@gmail.com> --------- Co-authored-by: Jeremy Liu <31809888+NotJeremyLiu@users.noreply.github.com> Co-authored-by: Yonggiee <58546952+Yonggiee@users.noreply.github.com>
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.
Updates adapter contracts to support multiple routes. Excluding:
Updates
osmosis-stdto access split route typesNote: I checked the Dexter router code and they properly track balances between swaps so the edge case found in #99 won't be an issue.