Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove osmo multihop discount #6468

Merged
merged 6 commits into from
Sep 26, 2023
Merged

Conversation

czarcas7ic
Copy link
Member

@czarcas7ic czarcas7ic commented Sep 20, 2023

Closes: #6373

What is the purpose of the change

Actions remaining part of prop 530

For multi-hop swaps, this would remove the “osmo multi-hop discount”, and charge the taker fee for every pool.

Taker fees are already implemented. We just need to remove the multi-hop discount

Testing and Verifying

Much of this PR is removing the specific osmo multi-hop discount logic/tests.

Kept some osmo incentivized multi hop pools in the tests to ensure the discount is no longer applied.

Documentation and Release Note

  • Does this pull request introduce a new feature or user-facing behavior changes?
  • Changelog entry added to Unreleased section of CHANGELOG.md?

Where is the change documented?

  • Specification (x/{module}/README.md)
  • Osmosis documentation site
  • Code comments?
  • N/A

@czarcas7ic czarcas7ic added the V:state/breaking State machine breaking PR label Sep 20, 2023
@czarcas7ic
Copy link
Member Author

devbot help

@devbot-wizard
Copy link
Collaborator

Hi! I'm DevBot, a bot that helps with common tasks in the development process. Commands:

  • devbot fix: Fix basic errors in the PR. (e.g. imports, changelog conflicts, go mod conflicts)
  • devbot merge base: Merge the base branch into the PR branch.
  • devbot add changelog [misc/feat/bug/api/sec] [message]: Add a changelog entry to the PR. (e.g. devbot add changelog feat Added a new feature)
    • If message is blank, defaults to PR title.
  • devbot re-pr: Re-PR the PR, useful for external contributors where we have no edit perms.

@czarcas7ic
Copy link
Member Author

devbot add changelog feat

@czarcas7ic czarcas7ic changed the title chore: remove osmo multihop discount feat: remove osmo multihop discount Sep 20, 2023
@github-actions github-actions bot added the C:docs Improvements or additions to documentation label Sep 20, 2023
@czarcas7ic czarcas7ic marked this pull request as ready for review September 20, 2023 19:41
Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@mattverse mattverse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Nice work!

@czarcas7ic Do you think it makes sense to have a single test case with Base Denom: showing that base denom does not account for multihop doscount before having this merged?

@czarcas7ic
Copy link
Member Author

@mattverse I had kept two tests from the previous feat that had accounted for multihop discount which no longer show a discount. Are those sufficient are you are saying there should be more?

@czarcas7ic czarcas7ic merged commit da6a1c5 into main Sep 26, 2023
1 check passed
@czarcas7ic czarcas7ic deleted the adam/remove-osmo-multiho-discount branch September 26, 2023 16:33
pysel pushed a commit that referenced this pull request Sep 27, 2023
* remove osmo multihop discount

* update changelog

* edit comments

* add sanity check that reduced swap fee is no longer applied

---------

Co-authored-by: devbot-wizard <141283918+devbot-wizard@users.noreply.github.com>
Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
@github-actions github-actions bot mentioned this pull request Mar 15, 2024
@github-actions github-actions bot mentioned this pull request May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:docs Improvements or additions to documentation C:x/poolmanager V:state/breaking State machine breaking PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

v20: Remove OSMO 2 hop route discount
4 participants