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.

Sign up for GitHub

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

Jump to bottom

CL: Update x/concentrated-liquidity to refer to swap fee as spread factor #5268

Merged
merged 21 commits into from
May 29, 2023
Merged

CL: Update x/concentrated-liquidity to refer to swap fee as spread factor #5268

merged 21 commits into from
May 29, 2023

Conversation

AlpinYukseloglu
Copy link
Contributor

@AlpinYukseloglu AlpinYukseloglu commented May 23, 2023 •
edited
Loading

Closes: #5243

What is the purpose of the change

This PR finishes renaming all uses of fees in the CL module to spread factor or spread rewards as appropriate, including renaming messages and the fees.go and fees_test.go files.

Testing and Verifying

This change is a trivial rework / code cleanup without any test coverage.

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?

Changelog entry was already added for initial PR – this one only touches CL logic and thus should not need one

Where is the change documented?

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

@AlpinYukseloglu AlpinYukseloglu added V:state/compatible/backport State machine compatible PR, should be backported A:no-changelog labels May 23, 2023
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:simulator Edits simulator or simulations C:x/concentrated-liquidity C:x/incentives C:x/poolmanager C:x/superfluid labels May 23, 2023
p0mvn
p0mvn reviewed May 23, 2023
View reviewed changes
tests/e2e/README.md Outdated Show resolved Hide resolved
@p0mvn
Copy link
Member

p0mvn commented May 23, 2023

Thanks for working on this @AlpinYukseloglu . There are a few cases where tx fee is renamed to spread reward. Could you please confirm that only swap fees are renamed to spread rewards?

p0mvn
p0mvn reviewed May 24, 2023
View reviewed changes
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.

Part way through

tests/e2e/configurer/chain/commands.go Outdated Show resolved Hide resolved
tests/e2e/helpers_e2e_test.go Outdated Show resolved Hide resolved
x/concentrated-liquidity/fees.go Outdated Show resolved Hide resolved
@mattverse
Copy link
Member

RIP merge conflict, what was the commit that made all these conflicts 🤔

@mattverse
Copy link
Member

Attempted to fix merge conflict, but in order to do so we need to come across a consensus for fee tokens.
Are we changing spread reward tokens to spread reward tokens or spread fee?

@p0mvn
Copy link
Member

p0mvn commented May 25, 2023

Attempted to fix merge conflict, but in order to do so we need to come across a consensus for fee tokens. Are we changing spread reward tokens to spread reward tokens or spread fee?

spread reward

Please make sure that tx fee is not renamed anywhere when you're updating

@AlpinYukseloglu AlpinYukseloglu mentioned this pull request May 29, 2023
Closed
@AlpinYukseloglu AlpinYukseloglu marked this pull request as ready for review May 29, 2023 04:03
@AlpinYukseloglu AlpinYukseloglu requested a review from p0mvn May 29, 2023 04:05
@p0mvn
Copy link
Member

p0mvn commented May 29, 2023

@AlpinYukseloglu I'm going to be committing nits directly as I review this so that we can merge this in ASAP and avoid more conflicts

p0mvn
p0mvn reviewed May 29, 2023
View reviewed changes
x/incentives/keeper/gauge.go Outdated Show resolved Hide resolved
@p0mvn
Copy link
Member

p0mvn commented May 29, 2023

I'm addressing latest comments now and should be good to merge

p0mvn
p0mvn approved these changes May 29, 2023
View reviewed changes
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, thank you @AlpinYukseloglu

@p0mvn
Copy link
Member

p0mvn commented May 29, 2023

Sorry for the PR breaks to others but I think it's easier to resolve many small PRs individually instead of this one. As a result, merging this

@p0mvn p0mvn merged commit 1756786 into main May 29, 2023
@p0mvn p0mvn deleted the alpo/spread-reward-rename branch May 29, 2023 15:37
pysel pushed a commit that referenced this pull request Jun 6, 2023
@AlpinYukseloglu @p0mvn @pysel
CL: Update x/concentrated-liquidity to refer to swap fee as spread fa…
01720c3 
…ctor (#5268)

* rename fee collection

* further renames

* rename fees files to spread factor

* roll back accidental tx fee renames

* pull fees files from main to maintain history

* rename fees files

* redo renaming on core files

* rename swap strategy fee files

* regenerate proto

* undo tx fee changes caught during review

* clean up readme

* fix another change

* regenerate proto checksum

* fix grpc query gen

* make run-querygen

* Apply suggestions from code review

* Update x/concentrated-liquidity/types/codec.go

* revert for gauge fee

* comment fix

---------

Co-authored-by: Roman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p0mvn p0mvn p0mvn approved these changes

@mattverse mattverse Awaiting requested review from mattverse mattverse is a code owner

@stackman27 stackman27 Awaiting requested review from stackman27

@czarcas7ic czarcas7ic Awaiting requested review from czarcas7ic czarcas7ic is a code owner

Assignees
No one assigned
Labels
A:no-changelog C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:simulator Edits simulator or simulations C:x/concentrated-liquidity C:x/superfluid V:state/compatible/backport State machine compatible PR, should be backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[CL]: Update x/concentrated-liquidity to refer to swap fee as spread factor
3 participants
@AlpinYukseloglu @p0mvn @mattverse