From 14a0860ddb3867e8b045c6057f91f8ce99f3754c Mon Sep 17 00:00:00 2001 From: Robert Pirtle Date: Thu, 20 Apr 2023 14:42:11 -0700 Subject: [PATCH] feat: add CommunityCDPRepayDebtPermission (#1566) * feat: add CommunityCDPRepayDebtPermission When granted, the new permission allows a committee to submit a CommunityCDPRepayDebtProposal to lower principal owed on a cdp owned by the x/community module. * update changelog * update protonet genesis.json --- CHANGELOG.md | 2 + ci/env/kava-protonet/genesis.json | 6 + docs/core/proto-docs.md | 11 + .../kava/committee/v1beta1/permissions.proto | 5 + x/committee/types/codec.go | 6 +- x/committee/types/permissions.go | 7 + x/committee/types/permissions.pb.go | 189 ++++++++++++++---- x/committee/types/permissions_test.go | 38 ++++ 8 files changed, 229 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5ae4539..a8033d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ - (x/community) [#1563] Include x/community module pool balance in x/distribution community_pool query response. - (x/community) [#1565] Add CommunityCDPRepayDebtProposal +- (x/committee) [#1566] Add CommunityCDPRepayDebtPermission ### Deprecated @@ -233,6 +234,7 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md). large-scale simulations remotely using aws-batch +[#1566]: https://github.com/Kava-Labs/kava/pull/1566 [#1565]: https://github.com/Kava-Labs/kava/pull/1565 [#1563]: https://github.com/Kava-Labs/kava/pull/1563 [#1562]: https://github.com/Kava-Labs/kava/pull/1562 diff --git a/ci/env/kava-protonet/genesis.json b/ci/env/kava-protonet/genesis.json index d7263b19..2645dde5 100644 --- a/ci/env/kava-protonet/genesis.json +++ b/ci/env/kava-protonet/genesis.json @@ -1091,6 +1091,12 @@ { "@type": "/kava.committee.v1beta1.TextPermission" }, + { + "@type": "/kava.committee.v1beta1.CommunityPoolLendWithdrawPermission" + }, + { + "@type": "/kava.committee.v1beta1.CommunityCDPRepayDebtPermission" + }, { "@type": "/kava.committee.v1beta1.ParamsChangePermission", "allowed_params_changes": [ diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md index f1e09d79..281a510b 100644 --- a/docs/core/proto-docs.md +++ b/docs/core/proto-docs.md @@ -138,6 +138,7 @@ - [kava/committee/v1beta1/permissions.proto](#kava/committee/v1beta1/permissions.proto) - [AllowedParamsChange](#kava.committee.v1beta1.AllowedParamsChange) + - [CommunityCDPRepayDebtPermission](#kava.committee.v1beta1.CommunityCDPRepayDebtPermission) - [CommunityPoolLendWithdrawPermission](#kava.committee.v1beta1.CommunityPoolLendWithdrawPermission) - [GodPermission](#kava.committee.v1beta1.GodPermission) - [ParamsChangePermission](#kava.committee.v1beta1.ParamsChangePermission) @@ -2325,6 +2326,16 @@ AllowedParamsChange contains data on the allowed parameter changes for subspace, + + +### CommunityCDPRepayDebtPermission +CommunityCDPRepayDebtPermission allows submission of CommunityCDPRepayDebtProposal + + + + + + ### CommunityPoolLendWithdrawPermission diff --git a/proto/kava/committee/v1beta1/permissions.proto b/proto/kava/committee/v1beta1/permissions.proto index 7a3d9342..4e75d127 100644 --- a/proto/kava/committee/v1beta1/permissions.proto +++ b/proto/kava/committee/v1beta1/permissions.proto @@ -21,6 +21,11 @@ message TextPermission { option (cosmos_proto.implements_interface) = "Permission"; } +// CommunityCDPRepayDebtPermission allows submission of CommunityCDPRepayDebtProposal +message CommunityCDPRepayDebtPermission { + option (cosmos_proto.implements_interface) = "Permission"; +} + // CommunityPoolLendWithdrawPermission allows submission of CommunityPoolLendWithdrawProposal message CommunityPoolLendWithdrawPermission { option (cosmos_proto.implements_interface) = "Permission"; diff --git a/x/committee/types/codec.go b/x/committee/types/codec.go index 448424b4..8c6c0537 100644 --- a/x/committee/types/codec.go +++ b/x/committee/types/codec.go @@ -48,7 +48,9 @@ func init() { RegisterProposalTypeCodec(govv1beta1.TextProposal{}, "cosmos-sdk/TextProposal") RegisterProposalTypeCodec(upgradetypes.SoftwareUpgradeProposal{}, "cosmos-sdk/SoftwareUpgradeProposal") RegisterProposalTypeCodec(upgradetypes.CancelSoftwareUpgradeProposal{}, "cosmos-sdk/CancelSoftwareUpgradeProposal") + RegisterProposalTypeCodec(communitytypes.CommunityCDPRepayDebtProposal{}, "kava/CommunityCDPRepayDebtProposal") RegisterProposalTypeCodec(communitytypes.CommunityPoolLendWithdrawProposal{}, "kava/CommunityPoolLendWithdrawProposal") + RegisterProposalTypeCodec(kavadisttypes.CommunityPoolMultiSpendProposal{}, "kava/CommunityPoolMultiSpendProposal") } // RegisterLegacyAminoCodec registers all the necessary types and interfaces for the module. @@ -70,6 +72,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(TextPermission{}, "kava/TextPermission", nil) cdc.RegisterConcrete(SoftwareUpgradePermission{}, "kava/SoftwareUpgradePermission", nil) cdc.RegisterConcrete(ParamsChangePermission{}, "kava/ParamsChangePermission", nil) + cdc.RegisterConcrete(CommunityCDPRepayDebtPermission{}, "kava/CommunityCDPRepayDebtPermission", nil) cdc.RegisterConcrete(CommunityPoolLendWithdrawPermission{}, "kava/CommunityPoolLendWithdrawPermission", nil) // Msgs @@ -106,6 +109,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { &TextPermission{}, &SoftwareUpgradePermission{}, &ParamsChangePermission{}, + &CommunityCDPRepayDebtPermission{}, &CommunityPoolLendWithdrawPermission{}, ) @@ -121,8 +125,8 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { &proposaltypes.ParameterChangeProposal{}, &upgradetypes.SoftwareUpgradeProposal{}, &upgradetypes.CancelSoftwareUpgradeProposal{}, + &communitytypes.CommunityCDPRepayDebtProposal{}, &communitytypes.CommunityPoolLendWithdrawProposal{}, - &kavadisttypes.CommunityPoolMultiSpendProposal{}, ) registry.RegisterImplementations( diff --git a/x/committee/types/permissions.go b/x/committee/types/permissions.go index 8afe43a9..b7debc7b 100644 --- a/x/committee/types/permissions.go +++ b/x/committee/types/permissions.go @@ -54,6 +54,7 @@ var ( _ Permission = TextPermission{} _ Permission = SoftwareUpgradePermission{} _ Permission = ParamsChangePermission{} + _ Permission = CommunityCDPRepayDebtPermission{} _ Permission = CommunityPoolLendWithdrawPermission{} ) @@ -72,6 +73,12 @@ func (SoftwareUpgradePermission) Allows(_ sdk.Context, _ ParamKeeper, p PubPropo return ok } +// Allows implement permission interface for CommunityCDPRepayDebtPermission. +func (CommunityCDPRepayDebtPermission) Allows(_ sdk.Context, _ ParamKeeper, p PubProposal) bool { + _, ok := p.(*communitytypes.CommunityCDPRepayDebtProposal) + return ok +} + // Allows implement permission interface for CommunityPoolLendWithdrawPermission. func (CommunityPoolLendWithdrawPermission) Allows(_ sdk.Context, _ ParamKeeper, p PubProposal) bool { _, ok := p.(*communitytypes.CommunityPoolLendWithdrawProposal) diff --git a/x/committee/types/permissions.pb.go b/x/committee/types/permissions.pb.go index 1123680b..81e35da6 100644 --- a/x/committee/types/permissions.pb.go +++ b/x/committee/types/permissions.pb.go @@ -135,6 +135,43 @@ func (m *TextPermission) XXX_DiscardUnknown() { var xxx_messageInfo_TextPermission proto.InternalMessageInfo +// CommunityCDPRepayDebtPermission allows submission of CommunityCDPRepayDebtProposal +type CommunityCDPRepayDebtPermission struct { +} + +func (m *CommunityCDPRepayDebtPermission) Reset() { *m = CommunityCDPRepayDebtPermission{} } +func (m *CommunityCDPRepayDebtPermission) String() string { return proto.CompactTextString(m) } +func (*CommunityCDPRepayDebtPermission) ProtoMessage() {} +func (*CommunityCDPRepayDebtPermission) Descriptor() ([]byte, []int) { + return fileDescriptor_bdfaf7be16465ae4, []int{3} +} +func (m *CommunityCDPRepayDebtPermission) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CommunityCDPRepayDebtPermission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CommunityCDPRepayDebtPermission.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CommunityCDPRepayDebtPermission) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommunityCDPRepayDebtPermission.Merge(m, src) +} +func (m *CommunityCDPRepayDebtPermission) XXX_Size() int { + return m.Size() +} +func (m *CommunityCDPRepayDebtPermission) XXX_DiscardUnknown() { + xxx_messageInfo_CommunityCDPRepayDebtPermission.DiscardUnknown(m) +} + +var xxx_messageInfo_CommunityCDPRepayDebtPermission proto.InternalMessageInfo + // CommunityPoolLendWithdrawPermission allows submission of CommunityPoolLendWithdrawProposal type CommunityPoolLendWithdrawPermission struct { } @@ -143,7 +180,7 @@ func (m *CommunityPoolLendWithdrawPermission) Reset() { *m = CommunityPo func (m *CommunityPoolLendWithdrawPermission) String() string { return proto.CompactTextString(m) } func (*CommunityPoolLendWithdrawPermission) ProtoMessage() {} func (*CommunityPoolLendWithdrawPermission) Descriptor() ([]byte, []int) { - return fileDescriptor_bdfaf7be16465ae4, []int{3} + return fileDescriptor_bdfaf7be16465ae4, []int{4} } func (m *CommunityPoolLendWithdrawPermission) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -181,7 +218,7 @@ func (m *ParamsChangePermission) Reset() { *m = ParamsChangePermission{} func (m *ParamsChangePermission) String() string { return proto.CompactTextString(m) } func (*ParamsChangePermission) ProtoMessage() {} func (*ParamsChangePermission) Descriptor() ([]byte, []int) { - return fileDescriptor_bdfaf7be16465ae4, []int{4} + return fileDescriptor_bdfaf7be16465ae4, []int{5} } func (m *ParamsChangePermission) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -233,7 +270,7 @@ func (m *AllowedParamsChange) Reset() { *m = AllowedParamsChange{} } func (m *AllowedParamsChange) String() string { return proto.CompactTextString(m) } func (*AllowedParamsChange) ProtoMessage() {} func (*AllowedParamsChange) Descriptor() ([]byte, []int) { - return fileDescriptor_bdfaf7be16465ae4, []int{5} + return fileDescriptor_bdfaf7be16465ae4, []int{6} } func (m *AllowedParamsChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -304,7 +341,7 @@ func (m *SubparamRequirement) Reset() { *m = SubparamRequirement{} } func (m *SubparamRequirement) String() string { return proto.CompactTextString(m) } func (*SubparamRequirement) ProtoMessage() {} func (*SubparamRequirement) Descriptor() ([]byte, []int) { - return fileDescriptor_bdfaf7be16465ae4, []int{6} + return fileDescriptor_bdfaf7be16465ae4, []int{7} } func (m *SubparamRequirement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -358,6 +395,7 @@ func init() { proto.RegisterType((*GodPermission)(nil), "kava.committee.v1beta1.GodPermission") proto.RegisterType((*SoftwareUpgradePermission)(nil), "kava.committee.v1beta1.SoftwareUpgradePermission") proto.RegisterType((*TextPermission)(nil), "kava.committee.v1beta1.TextPermission") + proto.RegisterType((*CommunityCDPRepayDebtPermission)(nil), "kava.committee.v1beta1.CommunityCDPRepayDebtPermission") proto.RegisterType((*CommunityPoolLendWithdrawPermission)(nil), "kava.committee.v1beta1.CommunityPoolLendWithdrawPermission") proto.RegisterType((*ParamsChangePermission)(nil), "kava.committee.v1beta1.ParamsChangePermission") proto.RegisterType((*AllowedParamsChange)(nil), "kava.committee.v1beta1.AllowedParamsChange") @@ -369,37 +407,38 @@ func init() { } var fileDescriptor_bdfaf7be16465ae4 = []byte{ - // 478 bytes of a gzipped FileDescriptorProto + // 493 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0x87, 0x1b, 0xbb, 0x88, 0x3b, 0xe2, 0xb2, 0x64, 0x4b, 0xc9, 0x86, 0x35, 0x2d, 0xf5, 0x52, - 0x28, 0x9b, 0xb0, 0x8a, 0x17, 0x6f, 0xed, 0x22, 0x5e, 0x3c, 0x94, 0xac, 0x22, 0x78, 0x09, 0x93, - 0x66, 0x4c, 0x87, 0xcd, 0x64, 0xe2, 0xbc, 0x6f, 0xda, 0x2d, 0x08, 0x7e, 0x05, 0xbf, 0x86, 0x9e, - 0xfd, 0x10, 0x8b, 0xa7, 0x3d, 0x7a, 0x52, 0x69, 0x3f, 0x86, 0x17, 0xc9, 0xdf, 0x16, 0x0c, 0xbd, - 0xcd, 0xbc, 0xf3, 0xfc, 0xde, 0x99, 0x67, 0x86, 0x21, 0xc3, 0x6b, 0xba, 0xa0, 0xce, 0x4c, 0x0a, - 0xc1, 0x11, 0x19, 0x73, 0x16, 0x17, 0x3e, 0x43, 0x7a, 0xe1, 0x24, 0x4c, 0x09, 0x0e, 0xc0, 0x65, - 0x0c, 0x76, 0xa2, 0x24, 0x4a, 0xbd, 0x9b, 0x91, 0x76, 0x4d, 0xda, 0x25, 0x69, 0x9e, 0xce, 0x24, - 0x08, 0x09, 0x5e, 0x4e, 0x39, 0xc5, 0xa4, 0x88, 0x98, 0x9d, 0x50, 0x86, 0xb2, 0xa8, 0x67, 0xa3, - 0xa2, 0x3a, 0xe8, 0x91, 0x47, 0xaf, 0x64, 0x30, 0xad, 0x37, 0x78, 0x71, 0xf4, 0xe3, 0xfb, 0x39, - 0xd9, 0xce, 0x07, 0x23, 0x72, 0x7a, 0x25, 0x3f, 0xe0, 0x92, 0x2a, 0xf6, 0x36, 0x09, 0x15, 0x0d, - 0xd8, 0x1e, 0xb8, 0x4f, 0x8e, 0xde, 0xb0, 0x1b, 0xdc, 0x43, 0x3c, 0x27, 0x4f, 0x2e, 0xa5, 0x10, - 0x69, 0xcc, 0x71, 0x35, 0x95, 0x32, 0x7a, 0xcd, 0xe2, 0xe0, 0x1d, 0xc7, 0x79, 0xa0, 0xe8, 0x72, - 0x4f, 0xec, 0xab, 0x46, 0xba, 0x53, 0xaa, 0xa8, 0x80, 0xcb, 0x39, 0x8d, 0xc3, 0x9d, 0x33, 0xe8, - 0x9f, 0x49, 0x97, 0x46, 0x91, 0x5c, 0xb2, 0xc0, 0x4b, 0x72, 0xc2, 0x9b, 0xe5, 0x08, 0x18, 0x5a, - 0xbf, 0x3d, 0x7c, 0xf8, 0x74, 0x64, 0x37, 0xdf, 0x95, 0x3d, 0x2e, 0x52, 0xbb, 0x6d, 0x27, 0x67, - 0xb7, 0xbf, 0x7a, 0xad, 0x6f, 0xbf, 0x7b, 0x9d, 0x86, 0x45, 0x70, 0x3b, 0xb4, 0xa1, 0xfa, 0xdf, - 0x59, 0xff, 0x6a, 0xe4, 0xa4, 0x21, 0xae, 0x9b, 0xe4, 0x01, 0xa4, 0x3e, 0x24, 0x74, 0xc6, 0x0c, - 0xad, 0xaf, 0x0d, 0x0f, 0xdd, 0x7a, 0xae, 0x1f, 0x93, 0xf6, 0x35, 0x5b, 0x19, 0xf7, 0xf2, 0x72, - 0x36, 0xd4, 0xc7, 0xe4, 0x31, 0xf0, 0x38, 0x8c, 0x98, 0x07, 0xa9, 0x9f, 0x8b, 0x79, 0x95, 0x26, - 0x45, 0x54, 0x60, 0xb4, 0xfb, 0xed, 0xe1, 0xa1, 0x6b, 0x16, 0xd0, 0x55, 0xc9, 0x94, 0xfb, 0x8e, - 0x33, 0x42, 0x07, 0x72, 0x26, 0xd2, 0x08, 0x79, 0xdd, 0x01, 0x3c, 0xc5, 0x3e, 0xa6, 0x5c, 0x31, - 0xc1, 0x62, 0x04, 0xe3, 0x60, 0xff, 0xfd, 0x54, 0x3d, 0xdd, 0x6d, 0x66, 0x72, 0x90, 0xdd, 0x8f, - 0x6b, 0xe6, 0x6d, 0xab, 0x75, 0xd8, 0x01, 0x60, 0xf0, 0x89, 0x9c, 0x34, 0x04, 0x2b, 0x41, 0x6d, - 0x2b, 0x78, 0x4c, 0xda, 0x0b, 0x1a, 0x55, 0xca, 0x0b, 0x1a, 0x65, 0xca, 0x95, 0xe2, 0xd6, 0x19, - 0x51, 0xd5, 0x0f, 0x5a, 0x2a, 0x97, 0x50, 0xed, 0x8c, 0xa8, 0xca, 0xb7, 0x98, 0xbc, 0xbc, 0x5d, - 0x5b, 0xda, 0xdd, 0xda, 0xd2, 0xfe, 0xac, 0x2d, 0xed, 0xcb, 0xc6, 0x6a, 0xdd, 0x6d, 0xac, 0xd6, - 0xcf, 0x8d, 0xd5, 0x7a, 0x3f, 0x0a, 0x39, 0xce, 0x53, 0x3f, 0xf3, 0x74, 0x32, 0xe1, 0xf3, 0x88, - 0xfa, 0x90, 0x8f, 0x9c, 0x9b, 0x9d, 0x2f, 0x87, 0xab, 0x84, 0x81, 0x7f, 0x3f, 0xff, 0x1c, 0xcf, - 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xcd, 0x1f, 0x08, 0x91, 0x03, 0x00, 0x00, + 0x18, 0x87, 0x1b, 0xb3, 0x88, 0x3b, 0xe2, 0xb2, 0x64, 0x4b, 0xc9, 0x86, 0x35, 0x2d, 0xf5, 0x52, + 0x28, 0x9b, 0x50, 0xc5, 0x8b, 0xb7, 0xb6, 0x2b, 0x5e, 0x3c, 0x94, 0xac, 0x22, 0x78, 0x09, 0x93, + 0x66, 0x4c, 0xc3, 0x26, 0x99, 0x38, 0xef, 0x9b, 0x76, 0x0b, 0x82, 0x5f, 0xc1, 0xaf, 0xa1, 0x67, + 0x3f, 0xc4, 0xe2, 0xa9, 0x47, 0x4f, 0x2a, 0xed, 0xc7, 0xf0, 0x22, 0xf9, 0xdb, 0x82, 0x21, 0xb7, + 0x99, 0x77, 0x9e, 0xdf, 0x3b, 0xf3, 0xcc, 0x30, 0x64, 0x70, 0x43, 0x97, 0xd4, 0x9c, 0xf3, 0x30, + 0xf4, 0x11, 0x19, 0x33, 0x97, 0x23, 0x87, 0x21, 0x1d, 0x99, 0x31, 0x13, 0xa1, 0x0f, 0xe0, 0xf3, + 0x08, 0x8c, 0x58, 0x70, 0xe4, 0x4a, 0x27, 0x25, 0x8d, 0x8a, 0x34, 0x0a, 0x52, 0x3b, 0x9f, 0x73, + 0x08, 0x39, 0xd8, 0x19, 0x65, 0xe6, 0x93, 0x3c, 0xa2, 0xb5, 0x3d, 0xee, 0xf1, 0xbc, 0x9e, 0x8e, + 0xf2, 0x6a, 0xbf, 0x4b, 0x1e, 0xbd, 0xe2, 0xee, 0xac, 0xda, 0xe0, 0xc5, 0xc9, 0x8f, 0xef, 0x97, + 0x64, 0x3f, 0xef, 0x0f, 0xc9, 0xf9, 0x35, 0xff, 0x80, 0x2b, 0x2a, 0xd8, 0xdb, 0xd8, 0x13, 0xd4, + 0x65, 0x0d, 0x70, 0x8f, 0x9c, 0xbc, 0x61, 0xb7, 0xd8, 0x40, 0x8c, 0x48, 0x77, 0xca, 0xc3, 0x30, + 0x89, 0x7c, 0x5c, 0x4f, 0xaf, 0x66, 0x16, 0x8b, 0xe9, 0xfa, 0x8a, 0x39, 0x4d, 0x91, 0xe7, 0xe4, + 0x49, 0x15, 0x99, 0x71, 0x1e, 0xbc, 0x66, 0x91, 0xfb, 0xce, 0xc7, 0x85, 0x2b, 0xe8, 0xaa, 0x21, + 0xf6, 0x55, 0x22, 0x9d, 0x19, 0x15, 0x34, 0x84, 0xe9, 0x82, 0x46, 0xde, 0xc1, 0xb1, 0x95, 0xcf, + 0xa4, 0x43, 0x83, 0x80, 0xaf, 0x98, 0x6b, 0xc7, 0x19, 0x61, 0xcf, 0x33, 0x04, 0x54, 0xa9, 0x27, + 0x0f, 0x1e, 0x3e, 0x1d, 0x1a, 0xf5, 0xd7, 0x6b, 0x8c, 0xf3, 0xd4, 0x61, 0xdb, 0xc9, 0xc5, 0xdd, + 0xaf, 0x6e, 0xeb, 0xdb, 0xef, 0x6e, 0xbb, 0x66, 0x11, 0xac, 0x36, 0xad, 0xa9, 0xfe, 0x77, 0xd6, + 0xbf, 0x12, 0x39, 0xab, 0x89, 0x2b, 0x1a, 0x79, 0x00, 0x89, 0x03, 0x31, 0x9d, 0x33, 0x55, 0xea, + 0x49, 0x83, 0x63, 0xab, 0x9a, 0x2b, 0xa7, 0x44, 0xbe, 0x61, 0x6b, 0xf5, 0x5e, 0x56, 0x4e, 0x87, + 0xca, 0x98, 0x3c, 0x06, 0x3f, 0xf2, 0x02, 0x66, 0x43, 0xe2, 0x64, 0x62, 0x76, 0xa9, 0x49, 0x11, + 0x05, 0xa8, 0x72, 0x4f, 0x1e, 0x1c, 0x5b, 0x5a, 0x0e, 0x5d, 0x17, 0x4c, 0xb1, 0xef, 0x38, 0x25, + 0x14, 0x20, 0x17, 0x61, 0x12, 0xa0, 0x5f, 0x75, 0x00, 0x5b, 0xb0, 0x8f, 0x89, 0x2f, 0x58, 0xc8, + 0x22, 0x04, 0xf5, 0xa8, 0xf9, 0x7e, 0xca, 0x9e, 0xd6, 0x3e, 0x33, 0x39, 0x4a, 0xef, 0xc7, 0xd2, + 0xb2, 0xb6, 0xe5, 0x3a, 0x1c, 0x00, 0xd0, 0xff, 0x44, 0xce, 0x6a, 0x82, 0xa5, 0xa0, 0xb4, 0x17, + 0x3c, 0x25, 0xf2, 0x92, 0x06, 0xa5, 0xf2, 0x92, 0x06, 0xa9, 0x72, 0xa9, 0xb8, 0x77, 0x46, 0x14, + 0xd5, 0x83, 0x16, 0xca, 0x05, 0x54, 0x39, 0x23, 0x8a, 0xe2, 0x2d, 0x26, 0x2f, 0xef, 0xb6, 0xba, + 0xb4, 0xd9, 0xea, 0xd2, 0x9f, 0xad, 0x2e, 0x7d, 0xd9, 0xe9, 0xad, 0xcd, 0x4e, 0x6f, 0xfd, 0xdc, + 0xe9, 0xad, 0xf7, 0x43, 0xcf, 0xc7, 0x45, 0xe2, 0xa4, 0x9e, 0x66, 0x2a, 0x7c, 0x19, 0x50, 0x07, + 0xb2, 0x91, 0x79, 0x7b, 0xf0, 0x4b, 0x71, 0x1d, 0x33, 0x70, 0xee, 0x67, 0xff, 0xe9, 0xd9, 0xbf, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0x2f, 0x94, 0x6f, 0xc4, 0x03, 0x00, 0x00, } func (m *GodPermission) Marshal() (dAtA []byte, err error) { @@ -471,6 +510,29 @@ func (m *TextPermission) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *CommunityCDPRepayDebtPermission) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *CommunityCDPRepayDebtPermission) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CommunityCDPRepayDebtPermission) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func (m *CommunityPoolLendWithdrawPermission) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -675,6 +737,15 @@ func (m *TextPermission) Size() (n int) { return n } +func (m *CommunityCDPRepayDebtPermission) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func (m *CommunityPoolLendWithdrawPermission) Size() (n int) { if m == nil { return 0 @@ -907,6 +978,56 @@ func (m *TextPermission) Unmarshal(dAtA []byte) error { } return nil } +func (m *CommunityCDPRepayDebtPermission) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPermissions + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: CommunityCDPRepayDebtPermission: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CommunityCDPRepayDebtPermission: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipPermissions(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthPermissions + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *CommunityPoolLendWithdrawPermission) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/committee/types/permissions_test.go b/x/committee/types/permissions_test.go index d3f8f69a..d0233760 100644 --- a/x/committee/types/permissions_test.go +++ b/x/committee/types/permissions_test.go @@ -41,6 +41,44 @@ func TestUnpackPermissions_Failure(t *testing.T) { require.Error(t, err) } +func TestCommunityCDPRepayDebtPermission_Allows(t *testing.T) { + permission := types.CommunityCDPRepayDebtPermission{} + testcases := []struct { + name string + proposal types.PubProposal + allowed bool + }{ + { + name: "allowed for correct proposal", + proposal: communitytypes.NewCommunityCDPRepayDebtProposal( + "repay x/community cdp debt", + "repays debt on a cdp position", + "collateral-type", + sdk.NewInt64Coin("ukava", 1e10), + ), + allowed: true, + }, + { + name: "fails for nil proposal", + proposal: nil, + allowed: false, + }, + { + name: "fails for wrong proposal", + proposal: newTestParamsChangeProposalWithChanges([]paramsproposal.ParamChange{ + {Subspace: "cdp", Key: "DebtThreshold", Value: `test`}, + }), + allowed: false, + }, + } + + for _, tc := range testcases { + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.allowed, permission.Allows(sdk.Context{}, nil, tc.proposal)) + }) + } +} + func TestCommunityPoolLendWithdrawPermission_Allows(t *testing.T) { permission := types.CommunityPoolLendWithdrawPermission{} testcases := []struct {