feat!: expedited proposals #240

p0mvn · 2022-05-19T21:49:35Z

Closes: #XXX

What is the purpose of the change

Feature: 2/3 Majority Emergency Voting Periods
Original Spec: osmosis-labs/osmosis#1517

Description

This change introduces an option for any existing proposal to be expedited. If a proposal is expedited, it uses a shorter voting duration and a higher tally threshold. If a the higher threshold is not met under shorter voting duration, the proposal is converted as if it was a regular proposal and tallied / voted on under regular rules.

The distinction is achieved by having an IsExpedited flag on the proposal struct. When a proposal is converted from expedited to regular, this flag is flipped and VotingEndTime is extended. The rest of the fields, including the ProposalId remain the same. As a result, all existing votes are preserved.

Differences from the Spec:

ExpeditedDuration is implemented on the VotingParams as opposed to Proposal struct
Did not create a separate index for expedited proposals. This would require duplicating logic for expedited proposals. Instead, in end block we iterate over both expedited and regular proposals and handle them appropriately

Brief Changelog

add IsExpedited flag to protos of all proposal content types
add ExpeditedVotingPeriod to protos of gov voting parameters
add ExpeditedThreshold to protos of gov tally parameters
implement changes in EndBlocker of x/gov to move expedited proposals to regular (with extended voting period) once voting period ends with proposal not meeting ExpeditedThreshold
add unit and integration tests to cover all new logic related to expedited proposals
fix existing tests

Testing and Verifying

This change is a trivial rework / code cleanup without any test coverage.

This change is already covered by existing tests, such as :

unit, integration and simulation tests in x/gov

This change added tests and can be verified as follows:

go test -timeout 30s -run ^TestExpeditedProposal_PassAndConversionToRegular$ github.com/cosmos/cosmos-sdk/x/gov
go test -timeout 30s -run ^TestProposalPassedEndblocker$ github.com/cosmos/cosmos-sdk/x/gov
go test -timeout 30s -run ^TestTickPassedVotingPeriod$ github.com/cosmos/cosmos-sdk/x/gov

Documentation and Release Note

Does this pull request introduce a new feature or user-facing behavior changes? yes
Is a relevant changelog entry added to the Unreleased section in CHANGELOG.md? no
How is the feature or change documented? not documented

…gular tally

alexanderbez

So far I've just reviewed the proto changes, they look great apart from a few messed up field numbers (see comments). Will continue reviewing...

proto/cosmos/distribution/v1beta1/distribution.proto

proto/cosmos/gov/v1beta1/gov.proto

proto/cosmos/params/v1beta1/params.proto

proto/cosmos/upgrade/v1beta1/upgrade.proto

alexanderbez

utACK. Looks great! Can't see any major flaws. Let's fix the proto stuff.

x/gov/abci.go

x/gov/types/genesis.go

x/gov/types/params.go

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

alexanderbez

🚀

mattverse

Nice and clean implementation 🔥 Just some minor nit comments and should be good to merge!

proto/cosmos/distribution/v1beta1/distribution.proto

proto/cosmos/params/v1beta1/params.proto

x/gov/keeper/proposal.go

x/gov/abci.go

x/gov/types/keys.go

x/gov/types/msgs_test.go

x/gov/types/proposal.go

x/params/types/proposal/proposal.go

* 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>

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

h/t osmosis-labs#240

p0mvn · 2022-06-16T21:28:43Z

Merging this to avoid having to continuously sync it with osmosis-main. We should be careful not to release this before governance decides on the future of this feature.

As for the current status of this as a whole, #254 needs to be completed and merged before we create a gov prop. The gov prop is already written up and ready to go on-chain once #254 is in

mattverse · 2022-06-17T01:52:49Z

Sweet! lmk once #254 is r4r!

* feat: expedited proposals h/t osmosis-labs#240 * fix: correctly generate random threshold params * fix: update randomised genesis state tests

