fix: CNS-fix-reward-query (#1633)

* fix * add handler vor v2.5.0 --------- Co-authored-by: Yarom Swisa <[email protected] git config --global user.name Yarom>
lavanet · Aug 18, 2024 · 28a5fdd · 28a5fdd
1 parent 26a8fad
commit 28a5fdd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/app/app.go b/app/app.go
@@ -199,6 +199,7 @@ var Upgrades = []upgrades.Upgrade{
 	upgrades.Upgrade_2_1_3,
 	upgrades.Upgrade_2_2_0,
 	upgrades.Upgrade_2_4_0,
+	upgrades.Upgrade_2_5_0,
 }
 
 // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals

diff --git a/app/upgrades/empty_upgrades.go b/app/upgrades/empty_upgrades.go
@@ -276,3 +276,9 @@ var Upgrade_2_4_0 = Upgrade{
 	CreateUpgradeHandler: defaultUpgradeHandler,
 	StoreUpgrades:        store.StoreUpgrades{},
 }
+
+var Upgrade_2_5_0 = Upgrade{
+	UpgradeName:          "v2.5.0",
+	CreateUpgradeHandler: defaultUpgradeHandler,
+	StoreUpgrades:        store.StoreUpgrades{},
+}
diff --git a/x/subscription/keeper/grpc_query_estimated_rewards.go b/x/subscription/keeper/grpc_query_estimated_rewards.go
@@ -41,7 +41,7 @@ func (k Keeper) EstimatedRewards(goCtx context.Context, req *types.QueryEstimate
 
 	// delegation of the provider
 	delegationAmount := entry.Stake
-	delegatorPart := sdk.NewDecFromInt(delegationAmount.Amount).QuoInt(totalStake).MulInt64(int64(entry.DelegateCommission)).QuoInt64(100)
+	delegatorPart := sdk.NewDecFromInt(delegationAmount.Amount).QuoInt(totalStake)
 	if req.AmountDelegator != "" {
 		_, err := sdk.AccAddressFromBech32(req.AmountDelegator)
 		if err == nil {
@@ -69,7 +69,7 @@ func (k Keeper) EstimatedRewards(goCtx context.Context, req *types.QueryEstimate
 		if entry.DelegateLimit.Amount.LT(entry.DelegateTotal.Amount) {
 			totalDelegations = entry.DelegateLimit.Amount
 		}
-		commission := sdk.NewDecFromInt(totalDelegations).QuoInt(entry.EffectiveStake()).MulInt64(int64(entry.DelegateCommission)).QuoInt64(100)
+		commission := sdk.NewDecFromInt(totalDelegations).QuoInt(totalStake).MulInt64(int64(entry.DelegateCommission)).QuoInt64(100)
 		delegatorPart = delegatorPart.Add(commission)
 	}
 	delegatorPart = delegatorPart.Mul(sdk.OneDec().Sub(specContribut))
@@ -99,7 +99,7 @@ func (k Keeper) EstimatedRewards(goCtx context.Context, req *types.QueryEstimate
 		return nil, fmt.Errorf("spec emission part not found for chain ID: %s", req.ChainId)
 	}
 
-	subscriptionRewards := sdk.NewCoins(totalSubsRewards.MulInt(specEmission.Emission.MulInt64(100).RoundInt())...)
+	subscriptionRewards, _ := sdk.NewDecCoinsFromCoins(totalSubsRewards...).MulDec(specEmission.Emission).TruncateDecimal()
 	valRewards, comRewards, err := k.rewardsKeeper.CalculateValidatorsAndCommunityParticipationRewards(ctx, subscriptionRewards[0])
 	if err != nil {
 		return nil, fmt.Errorf("failed to calculate Validators And Community Participation Rewards")

diff --git a/x/subscription/keeper/grpc_query_estimated_validator_rewards.go b/x/subscription/keeper/grpc_query_estimated_validator_rewards.go
@@ -38,7 +38,7 @@ func (k Keeper) EstimatedValidatorRewards(goCtx context.Context, req *types.Quer
 		if !found {
 			return nil, fmt.Errorf("self delegation not found")
 		}
-		delegatorPart = del.Shares.Quo(val.DelegatorShares).Add(val.DelegatorShares.Sub(del.Shares).Quo(val.DelegatorShares).Mul(val.Commission.Rate))
+		delegatorPart = del.Shares.Add(val.DelegatorShares.Sub(del.Shares).Mul(val.Commission.Rate)).Quo(val.DelegatorShares)
 	} else {
 		delAddress, err := sdk.AccAddressFromBech32(req.AmountDelegator)
 		// existing delegator