feat: add key file flags to p2p query

Author: minhd-vu

cmd/p2p/query/query.go

@@ -1,7 +1,9 @@
 package query
 
 import (
+	"crypto/ecdsa"
 	"fmt"
+	"net"
 
 	"github.com/ethereum/go-ethereum/eth/protocols/eth"
 	"github.com/rs/zerolog/log"
@@ -14,6 +16,12 @@ type (
 	queryParams struct {
 		StartBlock uint64
 		Amount     uint64
+		Port       int
+		Addr       net.IP
+		KeyFile    string
+		PrivateKey string
+
+		privateKey *ecdsa.PrivateKey
 	}
 )
 
@@ -30,10 +38,16 @@ This command will initially establish a handshake and exchange status message
 from the peer. Then, it will query the node for block(s) given the start block
 and the amount of blocks to query and print the results.`,
 	Args: cobra.MinimumNArgs(1),
-	PreRunE: func(cmd *cobra.Command, args []string) error {
+	PreRunE: func(cmd *cobra.Command, args []string) (err error) {
 		if inputQueryParams.Amount < 1 {
 			return fmt.Errorf("amount must be greater than 0")
 		}
+
+		inputQueryParams.privateKey, err = p2p.ParsePrivateKey(inputQueryParams.KeyFile, inputQueryParams.PrivateKey)
+		if err != nil {
+			return err
+		}
+
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
@@ -50,7 +64,13 @@ and the amount of blocks to query and print the results.`,
 			amount uint64 = inputQueryParams.Amount
 		)
 
-		conn, err := p2p.Dial(node, p2p.NewDialOpts())
+		opts := p2p.DialOpts{
+			Port:       inputQueryParams.Port,
+			Addr:       inputQueryParams.Addr,
+			PrivateKey: inputQueryParams.privateKey,
+		}
+
+		conn, err := p2p.Dial(node, opts)
 		if err != nil {
 			log.Error().Err(err).Msg("Dial failed")
 			return
@@ -106,6 +126,10 @@ func print(headers eth.BlockHeadersRequest) {
 func init() {
 	QueryCmd.Flags().Uint64VarP(&inputQueryParams.StartBlock, "start-block", "s", 0, "Block number to start querying from")
 	QueryCmd.Flags().Uint64VarP(&inputQueryParams.Amount, "amount", "a", 1, "Amount of blocks to query")
+	QueryCmd.Flags().IntVarP(&inputQueryParams.Port, "port", "P", 30303, "Port for discovery protocol")
+	QueryCmd.Flags().IPVarP(&inputQueryParams.Addr, "addr", "a", net.ParseIP("127.0.0.1"), "Address to bind discovery listener")
+	QueryCmd.Flags().StringVarP(&inputQueryParams.KeyFile, "key-file", "k", "", "Private key file (cannot be set with --key)")
+	QueryCmd.Flags().StringVar(&inputQueryParams.PrivateKey, "key", "", "Hex-encoded private key (cannot be set with --key-file)")
 	if err := QueryCmd.MarkFlagRequired("start-block"); err != nil {
 		log.Error().Err(err).Msg("Failed to mark start-block as required persistent flag")
 	}