Merge pull request #228 from binance-chain/rewards_calcu_fix

Distribution calculation fix
bnb-chain · Jul 10, 2020 · 8ece951 · 8ece951
2 parents f430a26 + 61ee35a
commit 8ece951
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/x/stake/keeper/distribute_sidechain.go b/x/stake/keeper/distribute_sidechain.go
@@ -31,16 +31,15 @@ func (k Keeper) Distribute(ctx sdk.Context) {
 		}
 		totalRewardDec := sdk.NewDec(totalReward)
 		commission := totalRewardDec.Mul(validator.Commission.Rate)
-		remainReward := totalRewardDec.Sub(commission).RawInt()
+		remainReward := totalRewardDec.Sub(commission)
 		// remove all balance of bondDenom from Distribution account
 		distAccCoins = distAccCoins.Minus(sdk.Coins{sdk.NewCoin(bondDenom, totalReward)})
 		if err := k.bankKeeper.SetCoins(ctx, validator.DistributionAddr, distAccCoins); err != nil {
 			panic(err)
 		}
-		//shouldCarry, shouldNotCarry, remainInt := allocateReward(delegations, commission, validator.DelegatorShares.RawInt(), remainInt)
-		rewards := allocate(simDelsToSharers(delegations), commission, validator.DelegatorShares)
-		if remainReward > 0 { // assign rewards to self-delegator
-			if _, _, err := k.bankKeeper.AddCoins(ctx, validator.GetFeeAddr(), sdk.Coins{sdk.NewCoin(bondDenom, remainReward)}); err != nil {
+		rewards := allocate(simDelsToSharers(delegations), remainReward, validator.DelegatorShares)
+		if commission.RawInt() > 0 { // assign rewards to self-delegator
+			if _, _, err := k.bankKeeper.AddCoins(ctx, validator.GetFeeAddr(), sdk.Coins{sdk.NewCoin(bondDenom, commission.RawInt())}); err != nil {
 				panic(err)
 			}
 		}

diff --git a/x/stake/keeper/distribute_sidechain_test.go b/x/stake/keeper/distribute_sidechain_test.go
@@ -63,7 +63,7 @@ func TestDistribute(t *testing.T) {
 		validator.DelegatorShares = sdk.NewDec(totalShares)
 		validator.Tokens = sdk.NewDec(totalShares)
 		validator.DistributionAddr = Addrs[499-i]
-		validator, setCommErr := validator.SetInitialCommission(types.Commission{Rate: sdk.NewDecWithPrec(60, 2), MaxRate: sdk.NewDecWithPrec(90, 2)})
+		validator, setCommErr := validator.SetInitialCommission(types.Commission{Rate: sdk.NewDecWithPrec(40, 2), MaxRate: sdk.NewDecWithPrec(90, 2)})
 		require.NoError(t, setCommErr)
 		validators[i] = validator