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

fix(x/gov): migrations from 2 to 3 (min proposer deposit) (backport #298) #300

Closed
wants to merge 78 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 27, 2022

This is an automatic backport of pull request #298 done by Mergify.
Cherry-pick of 51bfa90 has failed:

On branch mergify/bp/v0.45.0x-osmo-v11/pr-298
Your branch is up to date with 'origin/v0.45.0x-osmo-v11'.

You are currently cherry-picking commit 51bfa9079.
  (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:   x/gov/keeper/migrations.go
	modified:   x/gov/module.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/gov/legacy/v3/store.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

dependabot bot and others added 30 commits March 30, 2022 10:15
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v2.1.6...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/stale](https://github.com/actions/stale) from 3.0.19 to 5.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v3.0.19...v5)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 3.4.0 to 4.2.0.
- [Release notes](https://github.com/amannn/action-semantic-pull-request/releases)
- [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/master/CHANGELOG.md)
- [Commits](amannn/action-semantic-pull-request@v3.4.0...v4.2.0)

---
updated-dependencies:
- dependency-name: amannn/action-semantic-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
#123)

Bumps [github.com/magiconair/properties](https://github.com/magiconair/properties) from 1.8.5 to 1.8.6.
- [Release notes](https://github.com/magiconair/properties/releases)
- [Changelog](https://github.com/magiconair/properties/blob/main/CHANGELOG.md)
- [Commits](magiconair/properties@v1.8.5...v1.8.6)

---
updated-dependencies:
- dependency-name: github.com/magiconair/properties
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
)

Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 2.6.1 to 2.9.1.
- [Release notes](https://github.com/goreleaser/goreleaser-action/releases)
- [Commits](goreleaser/goreleaser-action@v2.6.1...v2.9.1)

---
updated-dependencies:
- dependency-name: goreleaser/goreleaser-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1.5.2 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](codecov/codecov-action@v1.5.2...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add proto for Clawback Vesting Account

* Change field to int

* Change field to int64

* add place holder for clawback

* add handler and basic msgs methods

* Update x/auth/vesting/types/msgs.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
* fix testing and protobuf related issues

* remove unnecessary changes in legacy migration tests

* remove extraneous comments

* add test for minselfdelegation

* fix: Ensure that MsgCreateValidator's accompanying delegation is at least the provided MinSelfDelegation (#132)

* add check to make sure validator object is only created if min delegation threshold is met

* fix check location and use standard error type

* fix logic for check

* add test for new check

* update test comments for better context

* add checks for global min self delegation and fix corresponding tests

* add migration code

* fix migration code tests

* fix staking client unit tests

* tidy up

* Apply suggestions from code review

Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* apply changes suggested in review

* fixed edge case error

* lint++

* lint++

* Update x/staking/keeper/msg_server.go

* Update x/staking/keeper/msg_server.go

* Update x/staking/keeper/msg_server.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](spf13/viper@v1.10.1...v1.11.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/viper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/amannn/action-semantic-pull-request/releases)
- [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/master/CHANGELOG.md)
- [Commits](amannn/action-semantic-pull-request@v4.2.0...v4.3.0)

---
updated-dependencies:
- dependency-name: amannn/action-semantic-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
…mit flow (#213)

* fix: simulation and grpc query concurrency with ABCI

* table tests for selectHeight

* add table-driven GRPC query tests and fix non-existent heights

* clean up

* clean up grpc query tests

* Apply suggestions from code review

* Update testutil/network/network.go

* fix typo in abci.go

* Update baseapp/abci.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* store last block height in a var

* avoid returning named parameters

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
…#214)

Bumps [github.com/btcsuite/btcd](https://github.com/btcsuite/btcd) from 0.22.0-beta to 0.22.1.
- [Release notes](https://github.com/btcsuite/btcd/releases)
- [Changelog](https://github.com/btcsuite/btcd/blob/v0.22.1/CHANGES)
- [Commits](btcsuite/btcd@v0.22.0-beta...v0.22.1)

---
updated-dependencies:
- dependency-name: github.com/btcsuite/btcd
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 4.3.0 to 4.5.0.
- [Release notes](https://github.com/amannn/action-semantic-pull-request/releases)
- [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/master/CHANGELOG.md)
- [Commits](amannn/action-semantic-pull-request@v4.3.0...v4.5.0)

---
updated-dependencies:
- dependency-name: amannn/action-semantic-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update codeowners

* update issue and PR templates similar to osmosis main repo
czarcas7ic and others added 23 commits June 6, 2022 18:21
* Add supply offsets to genesis

* Fix comments

* Fix migration test

* Fix test

Co-authored-by: mattverse <mattpark1028@gmail.com>
* Cherry-pick of cosmos#11551

Allow ScheduleUpgrade to come from same block

* Fix test
* make proto-all

* make proto-all with IsExpedited flag

* expedited_voting_period on voting params

* go mod tidy

* add IsExpedited flag to all proposals

* implement the foundation for expedited proposals

* add validation for voting period params

* validate tally params - expedited must be greater than or equal to regular tally

* fix cli

* fix problems with querying tally params

* TestProposalPassedEndblocker for expedited

* update TestCmdParams

* fix TestMigrate v040

* fix TestGRPCQueryProposal

* fix v043 TestMigrateJSON

* fix TestRandomizedGenState

* fix TestSimulateMsgSubmitProposal

* TestExpeditedToRegularConversion

* fix TestIntegrationTestSuite/TestCmdParams/text_output

* test TestExpeditedProposal_PassAndConversionToRegular

* attempt to fix TestAppStateDeterminism

* fix TestRandomizedGenState after changing rand generation bounds

* fix TestParamChanges

* Update x/gov/abci.go

* Update x/gov/abci.go

* Update x/gov/types/keys.go

* refactor to have isExpedited flag on the proposal struct

* fix tests

* clean up proto files and remove is_expedited from CommunityPoolSpendProposal

* fix migrate tests

* fix proto

* Update x/gov/abci.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update proto/cosmos/gov/v1beta1/gov.proto

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* expedited vote threshold must be strictly greater than regular

* fix Cmd tests

* fix another cmd test

* Add spec for emergency voting (#249)

* Add simple changelog

* Update x/gov/spec/01_concepts.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update x/gov/types/keys.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

* remove redundant isExpedited flag from ContentFromProposalType

* Update x/gov/abci.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
…#265)

* refactor: app version stored in multi store and shared in state sync

* app version is only stored in baseapp

* increase snapshot format version to with app version shared

* remove old comment

* Update store/rootmulti/store.go

* Update store/rootmulti/store.go

* Update baseapp/baseapp.go

* add TestGetAppVersion

* add TestSetAppVersion

* test app version snapshot and restore in different store

* set app version to 0 in testing init chain simulation

* test app version is zero on init chain

* revert changes to abci info

* consolidate app version manager in single interface

* Apply suggestions from code review

* remove unused error

* update godoc for CurrentFormat

* Update baseapp/baseapp_test.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update baseapp/abci.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* revert constant

* AppVersionError

Co-authored-by: Peter Bourgon <peterbourgon@users.noreply.github.com>

* reintroduce initialAppVersion

* rename to newBaseAppWithDB

* typo

* add on to snapshots README

* comment explaining the reason for storing version in multi store

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Peter Bourgon <peterbourgon@users.noreply.github.com>
* make proto-all

* make proto-all with IsExpedited flag

* expedited_voting_period on voting params

* go mod tidy

* add IsExpedited flag to all proposals

* implement the foundation for expedited proposals

* add validation for voting period params

* validate tally params - expedited must be greater than or equal to regular tally

* fix cli

* fix problems with querying tally params

* TestProposalPassedEndblocker for expedited

* update TestCmdParams

* fix TestMigrate v040

* fix TestGRPCQueryProposal

* fix v043 TestMigrateJSON

* fix TestRandomizedGenState

* fix TestSimulateMsgSubmitProposal

* TestExpeditedToRegularConversion

* fix TestIntegrationTestSuite/TestCmdParams/text_output

* test TestExpeditedProposal_PassAndConversionToRegular

* attempt to fix TestAppStateDeterminism

* fix TestRandomizedGenState after changing rand generation bounds

* fix TestParamChanges

* Update x/gov/abci.go

* Update x/gov/abci.go

* Update x/gov/types/keys.go

* refactor to have isExpedited flag on the proposal struct

* fix tests

* clean up proto files and remove is_expedited from CommunityPoolSpendProposal

* fix migrate tests

* fix proto

* Update x/gov/abci.go

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update proto/cosmos/gov/v1beta1/gov.proto

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* expedited vote threshold must be strictly greater than regular

* fix Cmd tests

* fix another cmd test

* Add spec for emergency voting (#249)

* Add simple changelog

* Update x/gov/spec/01_concepts.md

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* Update x/gov/types/keys.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

* remove redundant isExpedited flag from ContentFromProposalType

* Update x/gov/abci.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

* feat: expedited proposal min deposit param

* fix TestMigrateJSON

* improve TestProposalHandler to test validation of invalid min expedited deposit param

* fix abci tests

* fix migrate_test.go

* fix more cli tests

* fix TestRandomizedGenState

* fix merge issue

* Update x/gov/types/proposal.go

* Update x/gov/abci_test.go

Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com>
* Bring back the cliff vesting command #111

* Wrap error
* in progress

* in progress

* remove all code

* remove old error code comments

* edit comment

* removed Input and Output proto structs

* Delete deprecated comment

Co-authored-by: mattverse <mattpark1028@gmail.com>
(cherry picked from commit 0aca1df)

Co-authored-by: Adam Tucker <adam@osmosis.team>
* git checkout -b roman/fix-gov-migrations

* register migrations

(cherry picked from commit 51bfa90)

# Conflicts:
#	x/gov/legacy/v3/store.go
@mergify mergify bot requested a review from a team July 27, 2022 22:27
@mergify mergify bot added the conflicts label Jul 27, 2022
@p0mvn p0mvn changed the base branch from v0.45.0x-osmo-v11 to v0.45.0x-osmo-v9 July 27, 2022 22:30
@p0mvn p0mvn requested a review from alexanderbez as a code owner July 27, 2022 22:30
@p0mvn p0mvn closed this Jul 27, 2022
@mergify mergify bot deleted the mergify/bp/v0.45.0x-osmo-v11/pr-298 branch July 27, 2022 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants