LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge commit from fork

Browse Source 
* Prevent empty groups

(cherry picked from commit 95090a0ec1f193104ba7d6d033a490d1515e54d8)

* Handle inflight proposals

(cherry picked from commit 855983471882068894ed7952b592ab3e61b464b9)

* No empty group with simulations

* Update changelog

* Set release date

* updates

* Update RELEASE_NOTES.md

* Update RELEASE_NOTES.md

---------

Co-authored-by: Alex Peters <alpe@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
Alex | Interchain Labs 2025-02-20 11:14:24 -05:00 committed by aljo242
parent 0951ca9257
commit ad0b79a020
No known key found for this signature in database
GPG Key ID: 63A227E968B28324
7 changed files with 176 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -42,6 +42,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (query) []() Fix collection filtered pagination.
## [v0.50.12](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.12) - 2025-02-20
### Bug Fixes
* [GHSA-x5vx-95h7-rv4p](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-x5vx-95h7-rv4p) Fix Group module can halt chain when handling a malicious proposal
## [v0.50.11](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.11) - 2024-12-16
### Features

24
RELEASE_NOTES.md
View File

@ -1,26 +1,16 @@
# Cosmos SDK v0.50.11 Release Notes
# Cosmos SDK v0.50.12 Release Notes
💬 [**Release Discussion**](https://github.com/orgs/cosmos/discussions/58)
## 🚀 Highlights
We are back on schedule for our monthly v0.50.x patch releases.
The last two months, next to ramping up on v0.52 and v2, we added a few bug fixes and (UX) improvements.
This patch release fixes [GHSA-x5vx-95h7-rv4p](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-x5vx-95h7-rv4p).
It resolves a `x/group` module issue that can halt chain when handling a malicious proposal.
Only users of the `x/group` module are affected by this issue.
Notable changes:
* Fix [ABS-0043/ABS-0044](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-8wcc-m6j2-qxvm).
* New Linux-only backend that adds Linux kernel's `keyctl` support
* Skip sims test when running dry on validators
We recommended to upgrade to this patch release as soon as possible.
When upgrading from <= v0.50.11, please use a chain upgrade to ensure that 2/3 of the validator power upgrade to v0.50.12.
## 📝 Changelog
Check out the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.50.11/CHANGELOG.md) for an exhaustive list of changes, or [compare changes](https://github.com/cosmos/cosmos-sdk/compare/v0.50.10...v0.50.11) from the last release.
## Maintenance Policy
Cosmos SDK Olympus (v0.52) final release is approaching really soon. That means the Eden line (v0.50.x) will soon only be supported for bug fixes only, as per our release policy. Earlier versions are not maintained.
Note, that the next SDK release, v0.52, does not include `x/params` migration, when migrating from < v0.47, v0.50.x **or** v0.47.x, is a mandatory migration.
Start integrating with [Cosmos SDK Eden (v0.52)](https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#v052x) and enjoy and the new features and performance improvements.
Check out the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.50.12/CHANGELOG.md) for an exhaustive list of changes, or [compare changes](https://github.com/cosmos/cosmos-sdk/compare/v0.50.11...v0.50.12) from the last release.

6
x/group/keeper/msg_server.go
View File

@ -200,6 +200,10 @@ func (k Keeper) UpdateGroupMembers(goCtx context.Context, msg *group.MsgUpdateGr
return err
}
}
// ensure that group has one or more members
if totalWeight.IsZero() {
return errorsmod.Wrap(errors.ErrInvalid, "group must not be empty")
}
// Update group in the groupTable.
g.TotalWeight = totalWeight.String()
g.Version++
@ -1145,10 +1149,8 @@ func (k Keeper) validateMembers(members []group.MemberRequest) error {
if _, err := math.NewNonNegativeDecFromString(member.Weight); err != nil {
return errorsmod.Wrap(err, "weight must be non negative")
}
index[member.Address] = struct{}{}
}
return nil
}

284
x/group/keeper/msg_server_test.go
View File

