diff --git a/README.md b/README.md index 06cb11dc..c22874dc 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ · Integration Guide · - Code Audit - + Code Audit


diff --git a/audit/alliance-audit-v1.0.pdf b/audit/alliance-audit-v1.0.pdf new file mode 100644 index 00000000..06b15436 Binary files /dev/null and b/audit/alliance-audit-v1.0.pdf differ diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index 2912e7ab..8640ca0f 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -644,6 +644,7 @@ GenesisState defines the module's genesis state. | `take_rate` | [string](#string) | | | | `reward_change_rate` | [string](#string) | | | | `reward_change_interval` | [google.protobuf.Duration](#google.protobuf.Duration) | | | +| `reward_weight_range` | [RewardWeightRange](#alliance.alliance.RewardWeightRange) | | set a bound of weight range to limit how much reward weights can scale. | @@ -1368,6 +1369,7 @@ Params | `take_rate` | [string](#string) | | | | `reward_change_rate` | [string](#string) | | | | `reward_change_interval` | [google.protobuf.Duration](#google.protobuf.Duration) | | | +| `reward_weight_range` | [RewardWeightRange](#alliance.alliance.RewardWeightRange) | | set a bound of weight range to limit how much reward weights can scale. | diff --git a/proto/alliance/alliance/gov.proto b/proto/alliance/alliance/gov.proto index 9317582c..541ded98 100644 --- a/proto/alliance/alliance/gov.proto +++ b/proto/alliance/alliance/gov.proto @@ -80,6 +80,10 @@ message MsgUpdateAllianceProposal { (gogoproto.stdduration) = true ]; + // set a bound of weight range to limit how much reward weights can scale. + RewardWeightRange reward_weight_range = 8 [ + (gogoproto.nullable) = false + ]; } message MsgDeleteAllianceProposal { diff --git a/proto/alliance/alliance/tx.proto b/proto/alliance/alliance/tx.proto index 01d18761..611b5287 100644 --- a/proto/alliance/alliance/tx.proto +++ b/proto/alliance/alliance/tx.proto @@ -157,6 +157,11 @@ message MsgUpdateAlliance { (gogoproto.nullable) = false, (gogoproto.stdduration) = true ]; + + // set a bound of weight range to limit how much reward weights can scale. + RewardWeightRange reward_weight_range = 7 [ + (gogoproto.nullable) = false + ]; } message MsgUpdateAllianceResponse {} diff --git a/x/alliance/client/cli/gov.go b/x/alliance/client/cli/gov.go index af7917dc..06160085 100644 --- a/x/alliance/client/cli/gov.go +++ b/x/alliance/client/cli/gov.go @@ -118,7 +118,7 @@ func CreateAlliance() *cobra.Command { func UpdateAlliance() *cobra.Command { cmd := &cobra.Command{ - Use: "update-alliance denom reward-weight take-rate reward-change-rate reward-change-interval", + Use: "update-alliance denom reward-weight reward-weight-min reward-weight-max take-rate reward-change-rate reward-change-interval", Args: cobra.ExactArgs(5), Short: "Update an alliance with the specified parameters", RunE: func(cmd *cobra.Command, args []string) error { @@ -143,6 +143,16 @@ func UpdateAlliance() *cobra.Command { return err } + rewardWeightMin, err := sdk.NewDecFromStr(args[2]) + if err != nil { + return err + } + + rewardWeightMax, err := sdk.NewDecFromStr(args[3]) + if err != nil { + return err + } + takeRate, err := sdk.NewDecFromStr(args[2]) if err != nil { return err @@ -175,6 +185,10 @@ func UpdateAlliance() *cobra.Command { description, denom, rewardWeight, + types.RewardWeightRange{ + Min: rewardWeightMin, + Max: rewardWeightMax, + }, takeRate, rewardChangeRate, rewardChangeInterval, diff --git a/x/alliance/keeper/asset.go b/x/alliance/keeper/asset.go index a2cd662c..a8ccbcec 100644 --- a/x/alliance/keeper/asset.go +++ b/x/alliance/keeper/asset.go @@ -82,6 +82,7 @@ func (k Keeper) UpdateAllianceAsset(ctx sdk.Context, newAsset types.AllianceAsse asset.RewardChangeRate = newAsset.RewardChangeRate asset.RewardChangeInterval = newAsset.RewardChangeInterval asset.LastRewardChangeTime = newAsset.LastRewardChangeTime + asset.RewardWeightRange = newAsset.RewardWeightRange k.SetAsset(ctx, asset) return nil diff --git a/x/alliance/keeper/msg_server.go b/x/alliance/keeper/msg_server.go index cb1484e3..52b2f4e9 100644 --- a/x/alliance/keeper/msg_server.go +++ b/x/alliance/keeper/msg_server.go @@ -189,6 +189,7 @@ func (m MsgServer) UpdateAlliance(ctx context.Context, msg *types.MsgUpdateAllia if !found { return nil, types.ErrUnknownAsset } + asset.RewardWeightRange = msg.RewardWeightRange if asset.RewardWeightRange.Min.GT(msg.RewardWeight) || asset.RewardWeightRange.Max.LT(msg.RewardWeight) { return nil, types.ErrRewardWeightOutOfBound } diff --git a/x/alliance/keeper/proposal.go b/x/alliance/keeper/proposal.go index 25f0cdf2..c99ab900 100644 --- a/x/alliance/keeper/proposal.go +++ b/x/alliance/keeper/proposal.go @@ -28,6 +28,7 @@ func (k Keeper) UpdateAlliance(ctx context.Context, req *types.MsgUpdateAlliance RewardWeight: req.RewardWeight, TakeRate: req.TakeRate, RewardChangeRate: req.RewardChangeRate, + RewardWeightRange: req.RewardWeightRange, RewardChangeInterval: req.RewardChangeInterval, }) return err diff --git a/x/alliance/keeper/tests/asset_test.go b/x/alliance/keeper/tests/asset_test.go index 1d8130e8..4e4269f3 100644 --- a/x/alliance/keeper/tests/asset_test.go +++ b/x/alliance/keeper/tests/asset_test.go @@ -741,6 +741,7 @@ func TestRewardWeightDecay(t *testing.T) { Description: "", Denom: AllianceDenom, RewardWeight: sdk.MustNewDecFromStr("0.5"), + RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, TakeRate: sdk.ZeroDec(), RewardChangeRate: sdk.ZeroDec(), RewardChangeInterval: 0, @@ -753,6 +754,7 @@ func TestRewardWeightDecay(t *testing.T) { Description: "", Denom: AllianceDenom, RewardWeight: sdk.MustNewDecFromStr("0.5"), + RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, TakeRate: sdk.ZeroDec(), RewardChangeRate: sdk.MustNewDecFromStr("0.1"), RewardChangeInterval: decayInterval, @@ -779,6 +781,7 @@ func TestRewardWeightDecay(t *testing.T) { Description: "", Denom: AllianceDenomTwo, RewardWeight: sdk.MustNewDecFromStr("0.5"), + RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, TakeRate: sdk.ZeroDec(), RewardChangeRate: sdk.MustNewDecFromStr("0.1"), RewardChangeInterval: decayInterval, @@ -1113,6 +1116,7 @@ func TestRewardWeightRateChange(t *testing.T) { Description: "", Denom: alliance.Denom, RewardWeight: alliance.RewardWeight, + RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, TakeRate: alliance.TakeRate, RewardChangeRate: sdk.MustNewDecFromStr("1.001"), RewardChangeInterval: time.Minute * 5, diff --git a/x/alliance/keeper/tests/proposal_test.go b/x/alliance/keeper/tests/proposal_test.go index 15148739..8d5a7324 100644 --- a/x/alliance/keeper/tests/proposal_test.go +++ b/x/alliance/keeper/tests/proposal_test.go @@ -106,10 +106,14 @@ func TestUpdateAlliance(t *testing.T) { // WHEN updateErr := app.AllianceKeeper.UpdateAlliance(ctx, &types.MsgUpdateAllianceProposal{ - Title: "", - Description: "", - Denom: "uluna", - RewardWeight: sdk.NewDec(6), + Title: "", + Description: "", + Denom: "uluna", + RewardWeight: sdk.NewDec(11), + RewardWeightRange: types.RewardWeightRange{ + Min: sdk.NewDec(0), + Max: sdk.NewDec(11), + }, TakeRate: sdk.NewDec(7), RewardChangeInterval: 0, RewardChangeRate: sdk.ZeroDec(), @@ -123,8 +127,8 @@ func TestUpdateAlliance(t *testing.T) { Alliances: []types.AllianceAsset{ { Denom: "uluna", - RewardWeight: sdk.NewDec(6), - RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(10)}, + RewardWeight: sdk.NewDec(11), + RewardWeightRange: types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(11)}, TakeRate: sdk.NewDec(7), TotalTokens: sdk.ZeroInt(), TotalValidatorShares: sdk.NewDec(0), diff --git a/x/alliance/types/gov.go b/x/alliance/types/gov.go index 1f87dc94..18387845 100644 --- a/x/alliance/types/gov.go +++ b/x/alliance/types/gov.go @@ -85,7 +85,7 @@ func (m *MsgCreateAllianceProposal) ValidateBasic() error { return nil } -func NewMsgUpdateAllianceProposal(title, description, denom string, rewardWeight, takeRate sdk.Dec, rewardChangeRate sdk.Dec, rewardChangeInterval time.Duration) govtypes.Content { +func NewMsgUpdateAllianceProposal(title, description, denom string, rewardWeight sdk.Dec, rewardWeightRange RewardWeightRange, takeRate sdk.Dec, rewardChangeRate sdk.Dec, rewardChangeInterval time.Duration) govtypes.Content { return &MsgUpdateAllianceProposal{ Title: title, Description: description, @@ -94,6 +94,7 @@ func NewMsgUpdateAllianceProposal(title, description, denom string, rewardWeight TakeRate: takeRate, RewardChangeRate: rewardChangeRate, RewardChangeInterval: rewardChangeInterval, + RewardWeightRange: rewardWeightRange, } } func (m *MsgUpdateAllianceProposal) GetTitle() string { return m.Title } @@ -122,6 +123,19 @@ func (m *MsgUpdateAllianceProposal) ValidateBasic() error { return status.Errorf(codes.InvalidArgument, "Alliance rewardChangeInterval must be strictly a positive number") } + if m.RewardWeightRange.Min.IsNil() || m.RewardWeightRange.Min.LT(sdk.ZeroDec()) || + m.RewardWeightRange.Max.IsNil() || m.RewardWeightRange.Max.LT(sdk.ZeroDec()) { + return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight min and max must be zero or a positive number") + } + + if m.RewardWeightRange.Min.GT(m.RewardWeightRange.Max) { + return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight min must be less or equal to rewardWeight max") + } + + if m.RewardWeight.LT(m.RewardWeightRange.Min) || m.RewardWeight.GT(m.RewardWeightRange.Max) { + return status.Errorf(codes.InvalidArgument, "Alliance rewardWeight must be bounded in RewardWeightRange") + } + return nil } diff --git a/x/alliance/types/gov.pb.go b/x/alliance/types/gov.pb.go index 21b3892b..3d0610e6 100644 --- a/x/alliance/types/gov.pb.go +++ b/x/alliance/types/gov.pb.go @@ -95,6 +95,8 @@ type MsgUpdateAllianceProposal struct { TakeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=take_rate,json=takeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"take_rate"` RewardChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_change_rate"` RewardChangeInterval time.Duration `protobuf:"bytes,7,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` + // set a bound of weight range to limit how much reward weights can scale. + RewardWeightRange RewardWeightRange `protobuf:"bytes,8,opt,name=reward_weight_range,json=rewardWeightRange,proto3" json:"reward_weight_range"` } func (m *MsgUpdateAllianceProposal) Reset() { *m = MsgUpdateAllianceProposal{} } @@ -180,38 +182,37 @@ func init() { func init() { proto.RegisterFile("alliance/alliance/gov.proto", fileDescriptor_c66988d3be8665d9) } var fileDescriptor_c66988d3be8665d9 = []byte{ - // 483 bytes of a gzipped FileDescriptorProto + // 480 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x94, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x6d, 0x9a, 0x94, 0xf4, 0x5a, 0xa4, 0xf6, 0x88, 0x90, 0x5b, 0x24, 0x3b, 0x8a, 0x50, - 0xd5, 0xa5, 0x67, 0x04, 0x5b, 0x37, 0xdc, 0x2c, 0x80, 0x90, 0x90, 0x11, 0x42, 0x54, 0x48, 0xd1, + 0x14, 0xc7, 0x6d, 0x48, 0x4a, 0x7a, 0x2d, 0x52, 0x7b, 0x44, 0xc8, 0x2d, 0x92, 0x1d, 0x45, 0xa8, + 0xea, 0xd2, 0x33, 0x82, 0xad, 0x1b, 0x69, 0x16, 0x40, 0x48, 0xe8, 0x10, 0x42, 0x54, 0x48, 0xd1, 0xc5, 0x7e, 0x5c, 0xac, 0x9e, 0x7d, 0xd6, 0xf9, 0xd2, 0x92, 0x0f, 0x80, 0xc4, 0xc8, 0xc8, 0xd8, - 0x0f, 0xc2, 0x07, 0xe8, 0xd8, 0x11, 0x31, 0x84, 0x2a, 0x59, 0x98, 0xf9, 0x04, 0xe8, 0xce, 0x4e, - 0xe3, 0xd2, 0x2d, 0x03, 0x03, 0x62, 0xca, 0xbb, 0xf7, 0x7f, 0xf9, 0xdd, 0xe9, 0xff, 0x7f, 0x32, - 0xba, 0x4f, 0x39, 0x4f, 0x68, 0x16, 0x81, 0x7f, 0x55, 0x30, 0x71, 0x42, 0x72, 0x29, 0x94, 0xc0, - 0x5b, 0xf3, 0x1e, 0x99, 0x17, 0x3b, 0x9d, 0x9b, 0xf3, 0x57, 0x43, 0xe6, 0x4f, 0x3b, 0x6d, 0x26, - 0x98, 0x30, 0xa5, 0xaf, 0xab, 0xaa, 0xeb, 0x32, 0x21, 0x18, 0x07, 0xdf, 0x9c, 0x06, 0xa3, 0xf7, - 0x7e, 0x3c, 0x92, 0x54, 0x25, 0x22, 0x2b, 0xf5, 0xee, 0xd7, 0x06, 0xda, 0x7e, 0x51, 0xb0, 0x43, - 0x09, 0x54, 0xc1, 0x93, 0x8a, 0xf8, 0x52, 0x8a, 0x5c, 0x14, 0x94, 0xe3, 0x36, 0x6a, 0xaa, 0x44, - 0x71, 0x70, 0xec, 0x8e, 0xbd, 0xb7, 0x16, 0x96, 0x07, 0xdc, 0x41, 0xeb, 0x31, 0x14, 0x91, 0x4c, - 0x72, 0x0d, 0x72, 0x6e, 0x19, 0xad, 0xde, 0xc2, 0xbb, 0xa8, 0x19, 0x43, 0x26, 0x52, 0x67, 0x45, - 0x6b, 0xc1, 0xe6, 0xaf, 0x89, 0xb7, 0x31, 0xa6, 0x29, 0x3f, 0xe8, 0x9a, 0x76, 0x37, 0x2c, 0x65, - 0xfc, 0x0a, 0xdd, 0x91, 0x70, 0x4a, 0x65, 0xdc, 0x3f, 0x85, 0x84, 0x0d, 0x95, 0xd3, 0x30, 0xf3, - 0xe4, 0x7c, 0xe2, 0x59, 0xdf, 0x27, 0xde, 0x2e, 0x4b, 0xd4, 0x70, 0x34, 0x20, 0x91, 0x48, 0xfd, - 0x48, 0x14, 0xa9, 0x28, 0xaa, 0x9f, 0xfd, 0x22, 0x3e, 0xf6, 0xd5, 0x38, 0x87, 0x82, 0xf4, 0x20, - 0x0a, 0x37, 0x4a, 0xc8, 0x1b, 0xc3, 0xc0, 0xcf, 0xd1, 0x9a, 0xa2, 0xc7, 0xd0, 0x97, 0x54, 0x81, - 0xd3, 0x5c, 0x0a, 0xd8, 0xd2, 0x80, 0x90, 0x2a, 0xc0, 0xef, 0x10, 0xae, 0x5e, 0x18, 0x0d, 0x69, - 0xc6, 0x2a, 0xea, 0xea, 0x52, 0xd4, 0xcd, 0x92, 0x74, 0x68, 0x40, 0x86, 0xfe, 0x16, 0xdd, 0xbb, - 0x4e, 0x4f, 0x32, 0x05, 0xf2, 0x84, 0x72, 0xe7, 0x76, 0xc7, 0xde, 0x5b, 0x7f, 0xb4, 0x4d, 0xca, - 0xf8, 0xc8, 0x3c, 0x3e, 0xd2, 0xab, 0xe2, 0x0b, 0x5a, 0xfa, 0xf2, 0x2f, 0x3f, 0x3c, 0x3b, 0x6c, - 0xd7, 0xb1, 0x4f, 0x2b, 0x00, 0x3e, 0x42, 0x77, 0xaf, 0x59, 0xdb, 0x97, 0x5a, 0x76, 0x5a, 0x86, - 0xfb, 0x80, 0xdc, 0xd8, 0x30, 0x12, 0xd6, 0x3c, 0x0c, 0xf5, 0x6c, 0xd0, 0xd0, 0x57, 0x84, 0x5b, - 0xf2, 0x4f, 0xe1, 0xa0, 0xf5, 0xe9, 0xcc, 0xb3, 0x7e, 0x9e, 0x79, 0x56, 0xf7, 0x72, 0xc5, 0xac, - 0xcf, 0xeb, 0x3c, 0xfe, 0xbf, 0x3e, 0xff, 0xd2, 0xfa, 0xd4, 0x22, 0xfe, 0x68, 0x9b, 0x88, 0x7b, - 0xc0, 0xe1, 0xef, 0x47, 0xbc, 0x78, 0x47, 0xf0, 0xec, 0x7c, 0xea, 0xda, 0x17, 0x53, 0xd7, 0xbe, - 0x9c, 0xba, 0xf6, 0xe7, 0x99, 0x6b, 0x5d, 0xcc, 0x5c, 0xeb, 0xdb, 0xcc, 0xb5, 0x8e, 0x1e, 0xd6, - 0x0c, 0x54, 0x20, 0x25, 0xdd, 0x4f, 0x45, 0x06, 0xe3, 0xc5, 0x97, 0xf2, 0xc3, 0xa2, 0x34, 0x76, - 0x0e, 0x56, 0x8d, 0x21, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x42, 0x52, 0xc4, 0x1c, 0x86, - 0x05, 0x00, 0x00, + 0x0f, 0xc2, 0x07, 0xe8, 0xd8, 0x11, 0x31, 0x04, 0x94, 0x2c, 0xcc, 0x7c, 0x02, 0x74, 0x67, 0xa7, + 0x49, 0xe9, 0x44, 0x87, 0x4e, 0x99, 0xf2, 0xee, 0xfd, 0x5f, 0x7e, 0x77, 0x7a, 0xff, 0xbf, 0x8c, + 0x1e, 0x30, 0x21, 0x12, 0x96, 0x45, 0x10, 0x5e, 0x14, 0x5c, 0x1e, 0x93, 0x5c, 0x49, 0x2d, 0xf1, + 0xe6, 0xac, 0x47, 0x66, 0xc5, 0x76, 0xeb, 0xea, 0xfc, 0xc5, 0x90, 0xfd, 0xd3, 0x76, 0x93, 0x4b, + 0x2e, 0x6d, 0x19, 0x9a, 0xaa, 0xea, 0xfa, 0x5c, 0x4a, 0x2e, 0x20, 0xb4, 0xa7, 0xfe, 0xf0, 0x43, + 0x18, 0x0f, 0x15, 0xd3, 0x89, 0xcc, 0x4a, 0xbd, 0xfd, 0xad, 0x86, 0xb6, 0x5e, 0x16, 0xfc, 0x40, + 0x01, 0xd3, 0xf0, 0xb4, 0x22, 0xbe, 0x52, 0x32, 0x97, 0x05, 0x13, 0xb8, 0x89, 0xea, 0x3a, 0xd1, + 0x02, 0x3c, 0xb7, 0xe5, 0xee, 0xae, 0xd2, 0xf2, 0x80, 0x5b, 0x68, 0x2d, 0x86, 0x22, 0x52, 0x49, + 0x6e, 0x40, 0xde, 0x2d, 0xab, 0x2d, 0xb6, 0xf0, 0x0e, 0xaa, 0xc7, 0x90, 0xc9, 0xd4, 0xbb, 0x6d, + 0xb4, 0xce, 0xc6, 0x9f, 0x71, 0xb0, 0x3e, 0x62, 0xa9, 0xd8, 0x6f, 0xdb, 0x76, 0x9b, 0x96, 0x32, + 0x7e, 0x8d, 0xee, 0x2a, 0x38, 0x61, 0x2a, 0xee, 0x9d, 0x40, 0xc2, 0x07, 0xda, 0xab, 0xd9, 0x79, + 0x72, 0x36, 0x0e, 0x9c, 0x1f, 0xe3, 0x60, 0x87, 0x27, 0x7a, 0x30, 0xec, 0x93, 0x48, 0xa6, 0x61, + 0x24, 0x8b, 0x54, 0x16, 0xd5, 0xcf, 0x5e, 0x11, 0x1f, 0x85, 0x7a, 0x94, 0x43, 0x41, 0xba, 0x10, + 0xd1, 0xf5, 0x12, 0xf2, 0xd6, 0x32, 0xf0, 0x0b, 0xb4, 0xaa, 0xd9, 0x11, 0xf4, 0x14, 0xd3, 0xe0, + 0xd5, 0xaf, 0x05, 0x6c, 0x18, 0x00, 0x65, 0x1a, 0xf0, 0x7b, 0x84, 0xab, 0x17, 0x46, 0x03, 0x96, + 0xf1, 0x8a, 0xba, 0x72, 0x2d, 0xea, 0x46, 0x49, 0x3a, 0xb0, 0x20, 0x4b, 0x7f, 0x87, 0xee, 0x5f, + 0xa6, 0x27, 0x99, 0x06, 0x75, 0xcc, 0x84, 0x77, 0xa7, 0xe5, 0xee, 0xae, 0x3d, 0xde, 0x22, 0xa5, + 0x7d, 0x64, 0x66, 0x1f, 0xe9, 0x56, 0xf6, 0x75, 0x1a, 0xe6, 0xf2, 0xaf, 0x3f, 0x03, 0x97, 0x36, + 0x17, 0xb1, 0xcf, 0x2a, 0x00, 0x3e, 0x44, 0xf7, 0x2e, 0xad, 0xb6, 0xa7, 0x8c, 0xec, 0x35, 0x2c, + 0xf7, 0x21, 0xb9, 0x92, 0x30, 0x42, 0x17, 0x76, 0x48, 0xcd, 0x6c, 0xa7, 0x66, 0xae, 0xa0, 0x9b, + 0xea, 0x5f, 0x61, 0xbf, 0xf1, 0xf9, 0x34, 0x70, 0x7e, 0x9f, 0x06, 0xce, 0x2c, 0x3e, 0x6f, 0xf2, + 0x78, 0x19, 0x9f, 0x65, 0x7c, 0xfe, 0x3b, 0x3e, 0x9f, 0x5c, 0x1b, 0x9f, 0x2e, 0x08, 0xb8, 0xf9, + 0xf8, 0xcc, 0xdf, 0xd1, 0x79, 0x7e, 0x36, 0xf1, 0xdd, 0xf3, 0x89, 0xef, 0xfe, 0x9a, 0xf8, 0xee, + 0x97, 0xa9, 0xef, 0x9c, 0x4f, 0x7d, 0xe7, 0xfb, 0xd4, 0x77, 0x0e, 0x1f, 0x2d, 0x98, 0xa3, 0x41, + 0x29, 0xb6, 0x97, 0xca, 0x0c, 0x46, 0xf3, 0xaf, 0xf0, 0xc7, 0x79, 0x69, 0xad, 0xea, 0xaf, 0xd8, + 0x65, 0x3f, 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xec, 0xc4, 0xec, 0x59, 0xe2, 0x05, 0x00, 0x00, } func (m *MsgCreateAllianceProposal) Marshal() (dAtA []byte, err error) { @@ -326,12 +327,22 @@ func (m *MsgUpdateAllianceProposal) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - n3, err3 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RewardChangeInterval, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval):]) - if err3 != nil { - return 0, err3 + { + size, err := m.RewardWeightRange.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGov(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + n4, err4 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RewardChangeInterval, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval):]) + if err4 != nil { + return 0, err4 } - i -= n3 - i = encodeVarintGov(dAtA, i, uint64(n3)) + i -= n4 + i = encodeVarintGov(dAtA, i, uint64(n4)) i-- dAtA[i] = 0x3a { @@ -500,6 +511,8 @@ func (m *MsgUpdateAllianceProposal) Size() (n int) { n += 1 + l + sovGov(uint64(l)) l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval) n += 1 + l + sovGov(uint64(l)) + l = m.RewardWeightRange.Size() + n += 1 + l + sovGov(uint64(l)) return n } @@ -1104,6 +1117,39 @@ func (m *MsgUpdateAllianceProposal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardWeightRange", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGov + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGov + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGov + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.RewardWeightRange.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGov(dAtA[iNdEx:]) diff --git a/x/alliance/types/tests/types_test.go b/x/alliance/types/tests/types_test.go index 03281623..42943b05 100644 --- a/x/alliance/types/tests/types_test.go +++ b/x/alliance/types/tests/types_test.go @@ -62,11 +62,11 @@ func TestProposalsContent(t *testing.T) { str: "title:\"Alliance1\" description:\"Alliance with 1\" denom:\"ibc/denom1\" reward_weight:\"1000000000000000000\" take_rate:\"1000000000000000000\" reward_change_rate:\"1000000000000000000\" reward_change_interval: reward_weight_range: ", }, "msg_update_alliance_proposal": { - p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), sdk.NewDec(2), sdk.NewDec(2), time.Hour), + p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, sdk.NewDec(2), sdk.NewDec(2), time.Hour), title: "Alliance2", desc: "Alliance with 2", typ: "msg_update_alliance_proposal", - str: "title:\"Alliance2\" description:\"Alliance with 2\" denom:\"ibc/denom2\" reward_weight:\"2000000000000000000\" take_rate:\"2000000000000000000\" reward_change_rate:\"2000000000000000000\" reward_change_interval: ", + str: "title:\"Alliance2\" description:\"Alliance with 2\" denom:\"ibc/denom2\" reward_weight:\"2000000000000000000\" take_rate:\"2000000000000000000\" reward_change_rate:\"2000000000000000000\" reward_change_interval: reward_weight_range: ", }, "msg_delete_alliance_proposal": { p: types.NewMsgDeleteAllianceProposal("test", "abcd", "ibc/denom"), @@ -130,7 +130,7 @@ func TestInvalidProposalsContent(t *testing.T) { typ: "msg_create_alliance_proposal", }, "msg_update_alliance_proposal": { - p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), sdk.NewDec(2), sdk.NewDec(2), -time.Hour), + p: types.NewMsgUpdateAllianceProposal("Alliance2", "Alliance with 2", "ibc/denom2", sdk.NewDec(2), types.RewardWeightRange{Min: sdk.NewDec(0), Max: sdk.NewDec(5)}, sdk.NewDec(2), sdk.NewDec(2), -time.Hour), title: "Alliance2", desc: "Alliance with 2", typ: "msg_update_alliance_proposal", diff --git a/x/alliance/types/tx.pb.go b/x/alliance/types/tx.pb.go index 3417d71d..a82b5f96 100644 --- a/x/alliance/types/tx.pb.go +++ b/x/alliance/types/tx.pb.go @@ -550,6 +550,8 @@ type MsgUpdateAlliance struct { TakeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=take_rate,json=takeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"take_rate"` RewardChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=reward_change_rate,json=rewardChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"reward_change_rate"` RewardChangeInterval time.Duration `protobuf:"bytes,6,opt,name=reward_change_interval,json=rewardChangeInterval,proto3,stdduration" json:"reward_change_interval"` + // set a bound of weight range to limit how much reward weights can scale. + RewardWeightRange RewardWeightRange `protobuf:"bytes,7,opt,name=reward_weight_range,json=rewardWeightRange,proto3" json:"reward_weight_range"` } func (m *MsgUpdateAlliance) Reset() { *m = MsgUpdateAlliance{} } @@ -606,6 +608,13 @@ func (m *MsgUpdateAlliance) GetRewardChangeInterval() time.Duration { return 0 } +func (m *MsgUpdateAlliance) GetRewardWeightRange() RewardWeightRange { + if m != nil { + return m.RewardWeightRange + } + return RewardWeightRange{} +} + type MsgUpdateAllianceResponse struct { } @@ -752,66 +761,66 @@ func init() { func init() { proto.RegisterFile("alliance/alliance/tx.proto", fileDescriptor_caddd4794042022d) } var fileDescriptor_caddd4794042022d = []byte{ - // 941 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x97, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0xe3, 0xb6, 0x1b, 0xda, 0xd9, 0xee, 0xd2, 0xba, 0xed, 0x36, 0x35, 0x92, 0x13, 0x42, - 0x54, 0xaa, 0xd5, 0xd6, 0xa6, 0x0b, 0x02, 0xa9, 0xb7, 0x4d, 0xc3, 0x81, 0x1f, 0x91, 0x90, 0x2b, - 0x04, 0xac, 0x10, 0xd1, 0xc4, 0x1e, 0x1c, 0x6b, 0x6d, 0x4f, 0x34, 0x33, 0xc9, 0x6e, 0x24, 0x4e, - 0x70, 0xe1, 0x88, 0x38, 0x71, 0x41, 0x2c, 0xff, 0x01, 0x07, 0x4e, 0xfc, 0x05, 0x7b, 0x5c, 0x71, - 0x42, 0x1c, 0xb2, 0xa8, 0x3d, 0xc0, 0x99, 0x03, 0x67, 0x34, 0x9e, 0xb1, 0x63, 0x27, 0xf6, 0x26, - 0xbb, 0x42, 0xc0, 0x4a, 0x3d, 0xc5, 0xf6, 0x7b, 0xf3, 0x99, 0x37, 0xdf, 0xf7, 0xe6, 0xcd, 0x04, - 0x68, 0xd0, 0xf7, 0x3d, 0x18, 0xda, 0xc8, 0x4c, 0x1e, 0xd8, 0x3d, 0xa3, 0x4f, 0x30, 0xc3, 0xea, - 0x66, 0xfc, 0xc9, 0x88, 0x1f, 0xb4, 0x6d, 0x17, 0xbb, 0x38, 0xb2, 0x9a, 0xfc, 0x49, 0x38, 0x6a, - 0x7b, 0x36, 0xa6, 0x01, 0xa6, 0x1d, 0x61, 0x10, 0x2f, 0xd2, 0xb4, 0x2b, 0xde, 0xcc, 0x80, 0xba, - 0xe6, 0xf0, 0x88, 0xff, 0x48, 0x83, 0x2e, 0x0d, 0x5d, 0x48, 0x91, 0x39, 0x3c, 0xea, 0x22, 0x06, - 0x8f, 0x4c, 0x1b, 0x7b, 0x61, 0x6c, 0x9f, 0x0d, 0xac, 0x0f, 0x09, 0x0c, 0x62, 0x70, 0x6d, 0xd6, - 0x9e, 0x84, 0x2b, 0x09, 0x2e, 0xc6, 0xae, 0x8f, 0xcc, 0xe8, 0xad, 0x3b, 0xf8, 0xd4, 0x74, 0x06, - 0x04, 0x32, 0x0f, 0xcb, 0x19, 0xea, 0xdf, 0x2d, 0x81, 0xcb, 0x6d, 0xea, 0xb6, 0x90, 0x8f, 0x5c, - 0xc8, 0x90, 0xfa, 0x26, 0xd8, 0x74, 0xc4, 0x33, 0x26, 0x1d, 0xe8, 0x38, 0x04, 0x51, 0x5a, 0x51, - 0x6a, 0xca, 0xc1, 0x5a, 0xb3, 0xf2, 0xf3, 0x8f, 0x87, 0xdb, 0x72, 0x5d, 0xb7, 0x84, 0xe5, 0x94, - 0x11, 0x2f, 0x74, 0xad, 0x8d, 0x64, 0x88, 0xfc, 0xce, 0x31, 0x43, 0xe8, 0x7b, 0x4e, 0x06, 0xb3, - 0x34, 0x0f, 0x93, 0x0c, 0x89, 0x31, 0x5d, 0x50, 0x86, 0x01, 0x1e, 0x84, 0xac, 0xb2, 0x5c, 0x53, - 0x0e, 0x2e, 0xdf, 0xdc, 0x33, 0xe4, 0x40, 0x2e, 0x98, 0x21, 0x05, 0x33, 0x4e, 0xb0, 0x17, 0x36, - 0xcd, 0x07, 0xe3, 0x6a, 0xe9, 0xd7, 0x71, 0xf5, 0x65, 0xd7, 0x63, 0xbd, 0x41, 0xd7, 0xb0, 0x71, - 0x20, 0x93, 0x20, 0x7f, 0x0e, 0xa9, 0x73, 0xc7, 0x64, 0xa3, 0x3e, 0xa2, 0xd1, 0x00, 0x4b, 0x92, - 0x8f, 0xf5, 0x2f, 0xef, 0x57, 0x4b, 0x7f, 0xdc, 0xaf, 0x96, 0x3e, 0xff, 0xfd, 0x87, 0xeb, 0xb3, - 0x8b, 0xaf, 0xef, 0x80, 0xad, 0x94, 0x40, 0x16, 0xa2, 0x7d, 0x1c, 0x52, 0x54, 0xff, 0x7e, 0x09, - 0x5c, 0x69, 0x53, 0xf7, 0xfd, 0xd0, 0xb9, 0x90, 0xae, 0x48, 0xba, 0x5d, 0xb0, 0x93, 0x91, 0x28, - 0x11, 0xef, 0x2f, 0x21, 0x9e, 0x85, 0xfe, 0x69, 0xf1, 0xde, 0x05, 0x3b, 0x13, 0xf1, 0x28, 0xb1, - 0x17, 0x16, 0x70, 0x2b, 0x19, 0x76, 0x4a, 0xec, 0x5c, 0x9a, 0x43, 0x59, 0x42, 0x5b, 0x5e, 0x98, - 0xd6, 0xa2, 0x6c, 0x36, 0x23, 0x2b, 0xff, 0x71, 0x46, 0x26, 0xba, 0x27, 0x19, 0x79, 0xa4, 0x80, - 0xbd, 0x36, 0x75, 0x4f, 0x7c, 0xe8, 0x05, 0xb2, 0xd6, 0x3d, 0x1c, 0x5a, 0xe8, 0x2e, 0x24, 0x0e, - 0xfd, 0x9f, 0x95, 0xf6, 0x36, 0xb8, 0xe4, 0xa0, 0x10, 0x07, 0x22, 0x0d, 0x96, 0x78, 0x99, 0xbb, - 0xf4, 0x97, 0xc0, 0x8b, 0x85, 0x0b, 0x4c, 0x64, 0xf8, 0x5a, 0x01, 0xcf, 0xf3, 0x92, 0xed, 0x3b, - 0x90, 0xa1, 0xf7, 0xa2, 0x56, 0xab, 0xbe, 0x0e, 0xd6, 0xe0, 0x80, 0xf5, 0x30, 0xf1, 0xd8, 0x68, - 0xee, 0xa2, 0x27, 0xae, 0xea, 0x1b, 0xa0, 0x2c, 0x9a, 0x75, 0xb4, 0x44, 0x9e, 0xef, 0x99, 0xa3, - 0xc4, 0x10, 0x53, 0x34, 0x57, 0x78, 0xbe, 0x2d, 0xe9, 0x7e, 0x7c, 0x95, 0xaf, 0x60, 0x02, 0xaa, - 0xef, 0x81, 0xdd, 0xa9, 0x98, 0x92, 0x78, 0x7f, 0x5a, 0x01, 0x9b, 0x7c, 0x55, 0x04, 0x41, 0x86, - 0x6e, 0x49, 0xea, 0x53, 0x47, 0xbc, 0x1f, 0x0b, 0x2b, 0x72, 0xb2, 0xf1, 0xe7, 0xb8, 0xba, 0x3e, - 0x82, 0x81, 0x7f, 0x5c, 0x8f, 0x3e, 0xd7, 0xa5, 0xd4, 0xea, 0x29, 0xb8, 0x42, 0x22, 0xe1, 0x3a, - 0x77, 0x91, 0xe7, 0xf6, 0x98, 0xdc, 0x0f, 0x86, 0xac, 0xda, 0xfd, 0x05, 0xaa, 0xb6, 0x85, 0x6c, - 0x6b, 0x5d, 0x40, 0x3e, 0x88, 0x18, 0xea, 0x3b, 0x60, 0x8d, 0xc1, 0x3b, 0xa8, 0x43, 0x20, 0x43, - 0xd1, 0x0e, 0x79, 0x72, 0xe0, 0x2a, 0x07, 0x58, 0xbc, 0x9d, 0x7c, 0x0c, 0x54, 0x19, 0xa1, 0xdd, - 0x83, 0xa1, 0x2b, 0xa9, 0x97, 0x9e, 0x8a, 0xba, 0x21, 0x48, 0x27, 0x11, 0x28, 0xa2, 0x7f, 0x04, - 0xae, 0x65, 0xe9, 0x5e, 0xc8, 0x10, 0x19, 0x42, 0xbf, 0x52, 0x96, 0x99, 0x16, 0xa7, 0xae, 0x11, - 0x9f, 0xba, 0x46, 0x4b, 0x9e, 0xba, 0xcd, 0x55, 0x3e, 0xf9, 0x37, 0x8f, 0xaa, 0x8a, 0xb5, 0x9d, - 0xc6, 0xbe, 0x25, 0x01, 0xea, 0x6d, 0xb0, 0x95, 0x91, 0xb6, 0x43, 0xb8, 0xb9, 0xf2, 0x5c, 0xc4, - 0x6d, 0xe4, 0x54, 0x90, 0x95, 0xd2, 0xd0, 0xe2, 0xbe, 0xb2, 0x98, 0x36, 0xc9, 0xb4, 0x61, 0xa6, - 0xae, 0x5e, 0x10, 0x5b, 0x3e, 0x53, 0x3b, 0x49, 0x65, 0x8d, 0x97, 0xa3, 0xca, 0x12, 0x55, 0x77, - 0x51, 0x59, 0xcf, 0x7c, 0x65, 0x15, 0x64, 0x3f, 0x9b, 0xdf, 0x24, 0xfb, 0x5f, 0x28, 0x51, 0xf6, - 0x79, 0xa3, 0xfc, 0xf7, 0xb2, 0x5f, 0x10, 0x62, 0x36, 0x88, 0x38, 0xc4, 0x9b, 0xdf, 0x96, 0xc1, - 0x72, 0x9b, 0xba, 0xaa, 0x05, 0x56, 0x93, 0xdb, 0xab, 0x9e, 0xb3, 0x41, 0x52, 0x97, 0x37, 0x6d, - 0xff, 0xf1, 0xf6, 0x98, 0xad, 0x7e, 0x08, 0x40, 0xea, 0x6e, 0x52, 0xcb, 0x1f, 0x35, 0xf1, 0xd0, - 0x0e, 0xe6, 0x79, 0xa4, 0xc9, 0xa9, 0x2b, 0x63, 0x01, 0x79, 0xe2, 0x51, 0x44, 0x9e, 0xbd, 0x53, - 0xa9, 0x9f, 0x81, 0x6b, 0x05, 0xa7, 0xf7, 0x8d, 0x7c, 0x46, 0xbe, 0xb7, 0xf6, 0xda, 0x93, 0x78, - 0x27, 0xb3, 0x7f, 0x02, 0xd6, 0x33, 0x87, 0x66, 0xbd, 0x20, 0xee, 0x94, 0x8f, 0x76, 0x7d, 0xbe, - 0x4f, 0xc2, 0x77, 0xc0, 0xd5, 0xa9, 0x43, 0xae, 0x51, 0x10, 0x67, 0xc6, 0x4b, 0xbb, 0xb1, 0x88, - 0x57, 0x7a, 0x96, 0xa9, 0x86, 0xd7, 0x78, 0x5c, 0x8c, 0xf3, 0x66, 0xc9, 0xdf, 0x5c, 0x7c, 0x96, - 0xa9, 0x8d, 0xd5, 0x28, 0xae, 0xcb, 0xf9, 0xb3, 0xe4, 0xef, 0x8f, 0xe6, 0xdb, 0x0f, 0xce, 0x74, - 0xe5, 0xe1, 0x99, 0xae, 0xfc, 0x76, 0xa6, 0x2b, 0x5f, 0x9d, 0xeb, 0xa5, 0x87, 0xe7, 0x7a, 0xe9, - 0x97, 0x73, 0xbd, 0x74, 0xfb, 0x95, 0x54, 0x7b, 0x62, 0x88, 0x10, 0x78, 0x18, 0xe0, 0x10, 0x8d, - 0x26, 0xff, 0x21, 0xef, 0xa5, 0xfe, 0x07, 0xf3, 0x66, 0xd5, 0x2d, 0x47, 0xed, 0xe6, 0xd5, 0xbf, - 0x03, 0x00, 0x00, 0xff, 0xff, 0xed, 0xcc, 0xf1, 0x5b, 0x29, 0x0f, 0x00, 0x00, + // 935 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0x8e, 0xdb, 0x6e, 0x68, 0x67, 0xbb, 0x4b, 0xeb, 0xb6, 0xdb, 0xc4, 0x48, 0x4e, 0x08, 0x51, + 0xa9, 0x56, 0x5b, 0x9b, 0x2e, 0x08, 0xa4, 0xde, 0x36, 0x0d, 0x07, 0x7e, 0x44, 0x42, 0xae, 0x10, + 0xb0, 0x42, 0x44, 0x13, 0x7b, 0x70, 0xac, 0xb5, 0x3d, 0xd1, 0xcc, 0x24, 0xbb, 0x91, 0x38, 0xc1, + 0x85, 0x23, 0xe2, 0xc4, 0x05, 0xb1, 0xfc, 0x07, 0x1c, 0x38, 0xf1, 0x17, 0xec, 0x71, 0xc5, 0x09, + 0x71, 0xe8, 0xa2, 0xf6, 0x00, 0x67, 0x0e, 0x9c, 0xd1, 0x78, 0xc6, 0x8e, 0x9d, 0xd8, 0x9b, 0x74, + 0x85, 0x80, 0x43, 0x4f, 0xb1, 0xfd, 0xde, 0x7c, 0xef, 0xbd, 0xef, 0x7d, 0xf3, 0x66, 0x02, 0x34, + 0xe8, 0xfb, 0x1e, 0x0c, 0x6d, 0x64, 0x26, 0x0f, 0xec, 0x81, 0x31, 0x20, 0x98, 0x61, 0x75, 0x33, + 0xfe, 0x64, 0xc4, 0x0f, 0xda, 0xb6, 0x8b, 0x5d, 0x1c, 0x59, 0x4d, 0xfe, 0x24, 0x1c, 0xb5, 0xaa, + 0x8d, 0x69, 0x80, 0x69, 0x57, 0x18, 0xc4, 0x8b, 0x34, 0xed, 0x8a, 0x37, 0x33, 0xa0, 0xae, 0x39, + 0x3a, 0xe4, 0x3f, 0xd2, 0xa0, 0x4b, 0x43, 0x0f, 0x52, 0x64, 0x8e, 0x0e, 0x7b, 0x88, 0xc1, 0x43, + 0xd3, 0xc6, 0x5e, 0x18, 0xdb, 0x67, 0x13, 0x1b, 0x40, 0x02, 0x83, 0x18, 0xb8, 0x3e, 0x6b, 0x4f, + 0xd2, 0x95, 0x08, 0x2e, 0xc6, 0xae, 0x8f, 0xcc, 0xe8, 0xad, 0x37, 0xfc, 0xd4, 0x74, 0x86, 0x04, + 0x32, 0x0f, 0xcb, 0x08, 0x8d, 0xef, 0x96, 0xc0, 0xd5, 0x0e, 0x75, 0xdb, 0xc8, 0x47, 0x2e, 0x64, + 0x48, 0x7d, 0x13, 0x6c, 0x3a, 0xe2, 0x19, 0x93, 0x2e, 0x74, 0x1c, 0x82, 0x28, 0xad, 0x28, 0x75, + 0x65, 0x7f, 0xad, 0x55, 0xf9, 0xf9, 0xc7, 0x83, 0x6d, 0x59, 0xd7, 0x1d, 0x61, 0x39, 0x61, 0xc4, + 0x0b, 0x5d, 0x6b, 0x23, 0x59, 0x22, 0xbf, 0x73, 0x98, 0x11, 0xf4, 0x3d, 0x27, 0x03, 0xb3, 0x34, + 0x0f, 0x26, 0x59, 0x12, 0xc3, 0xf4, 0x40, 0x19, 0x06, 0x78, 0x18, 0xb2, 0xca, 0x72, 0x5d, 0xd9, + 0xbf, 0x7a, 0xbb, 0x6a, 0xc8, 0x85, 0x9c, 0x30, 0x43, 0x12, 0x66, 0x1c, 0x63, 0x2f, 0x6c, 0x99, + 0x8f, 0x4e, 0x6b, 0xa5, 0x5f, 0x4f, 0x6b, 0x2f, 0xbb, 0x1e, 0xeb, 0x0f, 0x7b, 0x86, 0x8d, 0x03, + 0xd9, 0x04, 0xf9, 0x73, 0x40, 0x9d, 0x7b, 0x26, 0x1b, 0x0f, 0x10, 0x8d, 0x16, 0x58, 0x12, 0xf9, + 0x48, 0xff, 0xf2, 0x61, 0xad, 0xf4, 0xc7, 0xc3, 0x5a, 0xe9, 0xf3, 0xdf, 0x7f, 0xb8, 0x39, 0x5b, + 0x7c, 0x63, 0x07, 0x6c, 0xa5, 0x08, 0xb2, 0x10, 0x1d, 0xe0, 0x90, 0xa2, 0xc6, 0xf7, 0x4b, 0xe0, + 0x5a, 0x87, 0xba, 0xef, 0x87, 0xce, 0x25, 0x75, 0x45, 0xd4, 0xed, 0x82, 0x9d, 0x0c, 0x45, 0x09, + 0x79, 0x7f, 0x09, 0xf2, 0x2c, 0xf4, 0x4f, 0x93, 0xf7, 0x2e, 0xd8, 0x99, 0x90, 0x47, 0x89, 0xbd, + 0x30, 0x81, 0x5b, 0xc9, 0xb2, 0x13, 0x62, 0xe7, 0xa2, 0x39, 0x94, 0x25, 0x68, 0xcb, 0x0b, 0xa3, + 0xb5, 0x29, 0x9b, 0xed, 0xc8, 0xca, 0x7f, 0xdc, 0x91, 0x09, 0xef, 0x49, 0x47, 0x9e, 0x28, 0xa0, + 0xda, 0xa1, 0xee, 0xb1, 0x0f, 0xbd, 0x40, 0x6a, 0xdd, 0xc3, 0xa1, 0x85, 0xee, 0x43, 0xe2, 0xd0, + 0xff, 0x99, 0xb4, 0xb7, 0xc1, 0x15, 0x07, 0x85, 0x38, 0x10, 0x6d, 0xb0, 0xc4, 0xcb, 0xdc, 0xd2, + 0x5f, 0x02, 0x2f, 0x16, 0x16, 0x98, 0xd0, 0xf0, 0xb5, 0x02, 0x9e, 0xe7, 0x92, 0x1d, 0x38, 0x90, + 0xa1, 0xf7, 0xa2, 0x51, 0xab, 0xbe, 0x0e, 0xd6, 0xe0, 0x90, 0xf5, 0x31, 0xf1, 0xd8, 0x78, 0x6e, + 0xd1, 0x13, 0x57, 0xf5, 0x0d, 0x50, 0x16, 0xc3, 0x3a, 0x2a, 0x91, 0xf7, 0x7b, 0xe6, 0x28, 0x31, + 0x44, 0x88, 0xd6, 0x0a, 0xef, 0xb7, 0x25, 0xdd, 0x8f, 0xae, 0xf3, 0x0a, 0x26, 0x40, 0x8d, 0x2a, + 0xd8, 0x9d, 0xca, 0x29, 0xc9, 0xf7, 0xa7, 0x15, 0xb0, 0xc9, 0xab, 0x22, 0x08, 0x32, 0x74, 0x47, + 0xa2, 0x3e, 0x73, 0xc6, 0x7b, 0x31, 0xb1, 0xa2, 0x27, 0x1b, 0x7f, 0x9e, 0xd6, 0xd6, 0xc7, 0x30, + 0xf0, 0x8f, 0x1a, 0xd1, 0xe7, 0x86, 0xa4, 0x5a, 0x3d, 0x01, 0xd7, 0x48, 0x44, 0x5c, 0xf7, 0x3e, + 0xf2, 0xdc, 0x3e, 0x93, 0xfb, 0xc1, 0x90, 0xaa, 0xdd, 0x5b, 0x40, 0xb5, 0x6d, 0x64, 0x5b, 0xeb, + 0x02, 0xe4, 0x83, 0x08, 0x43, 0x7d, 0x07, 0xac, 0x31, 0x78, 0x0f, 0x75, 0x09, 0x64, 0x28, 0xda, + 0x21, 0x17, 0x07, 0x5c, 0xe5, 0x00, 0x16, 0x1f, 0x27, 0x1f, 0x03, 0x55, 0x66, 0x68, 0xf7, 0x61, + 0xe8, 0x4a, 0xd4, 0x2b, 0xcf, 0x84, 0xba, 0x21, 0x90, 0x8e, 0x23, 0xa0, 0x08, 0xfd, 0x23, 0x70, + 0x23, 0x8b, 0xee, 0x85, 0x0c, 0x91, 0x11, 0xf4, 0x2b, 0x65, 0xd9, 0x69, 0x71, 0xea, 0x1a, 0xf1, + 0xa9, 0x6b, 0xb4, 0xe5, 0xa9, 0xdb, 0x5a, 0xe5, 0xc1, 0xbf, 0x79, 0x52, 0x53, 0xac, 0xed, 0x34, + 0xec, 0x5b, 0x12, 0x40, 0xbd, 0x0b, 0xb6, 0x32, 0xd4, 0x76, 0x09, 0x37, 0x57, 0x9e, 0x8b, 0x70, + 0x9b, 0x39, 0x0a, 0xb2, 0x52, 0x1c, 0x5a, 0xdc, 0x57, 0x8a, 0x69, 0x93, 0x4c, 0x1b, 0x66, 0x74, + 0xf5, 0x82, 0xd8, 0xf2, 0x19, 0xed, 0x4c, 0x2b, 0x4b, 0xa8, 0xee, 0x52, 0x59, 0x97, 0xca, 0xba, + 0xb8, 0xb2, 0xb2, 0xda, 0x49, 0x94, 0xf5, 0x85, 0x12, 0x29, 0x8b, 0x0f, 0xe1, 0x7f, 0x4f, 0x59, + 0x05, 0x29, 0x66, 0x93, 0x88, 0x53, 0xbc, 0xfd, 0x6d, 0x19, 0x2c, 0x77, 0xa8, 0xab, 0x5a, 0x60, + 0x35, 0xb9, 0x19, 0xeb, 0x39, 0x14, 0xa5, 0x2e, 0x86, 0xda, 0xde, 0xd3, 0xed, 0x31, 0xb6, 0xfa, + 0x21, 0x00, 0xa9, 0x7b, 0x4f, 0x3d, 0x7f, 0xd5, 0xc4, 0x43, 0xdb, 0x9f, 0xe7, 0x91, 0x46, 0x4e, + 0x5d, 0x47, 0x0b, 0x90, 0x27, 0x1e, 0x45, 0xc8, 0xb3, 0xf7, 0x35, 0xf5, 0x33, 0x70, 0xa3, 0xe0, + 0x66, 0x70, 0x2b, 0x1f, 0x23, 0xdf, 0x5b, 0x7b, 0xed, 0x22, 0xde, 0x49, 0xf4, 0x4f, 0xc0, 0x7a, + 0xe6, 0x40, 0x6e, 0x14, 0xe4, 0x9d, 0xf2, 0xd1, 0x6e, 0xce, 0xf7, 0x49, 0xf0, 0x1d, 0x70, 0x7d, + 0xea, 0x00, 0x6d, 0x16, 0xe4, 0x99, 0xf1, 0xd2, 0x6e, 0x2d, 0xe2, 0x95, 0x8e, 0x32, 0x35, 0x4c, + 0x9b, 0x4f, 0xcb, 0x71, 0x5e, 0x94, 0xfc, 0xcd, 0xc5, 0xa3, 0x4c, 0x6d, 0xac, 0x66, 0xb1, 0x2e, + 0xe7, 0x47, 0xc9, 0xdf, 0x1f, 0xad, 0xb7, 0x1f, 0x9d, 0xe9, 0xca, 0xe3, 0x33, 0x5d, 0xf9, 0xed, + 0x4c, 0x57, 0xbe, 0x3a, 0xd7, 0x4b, 0x8f, 0xcf, 0xf5, 0xd2, 0x2f, 0xe7, 0x7a, 0xe9, 0xee, 0x2b, + 0xa9, 0xd1, 0xc7, 0x10, 0x21, 0xf0, 0x20, 0xc0, 0x21, 0x1a, 0x4f, 0xfe, 0x9f, 0x3e, 0x48, 0xfd, + 0xc7, 0xe6, 0x83, 0xb0, 0x57, 0x8e, 0x46, 0xd9, 0xab, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf3, + 0x0f, 0x3f, 0x52, 0x85, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1621,12 +1630,22 @@ func (m *MsgUpdateAlliance) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n7, err7 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RewardChangeInterval, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval):]) - if err7 != nil { - return 0, err7 + { + size, err := m.RewardWeightRange.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + n8, err8 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.RewardChangeInterval, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval):]) + if err8 != nil { + return 0, err8 } - i -= n7 - i = encodeVarintTx(dAtA, i, uint64(n7)) + i -= n8 + i = encodeVarintTx(dAtA, i, uint64(n8)) i-- dAtA[i] = 0x32 { @@ -1970,6 +1989,8 @@ func (m *MsgUpdateAlliance) Size() (n int) { n += 1 + l + sovTx(uint64(l)) l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.RewardChangeInterval) n += 1 + l + sovTx(uint64(l)) + l = m.RewardWeightRange.Size() + n += 1 + l + sovTx(uint64(l)) return n } @@ -3558,6 +3579,39 @@ func (m *MsgUpdateAlliance) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardWeightRange", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.RewardWeightRange.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])