Merge branch 'main' into add-updating-evm-address-docs

cmd/blobstream/query/cmd.go

@@ -15,6 +15,8 @@ import (
 	"github.com/celestiaorg/orchestrator-relayer/cmd/blobstream/relayer"
 	"github.com/spf13/viper"
 
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
 	common2 "github.com/ethereum/go-ethereum/common"
 
 	celestiatypes "github.com/celestiaorg/celestia-app/x/qgb/types"
@@ -149,10 +151,19 @@ func Signers() *cobra.Command {
 }
 
 type signature struct {
-	EvmAddress string `json:"evmAddress"`
-	Signature  string `json:"signature"`
-	Signed     bool   `json:"signed"`
+	EvmAddress   string `json:"evmAddress"`
+	Moniker      string `json:"moniker"`
+	Signature    string `json:"signature"`
+	Signed       bool   `json:"signed"`
+	ValopAddress string `json:"valopAddress"`
+}
+
+type validatorInfo struct {
+	EvmAddress   string `json:"evmAddress"`
+	Moniker      string `json:"moniker"`
+	ValopAddress string `json:"valopAddress"`
 }
+
 type queryOutput struct {
 	Signatures        []signature `json:"signatures"`
 	Nonce             uint64      `json:"nonce"`
@@ -177,6 +188,16 @@ func getSignaturesAndPrintThem(
 		return err
 	}
 
+	validatorSet, err := appQuerier.QueryStakingValidatorSet(ctx)
+	if err != nil {
+		return err
+	}
+
+	validatorsInfo, err := toValidatorsInfo(ctx, appQuerier, validatorSet)
+	if err != nil {
+		return err
+	}
+
 	att, err := appQuerier.QueryAttestationByNonce(ctx, nonce)
 	if err != nil {
 		return err
@@ -195,7 +216,7 @@ func getSignaturesAndPrintThem(
 		if err != nil {
 			return err
 		}
-		qOutput := toQueryOutput(toValsetConfirmsMap(confirms), nonce, *lastValset)
+		qOutput := toQueryOutput(toValsetConfirmsMap(confirms), validatorsInfo, nonce, *lastValset)
 		if outputFile == "" {
 			printConfirms(logger, qOutput)
 		} else {
@@ -218,7 +239,7 @@ func getSignaturesAndPrintThem(
 		if err != nil {
 			return err
 		}
-		qOutput := toQueryOutput(toDataCommitmentConfirmsMap(confirms), nonce, *lastValset)
+		qOutput := toQueryOutput(toDataCommitmentConfirmsMap(confirms), validatorsInfo, nonce, *lastValset)
 		if outputFile == "" {
 			printConfirms(logger, qOutput)
 		} else {
@@ -233,6 +254,24 @@ func getSignaturesAndPrintThem(
 	return nil
 }
 
+func toValidatorsInfo(ctx context.Context, appQuerier *rpc.AppQuerier, validatorSet []stakingtypes.Validator) (map[string]validatorInfo, error) {
+	validatorsInfo := make(map[string]validatorInfo)
+	for _, val := range validatorSet {
+		evmAddr, err := appQuerier.QueryEVMAddress(ctx, val.OperatorAddress)
+		if err != nil {
+			return nil, err
+		}
+		if evmAddr != "" {
+			validatorsInfo[evmAddr] = validatorInfo{
+				EvmAddress:   evmAddr,
+				Moniker:      val.GetMoniker(),
+				ValopAddress: val.OperatorAddress,
+			}
+		}
+	}
+	return validatorsInfo, nil
+}
+
 func parseNonce(ctx context.Context, querier *rpc.AppQuerier, nonce string) (uint64, error) {
 	switch nonce {
 	case "latest":
@@ -260,24 +299,28 @@ func toDataCommitmentConfirmsMap(confirms []types.DataCommitmentConfirm) map[str
 	return confirmsMap
 }
 
-func toQueryOutput(confirmsMap map[string]string, nonce uint64, lastValset celestiatypes.Valset) queryOutput {
+func toQueryOutput(confirmsMap map[string]string, validatorsInfo map[string]validatorInfo, nonce uint64, lastValset celestiatypes.Valset) queryOutput {
 	currThreshold := uint64(0)
 	signatures := make([]signature, len(lastValset.Members))
 	// create the signature slice to be used for outputting the data
 	for key, val := range lastValset.Members {
 		sig, found := confirmsMap[val.EvmAddress]
 		if found {
 			signatures[key] = signature{
-				EvmAddress: val.EvmAddress,
-				Signature:  sig,
-				Signed:     true,
+				EvmAddress:   val.EvmAddress,
+				Signature:    sig,
+				Signed:       true,
+				Moniker:      validatorsInfo[val.EvmAddress].Moniker,
+				ValopAddress: validatorsInfo[val.EvmAddress].ValopAddress,
 			}
 			currThreshold += val.Power
 		} else {
 			signatures[key] = signature{
-				EvmAddress: val.EvmAddress,
-				Signature:  "",
-				Signed:     false,
+				EvmAddress:   val.EvmAddress,
+				Signature:    "",
+				Signed:       false,
+				Moniker:      validatorsInfo[val.EvmAddress].Moniker,
+				ValopAddress: validatorsInfo[val.EvmAddress].ValopAddress,
 			}
 		}
 	}
@@ -305,13 +348,13 @@ func printConfirms(logger tmlog.Logger, qOutput queryOutput) {
 	logger.Info("orchestrators that signed the attestation")
 	for _, sig := range qOutput.Signatures {
 		if sig.Signed {
-			logger.Info(sig.EvmAddress, "signed", sig.Signed, "signature", sig.Signature)
+			logger.Info(sig.Moniker, "signed", sig.Signed, "evm_address", sig.EvmAddress, "valop_address", sig.ValopAddress, "signature", sig.Signature)
 		}
 	}
 	logger.Info("orchestrators that missed signing the attestation")
 	for _, sig := range qOutput.Signatures {
 		if !sig.Signed {
-			logger.Info(sig.EvmAddress, "signed", sig.Signed)
+			logger.Info(sig.Moniker, "signed", sig.Signed, "evm_address", sig.EvmAddress, "valop_address", sig.ValopAddress)
 		}
 	}
 	logger.Info("done")
@@ -377,7 +420,7 @@ func Signature() *cobra.Command {
 			}()
 
 			// create tm querier and app querier
-			tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreRPC, config.grpcInsecure)
+			tmQuerier, appQuerier, stops, err := common.NewTmAndAppQuerier(logger, config.coreRPC, config.coreGRPC, config.grpcInsecure)
 			stopFuncs = append(stopFuncs, stops...)
 			if err != nil {
 				return err

rpc/app_querier.go

@@ -6,6 +6,9 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/types/query"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
 	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	cosmosgrpc "github.com/cosmos/cosmos-sdk/types/grpc"
 	"google.golang.org/grpc/metadata"
@@ -319,6 +322,35 @@ func (aq *AppQuerier) QueryLastValsetBeforeNonce(ctx context.Context, nonce uint
 	return resp.Valset, nil
 }
 
+// QueryStakingValidatorSet returns the list of all validators in the network.
+func (aq *AppQuerier) QueryStakingValidatorSet(ctx context.Context) ([]stakingtypes.Validator, error) {
+	queryClient := stakingtypes.NewQueryClient(aq.clientConn)
+	resp, err := queryClient.Validators(
+		ctx,
+		// Using 10000 as a conservative limit for number of validators instead of having to handle pagination
+		&stakingtypes.QueryValidatorsRequest{Pagination: &query.PageRequest{Limit: 10000}},
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.Validators, nil
+}
+
+// QueryEVMAddress returns the EVM address corresponding to a validator valop address.
+func (aq *AppQuerier) QueryEVMAddress(ctx context.Context, valopAddress string) (string, error) {
+	queryClient := celestiatypes.NewQueryClient(aq.clientConn)
+	resp, err := queryClient.EVMAddress(
+		ctx,
+		&celestiatypes.QueryEVMAddressRequest{ValidatorAddress: valopAddress},
+	)
+	if err != nil {
+		return "", err
+	}
+
+	return resp.EvmAddress, nil
+}
+
 // QueryHistoricalLastValsetBeforeNonce returns the last historical valset before nonce for a certain height.
 func (aq *AppQuerier) QueryHistoricalLastValsetBeforeNonce(ctx context.Context, nonce uint64, height uint64) (*celestiatypes.Valset, error) {
 	queryClient := celestiatypes.NewQueryClient(aq.clientConn)