add contract migration check on all calls

cmd/flow/main.go

@@ -20,10 +20,6 @@
 package main
 
 import (
-	"fmt"
-	"os"
-	"strings"
-
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flow-cli/internal/accounts"
@@ -57,34 +53,6 @@ func main() {
 	var cmd = &cobra.Command{
 		Use:              "flow",
 		TraverseChildren: true,
-		// Messaging for Cadence 1.0 upgrade
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			outputFlag, _ := cmd.Flags().GetString("output")
-			// If output is set to json, do not append any message
-			if outputFlag != "json" {
-
-				width := 80
-				url := "https://cadence-lang.org/docs/cadence_migration_guide"
-
-				// Function to center text within a given width
-				centerText := func(text string, width int) string {
-					space := (width - len(text)) / 2
-					if space < 0 {
-						space = 0
-					}
-					return fmt.Sprintf("%s%s%s", strings.Repeat(" ", space), text, strings.Repeat(" ", space))
-				}
-
-				fmt.Fprintln(os.Stderr, strings.Repeat("+", width))
-				fmt.Fprintln(os.Stderr, centerText("⚠ Upgrade to Cadence 1.0", width))
-				fmt.Fprintln(os.Stderr, centerText("The Crescendo network upgrade, including Cadence 1.0, is coming soon.", width))
-				fmt.Fprintln(os.Stderr, centerText("You may need to update your existing contracts to support this change.", width))
-				fmt.Fprintln(os.Stderr, centerText("Please visit our migration guide here:", width))
-				fmt.Fprintln(os.Stderr, centerText(url, width))
-				fmt.Fprintln(os.Stderr, strings.Repeat("+", width))
-
-			}
-		},
 	}
 
 	// quick commands

internal/command/command.go

@@ -126,6 +126,8 @@ func (c Command) AddToParent(parent *cobra.Command) {
 			checkVersion(logger)
 		}
 
+		// command to validate contracts are sstill valid for migration
+
 		// record command usage
 		wg := sync.WaitGroup{}
 		go UsageMetrics(c.Cmd, &wg)

internal/migrate/is_validated.go

@@ -25,6 +25,7 @@ import (
 	"io"
 	"path"
 	"regexp"
+	"slices"
 	"strings"
 	"time"
 
@@ -111,6 +112,85 @@ func newValidator(repoService GitHubRepositoriesService, network config.Network,
 	}
 }
 
+func (v *validator) getContractUpdateStatuses(contractNames ...string) ([]contractUpdateStatus, *time.Time, error) {
+	var contractUpdateStatuses []contractUpdateStatus
+	err := checkNetwork(v.network)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	v.logger.StartProgress("Checking if contracts has been validated")
+	defer v.logger.StopProgress()
+
+	addressToContractName := make(map[string]string)
+	for _, contractName := range contractNames {
+		addr, err := getAddressByContractName(v.state, contractName, v.network)
+		if err != nil {
+			return nil, nil, err
+		}
+		addressToContractName[addr.HexWithPrefix()] = contractName
+	}
+
+	// Get last migration report
+	report, ts, err := v.getLatestMigrationReport(v.network)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Get all the contract statuses from the report
+	statuses, err := v.fetchAndParseReport(report.GetPath())
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// Get the validation result related to the contract
+	var foundAddresses []string
+	for _, s := range statuses {
+		if addressToContractName[s.AccountAddress] == s.ContractName {
+			contractUpdateStatuses = append(contractUpdateStatuses, s)
+			foundAddresses = append(foundAddresses, s.AccountAddress)
+		}
+	}
+
+	for addr, contractName := range addressToContractName {
+		var missingContractErr error
+		if !slices.Contains(foundAddresses, addr) {
+			builder := strings.Builder{}
+			builder.WriteString("some contracts do not appear to have been a part of any emulated migrations yet, please ensure that it has been staged & wait for the next emulated migration (last migration report was at ")
+			builder.WriteString(ts.Format(time.RFC3339))
+			builder.WriteString(")\n\n")
+			builder.WriteString(" - Account: ")
+			builder.WriteString(addr)
+			builder.WriteString("\n - Contract: ")
+			builder.WriteString(contractName)
+			builder.WriteString("\n - Network: ")
+			builder.WriteString(v.network.Name)
+
+			missingContractErr = fmt.Errorf(builder.String())
+		}
+
+		if missingContractErr != nil {
+			return nil, nil, missingContractErr
+		}
+	}
+
+	return contractUpdateStatuses, ts, nil
+}
+
+func (v *validator) getContractValidationStatus(network config.Network, address string, contractName string) (contractUpdateStatus, *time.Time, error) {
+	status, ts, err := v.getContractUpdateStatuses(contractName)
+	if err != nil {
+		return contractUpdateStatus{}, nil, err
+	}
+
+	if len(status) != 1 {
+		return contractUpdateStatus{}, nil, fmt.Errorf("failed to find contract in last migration report")
+	}
+
+	return status[0], ts, nil
+
+}
+
 func (v *validator) validate(contractName string) (validationResult, error) {
 	err := checkNetwork(v.network)
 	if err != nil {
@@ -144,48 +224,6 @@ func (v *validator) validate(contractName string) (validationResult, error) {
 	}, nil
 }
 
-func (v *validator) getContractValidationStatus(network config.Network, address string, contractName string) (contractUpdateStatus, *time.Time, error) {
-	// Get last migration report
-	report, timestamp, err := v.getLatestMigrationReport(network)
-	if err != nil {
-		return contractUpdateStatus{}, nil, err
-	}
-
-	// Get all the contract statuses from the report
-	statuses, err := v.fetchAndParseReport(report.GetPath())
-	if err != nil {
-		return contractUpdateStatus{}, nil, err
-	}
-
-	// Get the validation result related to the contract
-	var status *contractUpdateStatus
-	for _, s := range statuses {
-		if s.ContractName == contractName && s.AccountAddress == address {
-			status = &s
-			break
-		}
-	}
-
-	// Throw error if contract was not part of the last migration
-	if status == nil {
-		builder := strings.Builder{}
-		builder.WriteString("the contract does not appear to have been a part of any emulated migrations yet, please ensure that it has been staged & wait for the next emulated migration (last migration report was at ")
-		builder.WriteString(timestamp.Format(time.RFC3339))
-		builder.WriteString(")\n\n")
-
-		builder.WriteString(" - Account: ")
-		builder.WriteString(address)
-		builder.WriteString("\n - Contract: ")
-		builder.WriteString(contractName)
-		builder.WriteString("\n - Network: ")
-		builder.WriteString(network.Name)
-
-		return contractUpdateStatus{}, nil, fmt.Errorf(builder.String())
-	}
-
-	return *status, timestamp, nil
-}
-
 func (v *validator) getLatestMigrationReport(network config.Network) (*github.RepositoryContent, *time.Time, error) {
 	// Get the content of the migration reports folder
 	_, folderContent, _, err := v.repoService.GetContents(