Merge branch 'cosmostation:develop' into develop

Author: maiquanghiep

docker/cvms/support_chains.yaml

@@ -29,6 +29,18 @@ akashnet-2:
     - upgrade
     - uptime
     - voteindexer
+allora-mainnet-1:
+  chain_name: allora
+  protocol_type: cosmos
+  mainnet: true
+  support_asset:
+    denom: uallo
+    decimal: 6
+  packages:
+    - block
+    - upgrade
+    - uptime
+    - voteindexer
 allora-testnet-1:
   chain_name: allora
   protocol_type: cosmos
@@ -449,7 +461,7 @@ deluge-1:
     - block
     - upgrade
     - uptime
-    - voteindexer    
+    - voteindexer
 evmos_9000-4:
   chain_name: evmos
   protocol_type: cosmos
@@ -1267,7 +1279,7 @@ imuachaintestnet_233-8:
     - block
     - upgrade
     # - uptime
-    # - voteindexer  
+    # - voteindexer
 selfchain-testnet:
   chain_name: selfchain
   protocol_type: cosmos
@@ -1364,7 +1376,7 @@ union-testnet-9:
     - block
     - upgrade
     - uptime
-    - voteindexer    
+    - voteindexer
 union-1:
   chain_name: union
   protocol_type: cosmos
@@ -1412,7 +1424,7 @@ xrplevm_1449000-1:
     - block
     - upgrade
     - uptime
-    - voteindexer    
+    - voteindexer
 zetachain_7000-1:
   chain_name: zeta
   protocol_type: cosmos

internal/common/api/babylon.go

@@ -114,12 +114,21 @@ func GetFinalityProviderUptime(c common.CommonClient, fpInfoList []types.Finalit
 		jailed := item.Jailed
 		active := item.Active
 		vp := item.VotingPower
-
+		slashedBTCHeight := item.SlashedBTCHeight
+		status := "active"
 		queryPath := types.BabylonFinalityProviderSigninInfoQueryPath(item.BTCPK)
 		go func(ch chan helper.Result) {
 			defer helper.HandleOutOfNilResponse(c.Entry)
 			defer wg.Done()
 
+			if jailed {
+				status = "jailed"
+			}
+
+			if slashedBTCHeight > 0 {
+				status = "slashed"
+			}
+
 			if !active {
 				ch <- helper.Result{
 					Success: true,
@@ -128,7 +137,7 @@ func GetFinalityProviderUptime(c common.CommonClient, fpInfoList []types.Finalit
 						Address:            Address,
 						BTCPK:              BTCPK,
 						MissedBlockCounter: 0,
-						Jailed:             strconv.FormatBool(jailed),
+						Status:             status,
 						Active:             strconv.FormatBool(active),
 						VotingPower:        0,
 					}}
@@ -167,7 +176,7 @@ func GetFinalityProviderUptime(c common.CommonClient, fpInfoList []types.Finalit
 					Address:            Address,
 					BTCPK:              BTCPK,
 					MissedBlockCounter: missedBlockCounter,
-					Jailed:             strconv.FormatBool(jailed),
+					Status:             status,
 					Active:             strconv.FormatBool(active),
 					VotingPower:        vp,
 				}}

internal/common/types/babylon.go

@@ -53,10 +53,13 @@ type FinalityProviderInfo struct {
 	Description struct {
 		Moniker string `json:"moniker"`
 	} `json:"description"`
-	Address string `json:"addr"`
-	BTCPK   string `json:"btc_pk"`
-	Jailed  bool   `json:"jailed"`
+	Address              string `json:"addr"`
+	BTCPK                string `json:"btc_pk"`
+	Jailed               bool   `json:"jailed"`
+	SlashedBabylonHeight string `json:"slashed_babylon_height"`
+	SlashedBTCHeight     int    `json:"slashed_btc_height"`
 	// injected
+	Slashed     bool
 	Active      bool
 	VotingPower float64
 }

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

@@ -34,12 +34,12 @@ func GetFinalityProviderUptime(exporter *common.Exporter) (types.BabylonFinality
 
 	exporter.Debugf("got active finality providers: %d", len(activeProviders))
 
-	fpInfoList, jailedCnt := addActiveStatus(activeProviders, finalityProviderInfos)
+	fpInfoList, jailedCnt, slashedCnt := addActiveStatus(activeProviders, finalityProviderInfos)
 	fpTotal := types.FinalityProviderTotal{
 		Active:   len(activeProviders),
 		Inactive: len(finalityProviderInfos) - len(activeProviders),
 		Jailed:   jailedCnt,
-		Unjailed: len(finalityProviderInfos) - jailedCnt,
+		Slashed:  slashedCnt,
 	}
 
 	// 5. get lity providers' uptime status
@@ -84,19 +84,24 @@ func GetFinalityProviderUptime(exporter *common.Exporter) (types.BabylonFinality
 	}, nil
 }
 
-func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityProviderInfos []commontypes.FinalityProviderInfo) ([]commontypes.FinalityProviderInfo, int) {
+func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityProviderInfos []commontypes.FinalityProviderInfo) ([]commontypes.FinalityProviderInfo, int, int) {
 	activeFpMap := make(map[string]commontypes.FinalityProvider, len(activeProviders))
 	for _, fp := range activeProviders {
 		activeFpMap[fp.BtcPkHex] = fp
 	}
 
 	jailedCnt := 0
+	slashedCnt := 0
 	// Modify the original slice using index-based iteration
 	for i := range finalityProviderInfos {
 		if finalityProviderInfos[i].Jailed {
 			jailedCnt++
 		}
 
+		if finalityProviderInfos[i].SlashedBTCHeight > 0 {
+			slashedCnt++
+		}
+
 		fp, exist := activeFpMap[finalityProviderInfos[i].BTCPK]
 		if exist {
 			// NOTE: fp.VotingPower must will be integer, so no need to check error
@@ -106,7 +111,7 @@ func addActiveStatus(activeProviders []commontypes.FinalityProvider, finalityPro
 		}
 	}
 
-	return finalityProviderInfos, jailedCnt
+	return finalityProviderInfos, jailedCnt, slashedCnt
 }
 
 func getLastFinalizedBlockInfo(votes []string, fps []commontypes.FinalityProvider) types.LastFinalizedBlockInfo {

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

@@ -30,7 +30,7 @@ const (
 	LastFinalizedBlockMissingVPMetricName         = "last_finalized_block_missing_vp"
 	LastFinalizedBlockFinalizedVPMetricName       = "last_finalized_block_finalized_vp"
 
-	METRIC_NAME_FINALITY_PROVIDERS_TOTAL = "finality_providers_total"
+	METRIC_NAME_FINALITY_PROVIDERS_TOTAL = "total"
 )
 
 func Start(p common.Packager) error {
@@ -65,7 +65,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 		common.MonikerLabel,
 		common.OrchestratorAddressLabel,
 		common.BTCPKLabel,
-		common.JailedLabel,
+		common.StatusLabel,
 		common.ActiveLabel,
 	})
 
@@ -78,7 +78,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 		common.MonikerLabel,
 		common.OrchestratorAddressLabel,
 		common.BTCPKLabel,
-		common.JailedLabel,
+		common.StatusLabel,
 		common.ActiveLabel,
 	})
 
