Skip to content

Commit 1e35f3c

Browse files
authored
fixing minimum vp issue (#1267)
* fixing minimum vp issue * fixing minimum vp issue
1 parent 79b6b2b commit 1e35f3c

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

app/ante/commission.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,27 @@ func (min MinCommissionDecorator) getValidator(ctx sdk.Context, bech32ValAddr st
3939
return val, nil
4040
}
4141

42-
func (min MinCommissionDecorator) getTotalDelegatedTokens(ctx sdk.Context) sdkmath.Int {
42+
func (min MinCommissionDecorator) getTotalBondedTokens(ctx sdk.Context) sdkmath.Int {
4343
bondDenom, err := min.sk.BondDenom(ctx)
4444
if err != nil {
4545
panic(err)
4646
}
4747
bondedPool := min.sk.GetBondedPool(ctx)
48-
notBondedPool := min.sk.GetNotBondedPool(ctx)
49-
50-
notBondedAmount := min.bk.GetBalance(ctx, notBondedPool.GetAddress(), bondDenom).Amount
5148
bondedAmount := min.bk.GetBalance(ctx, bondedPool.GetAddress(), bondDenom).Amount
5249

53-
return notBondedAmount.Add(bondedAmount)
50+
return bondedAmount
5451
}
5552

5653
// Returns the projected voting power as a percentage (not a fraction)
5754
func (min MinCommissionDecorator) CalculateValidatorProjectedVotingPower(ctx sdk.Context, delegateAmount sdkmath.LegacyDec) sdkmath.LegacyDec {
58-
totalDelegatedTokens := min.getTotalDelegatedTokens(ctx).ToLegacyDec()
55+
56+
bondedAmt := min.getTotalBondedTokens(ctx).ToLegacyDec()
5957
// If I am the first validator, then accept 100% voting power
60-
if totalDelegatedTokens.LTE(sdkmath.LegacyZeroDec()) {
58+
if bondedAmt.LTE(sdkmath.LegacyZeroDec()) {
6159
return sdkmath.LegacyZeroDec()
6260
}
6361

64-
projectedTotalDelegatedTokens := totalDelegatedTokens.Add(delegateAmount)
62+
projectedTotalDelegatedTokens := bondedAmt.Add(delegateAmount)
6563
projectedValidatorTokens := delegateAmount
6664

6765
// Ensure projectedTotalDelegatedTokens is not zero to avoid division by zero
@@ -75,9 +73,9 @@ func (min MinCommissionDecorator) CalculateValidatorProjectedVotingPower(ctx sdk
7573
// Returns the projected voting power as a percentage (not a fraction)
7674
func (min MinCommissionDecorator) CalculateDelegateProjectedVotingPower(ctx sdk.Context, validator stakingtypes.ValidatorI, delegateAmount sdkmath.LegacyDec) sdkmath.LegacyDec {
7775
validatorTokens := validator.GetTokens().ToLegacyDec()
78-
totalDelegatedTokens := min.getTotalDelegatedTokens(ctx).ToLegacyDec()
76+
bondedAmt := min.getTotalBondedTokens(ctx).ToLegacyDec()
7977

80-
projectedTotalDelegatedTokens := totalDelegatedTokens.Add(delegateAmount)
78+
projectedTotalDelegatedTokens := bondedAmt.Add(delegateAmount)
8179
projectedValidatorTokens := validatorTokens.Add(delegateAmount)
8280

8381
// Ensure projectedTotalDelegatedTokens is not zero to avoid division by zero
@@ -91,7 +89,7 @@ func (min MinCommissionDecorator) CalculateDelegateProjectedVotingPower(ctx sdk.
9189
// Returns the projected voting power as a percentage (not a fraction)
9290
func (min MinCommissionDecorator) CalculateRedelegateProjectedVotingPower(ctx sdk.Context, validator stakingtypes.ValidatorI, delegateAmount sdkmath.LegacyDec) sdkmath.LegacyDec {
9391
validatorTokens := validator.GetTokens().ToLegacyDec()
94-
projectedTotalDelegatedTokens := min.getTotalDelegatedTokens(ctx).ToLegacyDec() // no additional delegated tokens
92+
projectedTotalDelegatedTokens := min.getTotalBondedTokens(ctx).ToLegacyDec() // no additional delegated tokens
9593

9694
projectedValidatorTokens := validatorTokens.Add(delegateAmount)
9795

0 commit comments

Comments
 (0)