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!: custom fee distribution #485

Merged
merged 21 commits into from
Oct 28, 2021
Merged

feat!: custom fee distribution #485

merged 21 commits into from
Oct 28, 2021

Conversation

aljo242
Copy link
Contributor

@aljo242 aljo242 commented Oct 28, 2021

Description

Adds custom fee distribution logic based on an epoch model.

Epochs are implemented with the new x/epochs module included.

Updates the genesis params to add a selection for the epoch period ("hour" or "day").

This PR also expands on the simulation testing in the x/pylons module. These tests are important to verify the functionality of distribution over time.

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

@aljo242 aljo242 added the enhancement New feature or request label Oct 28, 2021
@aljo242 aljo242 requested a review from a user October 28, 2021 12:20
giunatale
giunatale approved these changes Oct 28, 2021
View reviewed changes
Copy link
Contributor

@giunatale giunatale left a comment

Choose a reason for hiding this comment

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

I'm approving my own code, but yeah, let's merge!

@aljo242 aljo242 merged commit 8e5b6a2 into main Oct 28, 2021
@aljo242 aljo242 deleted the dist-osmosis-epochs branch October 28, 2021 12:54
@aljo242 aljo242 restored the dist-osmosis-epochs branch October 28, 2021 12:59
aljo242 pushed a commit that referenced this pull request Oct 28, 2021
Revert "feat!: custom fee distribution (#485)"
5ccf126 
This reverts commit 8e5b6a2.
@aljo242 aljo242 mentioned this pull request Oct 28, 2021
Merged
aljo242 pushed a commit that referenced this pull request Oct 28, 2021
Revert "feat!: custom fee distribution (#485)" (#486)
97f743d 
This reverts commit 8e5b6a2.
aljo242 pushed a commit that referenced this pull request Oct 28, 2021
@giunatale
update develop to main (#488)
e46172e 
* remove recipe rate field

* update CHANGELOG.md

* create easel_test.go

* add validation

* add easel test

* fix errors

* fix fulfill trade itemID validation

* update CHANGELOG.md

* lint fix

* fix: entrieslist nil pointer reference (#482)

* hotfix entrieslist nil pointer reference

* format

* feat!: custom fee distribution (#485)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Revert "feat!: custom fee distribution (#485)" (#486)

This reverts commit 8e5b6a2.

* Dist osmosis epochs (#487)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

* Add epoch license

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Update CHANGELOG.md for release v0.2.0

* fix: CHANGELOG.md

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>
aljo242 pushed a commit that referenced this pull request Oct 29, 2021
@giunatale
merge develop <- main (#491)
feddcdc 
* remove recipe rate field

* update CHANGELOG.md

* create easel_test.go

* add validation

* add easel test

* fix errors

* fix fulfill trade itemID validation

* update CHANGELOG.md

* lint fix

* fix: entrieslist nil pointer reference (#482)

* hotfix entrieslist nil pointer reference

* format

* feat!: custom fee distribution (#485)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Revert "feat!: custom fee distribution (#485)" (#486)

This reverts commit 8e5b6a2.

* Dist osmosis epochs (#487)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

* Add epoch license

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Update CHANGELOG.md for release v0.2.0

* fix: CHANGELOG.md

* fix!: fix nodeVersion issue (#489)

* fix nodeVersion issue

* update CHANGELOG.md

* invert default percentages in payment processors (#490)

* format

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>
aljo242 pushed a commit that referenced this pull request Nov 1, 2021
@giunatale @faddat @MikeSofaer
develop <- main (#493)
124240c 
* remove recipe rate field

* update CHANGELOG.md

* create easel_test.go

* add validation

* add easel test

* fix errors

* fix fulfill trade itemID validation

* update CHANGELOG.md

* lint fix

* fix: entrieslist nil pointer reference (#482)

* hotfix entrieslist nil pointer reference

* format

* feat!: custom fee distribution (#485)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Revert "feat!: custom fee distribution (#485)" (#486)

This reverts commit 8e5b6a2.

* Dist osmosis epochs (#487)

* utd

* revert sims to working state

* fix non-determinisim in randomized genesis state

* add create-recipe

* utd

* execute recipe enhanced

* format

* move code to helpers.go

* format

* add osmosis epoch module and start hooks

* up to date

* add stakingKeeper in expecte_keepers

* fix imports

* fix imports

* cleanup

* add distribution test

* fix tests

* fix simulation genesis

* update CHANGELOG.md

* lint fix

* Add epoch license

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>

* Update CHANGELOG.md for release v0.2.0

* fix: CHANGELOG.md

* fix!: fix nodeVersion issue (#489)

* fix nodeVersion issue

* update CHANGELOG.md

* invert default percentages in payment processors (#490)

* format

* dodge a security issue in 44.2

Co-authored-by: Giuseppe Natale <12249307+giunatale@users.noreply.github.com>
Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Michael Sofaer <github@mike.sofaer.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@giunatale giunatale giunatale approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aljo242 @giunatale