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!: Add DistributionTransmissionChannel to ConsumerAdditionProposal (backport #965) #1028

Closed
wants to merge 18 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 16, 2023

This is an automatic backport of pull request #965 done by Mergify.
Cherry-pick of 0b636da has failed:

On branch mergify/bp/release/v2.0.x/pr-965
Your branch is up to date with 'origin/release/v2.0.x'.

You are currently cherry-picking commit 0b636da.
  (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:   CHANGELOG.md
	modified:   Dockerfile
	modified:   Dockerfile.gaia
	modified:   Makefile
	modified:   app/consumer-democracy/app.go
	new file:   app/sovereign/ante_handler.go
	new file:   app/sovereign/app.go
	new file:   app/sovereign/export.go
	new file:   app/sovereign/genesis.go
	new file:   cmd/interchain-security-sd/cmd/genaccounts.go
	new file:   cmd/interchain-security-sd/cmd/root.go
	new file:   cmd/interchain-security-sd/main.go
	modified:   docs/docs/consumer-development/onboarding.md
	modified:   docs/docs/features/proposals.md
	modified:   proto/interchain_security/ccv/consumer/v1/genesis.proto
	modified:   proto/interchain_security/ccv/provider/v1/provider.proto
	new file:   tests/e2e/actions_sovereign_chain.go
	modified:   tests/e2e/config.go
	modified:   tests/e2e/main.go
	modified:   tests/e2e/state.go
	modified:   tests/e2e/steps.go
	new file:   tests/e2e/steps_sovereign_changeover.go
	new file:   tests/e2e/testnet-scripts/sovereign-genesis.json
	new file:   tests/e2e/testnet-scripts/start-changeover.sh
	new file:   tests/e2e/testnet-scripts/start-sovereign.sh
	modified:   tests/integration/changeover.go
	modified:   testutil/keeper/unit_test_helpers.go
	modified:   x/ccv/consumer/ibc_module.go
	modified:   x/ccv/consumer/ibc_module_test.go
	modified:   x/ccv/consumer/keeper/changeover.go
	modified:   x/ccv/consumer/keeper/keeper.go
	modified:   x/ccv/consumer/keeper/keeper_test.go
	modified:   x/ccv/consumer/keeper/migration_test.go
	modified:   x/ccv/consumer/types/genesis_test.go
	modified:   x/ccv/consumer/types/params.go
	modified:   x/ccv/provider/client/proposal_handler.go
	modified:   x/ccv/provider/keeper/proposal.go
	modified:   x/ccv/provider/keeper/proposal_test.go
	modified:   x/ccv/provider/proposal_handler_test.go
	modified:   x/ccv/provider/types/proposal.go
	modified:   x/ccv/provider/types/proposal_test.go
	modified:   x/ccv/provider/types/provider.pb.go
	modified:   x/ccv/types/shared_params.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/e2e/actions.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 and others added 17 commits June 1, 2023 15:30
* Hardcode golangci-lint version

* Hardcode version in CI config
* Update keys.go

* tests

* fix another bug

* fix comments
* Update keys.go

* tests

* fix another bug

* remove consumer genesis deletion, link to test

* remove unused bond denom method

* Revert "remove unused bond denom method"

This reverts commit f930eca.

* remove test too

* update changelog
* Update reward-distribution.md

* docs: add instructions for registering denoms

* Update docs/docs/features/reward-distribution.md

Co-authored-by: Marius Poke <[email protected]>

* Update reward-distribution.md

* Update docs/docs/features/reward-distribution.md

Co-authored-by: Shawn <[email protected]>

---------

Co-authored-by: MSalopek <[email protected]>
Co-authored-by: Marius Poke <[email protected]>
* update PR workflow

* update issue workflow

* rename other.md to others.md

* fix typo

---------

Co-authored-by: Shawn <[email protected]>
#964)

* docs(adr): pause unbonding period during equivocation proposal

Co-authored-by: Albert Le Batteux <[email protected]>
Co-authored-by: Giuseppe Natale <[email protected]>

* fix voting period duration

* remove issue reference

* docs: filter out unbonding operations before pause/unpause

Co-authored-by: Albert Le Batteux <[email protected]>
Co-authored-by: Giuseppe Natale <[email protected]>

---------

Co-authored-by: Albert Le Batteux <[email protected]>
Co-authored-by: Giuseppe Natale <[email protected]>
* add config for mergify

* enable security dependecies for v2.0.x
markdownlint

Co-authored-by: Jacob Gadikian <[email protected]>
* initial implementation, still need tests

* UTs

* integration test

* linter

* Update CHANGELOG.md

* make vsc matured handled this block a var

* comment
* Add gorelayer and CometMock to Dockerfile

* Add option to start with cometmock in start-chain script

* Start adding support for rly

* Adjust relayer start action

* Add entrypoint for short happy path steps

* Add . nosec G204 and waiting for blocks

* Adjust rly config: Gas is free

* Remove optout steps from short happy path

* Use separate redelegate step for short happy path

* Wait for blocks after unbonding

* Make naming more descriptive and add comments

* Add comment to chain name sorting and improve comments

* Update start-chain.sh

Address comments form joint review session with @MSalopek

* Fix typo
* Create adr-006-denom-dos-fixes

* Update docs/docs/adrs/adr-006-denom-dos-fixes

Co-authored-by: Shawn <[email protected]>

* Update docs/docs/adrs/adr-006-denom-dos-fixes

Co-authored-by: Shawn <[email protected]>

* Update docs/docs/adrs/adr-006-denom-dos-fixes

Co-authored-by: Marius Poke <[email protected]>

* Update docs/docs/adrs/adr-006-denom-dos-fixes

* Update docs/docs/adrs/adr-006-denom-dos-fixes

* rename to adr 004

* remove extra file

* add entry to Table of Contents

* add ADR 7 to ToC

---------

Co-authored-by: Shawn <[email protected]>
Co-authored-by: Marius Poke <[email protected]>
Fix link to template

Fixes typo in contributing.md
#965)

* update proto

* remove transfer_channel_id from consumer genesis

* ConsumerAdditionProposal: transfer_channel_id -> distribution_transmission_channel

* send updated ConsumerAdditionProposal

* validate consumer genesis param

* remove StandaloneTransferChannelID from store

* fix TestOnChanOpenAck

* remove state breaking change

* finalize merge and fix issues

* chore: update docs and changelog

* chore: regenerate protos

* re-add integrationt tests around changeover

* mv entry in changelog

* test: add sovereign to consumer changeover e2e (#1025)

* tests: add sovereign to consumer e2e test

* rm unused bash scripts

* partially address review comments

* apply remaining review comments

* chore: apply formatting rules

---------

Co-authored-by: MSalopek <[email protected]>
#965)

* update proto

* remove transfer_channel_id from consumer genesis

* ConsumerAdditionProposal: transfer_channel_id -> distribution_transmission_channel

* send updated ConsumerAdditionProposal

* validate consumer genesis param

* remove StandaloneTransferChannelID from store

* fix TestOnChanOpenAck

* remove state breaking change

* finalize merge and fix issues

* chore: update docs and changelog

* chore: regenerate protos

* re-add integrationt tests around changeover

* mv entry in changelog

* test: add sovereign to consumer changeover e2e (#1025)

* tests: add sovereign to consumer e2e test

* rm unused bash scripts

* partially address review comments

* apply remaining review comments

* chore: apply formatting rules

---------

Co-authored-by: MSalopek <[email protected]>
(cherry picked from commit 0b636da)

# Conflicts:
#	tests/e2e/actions.go
@mergify mergify bot requested a review from a team as a code owner June 16, 2023 18:18
@mergify mergify bot added the conflicts label Jun 16, 2023
@mergify mergify bot assigned mpoke Jun 16, 2023
@shaspitz
Copy link
Contributor

lol I screwed up this PR, will backport manually

@shaspitz shaspitz closed this Jun 16, 2023
@shaspitz shaspitz deleted the mergify/bp/release/v2.0.x/pr-965 branch June 16, 2023 18:27
@shaspitz shaspitz restored the mergify/bp/release/v2.0.x/pr-965 branch June 16, 2023 19:00
@shaspitz shaspitz deleted the mergify/bp/release/v2.0.x/pr-965 branch June 16, 2023 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants