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

feat(spike): taker fee #6034

Merged
merged 94 commits into from
Aug 28, 2023
Merged

feat(spike): taker fee #6034

merged 94 commits into from
Aug 28, 2023

Commits on Aug 11, 2023

  1. add taker fee determination and extraction

    @czarcas7ic
    czarcas7ic committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    4eb8594 View commit details
    Browse the repository at this point in the history

  2. remove osmo multi hop logic

    @czarcas7ic
    czarcas7ic committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    12dccfa View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. route to both community pool and staking rewards

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e857cc9 View commit details
    Browse the repository at this point in the history

  2. fix a handfull of tests

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    f773225 View commit details
    Browse the repository at this point in the history

  3. assign taker fee to pool at time of creation

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    0e54b35 View commit details
    Browse the repository at this point in the history

  4. pull taker fee direct from pool struct

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    4d421fd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into adam/taker-fee-feat

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    8d1c8c6 View commit details
    Browse the repository at this point in the history

  6. fix more tests

    @czarcas7ic
    czarcas7ic committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    4177b7a View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. fix tests, set back up osmo multi hop discount

    @czarcas7ic
    czarcas7ic committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    49e6aff View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. correct taker fee extraction

    @czarcas7ic
    czarcas7ic committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e57f4a6 View commit details
    Browse the repository at this point in the history

  2. regen mocks

    @czarcas7ic
    czarcas7ic committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    547232f View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. abstract taker fee to pool manager (highest lvl)

    @czarcas7ic
    czarcas7ic committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    5ea549b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into adam/taker-fee-feat

    @czarcas7ic
    czarcas7ic committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    d43a1e5 View commit details
    Browse the repository at this point in the history

  3. fix extract cmd

    @czarcas7ic
    czarcas7ic committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    914cedc View commit details
    Browse the repository at this point in the history

  4. update changelog

    @devbot-wizard
    devbot-wizard committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    5a68fa6 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Merge branch 'main' into adam/taker-fee-feat

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    4312222 View commit details
    Browse the repository at this point in the history

  2. tidy

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    f0afc3d View commit details
    Browse the repository at this point in the history

  3. remove param that no longer exists

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    a3863d5 View commit details
    Browse the repository at this point in the history

  4. add extra params to genesis logic

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    e4294a4 View commit details
    Browse the repository at this point in the history

  5. add back osmo multihop tests

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    f21dba0 View commit details
    Browse the repository at this point in the history

  6. add comment

    @czarcas7ic
    czarcas7ic committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    48f1d6f View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. fix e2e keeping prints

    @czarcas7ic
    czarcas7ic committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    3fe5742 View commit details
    Browse the repository at this point in the history

  2. fixes

    @czarcas7ic
    czarcas7ic committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    925d619 View commit details
    Browse the repository at this point in the history

  3. more test fixes

    @czarcas7ic
    czarcas7ic committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    f51eb28 View commit details
    Browse the repository at this point in the history

  4. remove prints

    @czarcas7ic
    czarcas7ic committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    aa02dad View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. more naive approach to determining taker fee

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    bf5af4a View commit details
    Browse the repository at this point in the history

  2. fix e2e

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    2177b15 View commit details
    Browse the repository at this point in the history

  3. re-enable disabled test

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    3b5453e View commit details
    Browse the repository at this point in the history

  4. minor cleaning

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    e4420d3 View commit details
    Browse the repository at this point in the history

  5. simplify params

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    0834a30 View commit details
    Browse the repository at this point in the history

  6. not nullable

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    9a7b1c2 View commit details
    Browse the repository at this point in the history

  7. clean up

    @czarcas7ic
    czarcas7ic committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    279ae06 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. add whitelist set message denom pair taker fees

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    323d742 View commit details
    Browse the repository at this point in the history

  2. use real addresses

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    f96efbf View commit details
    Browse the repository at this point in the history

  3. add gov prop for denom pair taker fee update

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7e2bcf4 View commit details
    Browse the repository at this point in the history

  4. clean

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    71f1e90 View commit details
    Browse the repository at this point in the history

  5. move logic to its own taker_fee.go file

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    1bd9f15 View commit details
    Browse the repository at this point in the history

  6. add CLI for gov prop for denomPairTakerFee

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    21c7316 View commit details
    Browse the repository at this point in the history

  7. add admin address denomPairTakerFee cli msg

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    89b0fe3 View commit details
    Browse the repository at this point in the history

  8. clean and simplifications

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7ec60cc View commit details
    Browse the repository at this point in the history

  9. use authorized quote denoms from poolmanger

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    eeefe36 View commit details
    Browse the repository at this point in the history

  10. remove stableswap taker fee

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3ddd408 View commit details
    Browse the repository at this point in the history

  11. sim msg change

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    150eeb1 View commit details
    Browse the repository at this point in the history

  12. add test for CLI

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    08bb1ea View commit details
    Browse the repository at this point in the history

  13. msg server tests

    @czarcas7ic
    czarcas7ic committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    a300d6e View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. add route_test test

    @czarcas7ic
    czarcas7ic committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    411bfa6 View commit details
    Browse the repository at this point in the history

  2. add gov_test.go

    @czarcas7ic
    czarcas7ic committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    236505d View commit details
    Browse the repository at this point in the history

  3. add msgs_test.go

    @czarcas7ic
    czarcas7ic committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    9c17b70 View commit details
    Browse the repository at this point in the history

  4. remove print line

    @czarcas7ic
    czarcas7ic committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    41a1968 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Merge branch 'main' into adam/taker-fee-feat

    @czarcas7ic
    czarcas7ic committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c2108b7 View commit details
    Browse the repository at this point in the history

  2. change from v18 to v19

    @czarcas7ic
    czarcas7ic committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    d081c2a View commit details
    Browse the repository at this point in the history

  3. Update upgrades.go

    @czarcas7ic
    czarcas7ic committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    4cb0230 View commit details
    Browse the repository at this point in the history

  4. set default taker fee to zero in upgrade handler

    @czarcas7ic
    czarcas7ic committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    5c9fbd8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into adam/taker-fee-feat

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    214dd27 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into adam/taker-fee-feat 

    # Conflicts:
