Merge branch 'cosmostation:develop' into develop

Author: maiquanghiep

docker/cvms/support_chains.yaml

@@ -765,6 +765,18 @@ lumera-testnet-1:
     - block
     - upgrade
     - uptime
+ledger-testnet-1:
+  chain_name: lombard
+  protocol_type: cosmos
+  mainnet: false
+  support_asset:
+    denom: ulom
+    decimal: 6
+  packages:
+    - block
+    - upgrade
+    - uptime
+    - voteindexer
 mantle-1:
   chain_name: asset-mantle
   protocol_type: cosmos

internal/packages/babylon/finality-provider/api/api.go

@@ -34,8 +34,16 @@ func GetFinalityProviderUptime(exporter *common.Exporter) (types.BabylonFinality
 
 	exporter.Debugf("got active finality providers: %d", len(activeProviders))
 
+	fpInfoList, jailedCnt := addActiveStatus(activeProviders, finalityProviderInfos)
+	fpTotal := types.FinalityProviderTotal{
+		Active:   len(activeProviders),
+		Inactive: len(finalityProviderInfos) - len(activeProviders),
+		Jailed:   jailedCnt,
+		Unjailed: len(finalityProviderInfos) - jailedCnt,
+	}
+
 	// 5. get lity providers' uptime status
-	finalityProviderUptimeStatus, err := commonapi.GetFinalityProviderUptime(exporter.CommonClient, addActiveStatus(activeProviders, finalityProviderInfos))
+	finalityProviderUptimeStatus, err := commonapi.GetFinalityProviderUptime(exporter.CommonClient, fpInfoList)
 	if err != nil {
 		return types.BabylonFinalityProviderUptimeStatues{}, errors.Wrap(err, "failed to get babylon finality providers uptime")
 	}
@@ -72,17 +80,23 @@ func GetFinalityProviderUptime(exporter *common.Exporter) (types.BabylonFinality
 		MinSignedPerWindow:      minSignedPerWindow,
 		FinalityProvidersStatus: finalityProviderUptimeStatus,
 		LastFinalizedBlockInfo:  LastFinalizedBlockInfo,
+		FinalityProviderTotal:   fpTotal,
 	}, nil
 }
 
-func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityProviderInfos []commontypes.FinalityProviderInfo) []commontypes.FinalityProviderInfo {
+func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityProviderInfos []commontypes.FinalityProviderInfo) ([]commontypes.FinalityProviderInfo, int) {
 	activeFpMap := make(map[string]commontypes.FinalityProvider, len(activeProviders))
 	for _, fp := range activeProviders {
 		activeFpMap[fp.BtcPkHex] = fp
 	}
 
+	jailedCnt := 0
 	// Modify the original slice using index-based iteration
 	for i := range finalityProviderInfos {
+		if finalityProviderInfos[i].Jailed {
+			jailedCnt++
+		}
+
 		fp, exist := activeFpMap[finalityProviderInfos[i].BTCPK]
 		if exist {
 			// NOTE: fp.VotingPower must will be integer, so no need to check error
@@ -92,7 +106,7 @@ func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityPro
 		}
 	}
 
-	return finalityProviderInfos
+	return finalityProviderInfos, jailedCnt
 }
 
 func getLastFinalizedBlockInfo(votes []string, fps []commontypes.FinalityProvider) types.LastFinalizedBlockInfo {

internal/packages/babylon/finality-provider/collector/collector.go

@@ -29,6 +29,8 @@ const (
 	LastFinalizedBlockMissingVotesCountMetricName = "last_finalized_block_missing_votes_count"
 	LastFinalizedBlockMissingVPMetricName         = "last_finalized_block_missing_vp"
 	LastFinalizedBlockFinalizedVPMetricName       = "last_finalized_block_finalized_vp"
+
+	METRIC_NAME_FINALITY_PROVIDERS_TOTAL = "finality_providers_total"
 )
 
 func Start(p common.Packager) error {
@@ -113,6 +115,15 @@ func loop(exporter *common.Exporter, p common.Packager) {
 		ConstLabels: packageLabels,
 	})
 
+	fpTotalMetric := p.Factory.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace:   common.Namespace,
+		Subsystem:   Subsystem,
+		Name:        METRIC_NAME_FINALITY_PROVIDERS_TOTAL,
+		ConstLabels: packageLabels,
+	}, []string{
+		common.StatusLabel,
+	})
+
 	isUnhealth := false
 	for {
 		// node health check
@@ -178,6 +189,11 @@ func loop(exporter *common.Exporter, p common.Packager) {
 						Set(item.VotingPower)
 				}
 			}
