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!: provider proposal for changing reward denoms (backport #1280) #1307

Merged
merged 6 commits into from
Sep 14, 2023
Merged

feat!: provider proposal for changing reward denoms (backport #1280) #1307

merged 6 commits into from
Sep 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2023

This is an automatic backport of pull request #1280 done by Mergify.
Cherry-pick of 48a2186 has failed:

On branch mergify/bp/release/v2.1.x-provider-lsm/pr-1280
Your branch is up to date with 'origin/release/v2.1.x-provider-lsm'.

You are currently cherry-picking commit 48a2186.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/docs/features/proposals.md
	modified:   tests/e2e/main.go
	modified:   tests/e2e/steps_democracy.go
	modified:   tests/e2e/steps_reward_denom.go
	modified:   x/ccv/provider/handler.go
	modified:   x/ccv/provider/keeper/msg_server.go
	modified:   x/ccv/provider/keeper/proposal.go
	modified:   x/ccv/provider/proposal_handler.go
	modified:   x/ccv/provider/types/msg.go
	modified:   x/ccv/provider/types/proposal_test.go
	modified:   x/ccv/types/events.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   app/provider/app.go
	both modified:   proto/interchain_security/ccv/provider/v1/provider.proto
	both modified:   proto/interchain_security/ccv/provider/v1/tx.proto
	both modified:   tests/e2e/actions.go
	both modified:   tests/integration/distribution.go
	both modified:   x/ccv/provider/client/cli/tx.go
	both modified:   x/ccv/provider/client/proposal_handler.go
	both modified:   x/ccv/provider/keeper/distribution.go
	deleted by them: x/ccv/provider/keeper/distribution_test.go
	both modified:   x/ccv/provider/proposal_handler_test.go
	both modified:   x/ccv/provider/types/codec.go
	both modified:   x/ccv/provider/types/proposal.go
	both modified:   x/ccv/provider/types/provider.pb.go
	both modified:   x/ccv/provider/types/tx.pb.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@shaspitz @mergify
feat!: provider proposal for changing reward denoms (#1280)
e4c50ef 
* new provider prop type

* add methods and tests for new prop, update docs

* remove old tx, fix tests

* e2e handling

* fix command type

* boilerplate

* fix e2e tests

* Update CHANGELOG.md

* lint

* validate denoms

* Update proposal.go

* rm msg string

* fix tests

* rm chain in change denom action

* lint

* test for invalid denom

* events for both add and remove

* Update proposal_test.go

(cherry picked from commit 48a2186)

# Conflicts:
#	CHANGELOG.md
#	app/provider/app.go
#	proto/interchain_security/ccv/provider/v1/provider.proto
#	proto/interchain_security/ccv/provider/v1/tx.proto
#	tests/e2e/actions.go
#	tests/integration/distribution.go
#	x/ccv/provider/client/cli/tx.go
#	x/ccv/provider/client/proposal_handler.go
#	x/ccv/provider/keeper/distribution.go
#	x/ccv/provider/keeper/distribution_test.go
#	x/ccv/provider/proposal_handler_test.go
#	x/ccv/provider/types/codec.go
#	x/ccv/provider/types/proposal.go
#	x/ccv/provider/types/provider.pb.go
#	x/ccv/provider/types/tx.pb.go
@mergify mergify bot requested a review from a team as a code owner September 14, 2023 18:01
@mergify mergify bot added the conflicts label Sep 14, 2023
@shaspitz shaspitz merged commit a22e814 into release/v2.1.x-provider-lsm Sep 14, 2023
6 of 7 checks passed
@shaspitz shaspitz deleted the mergify/bp/release/v2.1.x-provider-lsm/pr-1280 branch September 14, 2023 18:54
@sainoe sainoe mentioned this pull request Sep 15, 2023
Merged
21 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shaspitz shaspitz shaspitz approved these changes

Assignees

@shaspitz shaspitz

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@shaspitz