From cb5bdb4c84e7f5ef063f9553ed89a127d52433c0 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Sun, 24 Mar 2024 19:01:44 -0600 Subject: [PATCH] Revert "feat!(x/gov): implement a minimum amount per deposit (backport #19312) (#510)" This reverts commit 106ba23d39cf2ce881c3a7fb23e91a0f9c562c32. --- CHANGELOG.md | 1 - api/cosmos/gov/v1/gov.pulsar.go | 151 ++++-------------- proto/cosmos/gov/v1/gov.proto | 8 - tests/e2e/gov/deposits.go | 29 +++- tests/e2e/gov/query.go | 3 +- tests/e2e/gov/tx.go | 28 +--- x/bank/app_test.go | 3 +- x/gov/abci_test.go | 10 +- x/gov/keeper/deposit.go | 76 +-------- x/gov/keeper/deposit_test.go | 80 +--------- x/gov/keeper/export_test.go | 9 +- x/gov/keeper/msg_server.go | 18 +-- x/gov/keeper/msg_server_test.go | 65 ++------ x/gov/migrations/v4/json.go | 3 - x/gov/migrations/v4/json_test.go | 1 - x/gov/migrations/v4/store.go | 3 - x/gov/migrations/v4/store_test.go | 1 - x/gov/simulation/genesis.go | 13 +- x/gov/simulation/operations.go | 12 +- x/gov/simulation/operations_test.go | 6 +- x/gov/types/errors.go | 3 - x/gov/types/v1/gov.pb.go | 232 +++++++++++----------------- x/gov/types/v1/params.go | 12 +- 23 files changed, 189 insertions(+), 578 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b6ee3ad6d26..3a5da4f64b62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,7 +44,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (slashing) [#543](https://github.com/osmosis-labs/cosmos-sdk/pull/543) Make slashing not write sign info every block * (authz) [#513](https://github.com/osmosis-labs/cosmos-sdk/pull/513) Limit expired authz grant pruning to 200 per block * (gov) [#514](https://github.com/osmosis-labs/cosmos-sdk/pull/514) Let gov hooks return an error -* (gov) [#510](https://github.com/osmosis-labs/cosmos-sdk/pull/510) Implement a minimum amount per deposit * (slashing) [#580](https://github.com/osmosis-labs/cosmos-sdk/pull/580) Less time intensive slashing migration ## [State Compatible] diff --git a/api/cosmos/gov/v1/gov.pulsar.go b/api/cosmos/gov/v1/gov.pulsar.go index 6de4461e3bad..ad7895d1d7b7 100644 --- a/api/cosmos/gov/v1/gov.pulsar.go +++ b/api/cosmos/gov/v1/gov.pulsar.go @@ -5481,7 +5481,6 @@ var ( fd_Params_burn_vote_quorum protoreflect.FieldDescriptor fd_Params_burn_proposal_deposit_prevote protoreflect.FieldDescriptor fd_Params_burn_vote_veto protoreflect.FieldDescriptor - fd_Params_min_deposit_ratio protoreflect.FieldDescriptor ) func init() { @@ -5500,7 +5499,6 @@ func init() { fd_Params_burn_vote_quorum = md_Params.Fields().ByName("burn_vote_quorum") fd_Params_burn_proposal_deposit_prevote = md_Params.Fields().ByName("burn_proposal_deposit_prevote") fd_Params_burn_vote_veto = md_Params.Fields().ByName("burn_vote_veto") - fd_Params_min_deposit_ratio = md_Params.Fields().ByName("min_deposit_ratio") } var _ protoreflect.Message = (*fastReflection_Params)(nil) @@ -5646,12 +5644,6 @@ func (x *fastReflection_Params) Range(f func(protoreflect.FieldDescriptor, proto return } } - if x.MinDepositRatio != "" { - value := protoreflect.ValueOfString(x.MinDepositRatio) - if !f(fd_Params_min_deposit_ratio, value) { - return - } - } } // Has reports whether a field is populated. @@ -5693,8 +5685,6 @@ func (x *fastReflection_Params) Has(fd protoreflect.FieldDescriptor) bool { return x.BurnProposalDepositPrevote != false case "cosmos.gov.v1.Params.burn_vote_veto": return x.BurnVoteVeto != false - case "cosmos.gov.v1.Params.min_deposit_ratio": - return x.MinDepositRatio != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -5737,8 +5727,6 @@ func (x *fastReflection_Params) Clear(fd protoreflect.FieldDescriptor) { x.BurnProposalDepositPrevote = false case "cosmos.gov.v1.Params.burn_vote_veto": x.BurnVoteVeto = false - case "cosmos.gov.v1.Params.min_deposit_ratio": - x.MinDepositRatio = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -5800,9 +5788,6 @@ func (x *fastReflection_Params) Get(descriptor protoreflect.FieldDescriptor) pro case "cosmos.gov.v1.Params.burn_vote_veto": value := x.BurnVoteVeto return protoreflect.ValueOfBool(value) - case "cosmos.gov.v1.Params.min_deposit_ratio": - value := x.MinDepositRatio - return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -5853,8 +5838,6 @@ func (x *fastReflection_Params) Set(fd protoreflect.FieldDescriptor, value proto x.BurnProposalDepositPrevote = value.Bool() case "cosmos.gov.v1.Params.burn_vote_veto": x.BurnVoteVeto = value.Bool() - case "cosmos.gov.v1.Params.min_deposit_ratio": - x.MinDepositRatio = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -5918,8 +5901,6 @@ func (x *fastReflection_Params) Mutable(fd protoreflect.FieldDescriptor) protore panic(fmt.Errorf("field burn_proposal_deposit_prevote of message cosmos.gov.v1.Params is not mutable")) case "cosmos.gov.v1.Params.burn_vote_veto": panic(fmt.Errorf("field burn_vote_veto of message cosmos.gov.v1.Params is not mutable")) - case "cosmos.gov.v1.Params.min_deposit_ratio": - panic(fmt.Errorf("field min_deposit_ratio of message cosmos.gov.v1.Params is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -5964,8 +5945,6 @@ func (x *fastReflection_Params) NewField(fd protoreflect.FieldDescriptor) protor return protoreflect.ValueOfBool(false) case "cosmos.gov.v1.Params.burn_vote_veto": return protoreflect.ValueOfBool(false) - case "cosmos.gov.v1.Params.min_deposit_ratio": - return protoreflect.ValueOfString("") default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.gov.v1.Params")) @@ -6088,10 +6067,6 @@ func (x *fastReflection_Params) ProtoMethods() *protoiface.Methods { if x.BurnVoteVeto { n += 2 } - l = len(x.MinDepositRatio) - if l > 0 { - n += 2 + l + runtime.Sov(uint64(l)) - } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -6121,15 +6096,6 @@ func (x *fastReflection_Params) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } - if len(x.MinDepositRatio) > 0 { - i -= len(x.MinDepositRatio) - copy(dAtA[i:], x.MinDepositRatio) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.MinDepositRatio))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } if x.BurnVoteVeto { i-- if x.BurnVoteVeto { @@ -6714,38 +6680,6 @@ func (x *fastReflection_Params) ProtoMethods() *protoiface.Methods { } } x.BurnVoteVeto = bool(v != 0) - case 16: - if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field MinDepositRatio", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow - } - if iNdEx >= l { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength - } - if postIndex > l { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF - } - x.MinDepositRatio = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -7510,13 +7444,6 @@ type Params struct { BurnProposalDepositPrevote bool `protobuf:"varint,14,opt,name=burn_proposal_deposit_prevote,json=burnProposalDepositPrevote,proto3" json:"burn_proposal_deposit_prevote,omitempty"` // burn deposits if quorum with vote type no_veto is met BurnVoteVeto bool `protobuf:"varint,15,opt,name=burn_vote_veto,json=burnVoteVeto,proto3" json:"burn_vote_veto,omitempty"` - // The ratio representing the proportion of the deposit value minimum that must be met when making a deposit. - // Default value: 0.01. Meaning that for a chain with a min_deposit of 100stake, a deposit of 1stake would be - // required. - // - // Since: cosmos-sdk 0.50 - // NOTE: backported from v50 (https://github.com/cosmos/cosmos-sdk/pull/18146) - MinDepositRatio string `protobuf:"bytes,16,opt,name=min_deposit_ratio,json=minDepositRatio,proto3" json:"min_deposit_ratio,omitempty"` } func (x *Params) Reset() { @@ -7630,13 +7557,6 @@ func (x *Params) GetBurnVoteVeto() bool { return false } -func (x *Params) GetMinDepositRatio() string { - if x != nil { - return x.MinDepositRatio - } - return "" -} - var File_cosmos_gov_v1_gov_proto protoreflect.FileDescriptor var file_cosmos_gov_v1_gov_proto_rawDesc = []byte{ @@ -7772,7 +7692,7 @@ var file_cosmos_gov_v1_gov_proto_rawDesc = []byte{ 0x64, 0x12, 0x35, 0x0a, 0x0e, 0x76, 0x65, 0x74, 0x6f, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x0d, 0x76, 0x65, 0x74, 0x6f, 0x54, - 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xff, 0x06, 0x0a, + 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x3a, 0x02, 0x18, 0x01, 0x22, 0xc3, 0x06, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, @@ -7825,42 +7745,39 @@ var file_cosmos_gov_v1_gov_proto_rawDesc = []byte{ 0x70, 0x6f, 0x73, 0x69, 0x74, 0x50, 0x72, 0x65, 0x76, 0x6f, 0x74, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x62, 0x75, 0x72, 0x6e, 0x5f, 0x76, 0x6f, 0x74, 0x65, 0x5f, 0x76, 0x65, 0x74, 0x6f, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x62, 0x75, 0x72, 0x6e, 0x56, 0x6f, 0x74, 0x65, 0x56, 0x65, - 0x74, 0x6f, 0x12, 0x3a, 0x0a, 0x11, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x5f, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xd2, - 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x0f, 0x6d, - 0x69, 0x6e, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x2a, 0x89, - 0x01, 0x0a, 0x0a, 0x56, 0x6f, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, - 0x17, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, - 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x56, 0x4f, - 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x59, 0x45, 0x53, 0x10, 0x01, 0x12, - 0x17, 0x0a, 0x13, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x41, - 0x42, 0x53, 0x54, 0x41, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x56, 0x4f, 0x54, 0x45, - 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x10, 0x03, 0x12, 0x1c, 0x0a, 0x18, - 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x5f, 0x57, - 0x49, 0x54, 0x48, 0x5f, 0x56, 0x45, 0x54, 0x4f, 0x10, 0x04, 0x2a, 0xce, 0x01, 0x0a, 0x0e, 0x50, - 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1f, 0x0a, - 0x1b, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, - 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x22, - 0x0a, 0x1e, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, - 0x53, 0x5f, 0x44, 0x45, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x5f, 0x50, 0x45, 0x52, 0x49, 0x4f, 0x44, - 0x10, 0x01, 0x12, 0x21, 0x0a, 0x1d, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, - 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x56, 0x4f, 0x54, 0x49, 0x4e, 0x47, 0x5f, 0x50, 0x45, 0x52, - 0x49, 0x4f, 0x44, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, - 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x45, 0x44, 0x10, - 0x03, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, - 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x45, 0x44, 0x10, 0x04, 0x12, - 0x1a, 0x0a, 0x16, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, - 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x05, 0x42, 0x99, 0x01, 0x0a, 0x11, - 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, 0x6f, 0x76, 0x2e, 0x76, - 0x31, 0x42, 0x08, 0x47, 0x6f, 0x76, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x24, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x67, 0x6f, 0x76, 0x2f, 0x76, 0x31, 0x3b, 0x67, 0x6f, - 0x76, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x47, 0x58, 0xaa, 0x02, 0x0d, 0x43, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2e, 0x47, 0x6f, 0x76, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x43, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x5c, 0x47, 0x6f, 0x76, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x43, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x5c, 0x47, 0x6f, 0x76, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0f, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, - 0x47, 0x6f, 0x76, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x6f, 0x2a, 0x89, 0x01, 0x0a, 0x0a, 0x56, 0x6f, 0x74, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, + 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x13, + 0x0a, 0x0f, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x59, 0x45, + 0x53, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, + 0x4f, 0x4e, 0x5f, 0x41, 0x42, 0x53, 0x54, 0x41, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, + 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x10, 0x03, + 0x12, 0x1c, 0x0a, 0x18, 0x56, 0x4f, 0x54, 0x45, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, + 0x4e, 0x4f, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x56, 0x45, 0x54, 0x4f, 0x10, 0x04, 0x2a, 0xce, + 0x01, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x12, 0x1f, 0x0a, 0x1b, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, + 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, + 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, + 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x44, 0x45, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x5f, 0x50, 0x45, + 0x52, 0x49, 0x4f, 0x44, 0x10, 0x01, 0x12, 0x21, 0x0a, 0x1d, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, + 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x56, 0x4f, 0x54, 0x49, 0x4e, 0x47, + 0x5f, 0x50, 0x45, 0x52, 0x49, 0x4f, 0x44, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x50, 0x52, 0x4f, + 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x53, + 0x53, 0x45, 0x44, 0x10, 0x03, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, + 0x4c, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x52, 0x45, 0x4a, 0x45, 0x43, 0x54, 0x45, + 0x44, 0x10, 0x04, 0x12, 0x1a, 0x0a, 0x16, 0x50, 0x52, 0x4f, 0x50, 0x4f, 0x53, 0x41, 0x4c, 0x5f, + 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x05, 0x42, + 0x99, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x67, + 0x6f, 0x76, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x47, 0x6f, 0x76, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x24, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x67, 0x6f, 0x76, 0x2f, 0x76, + 0x31, 0x3b, 0x67, 0x6f, 0x76, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x47, 0x58, 0xaa, 0x02, 0x0d, + 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x47, 0x6f, 0x76, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, + 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, 0x6f, 0x76, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, + 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x47, 0x6f, 0x76, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0f, 0x43, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x3a, 0x3a, 0x47, 0x6f, 0x76, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/proto/cosmos/gov/v1/gov.proto b/proto/cosmos/gov/v1/gov.proto index 388947109bce..2efd068ac758 100644 --- a/proto/cosmos/gov/v1/gov.proto +++ b/proto/cosmos/gov/v1/gov.proto @@ -253,12 +253,4 @@ message Params { // burn deposits if quorum with vote type no_veto is met bool burn_vote_veto = 15; - - // The ratio representing the proportion of the deposit value minimum that must be met when making a deposit. - // Default value: 0.01. Meaning that for a chain with a min_deposit of 100stake, a deposit of 1stake would be - // required. - // - // Since: cosmos-sdk 0.50 - // NOTE: backported from v50 (https://github.com/cosmos/cosmos-sdk/pull/18146) - string min_deposit_ratio = 16 [(cosmos_proto.scalar) = "cosmos.Dec"]; } diff --git a/tests/e2e/gov/deposits.go b/tests/e2e/gov/deposits.go index cf4b99b1ee7b..0e8f5e6ed0b4 100644 --- a/tests/e2e/gov/deposits.go +++ b/tests/e2e/gov/deposits.go @@ -72,6 +72,33 @@ func (s *DepositTestSuite) TearDownSuite() { s.network.Cleanup() } +func (s *DepositTestSuite) TestQueryDepositsWithoutInitialDeposit() { + val := s.network.Validators[0] + clientCtx := val.ClientCtx + + // submit proposal without initial deposit + id := s.submitProposal(val, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(0)), "TestQueryDepositsWithoutInitialDeposit") + proposalID := strconv.FormatUint(id, 10) + + // deposit amount + depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens.Add(sdk.NewInt(50))).String() + _, err := govclitestutil.MsgDeposit(clientCtx, val.Address.String(), proposalID, depositAmount) + s.Require().NoError(err) + s.Require().NoError(s.network.WaitForNextBlock()) + + // query deposit + deposit := s.queryDeposit(val, proposalID, false, "") + s.Require().NotNil(deposit) + s.Require().Equal(sdk.Coins(deposit.Amount).String(), depositAmount) + + // query deposits + deposits := s.queryDeposits(val, proposalID, false, "") + s.Require().NotNil(deposits) + s.Require().Len(deposits.Deposits, 1) + // verify initial deposit + s.Require().Equal(sdk.Coins(deposits.Deposits[0].Amount).String(), depositAmount) +} + func (s *DepositTestSuite) TestQueryDepositsWithInitialDeposit() { val := s.network.Validators[0] depositAmount := sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens) @@ -122,7 +149,7 @@ func (s *DepositTestSuite) TestQueryProposalAfterVotingPeriod() { s.Require().Contains(err.Error(), fmt.Sprintf("proposal %s doesn't exist", proposalID)) // query deposits - deposits := s.queryDeposits(val, proposalID, true, fmt.Sprintf("proposal %s doesn't exist", proposalID)) + deposits := s.queryDeposits(val, proposalID, true, "proposal 3 doesn't exist") s.Require().Nil(deposits) } diff --git a/tests/e2e/gov/query.go b/tests/e2e/gov/query.go index 21deb1f0e3ee..8b8b1a8db518 100644 --- a/tests/e2e/gov/query.go +++ b/tests/e2e/gov/query.go @@ -23,7 +23,7 @@ func (s *E2ETestSuite) TestCmdParams() { { "json output", []string{fmt.Sprintf("--%s=json", flags.FlagOutput)}, - `{"voting_params":{"voting_period":"172800s"},"deposit_params":{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800s"},"tally_params":{"quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000"},"params":{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800s","voting_period":"172800s","quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000","min_initial_deposit_ratio":"0.000000000000000000","expedited_voting_period":"86400s","expedited_threshold":"0.667000000000000000","expedited_min_deposit":[{"denom":"stake","amount":"50000000"}],"burn_vote_quorum":false,"burn_proposal_deposit_prevote":false,"burn_vote_veto":true,"min_deposit_ratio":"0.010000000000000000"}}`, + `{"voting_params":{"voting_period":"172800s"},"deposit_params":{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800s"},"tally_params":{"quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000"},"params":{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800s","voting_period":"172800s","quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000","min_initial_deposit_ratio":"0.000000000000000000","expedited_voting_period":"86400s","expedited_threshold":"0.667000000000000000","expedited_min_deposit":[{"denom":"stake","amount":"50000000"}],"burn_vote_quorum":false,"burn_proposal_deposit_prevote":false,"burn_vote_veto":true}}`, }, { "text output", @@ -47,7 +47,6 @@ params: min_deposit: - amount: "10000000" denom: stake - min_deposit_ratio: "0.010000000000000000" min_initial_deposit_ratio: "0.000000000000000000" quorum: "0.334000000000000000" threshold: "0.500000000000000000" diff --git a/tests/e2e/gov/tx.go b/tests/e2e/gov/tx.go index f97c2acc5d02..6a5cf913ba7f 100644 --- a/tests/e2e/gov/tx.go +++ b/tests/e2e/gov/tx.go @@ -54,11 +54,9 @@ func (s *E2ETestSuite) SetupSuite() { s.Require().NoError(err) s.Require().NoError(s.network.WaitForNextBlock()) - // create a proposal with a small deposit - minimumAcceptedDep := v1.DefaultMinDepositTokens.ToLegacyDec().Mul(v1.DefaultMinDepositRatio).Ceil().TruncateInt() + // create a proposal without deposit _, err = govclitestutil.MsgSubmitLegacyProposal(val.ClientCtx, val.Address.String(), - "Text Proposal 2", "Where is the title!?", v1beta1.ProposalTypeText, - fmt.Sprintf("--%s=%s", cli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, minimumAcceptedDep).String())) + "Text Proposal 2", "Where is the title!?", v1beta1.ProposalTypeText) s.Require().NoError(err) s.Require().NoError(s.network.WaitForNextBlock()) @@ -113,7 +111,7 @@ func (s *E2ETestSuite) TestNewCmdSubmitProposal() { "summary": "My awesome description", "metadata": "%s", "deposit": "%s" - }`, authtypes.NewModuleAddress(types.ModuleName), base64.StdEncoding.EncodeToString(propMetadata), sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(100000))) +}`, authtypes.NewModuleAddress(types.ModuleName), base64.StdEncoding.EncodeToString(propMetadata), sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(5431))) validPropFile := testutil.WriteToNewTempFile(s.T(), validProp) defer validPropFile.Close() @@ -181,7 +179,7 @@ func (s *E2ETestSuite) TestNewCmdSubmitLegacyProposal() { "description": "Hello, World!", "type": "Text", "deposit": "%s" - }`, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(154310))) + }`, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(5431))) validPropFile := testutil.WriteToNewTempFile(s.T(), validProp) defer validPropFile.Close() @@ -207,7 +205,7 @@ func (s *E2ETestSuite) TestNewCmdSubmitLegacyProposal() { []string{ fmt.Sprintf("--%s='Where is the title!?'", cli.FlagDescription), //nolint:staticcheck // we are intentionally using a deprecated flag here. fmt.Sprintf("--%s=%s", cli.FlagProposalType, v1beta1.ProposalTypeText), //nolint:staticcheck // we are intentionally using a deprecated flag here. - fmt.Sprintf("--%s=%s", cli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10000)).String()), + fmt.Sprintf("--%s=%s", cli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(5431)).String()), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), @@ -232,7 +230,7 @@ func (s *E2ETestSuite) TestNewCmdSubmitLegacyProposal() { fmt.Sprintf("--%s='Text Proposal'", cli.FlagTitle), //nolint:staticcheck // we are intentionally using a deprecated flag here. fmt.Sprintf("--%s='Where is the title!?'", cli.FlagDescription), //nolint:staticcheck // we are intentionally using a deprecated flag here. fmt.Sprintf("--%s=%s", cli.FlagProposalType, v1beta1.ProposalTypeText), //nolint:staticcheck // we are intentionally using a deprecated flag here. - fmt.Sprintf("--%s=%s", cli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(100000)).String()), + fmt.Sprintf("--%s=%s", cli.FlagDeposit, sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(5431)).String()), fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), @@ -305,23 +303,11 @@ func (s *E2ETestSuite) TestNewCmdDeposit() { }, false, 2, }, - { - "fail deposit on existing proposal", - []string{ - "1", - sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10)).String(), // 10stake -> insufficient min deposit amount - fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), - fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), - }, - false, 16, - }, { "deposit on existing proposal", []string{ "1", - sdk.NewCoin(s.cfg.BondDenom, v1.DefaultMinDepositTokens.Sub(sdk.NewInt(50))).String(), // slighty less than min initial deposit + sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10)).String(), // 10stake fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 14255b92c31a..5baabb258039 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -350,14 +350,13 @@ func TestMsgSetSendEnabled(t *testing.T) { ctx := s.App.BaseApp.NewContext(false, tmproto.Header{}) require.NoError(t, testutil.FundAccount(s.BankKeeper, ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 101)))) - require.NoError(t, testutil.FundAccount(s.BankKeeper, ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("stake", 100000)))) addr1Str := addr1.String() govAddr := s.BankKeeper.GetAuthority() goodGovProp, err := govv1.NewMsgSubmitProposal( []sdk.Msg{ types.NewMsgSetSendEnabled(govAddr, nil, nil), }, - sdk.Coins{{Denom: "stake", Amount: sdk.NewInt(100000)}}, + sdk.Coins{{Denom: "foocoin", Amount: sdk.NewInt(5)}}, addr1Str, "set default send enabled to true", "Change send enabled", diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index d58c4deceb5c..42efee8552f2 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -39,7 +39,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) { newProposalMsg, err := v1.NewMsgSubmitProposal( []sdk.Msg{mkTestLegacyContent(t)}, - sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 100000)}, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0].String(), "", "Proposal", @@ -96,7 +96,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { newProposalMsg, err := v1.NewMsgSubmitProposal( []sdk.Msg{mkTestLegacyContent(t)}, - sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 100000)}, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0].String(), "", "Proposal", @@ -123,7 +123,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { newProposalMsg2, err := v1.NewMsgSubmitProposal( []sdk.Msg{mkTestLegacyContent(t)}, - sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 100000)}, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0].String(), "", "Proposal", @@ -185,7 +185,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { newProposalMsg, err := v1.NewMsgSubmitProposal( []sdk.Msg{mkTestLegacyContent(t)}, - sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 100000)}, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, addrs[0].String(), "", "Proposal", @@ -212,7 +212,7 @@ func TestTickPassedDepositPeriod(t *testing.T) { require.False(t, inactiveQueue.Valid()) inactiveQueue.Close() - newDepositMsg := v1.NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 100000)}) + newDepositMsg := v1.NewMsgDeposit(addrs[1], proposalID, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}) res1, err := govMsgSvr.Deposit(sdk.WrapSDKContext(ctx), newDepositMsg) require.NoError(t, err) diff --git a/x/gov/keeper/deposit.go b/x/gov/keeper/deposit.go index 2928a0bf987f..5a9463093bc5 100644 --- a/x/gov/keeper/deposit.go +++ b/x/gov/keeper/deposit.go @@ -2,7 +2,6 @@ package keeper import ( "fmt" - "strings" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -119,54 +118,8 @@ func (keeper Keeper) AddDeposit(ctx sdk.Context, proposalID uint64, depositorAdd return false, sdkerrors.Wrapf(types.ErrInactiveProposal, "%d", proposalID) } - // Check coins to be deposited match the proposal's deposit params - params := keeper.GetParams(ctx) - - // NOTE: backported from v50 - // Upstream v47 does not have expedited proposals but we do, so we check the minDeposit here - minDepositAmount := proposal.GetMinDepositFromParams(params) - minDepositRatio, err := sdk.NewDecFromStr(params.GetMinDepositRatio()) - if err != nil { - return false, err - } - - if err := keeper.validateDepositDenom(ctx, params, depositAmount); err != nil { - return false, err - } - - // If minDepositRatio is set, the deposit must be equal or greater than minDepositAmount*minDepositRatio - // for at least one denom. If minDepositRatio is zero we skip this check. - if !minDepositRatio.IsZero() { - var ( - depositThresholdMet bool - thresholds []string - ) - for _, minDep := range minDepositAmount { - // calculate the threshold for this denom, and hold a list to later return a useful error message - threshold := sdk.NewCoin(minDep.GetDenom(), minDep.Amount.ToLegacyDec().Mul(minDepositRatio).TruncateInt()) - thresholds = append(thresholds, threshold.String()) - - found, deposit := depositAmount.Find(minDep.Denom) - if !found { // if not found, continue, as we know the deposit contains at least 1 valid denom - continue - } - - // Once we know at least one threshold has been met, we can break. The deposit - // might contain other denoms but we don't care. - if deposit.IsGTE(threshold) { - depositThresholdMet = true - break - } - } - - // the threshold must be met with at least one denom, if not, return the list of minimum deposits - if !depositThresholdMet { - return false, sdkerrors.Wrapf(types.ErrMinDepositTooSmall, "received %s but need at least one of the following: %s", depositAmount, strings.Join(thresholds, ",")) - } - } - // update the governance module's account coins pool - err = keeper.bankKeeper.SendCoinsFromAccountToModule(ctx, depositorAddr, types.ModuleName, depositAmount) + err := keeper.bankKeeper.SendCoinsFromAccountToModule(ctx, depositorAddr, types.ModuleName, depositAmount) if err != nil { return false, err } @@ -177,7 +130,7 @@ func (keeper Keeper) AddDeposit(ctx sdk.Context, proposalID uint64, depositorAdd // Check if deposit has provided sufficient total funds to transition the proposal into the voting period activatedVotingPeriod := false - minDepositAmount = proposal.GetMinDepositFromParams(keeper.GetParams(ctx)) + minDepositAmount := proposal.GetMinDepositFromParams(keeper.GetParams(ctx)) if proposal.Status == v1.StatusDepositPeriod && sdk.NewCoins(proposal.TotalDeposit...).IsAllGTE(minDepositAmount) { keeper.ActivateVotingPeriod(ctx, proposal) @@ -233,11 +186,8 @@ func (keeper Keeper) RefundAndDeleteDeposits(ctx sdk.Context, proposalID uint64) // validateInitialDeposit validates if initial deposit is greater than or equal to the minimum // required at the time of proposal submission. This threshold amount is determined by // the deposit parameters. Returns nil on success, error otherwise. -func (keeper Keeper) validateInitialDeposit(ctx sdk.Context, params v1.Params, initialDeposit sdk.Coins, expedited bool) error { - if !initialDeposit.IsValid() || initialDeposit.IsAnyNegative() { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidCoins, initialDeposit.String()) - } - +func (keeper Keeper) validateInitialDeposit(ctx sdk.Context, initialDeposit sdk.Coins, expedited bool) error { + params := keeper.GetParams(ctx) minInitialDepositRatio, err := sdk.NewDecFromStr(params.MinInitialDepositRatio) if err != nil { return err @@ -261,21 +211,3 @@ func (keeper Keeper) validateInitialDeposit(ctx sdk.Context, params v1.Params, i } return nil } - -// validateDepositDenom validates if the deposit denom is accepted by the governance module. -func (keeper Keeper) validateDepositDenom(ctx sdk.Context, params v1.Params, depositAmount sdk.Coins) error { - denoms := []string{} - acceptedDenoms := make(map[string]bool, len(params.MinDeposit)) - for _, coin := range params.MinDeposit { - acceptedDenoms[coin.Denom] = true - denoms = append(denoms, coin.Denom) - } - - for _, coin := range depositAmount { - if _, ok := acceptedDenoms[coin.Denom]; !ok { - return sdkerrors.Wrapf(types.ErrInvalidDepositDenom, "deposited %s, but gov accepts only the following denom(s): %v", depositAmount, denoms) - } - } - - return nil -} diff --git a/x/gov/keeper/deposit_test.go b/x/gov/keeper/deposit_test.go index e4946a299132..fb28262c0267 100644 --- a/x/gov/keeper/deposit_test.go +++ b/x/gov/keeper/deposit_test.go @@ -142,84 +142,6 @@ func TestDeposits(t *testing.T) { } } -func TestDepositAmount(t *testing.T) { - testcases := []struct { - name string - deposit sdk.Coins - minDepositRatio string - err string - }{ - { - name: "good amount and denoms", - deposit: sdk.NewCoins(sdk.NewInt64Coin("stake", 10000)), - minDepositRatio: "0.001", - }, - { - name: "good amount and denoms but not enough balance for zcoin", - deposit: sdk.NewCoins(sdk.NewInt64Coin("stake", 10000), sdk.NewInt64Coin("zcoin", 1)), - minDepositRatio: "0.001", - err: "not enough balance", - }, - { - name: "too small amount", - deposit: sdk.NewCoins(sdk.NewInt64Coin("stake", 10)), - minDepositRatio: "0.001", - err: "received 10stake but need at least one of the following: 10000stake,10zcoin: minimum deposit is too small", - }, - { - name: "too small amount with another coin", - deposit: sdk.NewCoins(sdk.NewInt64Coin("zcoin", 1)), - minDepositRatio: "0.001", - err: "received 1zcoin but need at least one of the following: 10000stake,10zcoin: minimum deposit is too small", - }, - { - name: "bad denom", - deposit: sdk.NewCoins(sdk.NewInt64Coin("euro", 10000)), - minDepositRatio: "0.001", - err: "deposited 10000euro, but gov accepts only the following denom(s): [stake zcoin]: invalid deposit denom", - }, - { - name: "mix containing bad and good denom", - deposit: sdk.NewCoins(sdk.NewInt64Coin("stake", 10000), sdk.NewInt64Coin("euro", 10000)), - minDepositRatio: "0.001", - err: "deposited 10000euro,10000stake, but gov accepts only the following denom(s): [stake zcoin]: invalid deposit denom", - }, - { - name: "minDepositRatio is zero", - deposit: sdk.NewCoins(sdk.NewInt64Coin("stake", 10)), - minDepositRatio: "0.0", - }, - } - - for _, tc := range testcases { - t.Run(tc.name, func(t *testing.T) { - govKeeper, _, bankKeeper, stakingKeeper, _, ctx := setupGovKeeper(t) - trackMockBalances(bankKeeper) - - testAddrs := simtestutil.AddTestAddrsIncremental(bankKeeper, stakingKeeper, ctx, 2, sdk.NewInt(1000000000000000)) - - params := v1.DefaultParams() - params.MinDepositRatio = tc.minDepositRatio - params.MinDeposit = sdk.NewCoins(params.MinDeposit...).Add(sdk.NewCoin("zcoin", sdk.NewInt(10000))) // coins must be sorted by denom - err := govKeeper.SetParams(ctx, params) - require.NoError(t, err) - - tp := TestProposal - proposal, err := govKeeper.SubmitProposal(ctx, tp, "", "title", "summary", testAddrs[0], false) - require.NoError(t, err) - proposalID := proposal.Id - - _, err = govKeeper.AddDeposit(ctx, proposalID, testAddrs[0], tc.deposit) - if tc.err != "" { - require.Error(t, err) - require.Equal(t, tc.err, err.Error()) - } else { - require.NoError(t, err) - } - }) - } -} - func TestValidateInitialDeposit(t *testing.T) { testcases := map[string]struct { minDeposit sdk.Coins @@ -321,7 +243,7 @@ func TestValidateInitialDeposit(t *testing.T) { govKeeper.SetParams(ctx, params) - err := govKeeper.ValidateInitialDeposit(ctx, params, tc.initialDeposit, tc.expedited) + err := govKeeper.ValidateInitialDeposit(ctx, tc.initialDeposit, tc.expedited) if tc.expectError { require.Error(t, err) diff --git a/x/gov/keeper/export_test.go b/x/gov/keeper/export_test.go index f2ed1b7b85f5..f56e25c34c0e 100644 --- a/x/gov/keeper/export_test.go +++ b/x/gov/keeper/export_test.go @@ -1,12 +1,9 @@ package keeper -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" -) +import sdk "github.com/cosmos/cosmos-sdk/types" // ValidateInitialDeposit is a helper function used only in deposit tests which returns the same // functionality of validateInitialDeposit private function. -func (k Keeper) ValidateInitialDeposit(ctx sdk.Context, params v1.Params, initialDeposit sdk.Coins, expedited bool) error { - return k.validateInitialDeposit(ctx, params, initialDeposit, expedited) +func (k Keeper) ValidateInitialDeposit(ctx sdk.Context, initialDeposit sdk.Coins, expedited bool) error { + return k.validateInitialDeposit(ctx, initialDeposit, expedited) } diff --git a/x/gov/keeper/msg_server.go b/x/gov/keeper/msg_server.go index 19b03a1c2e4a..d14975b106a3 100644 --- a/x/gov/keeper/msg_server.go +++ b/x/gov/keeper/msg_server.go @@ -10,7 +10,6 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" @@ -33,9 +32,8 @@ func (k msgServer) SubmitProposal(goCtx context.Context, msg *v1.MsgSubmitPropos ctx := sdk.UnwrapSDKContext(goCtx) initialDeposit := msg.GetInitialDeposit() - params := k.Keeper.GetParams(ctx) - if err := k.validateInitialDeposit(ctx, params, initialDeposit, msg.Expedited); err != nil { + if err := k.validateInitialDeposit(ctx, initialDeposit, msg.Expedited); err != nil { return nil, err } @@ -165,11 +163,6 @@ func (k msgServer) Deposit(goCtx context.Context, msg *v1.MsgDeposit) (*v1.MsgDe if err != nil { return nil, err } - - if err := validateDeposit(msg.Amount); err != nil { - return nil, err - } - votingStarted, err := k.Keeper.AddDeposit(ctx, msg.ProposalId, accAddr, msg.Amount) if err != nil { return nil, err @@ -195,15 +188,6 @@ func (k msgServer) Deposit(goCtx context.Context, msg *v1.MsgDeposit) (*v1.MsgDe return &v1.MsgDepositResponse{}, nil } -// validateDeposit validates the deposit amount, do not use for initial deposit. -func validateDeposit(amount sdk.Coins) error { - if !amount.IsValid() || !amount.IsAllPositive() { - return sdkerrors.ErrInvalidCoins.Wrap(amount.String()) - } - - return nil -} - // UpdateParams implements the MsgServer.UpdateParams method. func (k msgServer) UpdateParams(goCtx context.Context, msg *v1.MsgUpdateParams) (*v1.MsgUpdateParamsResponse, error) { if k.authority != msg.Authority { diff --git a/x/gov/keeper/msg_server_test.go b/x/gov/keeper/msg_server_test.go index c407fbd10d6c..b2a92bb41e6e 100644 --- a/x/gov/keeper/msg_server_test.go +++ b/x/gov/keeper/msg_server_test.go @@ -18,7 +18,7 @@ func (suite *KeeperTestSuite) TestSubmitProposalReq() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) initialDeposit := coins minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ @@ -92,36 +92,6 @@ func (suite *KeeperTestSuite) TestSubmitProposalReq() { expErr: true, expErrMsg: "proposal message not recognized by router", }, - "invalid deposited coin": { - preRun: func() (*v1.MsgSubmitProposal, error) { - return v1.NewMsgSubmitProposal( - []sdk.Msg{bankMsg}, - []sdk.Coin{sdk.NewCoin("invalid", sdk.NewInt(100))}, - proposer.String(), - "", - "Proposal", - "description of proposal", - false, - ) - }, - expErr: true, - expErrMsg: "deposited 100invalid, but gov accepts only the following denom(s): [stake]: invalid deposit denom", - }, - "invalid deposited coin (multiple)": { - preRun: func() (*v1.MsgSubmitProposal, error) { - return v1.NewMsgSubmitProposal( - []sdk.Msg{bankMsg}, - initialDeposit.Add(sdk.NewCoin("invalid", sdk.NewInt(100))), - proposer.String(), - "", - "Proposal", - "description of proposal", - false, - ) - }, - expErr: true, - expErrMsg: "deposited 100invalid,100000stake, but gov accepts only the following denom(s): [stake]: invalid deposit denom", - }, "all good": { preRun: func() (*v1.MsgSubmitProposal, error) { return v1.NewMsgSubmitProposal( @@ -174,7 +144,7 @@ func (suite *KeeperTestSuite) TestVoteReq() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), @@ -296,7 +266,7 @@ func (suite *KeeperTestSuite) TestVoteWeightedReq() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), @@ -418,8 +388,8 @@ func (suite *KeeperTestSuite) TestDepositReq() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) - minDeposit := sdk.Coins(suite.govKeeper.GetParams(suite.ctx).MinDeposit) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) + minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), ToAddress: proposer.String(), @@ -459,23 +429,6 @@ func (suite *KeeperTestSuite) TestDepositReq() { expErr: true, options: v1.NewNonSplitVoteOption(v1.OptionYes), }, - "invalid deposited coin ": { - preRun: func() uint64 { - return pId - }, - depositor: proposer, - deposit: minDeposit.Add(sdk.NewCoin("ibc/badcoin", sdk.NewInt(1000))), expErr: true, - options: v1.NewNonSplitVoteOption(v1.OptionYes), - }, - "invalid deposited coin (multiple)": { - preRun: func() uint64 { - return pId - }, - depositor: proposer, - deposit: append(minDeposit, sdk.NewCoin("ibc/badcoin", sdk.NewInt(1000))), - expErr: true, - options: v1.NewNonSplitVoteOption(v1.OptionYes), - }, "all good": { preRun: func() uint64 { return pId @@ -506,7 +459,7 @@ func (suite *KeeperTestSuite) TestLegacyMsgSubmitProposal() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) initialDeposit := coins minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit @@ -556,7 +509,7 @@ func (suite *KeeperTestSuite) TestLegacyMsgVote() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), @@ -668,7 +621,7 @@ func (suite *KeeperTestSuite) TestLegacyVoteWeighted() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), @@ -780,7 +733,7 @@ func (suite *KeeperTestSuite) TestLegacyMsgDeposit() { addrs := suite.addrs proposer := addrs[0] - coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100000))) + coins := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) minDeposit := suite.govKeeper.GetParams(suite.ctx).MinDeposit bankMsg := &banktypes.MsgSend{ FromAddress: govAcct.String(), diff --git a/x/gov/migrations/v4/json.go b/x/gov/migrations/v4/json.go index 03959c544ef2..125116c307af 100644 --- a/x/gov/migrations/v4/json.go +++ b/x/gov/migrations/v4/json.go @@ -27,9 +27,6 @@ func MigrateJSON(oldState *v1.GenesisState) (*v1.GenesisState, error) { defaultParams.BurnProposalDepositPrevote, defaultParams.BurnVoteQuorum, defaultParams.BurnVoteVeto, - - // NOTE: backport from v50 - defaultParams.MinDepositRatio, ) return &v1.GenesisState{ diff --git a/x/gov/migrations/v4/json_test.go b/x/gov/migrations/v4/json_test.go index 1ad673fdaab4..11c16e3d92b0 100644 --- a/x/gov/migrations/v4/json_test.go +++ b/x/gov/migrations/v4/json_test.go @@ -77,7 +77,6 @@ func TestMigrateJSON(t *testing.T) { "denom": "stake" } ], - "min_deposit_ratio": "0.010000000000000000", "min_initial_deposit_ratio": "0.000000000000000000", "quorum": "0.334000000000000000", "threshold": "0.500000000000000000", diff --git a/x/gov/migrations/v4/store.go b/x/gov/migrations/v4/store.go index d91e04619d9f..94d185d6e024 100644 --- a/x/gov/migrations/v4/store.go +++ b/x/gov/migrations/v4/store.go @@ -39,9 +39,6 @@ func migrateParams(ctx sdk.Context, storeKey storetypes.StoreKey, legacySubspace defaultParams.BurnProposalDepositPrevote, defaultParams.BurnVoteQuorum, defaultParams.BurnVoteVeto, - - // NOTE: backport from v50 - defaultParams.MinDepositRatio, ) bz, err := cdc.Marshal(¶ms) diff --git a/x/gov/migrations/v4/store_test.go b/x/gov/migrations/v4/store_test.go index e85ff91ad7f5..13083b2f7613 100644 --- a/x/gov/migrations/v4/store_test.go +++ b/x/gov/migrations/v4/store_test.go @@ -104,7 +104,6 @@ func TestMigrateStore(t *testing.T) { require.Equal(t, legacySubspace.tp.Threshold, params.Threshold) require.Equal(t, legacySubspace.tp.VetoThreshold, params.VetoThreshold) require.Equal(t, sdk.ZeroDec().String(), params.MinInitialDepositRatio) - require.Equal(t, sdk.MustNewDecFromStr("0.01").String(), params.MinDepositRatio) // Check proposals' status var migratedProp1 v1.Proposal diff --git a/x/gov/simulation/genesis.go b/x/gov/simulation/genesis.go index 1824d3052381..299e3d901df3 100644 --- a/x/gov/simulation/genesis.go +++ b/x/gov/simulation/genesis.go @@ -29,9 +29,6 @@ const ( ExpeditedThreshold = "expedited_threshold" Veto = "veto" - // NOTE: backport from v50 - MinDepositRatio = "min_deposit_ratio" - // ExpeditedThreshold must be at least as large as the regular Threshold // Therefore, we use this break out point in randomization. tallyNonExpeditedMax = 500 @@ -97,11 +94,6 @@ func GenVeto(r *rand.Rand) math.LegacyDec { return sdk.NewDecWithPrec(int64(simulation.RandIntBetween(r, 250, 334)), 3) } -// GenMinDepositRatio returns randomized DepositMinRatio -func GenMinDepositRatio(r *rand.Rand) math.LegacyDec { - return math.LegacyMustNewDecFromStr("0.01") -} - // RandomizedGenState generates a random GenesisState for gov func RandomizedGenState(simState *module.SimulationState) { startingProposalID := uint64(simState.Rand.Intn(100)) @@ -166,12 +158,9 @@ func RandomizedGenState(simState *module.SimulationState) { func(r *rand.Rand) { veto = GenVeto(r) }, ) - var minDepositRatio math.LegacyDec - simState.AppParams.GetOrGenerate(simState.Cdc, MinDepositRatio, &minDepositRatio, simState.Rand, func(r *rand.Rand) { minDepositRatio = GenMinDepositRatio(r) }) - govGenesis := v1.NewGenesisState( startingProposalID, - v1.NewParams(minDeposit, expeditedMinDeposit, depositPeriod, votingPeriod, expeditedVotingPeriod, quorum.String(), threshold.String(), expitedVotingThreshold.String(), veto.String(), minInitialDepositRatio.String(), simState.Rand.Intn(2) == 0, simState.Rand.Intn(2) == 0, simState.Rand.Intn(2) == 0, minDepositRatio.String()), + v1.NewParams(minDeposit, expeditedMinDeposit, depositPeriod, votingPeriod, expeditedVotingPeriod, quorum.String(), threshold.String(), expitedVotingThreshold.String(), veto.String(), minInitialDepositRatio.String(), simState.Rand.Intn(2) == 0, simState.Rand.Intn(2) == 0, simState.Rand.Intn(2) == 0), ) bz, err := json.MarshalIndent(&govGenesis, "", " ") diff --git a/x/gov/simulation/operations.go b/x/gov/simulation/operations.go index a46252b30db4..c8c65853835a 100644 --- a/x/gov/simulation/operations.go +++ b/x/gov/simulation/operations.go @@ -462,13 +462,6 @@ func randomDeposit( minDepositAmount := minDeposit[denomIndex].Amount - minDepositRatio, err := sdk.NewDecFromStr(params.GetMinDepositRatio()) - if err != nil { - return nil, false, err - } - - threshold := minDepositAmount.ToLegacyDec().Mul(minDepositRatio).TruncateInt() - minAmount := sdk.ZeroInt() if useMinAmount { minDepositPercent, err := sdk.NewDecFromStr(params.MinInitialDepositRatio) @@ -485,10 +478,7 @@ func randomDeposit( } amount = amount.Add(minAmount) - // NOTE: backport from v50 - amount = amount.MulRaw(3) // 3x what's required // TODO: this is a hack, we need to be able to calculate the correct amount using params - - if amount.GT(spendableBalance) || amount.LT(threshold) { + if amount.GT(spendableBalance) { return nil, true, nil } diff --git a/x/gov/simulation/operations_test.go b/x/gov/simulation/operations_test.go index a1a24da8db58..06b8adf51f79 100644 --- a/x/gov/simulation/operations_test.go +++ b/x/gov/simulation/operations_test.go @@ -152,7 +152,7 @@ func TestSimulateMsgSubmitProposal(t *testing.T) { require.True(t, operationMsg.OK) require.Equal(t, "cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r", msg.Proposer) require.NotEqual(t, len(msg.InitialDeposit), 0) - require.Equal(t, "143523282stake", msg.InitialDeposit[0].String()) + require.Equal(t, "47841094stake", msg.InitialDeposit[0].String()) require.Equal(t, simulation.TypeMsgSubmitProposal, sdk.MsgTypeURL(&msg)) } @@ -182,7 +182,7 @@ func TestSimulateMsgSubmitLegacyProposal(t *testing.T) { require.True(t, operationMsg.OK) require.Equal(t, "cosmos1p8wcgrjr4pjju90xg6u9cgq55dxwq8j7u4x9a0", msg.Proposer) require.NotEqual(t, len(msg.InitialDeposit), 0) - require.Equal(t, "75498768stake", msg.InitialDeposit[0].String()) + require.Equal(t, "25166256stake", msg.InitialDeposit[0].String()) require.Equal(t, "title-3: ZBSpYuLyYggwexjxusrBqDOTtGTOWeLrQKjLxzIivHSlcxgdXhhuTSkuxKGLwQvuyNhYFmBZHeAerqyNEUzXPFGkqEGqiQWIXnku", msg.Messages[0].GetCachedValue().(*v1.MsgExecLegacyContent).Content.GetCachedValue().(v1beta1.Content).GetTitle()) require.Equal(t, "description-3: NJWzHdBNpAXKJPHWQdrGYcAHSctgVlqwqHoLfHsXUdStwfefwzqLuKEhmMyYLdbZrcPgYqjNHxPexsruwEGStAneKbWkQDDIlCWBLSiAASNhZqNFlPtfqPJoxKsgMdzjWqLWdqKQuJqWPMvwPQWZUtVMOTMYKJbfdlZsjdsomuScvDmbDkgRualsxDvRJuCAmPOXitIbcyWsKGSdrEunFAOdmXnsuyFVgJqEjbklvmwrUlsxjRSfKZxGcpayDdgoFcnVSutxjRgOSFzPwidAjubMncNweqpbxhXGchpZUxuFDOtpnhNUycJICRYqsPhPSCjPTWZFLkstHWJxvdPEAyEIxXgLwbNOjrgzmaujiBABBIXvcXpLrbcEWNNQsbjvgJFgJkflpRohHUutvnaUqoopuKjTDaemDeSdqbnOzcfJpcTuAQtZoiLZOoAIlboFDAeGmSNwkvObPRvRWQgWkGkxwtPauYgdkmypLjbqhlHJIQTntgWjXwZdOyYEdQRRLfMSdnxqppqUofqLbLQDUjwKVKfZJUJQPsWIPwIVaSTrmKskoAhvmZyJgeRpkaTfGgrJzAigcxtfshmiDCFkuiluqtMOkidknnTBtumyJYlIsWLnCQclqdVmikUoMOPdPWwYbJxXyqUVicNxFxyqJTenNblyyKSdlCbiXxUiYUiMwXZASYfvMDPFgxniSjWaZTjHkqlJvtBsXqwPpyVxnJVGFWhfSxgOcduoxkiopJvFjMmFabrGYeVtTXLhxVUEiGwYUvndjFGzDVntUvibiyZhfMQdMhgsiuysLMiePBNXifRLMsSmXPkwlPloUbJveCvUlaalhZHuvdkCnkSHbMbmOnrfEGPwQiACiPlnihiaOdbjPqPiTXaHDoJXjSlZmltGqNHHNrcKdlFSCdmVOuvDcBLdSklyGJmcLTbSFtALdGlPkqqecJrpLCXNPWefoTJNgEJlyMEPneVaxxduAAEqQpHWZodWyRkDAxzyMnFMcjSVqeRXLqsNyNtQBbuRvunZflWSbbvXXdkyLikYqutQhLPONXbvhcQZJPSWnOulqQaXmbfFxAkqfYeseSHOQidHwbcsOaMnSrrmGjjRmEMQNuknupMxJiIeVjmgZvbmjPIQTEhQFULQLBMPrxcFPvBinaOPYWGvYGRKxLZdwamfRQQFngcdSlvwjfaPbURasIsGJVHtcEAxnIIrhSriiXLOlbEBLXFElXJFGxHJczRBIxAuPKtBisjKBwfzZFagdNmjdwIRvwzLkFKWRTDPxJCmpzHUcrPiiXXHnOIlqNVoGSXZewdnCRhuxeYGPVTfrNTQNOxZmxInOazUYNTNDgzsxlgiVEHPKMfbesvPHUqpNkUqbzeuzfdrsuLDpKHMUbBMKczKKWOdYoIXoPYtEjfOnlQLoGnbQUCuERdEFaptwnsHzTJDsuZkKtzMpFaZobynZdzNydEeJJHDYaQcwUxcqvwfWwNUsCiLvkZQiSfzAHftYgAmVsXgtmcYgTqJIawstRYJrZdSxlfRiqTufgEQVambeZZmaAyRQbcmdjVUZZCgqDrSeltJGXPMgZnGDZqISrGDOClxXCxMjmKqEPwKHoOfOeyGmqWqihqjINXLqnyTesZePQRqaWDQNqpLgNrAUKulklmckTijUltQKuWQDwpLmDyxLppPVMwsmBIpOwQttYFMjgJQZLYFPmxWFLIeZihkRNnkzoypBICIxgEuYsVWGIGRbbxqVasYnstWomJnHwmtOhAFSpttRYYzBmyEtZXiCthvKvWszTXDbiJbGXMcrYpKAgvUVFtdKUfvdMfhAryctklUCEdjetjuGNfJjajZtvzdYaqInKtFPPLYmRaXPdQzxdSQfmZDEVHlHGEGNSPRFJuIfKLLfUmnHxHnRjmzQPNlqrXgifUdzAGKVabYqvcDeYoTYgPsBUqehrBhmQUgTvDnsdpuhUoxskDdppTsYMcnDIPSwKIqhXDCIxOuXrywahvVavvHkPuaenjLmEbMgrkrQLHEAwrhHkPRNvonNQKqprqOFVZKAtpRSpvQUxMoXCMZLSSbnLEFsjVfANdQNQVwTmGxqVjVqRuxREAhuaDrFgEZpYKhwWPEKBevBfsOIcaZKyykQafzmGPLRAKDtTcJxJVgiiuUkmyMYuDUNEUhBEdoBLJnamtLmMJQgmLiUELIhLpiEvpOXOvXCPUeldLFqkKOwfacqIaRcnnZvERKRMCKUkMABbDHytQqQblrvoxOZkwzosQfDKGtIdfcXRJNqlBNwOCWoQBcEWyqrMlYZIAXYJmLfnjoJepgSFvrgajaBAIksoyeHqgqbGvpAstMIGmIhRYGGNPRIfOQKsGoKgxtsidhTaAePRCBFqZgPDWCIkqOJezGVkjfYUCZTlInbxBXwUAVRsxHTQtJFnnpmMvXDYCVlEmnZBKhmmxQOIQzxFWpJQkQoSAYzTEiDWEOsVLNrbfzeHFRyeYATakQQWmFDLPbVMCJcWjFGJjfqCoVzlbNNEsqxdSmNPjTjHYOkuEMFLkXYGaoJlraLqayMeCsTjWNRDPBywBJLAPVkGQqTwApVVwYAetlwSbzsdHWsTwSIcctkyKDuRWYDQikRqsKTMJchrliONJeaZIzwPQrNbTwxsGdwuduvibtYndRwpdsvyCktRHFalvUuEKMqXbItfGcNGWsGzubdPMYayOUOINjpcFBeESdwpdlTYmrPsLsVDhpTzoMegKrytNVZkfJRPuDCUXxSlSthOohmsuxmIZUedzxKmowKOdXTMcEtdpHaPWgIsIjrViKrQOCONlSuazmLuCUjLltOGXeNgJKedTVrrVCpWYWHyVrdXpKgNaMJVjbXxnVMSChdWKuZdqpisvrkBJPoURDYxWOtpjzZoOpWzyUuYNhCzRoHsMjmmWDcXzQiHIyjwdhPNwiPqFxeUfMVFQGImhykFgMIlQEoZCaRoqSBXTSWAeDumdbsOGtATwEdZlLfoBKiTvodQBGOEcuATWXfiinSjPmJKcWgQrTVYVrwlyMWhxqNbCMpIQNoSMGTiWfPTCezUjYcdWppnsYJihLQCqbNLRGgqrwHuIvsazapTpoPZIyZyeeSueJuTIhpHMEJfJpScshJubJGfkusuVBgfTWQoywSSliQQSfbvaHKiLnyjdSbpMkdBgXepoSsHnCQaYuHQqZsoEOmJCiuQUpJkmfyfbIShzlZpHFmLCsbknEAkKXKfRTRnuwdBeuOGgFbJLbDksHVapaRayWzwoYBEpmrlAxrUxYMUekKbpjPNfjUCjhbdMAnJmYQVZBQZkFVweHDAlaqJjRqoQPoOMLhyvYCzqEuQsAFoxWrzRnTVjStPadhsESlERnKhpEPsfDxNvxqcOyIulaCkmPdambLHvGhTZzysvqFauEgkFRItPfvisehFmoBhQqmkfbHVsgfHXDPJVyhwPllQpuYLRYvGodxKjkarnSNgsXoKEMlaSKxKdcVgvOkuLcfLFfdtXGTclqfPOfeoVLbqcjcXCUEBgAGplrkgsmIEhWRZLlGPGCwKWRaCKMkBHTAcypUrYjWwCLtOPVygMwMANGoQwFnCqFrUGMCRZUGJKTZIGPyldsifauoMnJPLTcDHmilcmahlqOELaAUYDBuzsVywnDQfwRLGIWozYaOAilMBcObErwgTDNGWnwQMUgFFSKtPDMEoEQCTKVREqrXZSGLqwTMcxHfWotDllNkIJPMbXzjDVjPOOjCFuIvTyhXKLyhUScOXvYthRXpPfKwMhptXaxIxgqBoUqzrWbaoLTVpQoottZyPFfNOoMioXHRuFwMRYUiKvcWPkrayyTLOCFJlAyslDameIuqVAuxErqFPEWIScKpBORIuZqoXlZuTvAjEdlEWDODFRregDTqGNoFBIHxvimmIZwLfFyKUfEWAnNBdtdzDmTPXtpHRGdIbuucfTjOygZsTxPjfweXhSUkMhPjMaxKlMIJMOXcnQfyzeOcbWwNbeH", msg.Messages[0].GetCachedValue().(*v1.MsgExecLegacyContent).Content.GetCachedValue().(v1beta1.Content).GetDescription()) require.Equal(t, "gov", msg.Route()) @@ -231,7 +231,7 @@ func TestSimulateMsgDeposit(t *testing.T) { require.Equal(t, uint64(1), msg.ProposalId) require.Equal(t, "cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r", msg.Depositor) require.NotEqual(t, len(msg.Amount), 0) - require.Equal(t, "1682907stake", msg.Amount[0].String()) + require.Equal(t, "560969stake", msg.Amount[0].String()) require.Equal(t, "gov", msg.Route()) require.Equal(t, simulation.TypeMsgDeposit, msg.Type()) } diff --git a/x/gov/types/errors.go b/x/gov/types/errors.go index ca134a67f993..eb14067caa1d 100644 --- a/x/gov/types/errors.go +++ b/x/gov/types/errors.go @@ -22,7 +22,4 @@ var ( ErrInvalidSignalMsg = sdkerrors.Register(ModuleName, 14, "signal message is invalid") ErrMetadataTooLong = sdkerrors.Register(ModuleName, 15, "metadata too long") ErrMinDepositTooSmall = sdkerrors.Register(ModuleName, 16, "minimum deposit is too small") - - // Error 23 is added through backport of #18189 PR - ErrInvalidDepositDenom = sdkerrors.Register(ModuleName, 23, "invalid deposit denom") ) diff --git a/x/gov/types/v1/gov.pb.go b/x/gov/types/v1/gov.pb.go index b3e3f3426a22..0312e32938d3 100644 --- a/x/gov/types/v1/gov.pb.go +++ b/x/gov/types/v1/gov.pb.go @@ -772,13 +772,6 @@ type Params struct { BurnProposalDepositPrevote bool `protobuf:"varint,14,opt,name=burn_proposal_deposit_prevote,json=burnProposalDepositPrevote,proto3" json:"burn_proposal_deposit_prevote,omitempty"` // burn deposits if quorum with vote type no_veto is met BurnVoteVeto bool `protobuf:"varint,15,opt,name=burn_vote_veto,json=burnVoteVeto,proto3" json:"burn_vote_veto,omitempty"` - // The ratio representing the proportion of the deposit value minimum that must be met when making a deposit. - // Default value: 0.01. Meaning that for a chain with a min_deposit of 100stake, a deposit of 1stake would be - // required. - // - // Since: cosmos-sdk 0.50 - // NOTE: backported from v50 (https://github.com/cosmos/cosmos-sdk/pull/18146) - MinDepositRatio string `protobuf:"bytes,16,opt,name=min_deposit_ratio,json=minDepositRatio,proto3" json:"min_deposit_ratio,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -905,13 +898,6 @@ func (m *Params) GetBurnVoteVeto() bool { return false } -func (m *Params) GetMinDepositRatio() string { - if m != nil { - return m.MinDepositRatio - } - return "" -} - func init() { proto.RegisterEnum("cosmos.gov.v1.VoteOption", VoteOption_name, VoteOption_value) proto.RegisterEnum("cosmos.gov.v1.ProposalStatus", ProposalStatus_name, ProposalStatus_value) @@ -929,93 +915,92 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1/gov.proto", fileDescriptor_e05cb1c0d030febb) } var fileDescriptor_e05cb1c0d030febb = []byte{ - // 1364 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xcf, 0x73, 0xd3, 0xc6, - 0x17, 0x8f, 0x6c, 0xc7, 0x71, 0x9e, 0x63, 0x47, 0x2c, 0x81, 0x28, 0x81, 0xd8, 0xc1, 0xc3, 0x30, - 0xf9, 0xf2, 0xc3, 0xfe, 0x06, 0x4a, 0x0f, 0xd0, 0x99, 0x8e, 0x13, 0x8b, 0x22, 0x06, 0x62, 0x57, - 0x36, 0x0e, 0xf4, 0xa2, 0x91, 0xa3, 0xc5, 0xd1, 0xd4, 0xd2, 0xba, 0xd2, 0xda, 0xc4, 0x7f, 0x42, - 0x6f, 0x1c, 0x7b, 0xea, 0xf4, 0xd8, 0x63, 0x0f, 0x4c, 0xff, 0x06, 0x4e, 0x1d, 0x86, 0x4b, 0x7b, - 0x29, 0x74, 0xe0, 0xd0, 0x19, 0xfe, 0x89, 0x76, 0x76, 0xb5, 0xb2, 0x14, 0xc7, 0x9d, 0x24, 0x5c, - 0x12, 0xeb, 0xbd, 0xcf, 0xe7, 0xed, 0xfb, 0xbd, 0x12, 0x2c, 0xef, 0x11, 0xdf, 0x21, 0x7e, 0xa5, - 0x4b, 0x86, 0x95, 0xe1, 0x26, 0xfb, 0x57, 0xee, 0x7b, 0x84, 0x12, 0x94, 0x0b, 0x14, 0x65, 0x26, - 0x19, 0x6e, 0xae, 0x16, 0x04, 0xae, 0x63, 0xfa, 0xb8, 0x32, 0xdc, 0xec, 0x60, 0x6a, 0x6e, 0x56, - 0xf6, 0x88, 0xed, 0x06, 0xf0, 0xd5, 0xa5, 0x2e, 0xe9, 0x12, 0xfe, 0xb3, 0xc2, 0x7e, 0x09, 0x69, - 0xb1, 0x4b, 0x48, 0xb7, 0x87, 0x2b, 0xfc, 0xa9, 0x33, 0x78, 0x56, 0xa1, 0xb6, 0x83, 0x7d, 0x6a, - 0x3a, 0x7d, 0x01, 0x58, 0x99, 0x04, 0x98, 0xee, 0x48, 0xa8, 0x0a, 0x93, 0x2a, 0x6b, 0xe0, 0x99, - 0xd4, 0x26, 0xe1, 0x89, 0x2b, 0x81, 0x47, 0x46, 0x70, 0xa8, 0xf0, 0x36, 0x50, 0x9d, 0x31, 0x1d, - 0xdb, 0x25, 0x15, 0xfe, 0x37, 0x10, 0x95, 0x08, 0xa0, 0x5d, 0x6c, 0x77, 0xf7, 0x29, 0xb6, 0xda, - 0x84, 0xe2, 0x7a, 0x9f, 0x59, 0x42, 0x9b, 0x90, 0x26, 0xfc, 0x97, 0x22, 0xad, 0x4b, 0x1b, 0xf9, - 0x9b, 0x2b, 0xe5, 0x43, 0x51, 0x97, 0x23, 0xa8, 0x2e, 0x80, 0xe8, 0x0a, 0xa4, 0x9f, 0x73, 0x43, - 0x4a, 0x62, 0x5d, 0xda, 0x98, 0xdf, 0xca, 0xbf, 0x79, 0x79, 0x03, 0x04, 0xab, 0x86, 0xf7, 0x74, - 0xa1, 0x2d, 0xfd, 0x24, 0xc1, 0x5c, 0x0d, 0xf7, 0x89, 0x6f, 0x53, 0x54, 0x84, 0x6c, 0xdf, 0x23, - 0x7d, 0xe2, 0x9b, 0x3d, 0xc3, 0xb6, 0xf8, 0x59, 0x29, 0x1d, 0x42, 0x91, 0x66, 0xa1, 0xcf, 0x61, - 0xde, 0x0a, 0xb0, 0xc4, 0x13, 0x76, 0x95, 0x37, 0x2f, 0x6f, 0x2c, 0x09, 0xbb, 0x55, 0xcb, 0xf2, - 0xb0, 0xef, 0x37, 0xa9, 0x67, 0xbb, 0x5d, 0x3d, 0x82, 0xa2, 0x2f, 0x20, 0x6d, 0x3a, 0x64, 0xe0, - 0x52, 0x25, 0xb9, 0x9e, 0xdc, 0xc8, 0x46, 0xfe, 0xb3, 0x32, 0x95, 0x45, 0x99, 0xca, 0xdb, 0xc4, - 0x76, 0xb7, 0xe6, 0x5f, 0xbd, 0x2d, 0xce, 0xfc, 0xfc, 0xf7, 0x2f, 0x57, 0x25, 0x5d, 0x70, 0x4a, - 0xef, 0x66, 0x21, 0xd3, 0x10, 0x4e, 0xa0, 0x3c, 0x24, 0xc6, 0xae, 0x25, 0x6c, 0x0b, 0xfd, 0x1f, - 0x32, 0x0e, 0xf6, 0x7d, 0xb3, 0x8b, 0x7d, 0x25, 0xc1, 0x8d, 0x2f, 0x95, 0x83, 0x8a, 0x94, 0xc3, - 0x8a, 0x94, 0xab, 0xee, 0x48, 0x1f, 0xa3, 0xd0, 0x6d, 0x48, 0xfb, 0xd4, 0xa4, 0x03, 0x5f, 0x49, - 0xf2, 0x64, 0xae, 0x4d, 0x24, 0x33, 0x3c, 0xaa, 0xc9, 0x41, 0xba, 0x00, 0xa3, 0xfb, 0x80, 0x9e, - 0xd9, 0xae, 0xd9, 0x33, 0xa8, 0xd9, 0xeb, 0x8d, 0x0c, 0x0f, 0xfb, 0x83, 0x1e, 0x55, 0x52, 0xeb, - 0xd2, 0x46, 0xf6, 0xe6, 0xea, 0x84, 0x89, 0x16, 0x83, 0xe8, 0x1c, 0xa1, 0xcb, 0x9c, 0x15, 0x93, - 0xa0, 0x2a, 0x64, 0xfd, 0x41, 0xc7, 0xb1, 0xa9, 0xc1, 0xda, 0x4c, 0x99, 0x15, 0x26, 0x26, 0xbd, - 0x6e, 0x85, 0x3d, 0xb8, 0x95, 0x7a, 0xf1, 0xae, 0x28, 0xe9, 0x10, 0x90, 0x98, 0x18, 0x3d, 0x00, - 0x59, 0x64, 0xd7, 0xc0, 0xae, 0x15, 0xd8, 0x49, 0x9f, 0xd0, 0x4e, 0x5e, 0x30, 0x55, 0xd7, 0xe2, - 0xb6, 0x34, 0xc8, 0x51, 0x42, 0xcd, 0x9e, 0x21, 0xe4, 0xca, 0xdc, 0x29, 0x6a, 0xb4, 0xc0, 0xa9, - 0x61, 0x03, 0x3d, 0x84, 0x33, 0x43, 0x42, 0x6d, 0xb7, 0x6b, 0xf8, 0xd4, 0xf4, 0x44, 0x7c, 0x99, - 0x13, 0xfa, 0xb5, 0x18, 0x50, 0x9b, 0x8c, 0xc9, 0x1d, 0xbb, 0x0f, 0x42, 0x14, 0xc5, 0x38, 0x7f, - 0x42, 0x5b, 0xb9, 0x80, 0x18, 0x86, 0xb8, 0xca, 0x9a, 0x84, 0x9a, 0x96, 0x49, 0x4d, 0x05, 0x58, - 0xdb, 0xea, 0xe3, 0x67, 0xb4, 0x04, 0xb3, 0xd4, 0xa6, 0x3d, 0xac, 0x64, 0xb9, 0x22, 0x78, 0x40, - 0x0a, 0xcc, 0xf9, 0x03, 0xc7, 0x31, 0xbd, 0x91, 0xb2, 0xc0, 0xe5, 0xe1, 0x23, 0xfa, 0x0c, 0x32, - 0xc1, 0x44, 0x60, 0x4f, 0xc9, 0x1d, 0x33, 0x02, 0x63, 0x24, 0xba, 0x08, 0xf3, 0xf8, 0xa0, 0x8f, - 0x2d, 0x9b, 0x62, 0x4b, 0xc9, 0xaf, 0x4b, 0x1b, 0x19, 0x3d, 0x12, 0x94, 0x7e, 0x97, 0x20, 0x1b, - 0xef, 0x90, 0x6b, 0x30, 0x3f, 0xc2, 0xbe, 0xb1, 0xc7, 0x47, 0x46, 0x3a, 0x32, 0xbf, 0x9a, 0x4b, - 0xf5, 0xcc, 0x08, 0xfb, 0xdb, 0x4c, 0x8f, 0x6e, 0x41, 0xce, 0xec, 0xf8, 0xd4, 0xb4, 0x5d, 0x41, - 0x48, 0x4c, 0x25, 0x2c, 0x08, 0x50, 0x40, 0xfa, 0x1f, 0x64, 0x5c, 0x22, 0xf0, 0xc9, 0xa9, 0xf8, - 0x39, 0x97, 0x04, 0xd0, 0xbb, 0x80, 0x5c, 0x62, 0x3c, 0xb7, 0xe9, 0xbe, 0x31, 0xc4, 0x34, 0x24, - 0xa5, 0xa6, 0x92, 0x16, 0x5d, 0xb2, 0x6b, 0xd3, 0xfd, 0x36, 0xa6, 0x01, 0xb9, 0xf4, 0xab, 0x04, - 0x29, 0xb6, 0x9d, 0x8e, 0xdf, 0x2d, 0x65, 0x98, 0x1d, 0x12, 0x8a, 0x8f, 0xdf, 0x2b, 0x01, 0x0c, - 0xdd, 0x85, 0xb9, 0x60, 0xd5, 0xf9, 0x4a, 0x8a, 0x37, 0xec, 0xa5, 0x89, 0x21, 0x3c, 0xba, 0x47, - 0xf5, 0x90, 0x71, 0xa8, 0x21, 0x66, 0x0f, 0x37, 0xc4, 0x83, 0x54, 0x26, 0x29, 0xa7, 0x4a, 0x7f, - 0x4a, 0x90, 0x13, 0x6d, 0xdd, 0x30, 0x3d, 0xd3, 0xf1, 0xd1, 0x53, 0xc8, 0x3a, 0xb6, 0x3b, 0x9e, - 0x12, 0xe9, 0xb8, 0x29, 0x59, 0x63, 0x53, 0xf2, 0xf1, 0x6d, 0xf1, 0x5c, 0x8c, 0x75, 0x9d, 0x38, - 0x36, 0xc5, 0x4e, 0x9f, 0x8e, 0x74, 0x70, 0x6c, 0x37, 0x9c, 0x1b, 0x07, 0x90, 0x63, 0x1e, 0x84, - 0x20, 0xa3, 0x8f, 0x3d, 0x9b, 0x58, 0x3c, 0x11, 0xec, 0x84, 0xc9, 0x66, 0xaf, 0x89, 0x0b, 0x66, - 0xeb, 0xf2, 0xc7, 0xb7, 0xc5, 0x8b, 0x47, 0x89, 0xd1, 0x21, 0x3f, 0xb0, 0x59, 0x90, 0x1d, 0xf3, - 0x20, 0x8c, 0x84, 0xeb, 0xef, 0x24, 0x14, 0xa9, 0xf4, 0x04, 0x16, 0xda, 0x7c, 0x46, 0x44, 0x74, - 0x35, 0x10, 0x33, 0x13, 0x9e, 0x2e, 0x1d, 0x77, 0x7a, 0x8a, 0x5b, 0x5f, 0x08, 0x58, 0x31, 0xcb, - 0x3f, 0x86, 0xcd, 0x2c, 0x2c, 0x5f, 0x81, 0xf4, 0x77, 0x03, 0xe2, 0x0d, 0x9c, 0x29, 0x9d, 0xcc, - 0x6f, 0xa2, 0x40, 0x8b, 0xae, 0xc3, 0x3c, 0xdd, 0xf7, 0xb0, 0xbf, 0x4f, 0x7a, 0xd6, 0x7f, 0x5c, - 0x5a, 0x11, 0x00, 0xdd, 0x86, 0x3c, 0xef, 0xc6, 0x88, 0x92, 0x9c, 0x4a, 0xc9, 0x31, 0x54, 0x2b, - 0x04, 0x71, 0x07, 0xff, 0x49, 0x43, 0x5a, 0xf8, 0xa6, 0x9e, 0xb2, 0xa6, 0xb1, 0xcd, 0x17, 0xaf, - 0xdf, 0xa3, 0x4f, 0xab, 0x5f, 0x6a, 0x7a, 0x7d, 0x8e, 0xd6, 0x22, 0xf9, 0x09, 0xb5, 0x88, 0xe5, - 0x3d, 0x75, 0xf2, 0xbc, 0xcf, 0x9e, 0x3e, 0xef, 0xe9, 0x13, 0xe4, 0x1d, 0x69, 0xb0, 0xc2, 0x12, - 0x6d, 0xbb, 0x36, 0xb5, 0xa3, 0xab, 0xc6, 0xe0, 0xee, 0x2b, 0x73, 0x53, 0x2d, 0x9c, 0x77, 0x6c, - 0x57, 0x0b, 0xf0, 0x22, 0x3d, 0x3a, 0x43, 0xa3, 0x5d, 0x58, 0x1e, 0x6f, 0x4e, 0xe3, 0x70, 0x9e, - 0xe0, 0x64, 0x79, 0x3a, 0x37, 0xe6, 0xb7, 0xe3, 0x09, 0xfb, 0x12, 0xce, 0x46, 0x86, 0xa3, 0xf8, - 0xb2, 0x53, 0xbd, 0x43, 0x63, 0x68, 0x14, 0xe4, 0x13, 0x88, 0x2c, 0x1b, 0xf1, 0xbe, 0x5a, 0x38, - 0x45, 0x5f, 0x45, 0x3e, 0x3c, 0x8a, 0x1a, 0x6c, 0x03, 0xe4, 0xce, 0xc0, 0x73, 0x59, 0xb8, 0xd8, - 0x10, 0x55, 0xcd, 0xf1, 0x5b, 0x24, 0xcf, 0xe4, 0x6c, 0xc5, 0x7d, 0x1d, 0x54, 0xb3, 0x0a, 0x6b, - 0x1c, 0x39, 0x5e, 0xb6, 0xe3, 0xa6, 0xf4, 0x30, 0x63, 0x8b, 0xcb, 0x67, 0x95, 0x81, 0xc2, 0x37, - 0x9d, 0xb0, 0xfb, 0x02, 0x04, 0xba, 0x0c, 0xf9, 0xe8, 0x30, 0x56, 0x46, 0x65, 0x91, 0x73, 0x16, - 0xc2, 0xa3, 0xd8, 0x7a, 0x47, 0x77, 0xe0, 0x4c, 0x2c, 0x44, 0x51, 0x49, 0x79, 0x6a, 0xae, 0x16, - 0xa3, 0x51, 0xe1, 0x25, 0xbc, 0xfa, 0xbd, 0x04, 0x10, 0x7b, 0xbd, 0xbd, 0x00, 0xcb, 0xed, 0x7a, - 0x4b, 0x35, 0xea, 0x8d, 0x96, 0x56, 0xdf, 0x31, 0x1e, 0xef, 0x34, 0x1b, 0xea, 0xb6, 0x76, 0x4f, - 0x53, 0x6b, 0xf2, 0x0c, 0x3a, 0x0b, 0x8b, 0x71, 0xe5, 0x53, 0xb5, 0x29, 0x4b, 0x68, 0x19, 0xce, - 0xc6, 0x85, 0xd5, 0xad, 0x66, 0xab, 0xaa, 0xed, 0xc8, 0x09, 0x84, 0x20, 0x1f, 0x57, 0xec, 0xd4, - 0xe5, 0x24, 0xba, 0x08, 0xca, 0x61, 0x99, 0xb1, 0xab, 0xb5, 0xee, 0x1b, 0x6d, 0xb5, 0x55, 0x97, - 0x53, 0x57, 0x7f, 0x93, 0x20, 0x7f, 0xf8, 0x95, 0x0f, 0x15, 0xe1, 0x42, 0x43, 0xaf, 0x37, 0xea, - 0xcd, 0xea, 0x43, 0xa3, 0xd9, 0xaa, 0xb6, 0x1e, 0x37, 0x27, 0x7c, 0x2a, 0x41, 0x61, 0x12, 0x50, - 0x53, 0x1b, 0xf5, 0xa6, 0xd6, 0x32, 0x1a, 0xaa, 0xae, 0xd5, 0x6b, 0xb2, 0x84, 0x2e, 0xc1, 0xda, - 0x24, 0xa6, 0x5d, 0x6f, 0x69, 0x3b, 0x5f, 0x85, 0x90, 0x04, 0x5a, 0x85, 0xf3, 0x93, 0x90, 0x46, - 0xb5, 0xd9, 0x54, 0x6b, 0x81, 0xd3, 0x93, 0x3a, 0x5d, 0x7d, 0xa0, 0x6e, 0xb7, 0xd4, 0x9a, 0x9c, - 0x9a, 0xc6, 0xbc, 0x57, 0xd5, 0x1e, 0xaa, 0x35, 0x79, 0x76, 0x4b, 0x7d, 0xf5, 0xbe, 0x20, 0xbd, - 0x7e, 0x5f, 0x90, 0xfe, 0x7a, 0x5f, 0x90, 0x5e, 0x7c, 0x28, 0xcc, 0xbc, 0xfe, 0x50, 0x98, 0xf9, - 0xe3, 0x43, 0x61, 0xe6, 0x9b, 0x6b, 0x5d, 0x9b, 0xee, 0x0f, 0x3a, 0xe5, 0x3d, 0xe2, 0x88, 0x0f, - 0x11, 0xf1, 0xef, 0x86, 0x6f, 0x7d, 0x5b, 0x39, 0xe0, 0x1f, 0x57, 0x74, 0xd4, 0xc7, 0x3e, 0xfb, - 0x72, 0x4a, 0xf3, 0xe9, 0xb9, 0xf5, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xe3, 0xb8, 0x2b, - 0x7a, 0x0d, 0x00, 0x00, + // 1348 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x4f, 0x73, 0xd3, 0x46, + 0x14, 0x8f, 0x6c, 0xc7, 0x71, 0x9e, 0x63, 0xc7, 0x2c, 0x81, 0x28, 0x81, 0xd8, 0xc1, 0xc3, 0x30, + 0x29, 0x7f, 0xec, 0x06, 0x4a, 0x0f, 0xa5, 0x33, 0x1d, 0x27, 0x16, 0x45, 0x0c, 0xc4, 0xae, 0x6c, + 0x1c, 0xe8, 0x45, 0x23, 0x47, 0x8b, 0xb3, 0x53, 0x4b, 0xeb, 0x4a, 0x6b, 0x13, 0x7f, 0x84, 0xde, + 0x38, 0xf6, 0xd4, 0xe9, 0xb1, 0xc7, 0x1e, 0x98, 0x7e, 0x81, 0x5e, 0x38, 0x75, 0x18, 0x2e, 0xed, + 0xa5, 0xd0, 0x81, 0x43, 0x67, 0xf8, 0x14, 0x9d, 0x5d, 0xad, 0x2c, 0xc7, 0x71, 0x27, 0x09, 0x97, + 0xc4, 0x7a, 0xef, 0xf7, 0x7b, 0xef, 0xed, 0xfb, 0xb7, 0x12, 0x2c, 0xef, 0x51, 0xdf, 0xa1, 0x7e, + 0xb9, 0x43, 0x07, 0xe5, 0xc1, 0x26, 0xff, 0x57, 0xea, 0x79, 0x94, 0x51, 0x94, 0x09, 0x14, 0x25, + 0x2e, 0x19, 0x6c, 0xae, 0xe6, 0x25, 0xae, 0x6d, 0xf9, 0xb8, 0x3c, 0xd8, 0x6c, 0x63, 0x66, 0x6d, + 0x96, 0xf7, 0x28, 0x71, 0x03, 0xf8, 0xea, 0x52, 0x87, 0x76, 0xa8, 0xf8, 0x59, 0xe6, 0xbf, 0xa4, + 0xb4, 0xd0, 0xa1, 0xb4, 0xd3, 0xc5, 0x65, 0xf1, 0xd4, 0xee, 0x3f, 0x2d, 0x33, 0xe2, 0x60, 0x9f, + 0x59, 0x4e, 0x4f, 0x02, 0x56, 0x26, 0x01, 0x96, 0x3b, 0x94, 0xaa, 0xfc, 0xa4, 0xca, 0xee, 0x7b, + 0x16, 0x23, 0x34, 0xf4, 0xb8, 0x12, 0x44, 0x64, 0x06, 0x4e, 0x65, 0xb4, 0x81, 0xea, 0x8c, 0xe5, + 0x10, 0x97, 0x96, 0xc5, 0xdf, 0x40, 0x54, 0xa4, 0x80, 0x76, 0x31, 0xe9, 0xec, 0x33, 0x6c, 0xb7, + 0x28, 0xc3, 0xb5, 0x1e, 0xb7, 0x84, 0x36, 0x21, 0x49, 0xc5, 0x2f, 0x55, 0x59, 0x57, 0x36, 0xb2, + 0x37, 0x57, 0x4a, 0x87, 0x4e, 0x5d, 0x8a, 0xa0, 0x86, 0x04, 0xa2, 0x2b, 0x90, 0x7c, 0x26, 0x0c, + 0xa9, 0xb1, 0x75, 0x65, 0x63, 0x7e, 0x2b, 0xfb, 0xfa, 0xc5, 0x0d, 0x90, 0xac, 0x2a, 0xde, 0x33, + 0xa4, 0xb6, 0xf8, 0xb3, 0x02, 0x73, 0x55, 0xdc, 0xa3, 0x3e, 0x61, 0xa8, 0x00, 0xe9, 0x9e, 0x47, + 0x7b, 0xd4, 0xb7, 0xba, 0x26, 0xb1, 0x85, 0xaf, 0x84, 0x01, 0xa1, 0x48, 0xb7, 0xd1, 0xe7, 0x30, + 0x6f, 0x07, 0x58, 0xea, 0x49, 0xbb, 0xea, 0xeb, 0x17, 0x37, 0x96, 0xa4, 0xdd, 0x8a, 0x6d, 0x7b, + 0xd8, 0xf7, 0x1b, 0xcc, 0x23, 0x6e, 0xc7, 0x88, 0xa0, 0xe8, 0x4b, 0x48, 0x5a, 0x0e, 0xed, 0xbb, + 0x4c, 0x8d, 0xaf, 0xc7, 0x37, 0xd2, 0x51, 0xfc, 0xbc, 0x4c, 0x25, 0x59, 0xa6, 0xd2, 0x36, 0x25, + 0xee, 0xd6, 0xfc, 0xcb, 0x37, 0x85, 0x99, 0x5f, 0xfe, 0xfd, 0xf5, 0xaa, 0x62, 0x48, 0x4e, 0xf1, + 0xed, 0x2c, 0xa4, 0xea, 0x32, 0x08, 0x94, 0x85, 0xd8, 0x28, 0xb4, 0x18, 0xb1, 0xd1, 0xa7, 0x90, + 0x72, 0xb0, 0xef, 0x5b, 0x1d, 0xec, 0xab, 0x31, 0x61, 0x7c, 0xa9, 0x14, 0x54, 0xa4, 0x14, 0x56, + 0xa4, 0x54, 0x71, 0x87, 0xc6, 0x08, 0x85, 0x6e, 0x43, 0xd2, 0x67, 0x16, 0xeb, 0xfb, 0x6a, 0x5c, + 0x24, 0x73, 0x6d, 0x22, 0x99, 0xa1, 0xab, 0x86, 0x00, 0x19, 0x12, 0x8c, 0xee, 0x01, 0x7a, 0x4a, + 0x5c, 0xab, 0x6b, 0x32, 0xab, 0xdb, 0x1d, 0x9a, 0x1e, 0xf6, 0xfb, 0x5d, 0xa6, 0x26, 0xd6, 0x95, + 0x8d, 0xf4, 0xcd, 0xd5, 0x09, 0x13, 0x4d, 0x0e, 0x31, 0x04, 0xc2, 0xc8, 0x09, 0xd6, 0x98, 0x04, + 0x55, 0x20, 0xed, 0xf7, 0xdb, 0x0e, 0x61, 0x26, 0x6f, 0x33, 0x75, 0x56, 0x9a, 0x98, 0x8c, 0xba, + 0x19, 0xf6, 0xe0, 0x56, 0xe2, 0xf9, 0xdb, 0x82, 0x62, 0x40, 0x40, 0xe2, 0x62, 0x74, 0x1f, 0x72, + 0x32, 0xbb, 0x26, 0x76, 0xed, 0xc0, 0x4e, 0xf2, 0x84, 0x76, 0xb2, 0x92, 0xa9, 0xb9, 0xb6, 0xb0, + 0xa5, 0x43, 0x86, 0x51, 0x66, 0x75, 0x4d, 0x29, 0x57, 0xe7, 0x4e, 0x51, 0xa3, 0x05, 0x41, 0x0d, + 0x1b, 0xe8, 0x01, 0x9c, 0x19, 0x50, 0x46, 0xdc, 0x8e, 0xe9, 0x33, 0xcb, 0x93, 0xe7, 0x4b, 0x9d, + 0x30, 0xae, 0xc5, 0x80, 0xda, 0xe0, 0x4c, 0x11, 0xd8, 0x3d, 0x90, 0xa2, 0xe8, 0x8c, 0xf3, 0x27, + 0xb4, 0x95, 0x09, 0x88, 0xe1, 0x11, 0x57, 0x79, 0x93, 0x30, 0xcb, 0xb6, 0x98, 0xa5, 0x02, 0x6f, + 0x5b, 0x63, 0xf4, 0x8c, 0x96, 0x60, 0x96, 0x11, 0xd6, 0xc5, 0x6a, 0x5a, 0x28, 0x82, 0x07, 0xa4, + 0xc2, 0x9c, 0xdf, 0x77, 0x1c, 0xcb, 0x1b, 0xaa, 0x0b, 0x42, 0x1e, 0x3e, 0xa2, 0xcf, 0x20, 0x15, + 0x4c, 0x04, 0xf6, 0xd4, 0xcc, 0x31, 0x23, 0x30, 0x42, 0xa2, 0x8b, 0x30, 0x8f, 0x0f, 0x7a, 0xd8, + 0x26, 0x0c, 0xdb, 0x6a, 0x76, 0x5d, 0xd9, 0x48, 0x19, 0x91, 0xa0, 0xf8, 0xa7, 0x02, 0xe9, 0xf1, + 0x0e, 0xb9, 0x06, 0xf3, 0x43, 0xec, 0x9b, 0x7b, 0x62, 0x64, 0x94, 0x23, 0xf3, 0xab, 0xbb, 0xcc, + 0x48, 0x0d, 0xb1, 0xbf, 0xcd, 0xf5, 0xe8, 0x16, 0x64, 0xac, 0xb6, 0xcf, 0x2c, 0xe2, 0x4a, 0x42, + 0x6c, 0x2a, 0x61, 0x41, 0x82, 0x02, 0xd2, 0x27, 0x90, 0x72, 0xa9, 0xc4, 0xc7, 0xa7, 0xe2, 0xe7, + 0x5c, 0x1a, 0x40, 0xef, 0x00, 0x72, 0xa9, 0xf9, 0x8c, 0xb0, 0x7d, 0x73, 0x80, 0x59, 0x48, 0x4a, + 0x4c, 0x25, 0x2d, 0xba, 0x74, 0x97, 0xb0, 0xfd, 0x16, 0x66, 0x01, 0xb9, 0xf8, 0x9b, 0x02, 0x09, + 0xbe, 0x9d, 0x8e, 0xdf, 0x2d, 0x25, 0x98, 0x1d, 0x50, 0x86, 0x8f, 0xdf, 0x2b, 0x01, 0x0c, 0xdd, + 0x81, 0xb9, 0x60, 0xd5, 0xf9, 0x6a, 0x42, 0x34, 0xec, 0xa5, 0x89, 0x21, 0x3c, 0xba, 0x47, 0x8d, + 0x90, 0x71, 0xa8, 0x21, 0x66, 0x0f, 0x37, 0xc4, 0xfd, 0x44, 0x2a, 0x9e, 0x4b, 0x14, 0xff, 0x56, + 0x20, 0x23, 0xdb, 0xba, 0x6e, 0x79, 0x96, 0xe3, 0xa3, 0x27, 0x90, 0x76, 0x88, 0x3b, 0x9a, 0x12, + 0xe5, 0xb8, 0x29, 0x59, 0xe3, 0x53, 0xf2, 0xe1, 0x4d, 0xe1, 0xdc, 0x18, 0xeb, 0x3a, 0x75, 0x08, + 0xc3, 0x4e, 0x8f, 0x0d, 0x0d, 0x70, 0x88, 0x1b, 0xce, 0x8d, 0x03, 0xc8, 0xb1, 0x0e, 0x42, 0x90, + 0xd9, 0xc3, 0x1e, 0xa1, 0xb6, 0x48, 0x04, 0xf7, 0x30, 0xd9, 0xec, 0x55, 0x79, 0xc1, 0x6c, 0x5d, + 0xfe, 0xf0, 0xa6, 0x70, 0xf1, 0x28, 0x31, 0x72, 0xf2, 0x23, 0x9f, 0x85, 0x9c, 0x63, 0x1d, 0x84, + 0x27, 0x11, 0xfa, 0x2f, 0x62, 0xaa, 0x52, 0x7c, 0x0c, 0x0b, 0x2d, 0x31, 0x23, 0xf2, 0x74, 0x55, + 0x90, 0x33, 0x13, 0x7a, 0x57, 0x8e, 0xf3, 0x9e, 0x10, 0xd6, 0x17, 0x02, 0xd6, 0x98, 0xe5, 0x9f, + 0xc2, 0x66, 0x96, 0x96, 0xaf, 0x40, 0xf2, 0xfb, 0x3e, 0xf5, 0xfa, 0xce, 0x94, 0x4e, 0x16, 0x37, + 0x51, 0xa0, 0x45, 0xd7, 0x61, 0x9e, 0xed, 0x7b, 0xd8, 0xdf, 0xa7, 0x5d, 0xfb, 0x7f, 0x2e, 0xad, + 0x08, 0x80, 0x6e, 0x43, 0x56, 0x74, 0x63, 0x44, 0x89, 0x4f, 0xa5, 0x64, 0x38, 0xaa, 0x19, 0x82, + 0x44, 0x80, 0xbf, 0x27, 0x21, 0x29, 0x63, 0xd3, 0x4e, 0x59, 0xd3, 0xb1, 0xcd, 0x37, 0x5e, 0xbf, + 0x87, 0x1f, 0x57, 0xbf, 0xc4, 0xf4, 0xfa, 0x1c, 0xad, 0x45, 0xfc, 0x23, 0x6a, 0x31, 0x96, 0xf7, + 0xc4, 0xc9, 0xf3, 0x3e, 0x7b, 0xfa, 0xbc, 0x27, 0x4f, 0x90, 0x77, 0xa4, 0xc3, 0x0a, 0x4f, 0x34, + 0x71, 0x09, 0x23, 0xd1, 0x55, 0x63, 0x8a, 0xf0, 0xd5, 0xb9, 0xa9, 0x16, 0xce, 0x3b, 0xc4, 0xd5, + 0x03, 0xbc, 0x4c, 0x8f, 0xc1, 0xd1, 0x68, 0x17, 0x96, 0x47, 0x9b, 0xd3, 0x3c, 0x9c, 0x27, 0x38, + 0x59, 0x9e, 0xce, 0x8d, 0xf8, 0xad, 0xf1, 0x84, 0x7d, 0x05, 0x67, 0x23, 0xc3, 0xd1, 0xf9, 0xd2, + 0x53, 0xa3, 0x43, 0x23, 0x68, 0x74, 0xc8, 0xc7, 0x10, 0x59, 0x36, 0xc7, 0xfb, 0x6a, 0xe1, 0x14, + 0x7d, 0x15, 0xc5, 0xf0, 0x30, 0x6a, 0xb0, 0x0d, 0xc8, 0xb5, 0xfb, 0x9e, 0xcb, 0x8f, 0x8b, 0x4d, + 0x59, 0xd5, 0x8c, 0xb8, 0x45, 0xb2, 0x5c, 0xce, 0x57, 0xdc, 0x37, 0x41, 0x35, 0x2b, 0xb0, 0x26, + 0x90, 0xa3, 0x65, 0x3b, 0x6a, 0x4a, 0x0f, 0x73, 0xb6, 0xbc, 0x7c, 0x56, 0x39, 0x28, 0x7c, 0xd3, + 0x09, 0xbb, 0x2f, 0x40, 0xa0, 0xcb, 0x90, 0x8d, 0x9c, 0xf1, 0x32, 0xaa, 0x8b, 0x82, 0xb3, 0x10, + 0xba, 0xe2, 0xeb, 0xfd, 0xea, 0x0f, 0x0a, 0xc0, 0xd8, 0x2b, 0xea, 0x05, 0x58, 0x6e, 0xd5, 0x9a, + 0x9a, 0x59, 0xab, 0x37, 0xf5, 0xda, 0x8e, 0xf9, 0x68, 0xa7, 0x51, 0xd7, 0xb6, 0xf5, 0xbb, 0xba, + 0x56, 0xcd, 0xcd, 0xa0, 0xb3, 0xb0, 0x38, 0xae, 0x7c, 0xa2, 0x35, 0x72, 0x0a, 0x5a, 0x86, 0xb3, + 0xe3, 0xc2, 0xca, 0x56, 0xa3, 0x59, 0xd1, 0x77, 0x72, 0x31, 0x84, 0x20, 0x3b, 0xae, 0xd8, 0xa9, + 0xe5, 0xe2, 0xe8, 0x22, 0xa8, 0x87, 0x65, 0xe6, 0xae, 0xde, 0xbc, 0x67, 0xb6, 0xb4, 0x66, 0x2d, + 0x97, 0xb8, 0xfa, 0x87, 0x02, 0xd9, 0xc3, 0xaf, 0x6d, 0xa8, 0x00, 0x17, 0xea, 0x46, 0xad, 0x5e, + 0x6b, 0x54, 0x1e, 0x98, 0x8d, 0x66, 0xa5, 0xf9, 0xa8, 0x31, 0x11, 0x53, 0x11, 0xf2, 0x93, 0x80, + 0xaa, 0x56, 0xaf, 0x35, 0xf4, 0xa6, 0x59, 0xd7, 0x0c, 0xbd, 0x56, 0xcd, 0x29, 0xe8, 0x12, 0xac, + 0x4d, 0x62, 0x5a, 0xb5, 0xa6, 0xbe, 0xf3, 0x75, 0x08, 0x89, 0xa1, 0x55, 0x38, 0x3f, 0x09, 0xa9, + 0x57, 0x1a, 0x0d, 0xad, 0x1a, 0x04, 0x3d, 0xa9, 0x33, 0xb4, 0xfb, 0xda, 0x76, 0x53, 0xab, 0xe6, + 0x12, 0xd3, 0x98, 0x77, 0x2b, 0xfa, 0x03, 0xad, 0x9a, 0x9b, 0xdd, 0xd2, 0x5e, 0xbe, 0xcb, 0x2b, + 0xaf, 0xde, 0xe5, 0x95, 0x7f, 0xde, 0xe5, 0x95, 0xe7, 0xef, 0xf3, 0x33, 0xaf, 0xde, 0xe7, 0x67, + 0xfe, 0x7a, 0x9f, 0x9f, 0xf9, 0xf6, 0x5a, 0x87, 0xb0, 0xfd, 0x7e, 0xbb, 0xb4, 0x47, 0x1d, 0xf9, + 0x31, 0x21, 0xff, 0xdd, 0xf0, 0xed, 0xef, 0xca, 0x07, 0xe2, 0x03, 0x89, 0x0d, 0x7b, 0xd8, 0xe7, + 0x5f, 0x3f, 0x49, 0x31, 0x01, 0xb7, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x09, 0x89, 0x48, + 0x3e, 0x0d, 0x00, 0x00, } func (m *WeightedVoteOption) Marshal() (dAtA []byte, err error) { @@ -1504,15 +1489,6 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.MinDepositRatio) > 0 { - i -= len(m.MinDepositRatio) - copy(dAtA[i:], m.MinDepositRatio) - i = encodeVarintGov(dAtA, i, uint64(len(m.MinDepositRatio))) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0x82 - } if m.BurnVoteVeto { i-- if m.BurnVoteVeto { @@ -1917,10 +1893,6 @@ func (m *Params) Size() (n int) { if m.BurnVoteVeto { n += 2 } - l = len(m.MinDepositRatio) - if l > 0 { - n += 2 + l + sovGov(uint64(l)) - } return n } @@ -3772,38 +3744,6 @@ func (m *Params) Unmarshal(dAtA []byte) error { } } m.BurnVoteVeto = bool(v != 0) - case 16: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MinDepositRatio", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGov - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthGov - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGov - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.MinDepositRatio = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGov(dAtA[iNdEx:]) diff --git a/x/gov/types/v1/params.go b/x/gov/types/v1/params.go index 80d84e5efdb8..bef70bc7f9df 100644 --- a/x/gov/types/v1/params.go +++ b/x/gov/types/v1/params.go @@ -25,11 +25,9 @@ var ( DefaultExpeditedThreshold = sdk.NewDecWithPrec(667, 3) DefaultVetoThreshold = sdk.NewDecWithPrec(334, 3) DefaultMinInitialDepositRatio = sdk.ZeroDec() - DefaultBurnProposalPrevote = false // set to false to replicate behavior of when this change was made (0.47) - DefaultBurnVoteQuorom = false // set to false to replicate behavior of when this change was made (0.47) - DefaultBurnVoteVeto = true // set to true to replicate behavior of when this change was made (0.47) - DefaultMinDepositRatio = sdk.MustNewDecFromStr("0.01") // NOTE: backport from v50 - + DefaultBurnProposalPrevote = false // set to false to replicate behavior of when this change was made (0.47) + DefaultBurnVoteQuorom = false // set to false to replicate behavior of when this change was made (0.47) + DefaultBurnVoteVeto = true // set to true to replicate behavior of when this change was made (0.47) ) // Deprecated: NewDepositParams creates a new DepositParams object @@ -59,7 +57,7 @@ func NewVotingParams(votingPeriod *time.Duration) VotingParams { // NewParams creates a new Params instance with given values. func NewParams( minDeposit, expeditedminDeposit sdk.Coins, maxDepositPeriod, votingPeriod, expeditedVotingPeriod time.Duration, - quorum, threshold, expeditedThreshold, vetoThreshold, minInitialDepositRatio string, burnProposalDeposit, burnVoteQuorum, burnVoteVeto bool, minDepositRatio string, + quorum, threshold, expeditedThreshold, vetoThreshold, minInitialDepositRatio string, burnProposalDeposit, burnVoteQuorum, burnVoteVeto bool, ) Params { return Params{ MinDeposit: minDeposit, @@ -75,7 +73,6 @@ func NewParams( BurnProposalDepositPrevote: burnProposalDeposit, BurnVoteQuorum: burnVoteQuorum, BurnVoteVeto: burnVoteVeto, - MinDepositRatio: minDepositRatio, } } @@ -95,7 +92,6 @@ func DefaultParams() Params { DefaultBurnProposalPrevote, DefaultBurnVoteQuorom, DefaultBurnVoteVeto, - DefaultMinDepositRatio.String(), ) }