account address validation

Author: gregorgololicic

gateway/grpc.go

@@ -23,18 +23,23 @@ func (g *GRPC) SetAPIURL(url string) {
 }
 
 // GetAccount gets account by the address via grpc call
-func (g *GRPC) GetAccount(address string) (*models.Account, error) {
+func (g *GRPC) GetAccount(addr string) (*models.Account, error) {
 	flowClient, err := client.New(g.APIURL, grpc.WithInsecure())
 
 	if err != nil {
 		return nil, err
 	}
 
-	// validation of params
+	chainID := flow.ChainID("flow-emulator") // todo refactor this to config if used on other networks
+	address := flow.HexToAddress(addr)
+
+	if !address.IsValid(chainID) {
+		return nil, &InvalidAddress{}
+	}
 
 	account, err := flowClient.GetAccountAtLatestBlock(
 		context.Background(),
-		flow.HexToAddress(address),
+		address,
 	)
 
 	if err != nil {
@@ -43,3 +48,10 @@ func (g *GRPC) GetAccount(address string) (*models.Account, error) {
 
 	return &models.Account{account}, nil
 }
+
+// InvalidAddress error for wrong account address
+type InvalidAddress struct{}
+
+func (m *InvalidAddress) Error() string {
+	return "Invalid Address"
+}

util/util.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/onflow/flow-go-sdk/client"
+	"github.com/sideninja/flow-cli/gateway"
 	"github.com/spf13/viper"
 	"google.golang.org/grpc/codes"
 )
@@ -44,13 +45,20 @@ func PromptURL() {
 // HandleError main error handler for commands
 func HandleError(err error) {
 	if err != SilentErr {
+		// check if is address error
+		_, isInvalidAddress := err.(*gateway.InvalidAddress)
+		if isInvalidAddress {
+			fmt.Printf("\n\033[31mInvalid Address: Invalid Account Address. \nPlease check Flow documentation: \n \nhttps://docs.onflow.org/cadence/language/values-and-types/#addresses\033[0m\n\n")
+			os.Exit(1)
+		}
+
 		// check if error is grpc error
-		rpcError := client.RPCError{}
-		if errors.As(err, &rpcError) {
+		rpcError, isRPCError := err.(client.RPCError)
+		if isRPCError {
 			handleGrpcError(rpcError)
-		} else { // unhandeled error - can be improved
-			fmt.Printf("\n\033[31mUnhandeled Error: %s\033[0m\n\n", err)
 		}
+
+		fmt.Printf("\n\033[31mUnhandeled Error: %s\033[0m\n\n", err)
 	}
 
 	os.Exit(1)