Change validator info command

command/polybft/polybft_command.go

@@ -4,9 +4,9 @@ import (
 	"github.com/0xPolygon/polygon-edge/command/rootchain/registration"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/staking"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/supernet"
+	"github.com/0xPolygon/polygon-edge/command/rootchain/validators"
 	"github.com/0xPolygon/polygon-edge/command/rootchain/whitelist"
 	"github.com/0xPolygon/polygon-edge/command/sidechain/unstaking"
-	"github.com/0xPolygon/polygon-edge/command/sidechain/validators"
 
 	"github.com/0xPolygon/polygon-edge/command/sidechain/withdraw"
 	"github.com/spf13/cobra"
@@ -21,6 +21,7 @@ func GetCommand() *cobra.Command {
 	polybftCmd.AddCommand(
 		unstaking.GetCommand(),
 		withdraw.GetCommand(),
+		// rootchain (supernet manager) command that queries validator info
 		validators.GetCommand(),
 		// rootchain (supernet manager) whitelist validator
 		whitelist.GetCommand(),

command/rootchain/helper/metadata.go

@@ -2,12 +2,17 @@ package helper
 
 import (
 	"context"
-	"encoding/hex"
 	"errors"
 	"fmt"
+	"math/big"
 
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	"github.com/0xPolygon/polygon-edge/consensus/polybft"
+	"github.com/0xPolygon/polygon-edge/consensus/polybft/contractsapi"
 	polybftWallet "github.com/0xPolygon/polygon-edge/consensus/polybft/wallet"
+	"github.com/0xPolygon/polygon-edge/contracts"
+	"github.com/0xPolygon/polygon-edge/helper/hex"
+	"github.com/0xPolygon/polygon-edge/txrelayer"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/umbracle/ethgo"
@@ -109,3 +114,43 @@ func GetECDSAKey(privateKey, accountDir, accountConfig string) (ethgo.Key, error
 
 	return polybftWallet.GetEcdsaFromSecret(secretsManager)
 }
+
+// GetValidatorInfo queries SupernetManager smart contract on root
+// and retrieves validator info for given address
+func GetValidatorInfo(validatorAddr, supernetManagerAddr ethgo.Address,
+	txRelayer txrelayer.TxRelayer) (*polybft.ValidatorInfo, error) {
+	getValidatorMethod := contractsapi.CustomSupernetManager.Abi.GetMethod("validators")
+
+	encode, err := getValidatorMethod.Encode([]interface{}{validatorAddr})
+	if err != nil {
+		return nil, err
+	}
+
+	response, err := txRelayer.Call(ethgo.Address(contracts.SystemCaller),
+		supernetManagerAddr, encode)
+	if err != nil {
+		return nil, err
+	}
+
+	byteResponse, err := hex.DecodeHex(response)
+	if err != nil {
+		return nil, fmt.Errorf("unable to decode hex response, %w", err)
+	}
+
+	decoded, err := getValidatorMethod.Outputs.Decode(byteResponse)
+	if err != nil {
+		return nil, err
+	}
+
+	decodedOutputsMap, ok := decoded.(map[string]interface{})
+	if !ok {
+		return nil, fmt.Errorf("could not convert decoded outputs to map")
+	}
+
+	return &polybft.ValidatorInfo{
+		Address:     validatorAddr.Address(),
+		Stake:       decodedOutputsMap["stake"].(*big.Int),     //nolint:forcetypeassert
+		Active:      decodedOutputsMap["isActive"].(bool),      //nolint:forcetypeassert
+		Whitelisted: decodedOutputsMap["isWhitelisted"].(bool), //nolint:forcetypeassert
+	}, nil
+}

command/rootchain/validators/params.go

@@ -0,0 +1,44 @@
+package validators
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/0xPolygon/polygon-edge/command/helper"
+	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
+)
+
+type validatorInfoParams struct {
+	accountDir             string
+	accountConfig          string
+	jsonRPC                string
+	supernetManagerAddress string
+}
+
+func (v *validatorInfoParams) validateFlags() error {
+	return sidechainHelper.ValidateSecretFlags(v.accountDir, v.accountConfig)
+}
+
+type validatorsInfoResult struct {
+	address     string
+	stake       uint64
+	active      bool
+	whitelisted bool
+}
+
+func (vr validatorsInfoResult) GetOutput() string {
+	var buffer bytes.Buffer
+
+	buffer.WriteString("\n[VALIDATOR INFO]\n")
+
+	vals := make([]string, 4)
+	vals[0] = fmt.Sprintf("Validator Address|%s", vr.address)
+	vals[1] = fmt.Sprintf("Stake|%v", vr.stake)
+	vals[2] = fmt.Sprintf("Is Whitelisted|%v", vr.whitelisted)
+	vals[3] = fmt.Sprintf("Is Active|%v", vr.active)
+
+	buffer.WriteString(helper.FormatKV(vals))
+	buffer.WriteString("\n")
+
+	return buffer.String()
+}

command/sidechain/validators/validator_info.go → command/rootchain/validators/validator_info.go

@@ -6,9 +6,12 @@ import (
 	"github.com/0xPolygon/polygon-edge/command"
 	"github.com/0xPolygon/polygon-edge/command/helper"
 	"github.com/0xPolygon/polygon-edge/command/polybftsecrets"
+	rootHelper "github.com/0xPolygon/polygon-edge/command/rootchain/helper"
 	sidechainHelper "github.com/0xPolygon/polygon-edge/command/sidechain"
 	"github.com/0xPolygon/polygon-edge/txrelayer"
+	"github.com/0xPolygon/polygon-edge/types"
 	"github.com/spf13/cobra"
+	"github.com/umbracle/ethgo"
 )
 
 var (
@@ -44,6 +47,13 @@ func setFlags(cmd *cobra.Command) {
 		polybftsecrets.AccountConfigFlagDesc,
 	)
 
+	cmd.Flags().StringVar(
+		&params.supernetManagerAddress,
+		rootHelper.SupernetManagerFlag,
+		"",
+		rootHelper.SupernetManagerFlagDesc,
+	)
+
 	cmd.MarkFlagsMutuallyExclusive(polybftsecrets.AccountDirFlag, polybftsecrets.AccountConfigFlag)
 }
 
@@ -68,19 +78,18 @@ func runCommand(cmd *cobra.Command, _ []string) error {
 	}
 
 	validatorAddr := validatorAccount.Ecdsa.Address()
+	supernetManagerAddr := ethgo.Address(types.StringToAddress(params.supernetManagerAddress))
 
-	validatorInfo, err := sidechainHelper.GetValidatorInfo(validatorAddr, txRelayer)
+	validatorInfo, err := rootHelper.GetValidatorInfo(validatorAddr, supernetManagerAddr, txRelayer)
 	if err != nil {
 		return fmt.Errorf("failed to get validator info for %s: %w", validatorAddr, err)
 	}
 
 	outputter.WriteCommandResult(&validatorsInfoResult{
-		address:             validatorInfo.Address.String(),
-		stake:               validatorInfo.Stake.Uint64(),
-		totalStake:          validatorInfo.TotalStake.Uint64(),
-		commission:          validatorInfo.Commission.Uint64(),
-		withdrawableRewards: validatorInfo.WithdrawableRewards.Uint64(),
-		active:              validatorInfo.Active,
+		address:     validatorInfo.Address.String(),
+		stake:       validatorInfo.Stake.Uint64(),
+		active:      validatorInfo.Active,
+		whitelisted: validatorInfo.Whitelisted,
 	})
 
 	return nil

command/sidechain/helper.go

@@ -60,7 +60,10 @@ func GetAccountFromDir(accountDir string) (*wallet.Account, error) {
 	return GetAccount(accountDir, "")
 }
 
+//nolint:godox
+
 // GetValidatorInfo queries ChildValidatorSet smart contract and retrieves validator info for given address
+// TODO - @goran-ethernal depricate this function once we change e2e tests
 func GetValidatorInfo(validatorAddr ethgo.Address, txRelayer txrelayer.TxRelayer) (*polybft.ValidatorInfo, error) {
 	getValidatorMethod := contractsapi.ChildValidatorSet.Abi.GetMethod("getValidator")
 

consensus/polybft/system_state.go

@@ -12,15 +12,21 @@ import (
 	"github.com/umbracle/ethgo/contract"
 )
 
+//nolint:godox
+
 // ValidatorInfo is data transfer object which holds validator information,
 // provided by smart contract
+// TODO - @goran-ethernal deprecate this struct once we change e2e tests
+// we will instead use the contractsapi generated stub once we remove old
+// ChildValidatorSet contract and its stubs
 type ValidatorInfo struct {
 	Address             ethgo.Address
 	Stake               *big.Int
 	TotalStake          *big.Int
 	Commission          *big.Int
 	WithdrawableRewards *big.Int
 	Active              bool
+	Whitelisted         bool
 }
 
 // SystemState is an interface to interact with the consensus system contracts in the chain