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

fix(group)!: Fix group min execution period #13876

Merged
merged 12 commits into from
Nov 16, 2022
Merged

fix(group)!: Fix group min execution period #13876

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
11c8e7a
fix: don't check MinExecutionPeriod in `Allow`
amaury1093 Nov 15, 2022
e747e84
Check MinExecutionPeriod on doExecuteMsgs
amaury1093 Nov 15, 2022
c9c0b01
Fix TestExec
amaury1093 Nov 15, 2022
6e0e7e8
Fix TestExec
amaury1093 Nov 15, 2022
36f381c
test exec pruned
amaury1093 Nov 15, 2022
e6ed07d
Fix submitproposal
amaury1093 Nov 15, 2022
130a0e4
Add changelog
amaury1093 Nov 15, 2022
83a91f8
typo
amaury1093 Nov 15, 2022
b747bf5
revert some changes
amaury1093 Nov 15, 2022
df0843d
add minExecutionPeriod
amaury1093 Nov 15, 2022
0d123fc
Merge branch 'main' of ssh://github.com/cosmos/cosmos-sdk into am/fix…
amaury1093 Nov 16, 2022
fcaaee5
Add docs and specs
amaury1093 Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of ssh://github.com/cosmos/cosmos-sdk into am/fix… 
…-group
  • Loading branch information
@amaury1093
amaury1093 committed Nov 16, 2022
commit 0d123fcb85f02a93144a92a0fe9281d78d3e4eb6
4 changes: 4 additions & 0 deletions x/group/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,10 @@ func (k Keeper) doTallyAndUpdate(ctx sdk.Context, p *group.Proposal, electorate
}

result, err := policy.Allow(tallyResult, electorate.TotalWeight)
if err != nil {
return sdkerrors.Wrap(err, "policy allow")
}

// If the result was final (i.e. enough votes to pass) or if the voting
// period ended, then we consider the proposal as final.
if isFinal := result.Final || ctx.BlockTime().After(p.VotingPeriodEnd); isFinal {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.