@@ -176,7 +176,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 						common.MonikerLabel:             item.Moniker,
 						common.BTCPKLabel:               item.BTCPK,
 						common.OrchestratorAddressLabel: item.Address,
-						common.JailedLabel:              item.Jailed,
+						common.StatusLabel:              item.Status,
 						common.ActiveLabel:              item.Active,
 					}).
 					Set(float64(item.MissedBlockCounter))
@@ -187,7 +187,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 							common.MonikerLabel:             item.Moniker,
 							common.BTCPKLabel:               item.BTCPK,
 							common.OrchestratorAddressLabel: item.Address,
-							common.JailedLabel:              item.Jailed,
+							common.StatusLabel:              item.Status,
 							common.ActiveLabel:              item.Active,
 						}).
 						Set(item.VotingPower)
@@ -197,7 +197,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 			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))
+			fpTotalMetric.With(prometheus.Labels{common.StatusLabel: "slashed"}).Set(float64(status.FinalityProviderTotal.Slashed))
 		} else {
 			for _, item := range status.FinalityProvidersStatus {
 				if ok := helper.Contains(exporter.Monikers, item.Moniker); ok {
@@ -206,7 +206,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 							common.MonikerLabel:             item.Moniker,
 							common.BTCPKLabel:               item.BTCPK,
 							common.OrchestratorAddressLabel: item.Address,
-							common.JailedLabel:              item.Jailed,
+							common.StatusLabel:              item.Status,
 							common.ActiveLabel:              item.Active,
 						}).
 						Set(float64(item.MissedBlockCounter))
@@ -217,7 +217,7 @@ func loop(exporter *common.Exporter, p common.Packager) {
 								common.MonikerLabel:             item.Moniker,
 								common.BTCPKLabel:               item.BTCPK,
 								common.OrchestratorAddressLabel: item.Address,
-								common.JailedLabel:              item.Jailed,
+								common.StatusLabel:              item.Status,
 								common.ActiveLabel:              item.Active,
 							}).
 							Set(item.VotingPower)

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

@@ -14,7 +14,7 @@ type FinalityProviderUptimeStatus struct {
 	BTCPK              string
 	MissedBlockCounter float64
 	Active             string
-	Jailed             string
+	Status             string
 	VotingPower        float64
 }
 
@@ -28,5 +28,5 @@ type FinalityProviderTotal struct {
 	Active   int
 	Inactive int
 	Jailed   int
-	Unjailed int
+	Slashed  int
 }