+
+			fpTotalMetric.With(prometheus.Labels{common.StatusLabel: "active"}).Set(float64(status.FinalityProviderTotal.Active))
+			fpTotalMetric.With(prometheus.Labels{common.StatusLabel: "inactive"}).Set(float64(status.FinalityProviderTotal.Inactive))
+			fpTotalMetric.With(prometheus.Labels{common.StatusLabel: "jailed"}).Set(float64(status.FinalityProviderTotal.Jailed))
+			fpTotalMetric.With(prometheus.Labels{common.StatusLabel: "unjailed"}).Set(float64(status.FinalityProviderTotal.Unjailed))
 		} else {
 			for _, item := range status.FinalityProvidersStatus {
 				if ok := helper.Contains(exporter.Monikers, item.Moniker); ok {

internal/packages/babylon/finality-provider/types/status.go

@@ -5,6 +5,7 @@ type BabylonFinalityProviderUptimeStatues struct {
 	SignedBlocksWindow      float64
 	FinalityProvidersStatus []FinalityProviderUptimeStatus
 	LastFinalizedBlockInfo
+	FinalityProviderTotal
 }
 
 type FinalityProviderUptimeStatus struct {
@@ -22,3 +23,10 @@ type LastFinalizedBlockInfo struct {
 	MissingVP    float64
 	FinalizedVP  float64
 }
+
+type FinalityProviderTotal struct {
+	Active   int
+	Inactive int
+	Jailed   int
+	Unjailed int
+}

internal/packages/consensus/uptime/api/uptime.go

@@ -66,13 +66,20 @@ func getValidatorUptimeStatus(c common.CommonApp, chainName string, validators [
 
 	// 3. make pubkey map by using consensus hex address with extracted valcons prefix
 	pubkeysMap := make(map[string]string)
+	vpMap := make(map[string]float64)
 	for _, validator := range validators {
 		bz, _ := hex.DecodeString(validator.Address)
 		consensusAddress, err := sdkhelper.ConvertAndEncode(bech32ValconsPrefix, bz)
 		if err != nil {
 			return nil, common.ErrFailedConvertTypes
 		}
 		pubkeysMap[validator.Pubkey.Value] = consensusAddress
+
+		vp, err := strconv.ParseFloat(validator.VotingPower, 64)
+		if err != nil {
+			return nil, common.ErrFailedConvertTypes
+		}
+		vpMap[validator.Pubkey.Value] = vp
 	}
 
 	// 4. Sort staking validators by vp
@@ -91,6 +98,7 @@ func getValidatorUptimeStatus(c common.CommonApp, chainName string, validators [
 		validatorOperatorAddress := item.OperatorAddress
 		consensusAddress := pubkeysMap[item.ConsensusPubkey.Key]
 		queryPath := queryPathFunction(consensusAddress)
+		vp := vpMap[item.ConsensusPubkey.Key]
 
 		go func(ch chan helper.Result) {
 			defer helper.HandleOutOfNilResponse(c.Entry)
@@ -127,6 +135,7 @@ func getValidatorUptimeStatus(c common.CommonApp, chainName string, validators [
 					MissedBlockCounter:        missedBlocksCounter,
 					IsTomstoned:               isTomstoned,
 					ValidatorOperatorAddress:  validatorOperatorAddress,
+					VotingPower:               vp,
 				}}
 		}(ch)
 		time.Sleep(10 * time.Millisecond)

internal/packages/consensus/uptime/collector/collector.go

@@ -25,6 +25,8 @@ const (
 	JailedMetricName             = "jailed"
 	SignedBlocksWindowMetricName = "signed_blocks_window"
 	MinSignedPerWindowMetricName = "min_signed_per_window"
+
+	METRIC_NAME_VP = "validator_voting_power"
 )
 
 func Start(p common.Packager) error {
@@ -85,6 +87,18 @@ func loop(exporter *common.Exporter, p common.Packager) {
 		common.ProposerAddressLabel,
 	})
 
+	vpMetric := p.Factory.NewGaugeVec(prometheus.GaugeOpts{
+		Namespace:   common.Namespace,
+		Subsystem:   Subsystem,
+		Name:        METRIC_NAME_VP,
+		ConstLabels: packageLabels,
+	}, []string{
+		common.MonikerLabel,
+		common.ValidatorAddressLabel,
+		common.ConsensusAddressLabel,
+		common.ProposerAddressLabel,
+	})
+
 	// metrics for each chain
 	signedBlocksWindowMetric := p.Factory.NewGauge(prometheus.GaugeOpts{
 		Namespace:   common.Namespace,
@@ -156,6 +170,14 @@ func loop(exporter *common.Exporter, p common.Packager) {
 						common.MonikerLabel:          item.Moniker,
 					}).
 					Set(float64(item.IsTomstoned))
+				vpMetric.
+					With(prometheus.Labels{
+						common.ValidatorAddressLabel: item.ValidatorOperatorAddress,
+						common.ConsensusAddressLabel: item.ValidatorConsensusAddress,
+						common.ProposerAddressLabel:  item.ProposerAddress,
+						common.MonikerLabel:          item.Moniker,
+					}).
+					Set(item.VotingPower)
 			}
 		} else {
 			// update metrics by each validators
@@ -177,6 +199,14 @@ func loop(exporter *common.Exporter, p common.Packager) {
 							common.MonikerLabel:          item.Moniker,
 						}).
 						Set(float64(item.IsTomstoned))
+					vpMetric.
+						With(prometheus.Labels{
+							common.ValidatorAddressLabel: item.ValidatorOperatorAddress,
+							common.ConsensusAddressLabel: item.ValidatorConsensusAddress,
+							common.ProposerAddressLabel:  item.ProposerAddress,
+							common.MonikerLabel:          item.Moniker,
+						}).
+						Set(item.VotingPower)
 				}
 			}
 		}

internal/packages/consensus/uptime/types/types_common.go

@@ -19,6 +19,7 @@ type ValidatorUptimeStatus struct {
 	ValidatorOperatorAddress  string  `json:"validator_operator_address"`
 	ValidatorConsensusAddress string  `json:"validator_consensus_addreess"`
 	MissedBlockCounter        float64 `json:"missed_block_counter"`
+	VotingPower               float64
 	IsTomstoned               float64
 	// Only Consumer Chain
 	ConsumerConsensusAddress string `json:"consumer_consensus_address"`