clean up api usage and error handling

cmd/root.go

@@ -31,7 +31,12 @@ func RunE(f func(cmd *cobra.Command, args []string) error) func(cmd *cobra.Comma
 	return func(cmd *cobra.Command, args []string) (err error) {
 		err = f(cmd, args)
 		if verbose && err != nil {
-			fmt.Println(err.(*errors.Error).ErrorStack())
+			stackedErr, ok := err.(*errors.Error)
+			if ok {
+				fmt.Println(stackedErr.ErrorStack())
+				return err
+			}
+			fmt.Println(err)
 		}
 
 		return err

cmd/utils.go

@@ -40,13 +40,16 @@ func selectNetwork() (network.Network, error) {
 	if err := survey.AskOne(networkPrompt, &networkChoiceIndex); err != nil {
 		return network.Network{}, errors.Wrap(err, 0)
 	}
-	network := networks[networkChoiceIndex]
 
-	return network, nil
+	return networks[networkChoiceIndex], nil
 }
 
 func selectValidator(n network.Network, delegations ...stakingtypes.Delegation) (validator.ValidatorForNetwork, error) {
 	supportedValidators, err := validator.GetSupportedValidators(n.Identifier)
+	if err != nil {
+		return validator.ValidatorForNetwork{}, errors.Wrap(err, 0)
+	}
+
 	var validators []validator.ValidatorForNetwork
 	if len(delegations) == 0 {
 		validators = supportedValidators
@@ -60,23 +63,22 @@ func selectValidator(n network.Network, delegations ...stakingtypes.Delegation)
 		}
 	}
 
+	if len(validators) == 0 {
+		return validator.ValidatorForNetwork{}, errors.New("no relevant validators found (is the address staking with a REStake-enabled validator on this network?)")
+	}
+
 	validatorNameList := make([]string, len(validators))
 	for i, v := range validators {
 		validatorNameList[i] = v.Name
 	}
-	if err != nil {
-		return validator.ValidatorForNetwork{}, err
-	}
 	var validatorChoiceIndex int
 	validatorPrompt := &survey.Select{
 		Message: "Choose validator",
 		Options: validatorNameList,
 	}
 	err = survey.AskOne(validatorPrompt, &validatorChoiceIndex)
 	if err != nil {
-		return validator.ValidatorForNetwork{}, err
+		return validator.ValidatorForNetwork{}, errors.Wrap(err, 0)
 	}
-	validator := validators[validatorChoiceIndex]
-
-	return validator, nil
+	return validators[validatorChoiceIndex], nil
 }

pkg/validator/validator.go

@@ -53,7 +53,15 @@ func GetSupportedValidators(network string) (supportedValidators []ValidatorForN
 			if c.Name == network {
 				restakeAddr, ok := c.Restake.(string)
 				if !ok {
-					continue
+					restakeObj, ok := c.Restake.(map[string]interface{})
+					if !ok {
+						continue
+					}
+
+					restakeAddr, ok = restakeObj["address"].(string)
+					if !ok {
+						continue
+					}
 				}
 				supportedValidators = append(supportedValidators, ValidatorForNetwork{
 					Path:             v.Path,