Merge pull request #1354 from chengwenxi/validator-query

R4R: Fix bug for validator query and metrics

Author: Haifeng Xi

client/stake/utils.go

@@ -156,7 +156,7 @@ func ConvertValidatorToValidatorOutput(cliCtx context.CLIContext, v stake.Valida
 		Tokens:           utils.ConvertDecToRat(v.Tokens).Mul(exRate).FloatString(),
 		DelegatorShares:  utils.ConvertDecToRat(v.DelegatorShares).Mul(exRate).FloatString(),
 		Description:      v.Description,
-		BondHeight:       v.UnbondingHeight,
+		BondHeight:       v.BondHeight,
 		UnbondingHeight:  v.UnbondingHeight,
 		UnbondingMinTime: v.UnbondingMinTime,
 		Commission:       commission,

modules/distribution/keeper/allocation.go

@@ -69,7 +69,7 @@ func (k Keeper) AllocateTokens(ctx sdk.Context, percentVotes sdk.Dec, proposer s
 	tokenPrecision := sdk.NewIntWithDecimal(1, 18)
 	communityTaxAmount, err := strconv.ParseFloat(feePool.CommunityPool.AmountOf(sdk.NativeTokenMinDenom).QuoInt(tokenPrecision).String(), 64)
 	if err == nil {
-		k.metrics.CommunityTax.With("height", strconv.Itoa(int(ctx.BlockHeight()))).Set(communityTaxAmount)
+		k.metrics.CommunityTax.Set(communityTaxAmount)
 	}
 
 	logger.Info("Allocate reward to community tax fund", "allocate_amount", communityFunding.ToString(), "total_community_tax", feePool.CommunityPool.ToString())
@@ -96,7 +96,7 @@ func (k Keeper) AllocateFeeTax(ctx sdk.Context, destAddr sdk.AccAddress, percent
 	tokenPrecision := sdk.NewIntWithDecimal(1, 18)
 	communityTaxAmount, err := strconv.ParseFloat(feePool.CommunityPool.AmountOf(sdk.NativeTokenMinDenom).QuoInt(tokenPrecision).String(), 64)
 	if err == nil {
-		k.metrics.CommunityTax.With("height", strconv.Itoa(int(ctx.BlockHeight()))).Set(communityTaxAmount)
+		k.metrics.CommunityTax.Set(communityTaxAmount)
 	}
 
 	k.SetFeePool(ctx, feePool)

modules/distribution/keeper/metrics.go

@@ -25,7 +25,7 @@ func PrometheusMetrics(config *cfg.InstrumentationConfig) *Metrics {
 			Subsystem: MetricsSubsystem,
 			Name:      "community_tax",
 			Help:      "community tax",
-		}, []string{"height"}),
+		}, []string{}),
 	}
 }