@ -237,20 +237,13 @@ func (s *TestSuite) TestCreateGroup() {
}
func (s *TestSuite) TestUpdateGroupMembers() {
addrs := s.addrs
addr3 := addrs[2]
addr4 := addrs[3]
addr5 := addrs[4]
addr6 := addrs[5]
unknownAddr, myAdmin := s.addrs[0].String(), s.addrs[1].String()
member1, member2, member3 := s.addrs[2].String(), s.addrs[3].String(), s.addrs[4].String()
members := []group.MemberRequest{
{Address: member1, Weight: "1"},
{Address: member2, Weight: "2"},
}
member1 := addr5.String()
member2 := addr6.String()
members := []group.MemberRequest{{
Address: member1,
Weight: "1",
}}
myAdmin := addr4.String()
groupRes, err := s.groupKeeper.CreateGroup(s.ctx, &group.MsgCreateGroup{
Admin: myAdmin,
Members: members,
@ -270,7 +263,7 @@ func (s *TestSuite) TestUpdateGroupMembers() {
GroupId: 0,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member2,
Address: member3,
Weight: "2",
}},
},
@ -303,7 +296,7 @@ func (s *TestSuite) TestUpdateGroupMembers() {
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{
{
Address: member2,
Address: member3,
Weight: "2",
Metadata: strings.Repeat("a", 256),
},
@ -314,12 +307,61 @@ func (s *TestSuite) TestUpdateGroupMembers() {
},
"add new member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member2,
Weight: "2",
}},
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: member3, Weight: "3"}},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "6",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{
{
Member: &group.Member{Address: member3, Weight: "3", AddedAt: s.blockTime},
GroupId: groupID,
},
{
Member: &group.Member{Address: member1, Weight: "1", AddedAt: s.blockTime},
GroupId: groupID,
},
{
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
},
},
},
"update member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: member1, Weight: "2"}},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "4",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{
{
Member: &group.Member{Address: member1, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
},
{
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
},
},
},
"update member with same data": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: member1, Weight: "1"}},
},
expGroup: &group.GroupInfo{
Id: groupID,
@ -330,31 +372,46 @@ func (s *TestSuite) TestUpdateGroupMembers() {
},
expMembers: []*group.GroupMember{
{
Member: &group.Member{
Address: member2,
Weight: "2",
AddedAt: s.sdkCtx.BlockTime(),
},
GroupId: groupID,
Member: &group.Member{Address: member1, Weight: "1", AddedAt: s.blockTime},
},
{
Member: &group.Member{
Address: member1,
Weight: "1",
AddedAt: s.blockTime,
},
GroupId: groupID,
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
},
},
},
"update member": {
"replace member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member1,
Weight: "2",
MemberUpdates: []group.MemberRequest{
{Address: member1, Weight: "0"},
{Address: member3, Weight: "1"},
},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "3",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{
{
Member: &group.Member{Address: member3, Weight: "1", AddedAt: s.blockTime},
GroupId: groupID,
},
{
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
}},
},
"remove existing member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: member1, Weight: "0"}},
},
expGroup: &group.GroupInfo{
Id: groupID,
@ -365,99 +422,15 @@ func (s *TestSuite) TestUpdateGroupMembers() {
},
expMembers: []*group.GroupMember{
{
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
Member: &group.Member{
Address: member1,
Weight: "2",
AddedAt: s.blockTime,
},
},
},
},
"update member with same data": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member1,
Weight: "1",
}},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "1",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{
{
GroupId: groupID,
Member: &group.Member{
Address: member1,
Weight: "1",
AddedAt: s.blockTime,
},
},
},
},
"replace member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{
{
Address: member1,
Weight: "0",
},
{
Address: member2,
Weight: "1",
},
},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "1",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{{
GroupId: groupID,
Member: &group.Member{
Address: member2,
Weight: "1",
AddedAt: s.sdkCtx.BlockTime(),
},
}},
},
"remove existing member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member1,
Weight: "0",
}},
},
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "0",
Version: 2,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{},
},
"remove unknown member": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: addr4.String(),
Weight: "0",
}},
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: unknownAddr, Weight: "0"}},
},
expErr: true,
expGroup: &group.GroupInfo{
@ -467,66 +440,73 @@ func (s *TestSuite) TestUpdateGroupMembers() {
Version: 1,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{{
GroupId: groupID,
Member: &group.Member{
Address: member1,
Weight: "1",
},
}},
expMembers: []*group.GroupMember{
{
GroupId: groupID,
Member: &group.Member{Address: member1, Weight: "1"},
}, {
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
}},
},
"with wrong admin": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: addr3.String(),
MemberUpdates: []group.MemberRequest{{
Address: member1,
Weight: "2",
}},
GroupId: groupID,
Admin: unknownAddr,
MemberUpdates: []group.MemberRequest{{Address: member1, Weight: "2"}},
},
expErr: true,
expErrMsg: "not group admin",
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "1",
TotalWeight: "3",
Version: 1,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{{
GroupId: groupID,
Member: &group.Member{
Address: member1,
Weight: "1",
},
Member: &group.Member{Address: member1, Weight: "1"},
}, {
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
}},
},
"with unknown groupID": {
req: &group.MsgUpdateGroupMembers{
GroupId: 999,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{
Address: member1,
Weight: "2",
}},
GroupId: 999,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{{Address: member1, Weight: "2"}},
},
expErr: true,
expErrMsg: "not found",
expGroup: &group.GroupInfo{
Id: groupID,
Admin: myAdmin,
TotalWeight: "1",
TotalWeight: "3",
Version: 1,
CreatedAt: s.blockTime,
},
expMembers: []*group.GroupMember{{
GroupId: groupID,
Member: &group.Member{
Address: member1,
Weight: "1",
},
Member: &group.Member{Address: member1, Weight: "1"},
}, {
Member: &group.Member{Address: member2, Weight: "2", AddedAt: s.blockTime},
GroupId: groupID,
}},
},
"remove all members": {
req: &group.MsgUpdateGroupMembers{
GroupId: groupID,
Admin: myAdmin,
MemberUpdates: []group.MemberRequest{
{Address: member1, Weight: "0"},
{Address: member2, Weight: "0"},
},
},
expErr: true,
expErrMsg: "group must not be empty",
},
}
for msg, spec := range specs {
spec := spec

2
x/group/simulation/operations.go
View File

@ -629,7 +629,7 @@ func SimulateMsgUpdateGroupMembers(
// set existing random group member weight to zero to remove from the group
existigMembers := res.Members
if len(existigMembers) > 0 {
if len(existigMembers) > 1 {
memberToRemove := existigMembers[r.Intn(len(existigMembers))]
var isDuplicateMember bool
for idx, m := range members {

4
x/group/types.go
View File

@ -209,7 +209,9 @@ func (p PercentageDecisionPolicy) Allow(tally TallyResult, totalPower string) (D
if err != nil {
return DecisionPolicyResult{}, errorsmod.Wrap(err, "total power")
}
if totalPowerDec.IsZero() {
return DecisionPolicyResult{Allow: false, Final: true}, nil
}
yesPercentage, err := yesCount.Quo(totalPowerDec)
if err != nil {
return DecisionPolicyResult{}, err

22
x/group/types_test.go
View File

@ -239,6 +239,28 @@ func TestPercentageDecisionPolicyAllow(t *testing.T) {
},
false,
},
{
"empty total power",
&group.PercentageDecisionPolicy{
Percentage: "0.5",
Windows: &group.DecisionPolicyWindows{
VotingPeriod: time.Second * 100,
},
},
&group.TallyResult{
YesCount: "1",
NoCount: "0",
AbstainCount: "0",
NoWithVetoCount: "0",
},
"0",
time.Second * 50,
group.DecisionPolicyResult{
Allow: false,
Final: true,
},
false,
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {