FEAT: Display extra owners data

epochStart/metachain/auctionListDisplayer.go

@@ -11,7 +11,6 @@ import (
 	"github.com/multiversx/mx-chain-go/config"
 	errorsCommon "github.com/multiversx/mx-chain-go/errors"
 	"github.com/multiversx/mx-chain-go/state"
-	logger "github.com/multiversx/mx-chain-logger-go"
 )
 
 const maxPubKeyDisplayableLen = 20
@@ -69,9 +68,6 @@ func checkDisplayerNilArgs(args ArgsAuctionListDisplayer) error {
 
 // DisplayOwnersData will display initial owners data for auction selection
 func (ald *auctionListDisplayer) DisplayOwnersData(ownersData map[string]*OwnerAuctionData) {
-	if log.GetLevel() > logger.LogDebug {
-		return
-	}
 
 	tableHeader := []string{
 		"Owner",
@@ -100,6 +96,34 @@ func (ald *auctionListDisplayer) DisplayOwnersData(ownersData map[string]*OwnerA
 	ald.tableDisplayer.DisplayTable(tableHeader, lines, "Initial nodes config in auction list")
 }
 
+func (ald *auctionListDisplayer) DisplayExtraOwnersData(ownersData map[string]*OwnerAuctionData) {
+	tableHeader := []string{
+		"Owner",
+		"Num staked nodes",
+		"Num active nodes",
+		"Num auction nodes",
+		"Total top up",
+		"Top up per node",
+		"Auction list nodes",
+	}
+
+	lines := make([]*display.LineData, 0, len(ownersData))
+	for ownerPubKey, owner := range ownersData {
+		line := []string{
+			ald.addressPubKeyConverter.SilentEncode([]byte(ownerPubKey), log),
+			strconv.Itoa(int(owner.numStakedNodes)),
+			strconv.Itoa(int(owner.numActiveNodes)),
+			strconv.Itoa(int(owner.numAuctionNodes)),
+			getPrettyValue(owner.totalTopUp, ald.softAuctionConfig.denominator),
+			getPrettyValue(owner.topUpPerNode, ald.softAuctionConfig.denominator),
+			ald.getShortDisplayableBlsKeys(owner.auctionList),
+		}
+		lines = append(lines, display.NewLineData(false, line))
+	}
+
+	ald.tableDisplayer.DisplayTable(tableHeader, lines, "All nodes config with and without auction")
+}
+
 func getPrettyValue(val *big.Int, denominator *big.Int) string {
 	first := big.NewInt(0).Div(val, denominator).String()
 	decimals := big.NewInt(0).Mod(val, denominator).String()
@@ -144,9 +168,6 @@ func (ald *auctionListDisplayer) getShortKey(pubKey []byte) string {
 
 // DisplayOwnersSelectedNodes will display owners' selected nodes
 func (ald *auctionListDisplayer) DisplayOwnersSelectedNodes(ownersData map[string]*OwnerAuctionData) {
-	if log.GetLevel() > logger.LogDebug {
-		return
-	}
 
 	tableHeader := []string{
 		"Owner",
@@ -185,9 +206,6 @@ func (ald *auctionListDisplayer) DisplayAuctionList(
 	ownersData map[string]*OwnerAuctionData,
 	numOfSelectedNodes uint32,
 ) {
-	if log.GetLevel() > logger.LogDebug {
-		return
-	}
 
 	tableHeader := []string{"Owner", "Registered key", "Qualified TopUp per node"}
 	lines := make([]*display.LineData, 0, len(auctionList))

epochStart/metachain/auctionListSelector.go

@@ -190,7 +190,7 @@ func (als *auctionListSelector) SelectNodesFromAuctionList(
 		return process.ErrNilRandSeed
 	}
 
-	ownersData, auctionListSize := als.getAuctionData()
+	ownersData, extraOwnersData, auctionListSize := als.getAuctionData()
 	if auctionListSize == 0 {
 		log.Info("auctionListSelector.SelectNodesFromAuctionList: empty auction list; skip selection")
 		return nil
@@ -230,6 +230,7 @@ func (als *auctionListSelector) SelectNodesFromAuctionList(
 	)
 
 	als.auctionListDisplayer.DisplayOwnersData(ownersData)
+	als.auctionListDisplayer.(*auctionListDisplayer).DisplayExtraOwnersData(extraOwnersData)
 	numOfAvailableNodeSlots := core.MinUint32(auctionListSize, availableSlots)
 
 	sw := core.NewStopWatch()
@@ -242,8 +243,9 @@ func (als *auctionListSelector) SelectNodesFromAuctionList(
 	return als.sortAuctionList(ownersData, numOfAvailableNodeSlots, validatorsInfoMap, randomness)
 }
 
-func (als *auctionListSelector) getAuctionData() (map[string]*OwnerAuctionData, uint32) {
+func (als *auctionListSelector) getAuctionData() (map[string]*OwnerAuctionData, map[string]*OwnerAuctionData, uint32) {
 	ownersData := make(map[string]*OwnerAuctionData)
+	extraOwnersData := make(map[string]*OwnerAuctionData)
 	numOfNodesInAuction := uint32(0)
 
 	for owner, ownerData := range als.stakingDataProvider.GetOwnersData() {
@@ -263,9 +265,21 @@ func (als *auctionListSelector) getAuctionData() (map[string]*OwnerAuctionData,
 			copy(ownersData[owner].auctionList, ownerData.AuctionList)
 			numOfNodesInAuction += uint32(numAuctionNodes)
 		}
+		numAuctionNodes := len(ownerData.AuctionList)
+		extraOwnersData[owner] = &OwnerAuctionData{
+			numActiveNodes:           ownerData.NumActiveNodes,
+			numAuctionNodes:          int64(numAuctionNodes),
+			numQualifiedAuctionNodes: int64(numAuctionNodes),
+			numStakedNodes:           ownerData.NumStakedNodes,
+			totalTopUp:               ownerData.TotalTopUp,
+			topUpPerNode:             ownerData.TopUpPerNode,
+			qualifiedTopUpPerNode:    ownerData.TopUpPerNode,
+			auctionList:              make([]state.ValidatorInfoHandler, numAuctionNodes),
+		}
+		copy(extraOwnersData[owner].auctionList, ownerData.AuctionList)
 	}
 
-	return ownersData, numOfNodesInAuction
+	return ownersData, extraOwnersData, numOfNodesInAuction
 }
 
 func isInAuction(validator state.ValidatorInfoHandler) bool {
@@ -297,7 +311,7 @@ func (als *auctionListSelector) calcSoftAuctionNodesConfig(
 ) map[string]*OwnerAuctionData {
 	ownersData := copyOwnersData(data)
 	minTopUp, maxTopUp := als.getMinMaxPossibleTopUp(ownersData)
-	log.Debug("auctionListSelector: calc min and max possible top up",
+	log.Info("auctionListSelector: calc min and max possible top up",
 		"min top up per node", getPrettyValue(minTopUp, als.softAuctionConfig.denominator),
 		"max top up per node", getPrettyValue(maxTopUp, als.softAuctionConfig.denominator),
 	)
@@ -319,7 +333,7 @@ func (als *auctionListSelector) calcSoftAuctionNodesConfig(
 		maxNumberOfIterationsReached = iterationNumber >= als.softAuctionConfig.maxNumberOfIterations
 	}
 
-	log.Debug("auctionListSelector: found min required",
+	log.Info("auctionListSelector: found min required",
 		"topUp", getPrettyValue(topUp, als.softAuctionConfig.denominator),
 		"after num of iterations", iterationNumber,
 	)

epochStart/metachain/tableDisplayer.go

@@ -23,7 +23,7 @@ func (tb *tableDisplayer) DisplayTable(tableHeader []string, lines []*display.Li
 	}
 
 	msg := fmt.Sprintf("%s\n%s", message, table)
-	log.Debug(msg)
+	log.Info(msg)
 }
 
 // IsInterfaceNil checks if the underlying pointer is nil

epochStart/metachain/trigger.go

@@ -219,8 +219,8 @@ func (t *trigger) Update(round uint64, nonce uint64) {
 		t.currEpochStartRound = t.currentRound
 
 		msg := fmt.Sprintf("EPOCH %d BEGINS IN ROUND (%d)", t.epoch, t.currentRound)
-		log.Debug(display.Headline(msg, "", "#"))
-		log.Debug("trigger.Update", "isEpochStart", t.isEpochStart)
+		log.Info(display.Headline(msg, "", "#"))
+		log.Info("trigger.Update", "isEpochStart", t.isEpochStart)
 		logger.SetCorrelationEpoch(t.epoch)
 		t.nextEpochStartRound = disabledRoundForForceEpochStart
 	}

epochStart/shardchain/trigger.go

@@ -661,8 +661,8 @@ func (t *trigger) updateTriggerFromMeta() {
 			t.epochStartNotifier.NotifyEpochChangeConfirmed(t.metaEpoch)
 
 			msg := fmt.Sprintf("EPOCH %d BEGINS IN ROUND (%d)", t.metaEpoch, t.epochStartRound)
-			log.Debug(display.Headline(msg, "", "#"))
-			log.Debug("trigger.updateTriggerFromMeta", "isEpochStart", t.isEpochStart)
+			log.Info(display.Headline(msg, "", "#"))
+			log.Info("trigger.updateTriggerFromMeta", "isEpochStart", t.isEpochStart)
 			logger.SetCorrelationEpoch(t.metaEpoch)
 			t.clearMissingMiniBlocksMap(t.metaEpoch)
 			t.clearMissingValidatorsInfoMap(t.metaEpoch)