* feat: custom proposal-based voting periods (#1) h/t osmosis-labs#239 * feat: expedited proposals (#2) * feat: expedited proposals h/t osmosis-labs#240 * fix: correctly generate random threshold params * fix: update randomised genesis state tests * feat: allow protocol stakers and delegators to vote (#3) * feat: expedited deposits (#4) h/t osmosis-labs#254 * fix: still include custom voting periods * fix: fallback to custom voting periods

p0mvn added 5 commits May 19, 2022 11:53

make proto-all

5fd6d11

make proto-all with IsExpedited flag

ebc98bd

expedited_voting_period on voting params

4498298

go mod tidy

c964a0d

add IsExpedited flag to all proposals

68d3724

github-actions bot added C:CLI C:Simulations C:x/distribution C:x/gov C:x/params C:x/staking C:x/upgrade labels May 19, 2022

implement the foundation for expedited proposals

e74b6ce

p0mvn force-pushed the roman/emergency-voting branch from f1a9094 to e74b6ce Compare May 20, 2022 02:42

p0mvn added 4 commits May 19, 2022 22:47

add validation for voting period params

de4f187

validate tally params - expedited must be greater than or equal to re…

2be2b33

…gular tally

fix cli

de6d0d4

fix problems with querying tally params

14ac4ee

p0mvn changed the title ~~feat: expedited proposals~~ feat!: expedited proposals May 20, 2022

p0mvn added 11 commits May 20, 2022 11:19

TestProposalPassedEndblocker for expedited

c9f61a4

update TestCmdParams

6f6d34d

fix TestMigrate v040

2e2f96d

fix TestGRPCQueryProposal

c46a1e6

fix v043 TestMigrateJSON

39344ce

fix TestRandomizedGenState

fe53f96

fix TestSimulateMsgSubmitProposal

ddfda7c

TestExpeditedToRegularConversion

83bad19

fix TestIntegrationTestSuite/TestCmdParams/text_output

3f949da

test TestExpeditedProposal_PassAndConversionToRegular

45eb715

attempt to fix TestAppStateDeterminism

324fb3e

fix migrate tests

91fbb54

alexanderbez reviewed Jun 3, 2022

View reviewed changes

alexanderbez approved these changes Jun 3, 2022

View reviewed changes

x/gov/abci.go Outdated Show resolved Hide resolved

x/gov/types/genesis.go Outdated Show resolved Hide resolved

x/gov/types/params.go Outdated Show resolved Hide resolved

p0mvn and others added 5 commits June 3, 2022 12:32

fix proto

47d3cae

Update x/gov/abci.go

9ffefd0

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

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

6896268

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

expedited vote threshold must be strictly greater than regular

3cc294a

fix Cmd tests

69d7f3b

alexanderbez approved these changes Jun 3, 2022

View reviewed changes

fix another cmd test

7c12628

mattverse approved these changes Jun 4, 2022

View reviewed changes

mattverse and others added 5 commits June 6, 2022 00:10

Add spec for emergency voting (#249)

68528ce

* 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

1430846

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

remove redundant isExpedited flag from ContentFromProposalType

a7d05e0

Update x/gov/abci.go

3d13fa5

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

Merge branch 'osmosis-main' into roman/emergency-voting

3bccb4d

p0mvn mentioned this pull request Jun 7, 2022

feat!: expedited proposal min deposit param #254

Merged

Merge branch 'osmosis-main' into roman/emergency-voting

b4ff818

github-actions bot removed the C:x/auth label Jun 7, 2022

johnletey added a commit to kyve-org/cosmos-sdk-old that referenced this pull request Jun 15, 2022

feat: expedited proposals

abc88d9

h/t osmosis-labs#240

johnletey mentioned this pull request Jun 15, 2022

feat: expedited proposals kyve-org/cosmos-sdk-old#2

Merged

Merge branch 'osmosis-main' into roman/emergency-voting

fc5d8ac

p0mvn merged commit ae817b9 into osmosis-main Jun 16, 2022

p0mvn deleted the roman/emergency-voting branch June 16, 2022 21:29

johnletey added a commit to kyve-org/cosmos-sdk-old that referenced this pull request Jun 18, 2022

feat: expedited proposals (#2)

08a6bbc

* feat: expedited proposals h/t osmosis-labs#240 * fix: correctly generate random threshold params * fix: update randomised genesis state tests

sunnya97 mentioned this pull request Jul 6, 2022

Revert function signature change for NewMsgSubmitProposal #279

Closed

julienrbrt mentioned this pull request Jan 19, 2023

Upstream expedited proposals cosmos/cosmos-sdk#14694

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat!: expedited proposals #240

feat!: expedited proposals #240

p0mvn commented May 19, 2022 •

edited

Loading

alexanderbez left a comment

alexanderbez left a comment

alexanderbez left a comment

mattverse left a comment

p0mvn commented Jun 16, 2022

mattverse commented Jun 17, 2022

feat!: expedited proposals #240

feat!: expedited proposals #240

Conversation

p0mvn commented May 19, 2022 • edited Loading

What is the purpose of the change

Description

Differences from the Spec:

Brief Changelog

Testing and Verifying

Documentation and Release Note

alexanderbez left a comment

Choose a reason for hiding this comment

alexanderbez left a comment

Choose a reason for hiding this comment

alexanderbez left a comment

Choose a reason for hiding this comment

mattverse left a comment

Choose a reason for hiding this comment

p0mvn commented Jun 16, 2022

mattverse commented Jun 17, 2022

p0mvn commented May 19, 2022 •

edited

Loading