Skip to content

fix(staking): default params #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gezerui0124 merged 2 commits into from
Oct 15, 2024
Merged

fix(staking): default params #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6dde5
feat(staking): default params
gezerui0124 Oct 15, 2024
b0f870c
feat(staking): default params
gezerui0124 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions tests/fixtures/adr-024-coin-metadata_genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,23 +221,28 @@
"1": {
"duration": "7776000s",
"period_type": 1,
"rewards_multiplier": "1.100000000000000000"
"rewards_multiplier": "1.051000000000000000"
},
"2": {
"duration": "31536000s",
"period_type": 2,
"rewards_multiplier": "1.200000000000000000"
"rewards_multiplier": "1.160000000000000000"
},
"3": {
"duration": "46656000s",
"period_type": 3,
"rewards_multiplier": "1.340000000000000000"
}
}
},
"token_types": {
"token_type_info_map": {
"0": {
"rewards_multiplier": "1.000000000000000000",
"rewards_multiplier": "0.500000000000000000",
"token_type": 0
},
"1": {
"rewards_multiplier": "2.000000000000000000",
"rewards_multiplier": "1.000000000000000000",
"token_type": 1
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/distribution/keeper/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ func TestGRPCDelegationRewards(t *testing.T) {

// setup delegation
delTokens := sdk.TokensFromConsensusPower(2, sdk.DefaultPowerReduction)
validator, issuedShares := val.AddTokensFromDel(delTokens)
validator, issuedShares, _ := val.AddTokensFromDel(delTokens, math.LegacyOneDec())
delegation := stakingtypes.NewDelegation(delAddr.String(), f.valAddr.String(), issuedShares, issuedShares,
stakingtypes.FlexibleDelegationID, stakingtypes.PeriodType_FLEXIBLE,
time.Unix(0, 0),
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/distribution/keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func TestMsgWithdrawDelegatorReward(t *testing.T) {

// setup delegation
delTokens := sdk.TokensFromConsensusPower(2, sdk.DefaultPowerReduction)
validator, issuedShares := validator.AddTokensFromDel(delTokens)
validator, issuedShares, _ := validator.AddTokensFromDel(delTokens, math.LegacyOneDec())

valBz, err := f.stakingKeeper.ValidatorAddressCodec().StringToBytes(validator.GetOperator())
require.NoError(t, err)
Expand Down Expand Up @@ -585,7 +585,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: "invalid",
Params: distrtypes.Params{
Ubi: math.LegacyNewDecWithPrec(2, 0),
Ubi: math.LegacyNewDecWithPrec(2, 0),
WithdrawAddrEnabled: withdrawAddrEnabled,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyZeroDec(),
Expand All @@ -599,7 +599,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: math.LegacyDec{},
Ubi: math.LegacyDec{},
WithdrawAddrEnabled: withdrawAddrEnabled,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyZeroDec(),
Expand All @@ -613,7 +613,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: math.LegacyNewDecWithPrec(2, 0),
Ubi: math.LegacyNewDecWithPrec(2, 0),
WithdrawAddrEnabled: withdrawAddrEnabled,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyZeroDec(),
Expand All @@ -627,7 +627,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: math.LegacyNewDecWithPrec(-2, 1),
Ubi: math.LegacyNewDecWithPrec(-2, 1),
WithdrawAddrEnabled: withdrawAddrEnabled,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyZeroDec(),
Expand All @@ -641,7 +641,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: ubi,
Ubi: ubi,
BaseProposerReward: math.LegacyNewDecWithPrec(1, 2),
BonusProposerReward: math.LegacyZeroDec(),
WithdrawAddrEnabled: withdrawAddrEnabled,
Expand All @@ -655,7 +655,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: ubi,
Ubi: ubi,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyNewDecWithPrec(1, 2),
WithdrawAddrEnabled: withdrawAddrEnabled,
Expand All @@ -669,7 +669,7 @@ func TestMsgUpdateParams(t *testing.T) {
msg: &distrtypes.MsgUpdateParams{
Authority: f.distrKeeper.GetAuthority(),
Params: distrtypes.Params{
Ubi: ubi,
Ubi: ubi,
BaseProposerReward: math.LegacyZeroDec(),
BonusProposerReward: math.LegacyZeroDec(),
WithdrawAddrEnabled: withdrawAddrEnabled,
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/staking/keeper/delegation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestUnbondingDelegationsMaxEntries(t *testing.T) {
// create a validator and a delegator to that validator
validator := testutil.NewValidator(t, addrVal, PKs[0])

validator, issuedShares := validator.AddTokensFromDel(startTokens)
validator, issuedShares, _ := validator.AddTokensFromDel(startTokens, math.LegacyOneDec())
assert.DeepEqual(t, startTokens, issuedShares.RoundInt())

validator = keeper.TestingUpdateValidator(f.stakingKeeper, ctx, validator, true)
Expand Down
12 changes: 9 additions & 3 deletions tests/integration/staking/keeper/determinstic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ func createValidator(rt *rapid.T, f *deterministicFixture, t *testing.T) staking
math.LegacyNewDecWithPrec(rapid.Int64Range(0, 100).Draw(rt, "max-rate"), 2),
math.LegacyNewDecWithPrec(rapid.Int64Range(0, 100).Draw(rt, "max-change-rate"), 2),
),
MinSelfDelegation: math.NewInt(rapid.Int64Min(1).Draw(rt, "tokens")),
MinSelfDelegation: math.NewInt(rapid.Int64Min(1).Draw(rt, "tokens")),
DelegatorRewardsShares: math.LegacyNewDecWithPrec(rapid.Int64Range(1, 100).Draw(rt, "commission"), 2),
SupportTokenType: stakingtypes.TokenType_LOCKED,
}
}

Expand Down Expand Up @@ -276,7 +278,9 @@ func getStaticValidator(f *deterministicFixture, t *testing.T) stakingtypes.Vali
math.LegacyNewDecWithPrec(5, 2),
math.LegacyNewDecWithPrec(5, 2),
),
MinSelfDelegation: math.NewInt(10),
MinSelfDelegation: math.NewInt(10),
DelegatorRewardsShares: math.LegacyNewDecWithPrec(5, 2),
SupportTokenType: stakingtypes.TokenType_LOCKED,
}

setValidator(f, t, validator)
Expand Down Expand Up @@ -310,7 +314,9 @@ func getStaticValidator2(f *deterministicFixture, t *testing.T) stakingtypes.Val
math.LegacyNewDecWithPrec(59, 2),
math.LegacyNewDecWithPrec(51, 2),
),
MinSelfDelegation: math.NewInt(1),
MinSelfDelegation: math.NewInt(1),
DelegatorRewardsShares: math.LegacyNewDecWithPrec(96, 2),
SupportTokenType: stakingtypes.TokenType_LOCKED,
}
setValidator(f, t, validator)

Expand Down
56 changes: 32 additions & 24 deletions tests/integration/staking/keeper/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ func TestInitGenesis(t *testing.T) {
assert.NilError(t, err)

bondedVal := types.Validator{
OperatorAddress: sdk.ValAddress(addrs[0]).String(),
ConsensusPubkey: pk0,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("hoop", "", "", "", ""),
OperatorAddress: sdk.ValAddress(addrs[0]).String(),
ConsensusPubkey: pk0,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
DelegatorRewardsShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("hoop", "", "", "", ""),
SupportTokenType: types.TokenType_LOCKED,
}
assert.NilError(t, f.stakingKeeper.SetValidator(f.sdkCtx, bondedVal))

Expand All @@ -66,20 +68,24 @@ func TestInitGenesis(t *testing.T) {

// initialize the validators
bondedVal1 := types.Validator{
OperatorAddress: sdk.ValAddress(addrs[1]).String(),
ConsensusPubkey: pk1,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("hoop", "", "", "", ""),
OperatorAddress: sdk.ValAddress(addrs[1]).String(),
ConsensusPubkey: pk1,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
DelegatorRewardsShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("hoop", "", "", "", ""),
SupportTokenType: types.TokenType_LOCKED,
}
bondedVal2 := types.Validator{
OperatorAddress: sdk.ValAddress(addrs[2]).String(),
ConsensusPubkey: pk2,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("bloop", "", "", "", ""),
OperatorAddress: sdk.ValAddress(addrs[2]).String(),
ConsensusPubkey: pk2,
Status: types.Bonded,
Tokens: valTokens,
DelegatorShares: math.LegacyNewDecFromInt(valTokens),
DelegatorRewardsShares: math.LegacyNewDecFromInt(valTokens),
Description: types.NewDescription("bloop", "", "", "", ""),
SupportTokenType: types.TokenType_LOCKED,
}

// append new bonded validators to the list
Expand Down Expand Up @@ -147,12 +153,14 @@ func TestInitGenesis_PoolsBalanceMismatch(t *testing.T) {
assert.NilError(t, err)

validator := types.Validator{
OperatorAddress: sdk.ValAddress("12345678901234567890").String(),
ConsensusPubkey: consPub,
Jailed: false,
Tokens: math.NewInt(10),
DelegatorShares: math.LegacyNewDecFromInt(math.NewInt(10)),
Description: types.NewDescription("bloop", "", "", "", ""),
OperatorAddress: sdk.ValAddress("12345678901234567890").String(),
ConsensusPubkey: consPub,
Jailed: false,
Tokens: math.NewInt(10),
DelegatorShares: math.LegacyNewDecFromInt(math.NewInt(10)),
DelegatorRewardsShares: math.LegacyNewDecFromInt(math.NewInt(10)),
Description: types.NewDescription("bloop", "", "", "", ""),
SupportTokenType: types.TokenType_LOCKED,
}

params := types.Params{
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/staking/keeper/slash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func bootstrapSlashTest(t *testing.T, power int64) (*fixture, []sdk.AccAddress,

for i := int64(0); i < numVals; i++ {
validator := testutil.NewValidator(t, addrVals[i], PKs[i])
validator, _ = validator.AddTokensFromDel(amt)
validator, _, _ = validator.AddTokensFromDel(amt, math.LegacyOneDec())
validator = keeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator, true)
assert.NilError(t, f.stakingKeeper.SetValidatorByConsAddr(f.sdkCtx, validator))
}
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/staking/keeper/unbonding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func SetupUnbondingTests(t *testing.T, f *fixture, hookCalled *bool, ubdeID *uin

// Create a validator
validator1 := testutil.NewValidator(t, addrVals[0], PKs[0])
validator1, issuedShares1 := validator1.AddTokensFromDel(valTokens)
validator1, issuedShares1, _ := validator1.AddTokensFromDel(valTokens, math.LegacyOneDec())
assert.DeepEqual(t, valTokens, issuedShares1.RoundInt())

validator1 = stakingkeeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator1, true)
Expand All @@ -76,7 +76,7 @@ func SetupUnbondingTests(t *testing.T, f *fixture, hookCalled *bool, ubdeID *uin

// Create a validator to redelegate to
validator2 := testutil.NewValidator(t, addrVals[1], PKs[1])
validator2, issuedShares2 := validator2.AddTokensFromDel(valTokens)
validator2, issuedShares2, _ := validator2.AddTokensFromDel(valTokens, math.LegacyOneDec())
assert.DeepEqual(t, valTokens, issuedShares2.RoundInt())

validator2 = stakingkeeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator2, true)
Expand Down
Loading