Merge pull request #2129 from onflow/cf/merge-fixes

Update code with changes from master

Author: chasefleming

internal/schedule/list.go

@@ -72,7 +72,7 @@ func listRun(
 	accountInput := args[0]
 
 	// Resolve account address from input (could be address or account name)
-	address, err := util.ResolveAddressOrAccountName(accountInput, state)
+	address, err := util.ResolveAddressOrAccountNameForNetworks(accountInput, state, []string{"mainnet", "testnet", "emulator"})
 	if err != nil {
 		return nil, fmt.Errorf("failed to resolve account: %w", err)
 	}

internal/util/accounts.go

@@ -145,3 +145,12 @@ func ResolveAddressOrAccountNameForNetworks(input string, state *flowkit.State,
 	networksStr := strings.Join(supportedNetworks, " and ")
 	return flow.EmptyAddress, fmt.Errorf("account %s has address %s which is not valid for %s addresses", input, account.Address.String(), networksStr)
 }
+
+// GetSignerAccount resolves and returns the signer account from the state by name
+func GetSignerAccount(state *flowkit.State, signerName string) (*accounts.Account, error) {
+	signer, err := state.Accounts().ByName(signerName)
+	if err != nil {
+		return nil, fmt.Errorf("failed to resolve signer account '%s': %w", signerName, err)
+	}
+	return signer, nil
+}

internal/util/util.go

@@ -36,7 +36,6 @@ import (
 	flowGo "github.com/onflow/flow-go/model/flow"
 
 	"github.com/onflow/flowkit/v2"
-	"github.com/onflow/flowkit/v2/accounts"
 	"github.com/onflow/flowkit/v2/config"
 )
 
@@ -284,31 +283,6 @@ func IsCoreContract(contractName string) bool {
 	return false
 }
 
-// ResolveAddressOrAccountName resolves a string that could be either an address or account name
-func ResolveAddressOrAccountName(input string, state *flowkit.State) (flow.Address, error) {
-	address := flow.HexToAddress(input)
-
-	if address.IsValid(flow.Mainnet) || address.IsValid(flow.Testnet) || address.IsValid(flow.Emulator) {
-		return address, nil
-	}
-
-	account, err := state.Accounts().ByName(input)
-	if err != nil {
-		return flow.EmptyAddress, fmt.Errorf("could not find account with name %s", input)
-	}
-
-	return account.Address, nil
-}
-
-// GetSignerAccount resolves and returns the signer account from the state by name
-func GetSignerAccount(state *flowkit.State, signerName string) (*accounts.Account, error) {
-	signer, err := state.Accounts().ByName(signerName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to resolve signer account '%s': %w", signerName, err)
-	}
-	return signer, nil
-}
-
 // IsEmulatorRunning checks if the emulator is running on the given host
 func IsEmulatorRunning(host string) bool {
 	conn, err := net.DialTimeout("tcp", host, 2*time.Second)