Skip to content

fix(coredaos): prevent veto of a proposal that disables the Oversight DAO #299

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

Open
giunatale wants to merge 2 commits into
base: main
Choose a base branch
from
+28 −2
Open

fix(coredaos): prevent veto of a proposal that disables the Oversight DAO #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a091f4
removal of oversight DAO cannot be vetoed
giunatale Mar 16, 2026
8374d56
update CL
giunatale Mar 16, 2026
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

- Migrate `x/gov` fork from Atom One to Atom One SDK [#248](https://github.com/atomone-hub/atomone/pull/248)
- Add governors to `x/gov` module [#258](https://github.com/atomone-hub/atomone/pull/258)
- Prevent Oversight DAO from vetoing proposals that include a change to the Oversight DAO address [#275](https://github.com/atomone-hub/atomone/pull/275)
- Prevent Oversight DAO from vetoing proposals that include a change to the Oversight DAO address [#275](https://github.com/atomone-hub/atomone/pull/275) [#299](https://github.com/atomone-hub/atomone/pull/299)

### STATE BREAKING

Expand Down
2 changes: 1 addition & 1 deletion x/coredaos/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func (ms MsgServer) VetoProposal(goCtx context.Context, msg *types.MsgVetoPropos

return nil, err
}
if updateParamsMsg.Params.OversightDaoAddress != "" && updateParamsMsg.Params.OversightDaoAddress != params.OversightDaoAddress {
if updateParamsMsg.Params.OversightDaoAddress != params.OversightDaoAddress {
logger.Error(
"proposal contains a change of the oversight DAO address, vetoing it would prevent the replacement of the current oversight DAO",
"proposal", proposal.Id,
Expand Down
26 changes: 26 additions & 0 deletions x/coredaos/keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,20 @@ func TestMsgServerVetoProposal(t *testing.T) {
Status: govtypesv1.StatusVotingPeriod,
Messages: proposalWithChangeOversightDAOMsgs,
}
proposalWithEmptyOversightDAOMsgs, err := sdktx.SetMsgs([]sdk.Msg{&types.MsgUpdateParams{
Authority: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn",
Params: types.Params{
OversightDaoAddress: "",
},
}})
require.NoError(t, err)
proposalWithEmptyOversightDAO := govtypesv1.Proposal{
Title: "Test Proposal",
Summary: "A proposal to set empty oversight DAO address",
Id: 5,
Status: govtypesv1.StatusVotingPeriod,
Messages: proposalWithEmptyOversightDAOMsgs,
}
tests := []struct {
name string
msg *types.MsgVetoProposal
Expand Down Expand Up @@ -840,6 +854,18 @@ func TestMsgServerVetoProposal(t *testing.T) {
},
setOversightDAO: true,
},
{
name: "veto proposal with disablement of oversight DAO",
msg: &types.MsgVetoProposal{
Vetoer: oversightDAOAcc,
ProposalId: 5,
},
expectedErr: "proposal with ID 5 contains a change of the oversight DAO address, vetoing it would prevent the replacement of the current oversight DAO: oversight DAO cannot veto this proposal",
setupMocks: func(ctx sdk.Context, m *testutil.Mocks) {
m.GovKeeper.EXPECT().GetProposal(ctx, uint64(5)).Return(proposalWithEmptyOversightDAO, true)
},
setOversightDAO: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
Loading