smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-26 08:15:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add savings params to incentive module (#1201)

Browse Source 
* update proto types

* update incentive module types

* update genesis test

* update legacy migration test for pass

* include regenerated proto docs
This commit is contained in:
Denali Marsh 2022-03-31 11:08:56 +02:00 committed by GitHub
parent 9170090f67
commit 9a389203c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 135 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/core/proto-docs.md
View File

@ -3800,6 +3800,7 @@ Params
| `hard_borrow_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | | | `hard_borrow_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | |
| `delegator_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | | | `delegator_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | |
| `swap_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | | | `swap_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | |
| `savings_reward_periods` | [MultiRewardPeriod](#kava.incentive.v1beta1.MultiRewardPeriod) | repeated | |
| `claim_multipliers` | [MultipliersPerDenom](#kava.incentive.v1beta1.MultipliersPerDenom) | repeated | | | `claim_multipliers` | [MultipliersPerDenom](#kava.incentive.v1beta1.MultipliersPerDenom) | repeated | |
| `claim_end` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | | | `claim_end` | [google.protobuf.Timestamp](#google.protobuf.Timestamp) | | |

7
proto/kava/incentive/v1beta1/params.proto
View File

@ -72,8 +72,11 @@ message Params {
repeated MultiRewardPeriod swap_reward_periods = 5 repeated MultiRewardPeriod swap_reward_periods = 5
[(gogoproto.castrepeated) = "MultiRewardPeriods", (gogoproto.nullable) = false]; [(gogoproto.castrepeated) = "MultiRewardPeriods", (gogoproto.nullable) = false];
repeated MultipliersPerDenom claim_multipliers = 6 repeated MultiRewardPeriod savings_reward_periods = 6
[(gogoproto.castrepeated) = "MultiRewardPeriods", (gogoproto.nullable) = false];
repeated MultipliersPerDenom claim_multipliers = 7
[(gogoproto.castrepeated) = "MultipliersPerDenoms", (gogoproto.nullable) = false]; [(gogoproto.castrepeated) = "MultipliersPerDenoms", (gogoproto.nullable) = false];
google.protobuf.Timestamp claim_end = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; google.protobuf.Timestamp claim_end = 8 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
} }

2
x/incentive/genesis_test.go
View File

@ -69,6 +69,7 @@ func (suite *GenesisTestSuite) SetupTest() {
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "bnb", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("hard", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "bnb", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("hard", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "btcb/usdx", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("swp", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "btcb/usdx", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("swp", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", suite.genesisTime.Add(-1*oneYear), suite.genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultipliersPerDenoms{ types.MultipliersPerDenoms{
{ {
Denom: "ukava", Denom: "ukava",
@ -131,6 +132,7 @@ func (suite *GenesisTestSuite) TestExportedGenesisMatchesImported() {
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "bnb", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("hard", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "bnb", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("hard", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "btcb/usdx", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("swp", 122354)))}, types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "btcb/usdx", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("swp", 122354)))},
types.MultiRewardPeriods{types.NewMultiRewardPeriod(true, "ukava", genesisTime.Add(-1*oneYear), genesisTime.Add(oneYear), cs(c("hard", 122354)))},
types.MultipliersPerDenoms{ types.MultipliersPerDenoms{
{ {
Denom: "ukava", Denom: "ukava",

1
x/incentive/legacy/v0_16/testdata/v16-incentive.json vendored
View File

@ -82,6 +82,7 @@
] ]
} }
], ],
"savings_reward_periods": [],
"claim_multipliers": [ "claim_multipliers": [
{ {
"denom": "hard", "denom": "hard",

1
x/incentive/types/genesis_test.go
View File

@ -45,6 +45,7 @@ func TestGenesisState_Validate(t *testing.T) {
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods,
MultipliersPerDenoms{ MultipliersPerDenoms{
{ {
Denom: "ukava", Denom: "ukava",

12
x/incentive/types/params.go
View File

@ -20,6 +20,7 @@ var (
KeyHardBorrowRewardPeriods = []byte("HardBorrowRewardPeriods") KeyHardBorrowRewardPeriods = []byte("HardBorrowRewardPeriods")
KeyDelegatorRewardPeriods = []byte("DelegatorRewardPeriods") KeyDelegatorRewardPeriods = []byte("DelegatorRewardPeriods")
KeySwapRewardPeriods = []byte("SwapRewardPeriods") KeySwapRewardPeriods = []byte("SwapRewardPeriods")
KeySavingsRewardPeriods = []byte("SavingsRewardPeriods")
KeyClaimEnd = []byte("ClaimEnd") KeyClaimEnd = []byte("ClaimEnd")
KeyMultipliers = []byte("ClaimMultipliers") KeyMultipliers = []byte("ClaimMultipliers")
@ -36,14 +37,15 @@ var (
) )
// NewParams returns a new params object // NewParams returns a new params object
func NewParams(usdxMinting RewardPeriods, hardSupply, hardBorrow, delegator, swap MultiRewardPeriods, func NewParams(usdxMinting RewardPeriods, hardSupply, hardBorrow, delegator, swap,
multipliers MultipliersPerDenoms, claimEnd time.Time) Params { savings MultiRewardPeriods, multipliers MultipliersPerDenoms, claimEnd time.Time) Params {
return Params{ return Params{
USDXMintingRewardPeriods: usdxMinting, USDXMintingRewardPeriods: usdxMinting,
HardSupplyRewardPeriods: hardSupply, HardSupplyRewardPeriods: hardSupply,
HardBorrowRewardPeriods: hardBorrow, HardBorrowRewardPeriods: hardBorrow,
DelegatorRewardPeriods: delegator, DelegatorRewardPeriods: delegator,
SwapRewardPeriods: swap, SwapRewardPeriods: swap,
SavingsRewardPeriods: savings,
ClaimMultipliers: multipliers, ClaimMultipliers: multipliers,
ClaimEnd: claimEnd, ClaimEnd: claimEnd,
} }
@ -57,6 +59,7 @@ func DefaultParams() Params {
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods, DefaultMultiRewardPeriods,
DefaultMultiRewardPeriods,
DefaultMultipliers, DefaultMultipliers,
DefaultClaimEnd, DefaultClaimEnd,
) )
@ -75,6 +78,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
paramtypes.NewParamSetPair(KeyHardBorrowRewardPeriods, &p.HardBorrowRewardPeriods, validateMultiRewardPeriodsParam), paramtypes.NewParamSetPair(KeyHardBorrowRewardPeriods, &p.HardBorrowRewardPeriods, validateMultiRewardPeriodsParam),
paramtypes.NewParamSetPair(KeyDelegatorRewardPeriods, &p.DelegatorRewardPeriods, validateMultiRewardPeriodsParam), paramtypes.NewParamSetPair(KeyDelegatorRewardPeriods, &p.DelegatorRewardPeriods, validateMultiRewardPeriodsParam),
paramtypes.NewParamSetPair(KeySwapRewardPeriods, &p.SwapRewardPeriods, validateMultiRewardPeriodsParam), paramtypes.NewParamSetPair(KeySwapRewardPeriods, &p.SwapRewardPeriods, validateMultiRewardPeriodsParam),
paramtypes.NewParamSetPair(KeySavingsRewardPeriods, &p.SavingsRewardPeriods, validateMultiRewardPeriodsParam),
paramtypes.NewParamSetPair(KeyMultipliers, &p.ClaimMultipliers, validateMultipliersPerDenomParam), paramtypes.NewParamSetPair(KeyMultipliers, &p.ClaimMultipliers, validateMultipliersPerDenomParam),
paramtypes.NewParamSetPair(KeyClaimEnd, &p.ClaimEnd, validateClaimEndParam), paramtypes.NewParamSetPair(KeyClaimEnd, &p.ClaimEnd, validateClaimEndParam),
} }
@ -107,6 +111,10 @@ func (p Params) Validate() error {
return err return err
} }
if err := validateMultiRewardPeriodsParam(p.SavingsRewardPeriods); err != nil {
return err
}
return nil return nil
} }

159
x/incentive/types/params.pb.go
View File

@ -199,8 +199,9 @@ type Params struct {
HardBorrowRewardPeriods MultiRewardPeriods `protobuf:"bytes,3,rep,name=hard_borrow_reward_periods,json=hardBorrowRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"hard_borrow_reward_periods"` HardBorrowRewardPeriods MultiRewardPeriods `protobuf:"bytes,3,rep,name=hard_borrow_reward_periods,json=hardBorrowRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"hard_borrow_reward_periods"`
DelegatorRewardPeriods MultiRewardPeriods `protobuf:"bytes,4,rep,name=delegator_reward_periods,json=delegatorRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"delegator_reward_periods"` DelegatorRewardPeriods MultiRewardPeriods `protobuf:"bytes,4,rep,name=delegator_reward_periods,json=delegatorRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"delegator_reward_periods"`
SwapRewardPeriods MultiRewardPeriods `protobuf:"bytes,5,rep,name=swap_reward_periods,json=swapRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"swap_reward_periods"` SwapRewardPeriods MultiRewardPeriods `protobuf:"bytes,5,rep,name=swap_reward_periods,json=swapRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"swap_reward_periods"`
ClaimMultipliers MultipliersPerDenoms `protobuf:"bytes,6,rep,name=claim_multipliers,json=claimMultipliers,proto3,castrepeated=MultipliersPerDenoms" json:"claim_multipliers"` SavingsRewardPeriods MultiRewardPeriods `protobuf:"bytes,6,rep,name=savings_reward_periods,json=savingsRewardPeriods,proto3,castrepeated=MultiRewardPeriods" json:"savings_reward_periods"`
ClaimEnd time.Time `protobuf:"bytes,7,opt,name=claim_end,json=claimEnd,proto3,stdtime" json:"claim_end"` ClaimMultipliers MultipliersPerDenoms `protobuf:"bytes,7,rep,name=claim_multipliers,json=claimMultipliers,proto3,castrepeated=MultipliersPerDenoms" json:"claim_multipliers"`
ClaimEnd time.Time `protobuf:"bytes,8,opt,name=claim_end,json=claimEnd,proto3,stdtime" json:"claim_end"`
} }
func (m *Params) Reset() { *m = Params{} } func (m *Params) Reset() { *m = Params{} }
@ -249,53 +250,55 @@ func init() {
} }
var fileDescriptor_bb8833f5d745eac9 = []byte{ var fileDescriptor_bb8833f5d745eac9 = []byte{
// 736 bytes of a gzipped FileDescriptorProto // 758 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0x4d, 0x4f, 0xd4, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x96, 0x4f, 0x4f, 0x13, 0x4f,
0x18, 0xc7, 0xb7, 0xfb, 0x26, 0x0c, 0xa0, 0x30, 0x10, 0xac, 0xab, 0xe9, 0x92, 0xc5, 0xe8, 0x1a, 0x18, 0xc7, 0xbb, 0xfd, 0x47, 0x19, 0xe0, 0xf7, 0x83, 0xa1, 0xa9, 0x6b, 0x35, 0x5b, 0x52, 0x8c,
0x42, 0x2b, 0x9a, 0x78, 0xf0, 0x66, 0x45, 0x13, 0x13, 0x49, 0x48, 0xc1, 0x44, 0xbd, 0x6c, 0xa6, 0xd6, 0x10, 0x76, 0x45, 0x13, 0x0f, 0xde, 0x5c, 0xd1, 0xc4, 0x44, 0x12, 0xb2, 0x60, 0xa2, 0x5e,
0xed, 0x50, 0x1a, 0xda, 0x4e, 0x33, 0x33, 0x5d, 0xd8, 0x93, 0x89, 0x07, 0x6f, 0x26, 0xc4, 0x83, 0x9a, 0xe9, 0xee, 0xb0, 0x6c, 0xd8, 0xdd, 0xd9, 0xcc, 0x4c, 0x0b, 0x8d, 0x07, 0x13, 0x0f, 0xde,
0x1f, 0x82, 0xaf, 0xe1, 0x85, 0x23, 0x47, 0xe3, 0x61, 0xd1, 0xe5, 0x8b, 0x98, 0x99, 0x16, 0xb6, 0x4c, 0x88, 0x07, 0x5f, 0x04, 0x6f, 0xc3, 0x0b, 0x47, 0x8e, 0x46, 0x13, 0xd0, 0xf2, 0x46, 0xcc,
0xbb, 0x2e, 0x28, 0x09, 0x17, 0x4f, 0x3b, 0x2f, 0xcf, 0xf3, 0xfc, 0xfe, 0xf3, 0xdf, 0x79, 0xa6, 0xcc, 0x2e, 0x74, 0x5b, 0x0b, 0x4a, 0xd2, 0x8b, 0xa7, 0xce, 0x9f, 0xe7, 0x79, 0x3e, 0xdf, 0xf9,
0x60, 0x71, 0x07, 0xb5, 0x91, 0xe1, 0x47, 0x0e, 0x8e, 0xb8, 0xdf, 0xc6, 0x46, 0x7b, 0xc5, 0xc6, 0x76, 0x9e, 0xc9, 0x82, 0xc5, 0x1d, 0xd4, 0x41, 0x86, 0x17, 0xda, 0x38, 0xe4, 0x5e, 0x07, 0x1b,
0x1c, 0xad, 0x18, 0x31, 0xa2, 0x28, 0x64, 0x7a, 0x4c, 0x09, 0x27, 0x70, 0x5e, 0x04, 0xe9, 0x67, 0x9d, 0x95, 0x16, 0xe6, 0x68, 0xc5, 0x88, 0x10, 0x45, 0x01, 0xd3, 0x23, 0x4a, 0x38, 0x81, 0x15,
0x41, 0x7a, 0x16, 0x54, 0x9b, 0xf3, 0x88, 0x47, 0x64, 0x88, 0x21, 0x46, 0x69, 0x74, 0xad, 0xee, 0x11, 0xa4, 0x9f, 0x07, 0xe9, 0x49, 0x50, 0xb5, 0xec, 0x12, 0x97, 0xc8, 0x10, 0x43, 0x8c, 0xe2,
0x11, 0xe2, 0x05, 0xd8, 0x90, 0x33, 0x3b, 0xd9, 0x32, 0xb8, 0x1f, 0x62, 0xc6, 0x51, 0x18, 0x67, 0xe8, 0x6a, 0xcd, 0x25, 0xc4, 0xf5, 0xb1, 0x21, 0x67, 0xad, 0xf6, 0x96, 0xc1, 0xbd, 0x00, 0x33,
0x01, 0x9a, 0x43, 0x58, 0x48, 0x98, 0x61, 0x23, 0xd6, 0x07, 0x3a, 0xc4, 0x8f, 0xd2, 0xfd, 0xc6, 0x8e, 0x82, 0x28, 0x09, 0xd0, 0x6c, 0xc2, 0x02, 0xc2, 0x8c, 0x16, 0x62, 0x7d, 0xa0, 0x4d, 0xbc,
0x97, 0x22, 0x98, 0xb4, 0xf0, 0x2e, 0xa2, 0xee, 0x3a, 0xa6, 0x3e, 0x71, 0xe1, 0x3c, 0xa8, 0x22, 0x30, 0xde, 0xaf, 0x7f, 0xca, 0x82, 0x69, 0x0b, 0xef, 0x22, 0xea, 0xac, 0x63, 0xea, 0x11, 0x07,
0x47, 0x90, 0x55, 0x65, 0x41, 0x69, 0x8e, 0x59, 0xd9, 0x0c, 0xde, 0x07, 0x37, 0x1c, 0x12, 0x04, 0x56, 0x40, 0x11, 0xd9, 0x82, 0xac, 0x2a, 0x0b, 0x4a, 0xa3, 0x64, 0x25, 0x33, 0x78, 0x07, 0xfc,
0x88, 0x63, 0x8a, 0x82, 0x16, 0xef, 0xc4, 0x58, 0x2d, 0x2e, 0x28, 0xcd, 0x71, 0xeb, 0x7a, 0x7f, 0x6f, 0x13, 0xdf, 0x47, 0x1c, 0x53, 0xe4, 0x37, 0x79, 0x37, 0xc2, 0x6a, 0x76, 0x41, 0x69, 0x4c,
0x79, 0xb3, 0x13, 0x63, 0xf8, 0x14, 0x54, 0x18, 0x47, 0x94, 0xab, 0xa5, 0x05, 0xa5, 0x39, 0xf1, 0x5a, 0xff, 0xf5, 0x97, 0x37, 0xbb, 0x11, 0x86, 0x8f, 0x40, 0x81, 0x71, 0x44, 0xb9, 0x9a, 0x5b,
0xa8, 0xa6, 0xa7, 0x12, 0xf5, 0x53, 0x89, 0xfa, 0xe6, 0xa9, 0x44, 0x73, 0xec, 0xb0, 0x5b, 0x2f, 0x50, 0x1a, 0x53, 0xf7, 0xab, 0x7a, 0x2c, 0x51, 0x3f, 0x93, 0xa8, 0x6f, 0x9e, 0x49, 0x34, 0x4b,
0xec, 0x1f, 0xd7, 0x15, 0x2b, 0x4d, 0x81, 0x4f, 0x40, 0x09, 0x47, 0xae, 0x5a, 0xbe, 0x44, 0xa6, 0x87, 0xc7, 0xb5, 0xcc, 0xfe, 0x49, 0x4d, 0xb1, 0xe2, 0x14, 0xf8, 0x10, 0xe4, 0x70, 0xe8, 0xa8,
0x48, 0x80, 0x6b, 0x00, 0x52, 0x79, 0x08, 0xd6, 0x8a, 0x31, 0x6d, 0x31, 0xec, 0x90, 0xc8, 0x55, 0xf9, 0x2b, 0x64, 0x8a, 0x04, 0xb8, 0x06, 0x20, 0x95, 0x87, 0x60, 0xcd, 0x08, 0xd3, 0x26, 0xc3,
0x2b, 0xb2, 0xcc, 0x2d, 0x3d, 0xb5, 0x40, 0x17, 0x16, 0x9c, 0xda, 0xa9, 0x3f, 0x27, 0x7e, 0x64, 0x36, 0x09, 0x1d, 0xb5, 0x20, 0xcb, 0x5c, 0xd7, 0x63, 0x0b, 0x74, 0x61, 0xc1, 0x99, 0x9d, 0xfa,
0x96, 0x45, 0x15, 0x6b, 0x3a, 0x4b, 0x5d, 0xc7, 0x74, 0x43, 0x26, 0x36, 0xbe, 0x15, 0xc1, 0xcc, 0x13, 0xe2, 0x85, 0x66, 0x5e, 0x54, 0xb1, 0x66, 0x93, 0xd4, 0x75, 0x4c, 0x37, 0x64, 0x62, 0xfd,
0x5a, 0x12, 0x70, 0xff, 0xff, 0x77, 0xa6, 0x73, 0x8e, 0x33, 0xa5, 0x8b, 0x9d, 0x79, 0x28, 0xaa, 0x4b, 0x16, 0xcc, 0xad, 0xb5, 0x7d, 0xee, 0xfd, 0xfb, 0xce, 0x74, 0x2f, 0x70, 0x26, 0x77, 0xb9,
0x1c, 0x1c, 0xd7, 0x9b, 0x9e, 0xcf, 0xb7, 0x13, 0x5b, 0x77, 0x48, 0x68, 0x64, 0x37, 0x29, 0xfd, 0x33, 0xf7, 0x44, 0x95, 0x83, 0x93, 0x5a, 0xc3, 0xf5, 0xf8, 0x76, 0xbb, 0xa5, 0xdb, 0x24, 0x30,
0x59, 0x66, 0xee, 0x8e, 0x21, 0xce, 0xca, 0x64, 0x02, 0x1b, 0xe1, 0xe2, 0x67, 0x05, 0x00, 0xe9, 0x92, 0x9b, 0x14, 0xff, 0x2c, 0x33, 0x67, 0xc7, 0x10, 0x67, 0x65, 0x32, 0x81, 0x8d, 0x70, 0xf1,
0x62, 0x1c, 0xf8, 0x98, 0x42, 0x08, 0xca, 0x11, 0x0a, 0x53, 0xf3, 0xc6, 0x2d, 0x39, 0x86, 0x8b, 0xa3, 0x02, 0x80, 0x74, 0x31, 0xf2, 0x3d, 0x4c, 0x21, 0x04, 0xf9, 0x10, 0x05, 0xb1, 0x79, 0x93,
0x60, 0x2a, 0x24, 0x11, 0xdf, 0x66, 0xad, 0x80, 0x38, 0x3b, 0x49, 0x2c, 0x8d, 0x2b, 0x59, 0x93, 0x96, 0x1c, 0xc3, 0x45, 0x30, 0x13, 0x90, 0x90, 0x6f, 0xb3, 0xa6, 0x4f, 0xec, 0x9d, 0x76, 0x24,
0xe9, 0xe2, 0x6b, 0xb9, 0x06, 0x5f, 0x82, 0xea, 0x16, 0x72, 0x38, 0xa1, 0xd2, 0xb7, 0x49, 0x53, 0x8d, 0xcb, 0x59, 0xd3, 0xf1, 0xe2, 0x0b, 0xb9, 0x06, 0x9f, 0x81, 0xe2, 0x16, 0xb2, 0x39, 0xa1,
0x17, 0xda, 0x7e, 0x74, 0xeb, 0xf7, 0xfe, 0x41, 0xdb, 0x2a, 0x76, 0xac, 0x2c, 0xbb, 0xf1, 0x49, 0xd2, 0xb7, 0x69, 0x53, 0x17, 0xda, 0xbe, 0x1d, 0xd7, 0x6e, 0xff, 0x85, 0xb6, 0x55, 0x6c, 0x5b,
0x01, 0xb3, 0x7d, 0x3d, 0x42, 0xe8, 0x2a, 0x8e, 0x48, 0x08, 0xe7, 0x40, 0xc5, 0x15, 0x83, 0x4c, 0x49, 0x76, 0xfd, 0x83, 0x02, 0xe6, 0xfb, 0x7a, 0x84, 0xd0, 0x55, 0x1c, 0x92, 0x00, 0x96, 0x41,
0x59, 0x3a, 0x81, 0xef, 0xc0, 0x44, 0xd8, 0x0f, 0x56, 0x8b, 0xd2, 0xb1, 0x86, 0x3e, 0xba, 0x3b, 0xc1, 0x11, 0x83, 0x44, 0x59, 0x3c, 0x81, 0xaf, 0xc1, 0x54, 0xd0, 0x0f, 0x56, 0xb3, 0xd2, 0xb1,
0xf5, 0x7e, 0x5d, 0x73, 0x36, 0xb3, 0x6e, 0x22, 0xc7, 0xb2, 0xf2, 0xb5, 0x1a, 0xdd, 0x2a, 0xa8, 0xba, 0x3e, 0xba, 0x3b, 0xf5, 0x7e, 0x5d, 0x73, 0x3e, 0xb1, 0x6e, 0x2a, 0xc5, 0xb2, 0xd2, 0xb5,
0xae, 0xcb, 0x9e, 0x87, 0x5f, 0x15, 0x70, 0x3b, 0x61, 0xee, 0x5e, 0x2b, 0xf4, 0x23, 0xee, 0x47, 0xea, 0xdf, 0x27, 0x40, 0x71, 0x5d, 0xf6, 0x3c, 0xfc, 0xac, 0x80, 0x1b, 0x6d, 0xe6, 0xec, 0x35,
0x5e, 0x2b, 0x75, 0x51, 0xfc, 0x57, 0x3e, 0x71, 0x99, 0xaa, 0x48, 0xec, 0xdd, 0xf3, 0xb0, 0xf9, 0x03, 0x2f, 0xe4, 0x5e, 0xe8, 0x36, 0x63, 0x17, 0xc5, 0x7f, 0xe5, 0x11, 0x87, 0xa9, 0x8a, 0xc4,
0xfb, 0x69, 0xae, 0x08, 0x70, 0xaf, 0x5b, 0x57, 0xdf, 0x6c, 0xac, 0xbe, 0x5d, 0x4b, 0xeb, 0xe5, 0xde, 0xba, 0x08, 0x9b, 0xbe, 0x9f, 0xe6, 0x8a, 0x00, 0xf7, 0x8e, 0x6b, 0xea, 0xcb, 0x8d, 0xd5,
0x03, 0xd8, 0xc1, 0x71, 0x7d, 0x6a, 0x60, 0xc1, 0x52, 0x05, 0x7b, 0x54, 0x28, 0xfc, 0xa8, 0x80, 0x57, 0x6b, 0x71, 0xbd, 0x74, 0x00, 0x3b, 0x38, 0xa9, 0xcd, 0x0c, 0x2c, 0x58, 0xaa, 0x60, 0x8f,
0xda, 0xb6, 0x50, 0xc2, 0x92, 0x38, 0x0e, 0x3a, 0xc3, 0xba, 0x52, 0x3b, 0x1e, 0x5c, 0x68, 0xc7, 0x0a, 0x85, 0xef, 0x15, 0x50, 0xdd, 0x16, 0x4a, 0x58, 0x3b, 0x8a, 0xfc, 0xee, 0xb0, 0xae, 0xd8,
0x80, 0xb8, 0x5a, 0xe6, 0x0a, 0xfc, 0x63, 0x8b, 0x59, 0x37, 0x05, 0x68, 0x43, 0x72, 0xce, 0x11, 0x8e, 0xbb, 0x97, 0xda, 0x31, 0x20, 0xae, 0x9a, 0xb8, 0x02, 0x7f, 0xdb, 0x62, 0xd6, 0x35, 0x01,
0x61, 0x13, 0x4a, 0xc9, 0xee, 0xb0, 0x88, 0xd2, 0x95, 0x8b, 0x30, 0x25, 0x67, 0x50, 0xc4, 0x07, 0xda, 0x90, 0x9c, 0x0b, 0x44, 0xb4, 0x08, 0xa5, 0x64, 0x77, 0x58, 0x44, 0x6e, 0xec, 0x22, 0x4c,
0xa0, 0xba, 0x38, 0xc0, 0x1e, 0xe2, 0x84, 0x0e, 0x2b, 0x28, 0x5f, 0xa5, 0x82, 0xf9, 0x33, 0xcc, 0xc9, 0x19, 0x14, 0xf1, 0x0e, 0xa8, 0x0e, 0xf6, 0xb1, 0x8b, 0x38, 0xa1, 0xc3, 0x0a, 0xf2, 0xe3,
0xa0, 0x80, 0x04, 0xcc, 0xb2, 0x5d, 0x14, 0x0f, 0xb3, 0x2b, 0x57, 0xc9, 0x9e, 0x11, 0x84, 0x41, 0x54, 0x50, 0x39, 0xc7, 0x0c, 0x0a, 0x68, 0x83, 0x79, 0xb6, 0x8b, 0xa2, 0x61, 0x76, 0x61, 0x9c,
0x6c, 0x1b, 0xcc, 0x38, 0x01, 0xf2, 0xc3, 0x56, 0xbe, 0x0d, 0xaa, 0x12, 0xba, 0xf4, 0xf7, 0x36, 0xec, 0x39, 0x41, 0x18, 0xc4, 0xbe, 0x05, 0x15, 0x86, 0x3a, 0x5e, 0xe8, 0xb2, 0x61, 0x72, 0x71,
0x38, 0x6b, 0x2f, 0xf3, 0x4e, 0x86, 0x9d, 0x1b, 0xb1, 0xc9, 0xac, 0x69, 0xc9, 0xc8, 0x6d, 0xc1, 0x9c, 0xe4, 0x72, 0x02, 0x19, 0x84, 0x77, 0xc0, 0x9c, 0xed, 0x23, 0x2f, 0x68, 0xa6, 0x7b, 0x70,
0x67, 0x60, 0x3c, 0xe5, 0x8a, 0xf7, 0xee, 0xda, 0x25, 0xde, 0xbb, 0x31, 0x99, 0xf6, 0x22, 0x72, 0x42, 0x72, 0x97, 0xfe, 0xdc, 0x83, 0xe7, 0xbd, 0x6d, 0xde, 0x4c, 0xc8, 0xe5, 0x11, 0x9b, 0xcc,
0xcd, 0x57, 0x87, 0xbf, 0xb4, 0xc2, 0x61, 0x4f, 0x53, 0x8e, 0x7a, 0x9a, 0xf2, 0xb3, 0xa7, 0x29, 0x9a, 0x95, 0x8c, 0xd4, 0x16, 0x7c, 0x0c, 0x26, 0x63, 0xae, 0x78, 0x6c, 0x4b, 0x57, 0x78, 0x6c,
0xfb, 0x27, 0x5a, 0xe1, 0xe8, 0x44, 0x2b, 0x7c, 0x3f, 0xd1, 0x0a, 0xef, 0x97, 0x72, 0xef, 0x86, 0x4b, 0x32, 0xed, 0x69, 0xe8, 0x98, 0xcf, 0x0f, 0x7f, 0x6a, 0x99, 0xc3, 0x9e, 0xa6, 0x1c, 0xf5,
0x38, 0xc7, 0x72, 0x80, 0x6c, 0x26, 0x47, 0xc6, 0x5e, 0xee, 0xeb, 0x2c, 0x1f, 0x10, 0xbb, 0x2a, 0x34, 0xe5, 0x47, 0x4f, 0x53, 0xf6, 0x4f, 0xb5, 0xcc, 0xd1, 0xa9, 0x96, 0xf9, 0x7a, 0xaa, 0x65,
0x91, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x34, 0xa7, 0x20, 0x49, 0xbc, 0x07, 0x00, 0x00, 0xde, 0x2c, 0xa5, 0x1e, 0x2d, 0x71, 0x8e, 0x65, 0x1f, 0xb5, 0x98, 0x1c, 0x19, 0x7b, 0xa9, 0x4f,
0x03, 0xf9, 0x7a, 0xb5, 0x8a, 0x12, 0xf9, 0xe0, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0x0f,
0x7e, 0x30, 0x39, 0x08, 0x00, 0x00,
} }
func (m *RewardPeriod) Marshal() (dAtA []byte, err error) { func (m *RewardPeriod) Marshal() (dAtA []byte, err error) {
@ -550,7 +553,7 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i -= n6 i -= n6
i = encodeVarintParams(dAtA, i, uint64(n6)) i = encodeVarintParams(dAtA, i, uint64(n6))
i-- i--
dAtA[i] = 0x3a dAtA[i] = 0x42
if len(m.ClaimMultipliers) > 0 { if len(m.ClaimMultipliers) > 0 {
for iNdEx := len(m.ClaimMultipliers) - 1; iNdEx >= 0; iNdEx-- { for iNdEx := len(m.ClaimMultipliers) - 1; iNdEx >= 0; iNdEx-- {
{ {
@ -562,6 +565,20 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintParams(dAtA, i, uint64(size)) i = encodeVarintParams(dAtA, i, uint64(size))
} }
i-- i--
dAtA[i] = 0x3a
}
}
if len(m.SavingsRewardPeriods) > 0 {
for iNdEx := len(m.SavingsRewardPeriods) - 1; iNdEx >= 0; iNdEx-- {
{
size, err := m.SavingsRewardPeriods[iNdEx].MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintParams(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x32 dAtA[i] = 0x32
} }
} }
@ -770,6 +787,12 @@ func (m *Params) Size() (n int) {
n += 1 + l + sovParams(uint64(l)) n += 1 + l + sovParams(uint64(l))
} }
} }
if len(m.SavingsRewardPeriods) > 0 {
for _, e := range m.SavingsRewardPeriods {
l = e.Size()
n += 1 + l + sovParams(uint64(l))
}
}
if len(m.ClaimMultipliers) > 0 { if len(m.ClaimMultipliers) > 0 {
for _, e := range m.ClaimMultipliers { for _, e := range m.ClaimMultipliers {
l = e.Size() l = e.Size()
@ -1640,6 +1663,40 @@ func (m *Params) Unmarshal(dAtA []byte) error {
} }
iNdEx = postIndex iNdEx = postIndex
case 6: case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field SavingsRewardPeriods", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowParams
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthParams
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthParams
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.SavingsRewardPeriods = append(m.SavingsRewardPeriods, MultiRewardPeriod{})
if err := m.SavingsRewardPeriods[len(m.SavingsRewardPeriods)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
case 7:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClaimMultipliers", wireType) return fmt.Errorf("proto: wrong wireType = %d for field ClaimMultipliers", wireType)
} }
@ -1673,7 +1730,7 @@ func (m *Params) Unmarshal(dAtA []byte) error {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex
case 7: case 8:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClaimEnd", wireType) return fmt.Errorf("proto: wrong wireType = %d for field ClaimEnd", wireType)
} }

7
x/incentive/types/params_test.go
View File

@ -81,6 +81,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.MultipliersPerDenoms{ ClaimMultipliers: types.MultipliersPerDenoms{
{ {
Denom: "hard", Denom: "hard",
@ -111,6 +112,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.DefaultMultipliers, ClaimMultipliers: types.DefaultMultipliers,
ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC), ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC),
}, },
@ -127,6 +129,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.DefaultMultipliers, ClaimMultipliers: types.DefaultMultipliers,
ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC), ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC),
}, },
@ -143,6 +146,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond}, HardBorrowRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond},
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.DefaultMultipliers, ClaimMultipliers: types.DefaultMultipliers,
ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC), ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC),
}, },
@ -159,6 +163,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond}, DelegatorRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond},
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.DefaultMultipliers, ClaimMultipliers: types.DefaultMultipliers,
ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC), ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC),
}, },
@ -175,6 +180,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond}, SwapRewardPeriods: types.MultiRewardPeriods{rewardMultiPeriodWithInvalidRewardsPerSecond},
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.DefaultMultipliers, ClaimMultipliers: types.DefaultMultipliers,
ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC), ClaimEnd: time.Date(2025, 10, 15, 14, 0, 0, 0, time.UTC),
}, },
@ -191,6 +197,7 @@ func (suite *ParamTestSuite) TestParamValidation() {
HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods, HardBorrowRewardPeriods: types.DefaultMultiRewardPeriods,
DelegatorRewardPeriods: types.DefaultMultiRewardPeriods, DelegatorRewardPeriods: types.DefaultMultiRewardPeriods,
SwapRewardPeriods: types.DefaultMultiRewardPeriods, SwapRewardPeriods: types.DefaultMultiRewardPeriods,
SavingsRewardPeriods: types.DefaultMultiRewardPeriods,
ClaimMultipliers: types.MultipliersPerDenoms{ ClaimMultipliers: types.MultipliersPerDenoms{
{ {
Denom: "hard", Denom: "hard",