#	app/app.go
#	app/apptesting/concentrated_liquidity.go
#	tests/mocks/cl_pool.go
#	x/concentrated-liquidity/keeper.go
#	x/poolmanager/client/cli/tx_test.go
#	x/poolmanager/router.go
#	x/poolmanager/types/genesis.pb.go
#	x/poolmanager/types/tx.pb.go
#	x/txfees/keeper/keeper_test.go
    @devbot-wizard
    devbot-wizard committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    f5ee761 View commit details
    Browse the repository at this point in the history

  7. conflicts

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    e617f04 View commit details
    Browse the repository at this point in the history

  8. Update proto/osmosis/poolmanager/v1beta1/genesis.proto

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    7e8f86e View commit details
    Browse the repository at this point in the history

  9. Update proto/osmosis/poolmanager/v1beta1/genesis.proto

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c23c5b5 View commit details
    Browse the repository at this point in the history

  10. Update x/poolmanager/taker_fee.go

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    6caac1f View commit details
    Browse the repository at this point in the history

  11. Generated protofile changes

    github-actions committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    fbd5700 View commit details
    Browse the repository at this point in the history

  12. rename extractTakerFeeAndDistribute to chargeTakerFee

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    55be63b View commit details
    Browse the repository at this point in the history

  13. clean up

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    b716e72 View commit details
    Browse the repository at this point in the history

  14. comment

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    0e5d2eb View commit details
    Browse the repository at this point in the history

  15. rename

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    333dc17 View commit details
    Browse the repository at this point in the history

  16. godoc for NonNativeFeeCollectorForCommunityPoolName

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    fca43b5 View commit details
    Browse the repository at this point in the history

  17. baseDenom to defaultFeesDenom name change

    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    3b4d80c View commit details
    Browse the repository at this point in the history

  18. fix upgrade handler

    @AlpinYukseloglu
    AlpinYukseloglu committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    7563916 View commit details
    Browse the repository at this point in the history

  19. fix AfterEpochEnd order of denoms when getting pools; reduce code dup… 

    …l; tests
    @p0mvn
    p0mvn committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    72ffbb6 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. fix track volume

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    cf5a80c View commit details
    Browse the repository at this point in the history

  2. add key separator for pool manager

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    aab35ca View commit details
    Browse the repository at this point in the history

  3. add comment to denom pair route

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    b2c7d50 View commit details
    Browse the repository at this point in the history

  4. add basic lexicographical key test

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    cbc2ff4 View commit details
    Browse the repository at this point in the history

  5. update chargeTakerFee godoc

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    0f2da85 View commit details
    Browse the repository at this point in the history

  6. set the default taker fee back to non zero for e2e

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    d129ea3 View commit details
    Browse the repository at this point in the history

  7. change PoolMangerGetParams API to GetAuthorizedQuoteDenoms (same for … 

    …setters)
    @p0mvn
    p0mvn committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    9a5616d View commit details
    Browse the repository at this point in the history

  8. update txfees & poolmanager READMEs with takerFee

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    573565e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into adam/taker-fee-feat

    @czarcas7ic
    czarcas7ic committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    07b98f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Merge branch 'main' into adam/taker-fee-feat

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    bed1140 View commit details
    Browse the repository at this point in the history

  2. fix merge main

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    0ba3702 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into adam/taker-fee-feat

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    95bfae1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into adam/taker-fee-feat

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    b01f264 View commit details
    Browse the repository at this point in the history

  5. add comment to denom pair taker fee

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    73830bc View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into adam/taker-fee-feat

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    518f68b View commit details
    Browse the repository at this point in the history

  7. de-dup taker fee param validation

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    52e210c View commit details
    Browse the repository at this point in the history

  8. Update x/poolmanager/types/msgs.go

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    303bfb9 View commit details
    Browse the repository at this point in the history

  9. Apply suggestions from code review

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    e7b7a20 View commit details
    Browse the repository at this point in the history

  10. Update x/poolmanager/taker_fee.go

    @ValarDragon
    ValarDragon committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    d5e9123 View commit details
    Browse the repository at this point in the history

  11. remove unneeded setup test

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    708442e View commit details
    Browse the repository at this point in the history

  12. get pool creation free from previous

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    759c310 View commit details
    Browse the repository at this point in the history

  13. take non native out of name

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    ecaa3f3 View commit details
    Browse the repository at this point in the history

  14. undo param pull instead of default

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    87e4310 View commit details
    Browse the repository at this point in the history

  15. use current pool creation fee

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    84c8873 View commit details
    Browse the repository at this point in the history

  16. use default

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    726532e View commit details
    Browse the repository at this point in the history

  17. e2e

    @czarcas7ic
    czarcas7ic committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    e48e614 View commit details
    Browse the repository at this point in the history