full suspension support

Author: solimander

pkg/commands/app/info.go

@@ -203,7 +203,7 @@ func logsAction(cCtx *cli.Context) error {
 			case common.AppStatusStopping:
 				logger.Info("%s is currently stopping. Logs may be limited.", formattedApp)
 				return nil
-			case common.AppStatusStopped, common.AppStatusTerminating, common.AppStatusTerminated:
+			case common.AppStatusStopped, common.AppStatusTerminating, common.AppStatusTerminated, common.AppStatusSuspended:
 				logger.Info("%s is %s. Logs are not available.", formattedApp, strings.ToLower(status))
 				return nil
 			case common.AppStatusFailed:

pkg/commands/billing/cancel.go

@@ -1,11 +1,13 @@
 package billing
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/Layr-Labs/eigenx-cli/pkg/commands/utils"
 	"github.com/Layr-Labs/eigenx-cli/pkg/common"
 	"github.com/Layr-Labs/eigenx-cli/pkg/common/output"
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/urfave/cli/v2"
 )
 
@@ -88,15 +90,19 @@ var CancelCommand = &cli.Command{
 				caller := info.Caller
 				logger.Info("Suspending apps on %s...", env)
 
-				// Get all apps for this developer on this network
-				apps, _, err := caller.GetAppsByCreator(ctx, developerAddr, 0, 1_000)
+				// Get only active apps for this developer on this network
+				activeApps, err := getActiveAppsByCreator(ctx, caller, developerAddr)
 				if err != nil {
-					return fmt.Errorf("failed to get apps for %s: %w", env, err)
+					return fmt.Errorf("failed to get active apps for %s: %w", env, err)
 				}
 
-				// Call suspend with all apps
-				// Note: The contract will filter to only active apps (STARTED/STOPPED)
-				err = caller.Suspend(ctx, developerAddr, apps)
+				if len(activeApps) == 0 {
+					logger.Info("No active apps to suspend on %s", env)
+					continue
+				}
+
+				// Suspend only active apps
+				err = caller.Suspend(ctx, developerAddr, activeApps)
 				if err != nil {
 					return fmt.Errorf("failed to suspend apps on %s: %w", env, err)
 				}
@@ -127,3 +133,23 @@ var CancelCommand = &cli.Command{
 		return nil
 	},
 }
+
+// getActiveAppsByCreator retrieves only the active apps (STARTED/STOPPED) for a creator
+func getActiveAppsByCreator(ctx context.Context, caller *common.ContractCaller, creator ethcommon.Address) ([]ethcommon.Address, error) {
+	// Get all apps for this creator on this network
+	allApps, appConfigs, err := caller.GetAppsByCreator(ctx, creator, 0, 1_000)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get apps by creator: %w", err)
+	}
+
+	// Filter to only active apps (STARTED/STOPPED)
+	var activeApps []ethcommon.Address
+	for i, app := range allApps {
+		config := appConfigs[i]
+		status := common.AppStatus(config.Status)
+		if status == common.ContractAppStatusStarted || status == common.ContractAppStatusStopped {
+			activeApps = append(activeApps, app)
+		}
+	}
+	return activeApps, nil
+}

pkg/commands/utils/contract_utils.go

@@ -315,6 +315,8 @@ func contractStatusToString(status uint8) string {
 		return "Running"
 	case common.ContractAppStatusStopped:
 		return "Stopped"
+	case common.ContractAppStatusSuspended:
+		return "Suspended"
 	case common.ContractAppStatusTerminated:
 		return "Terminated"
 	default:

pkg/commands/utils/interactive.go

@@ -250,7 +250,7 @@ func GetAppIDInteractive(cCtx *cli.Context, argIndex int, action string) (ethcom
 		case "view":
 			return true
 		case "start":
-			return status == common.ContractAppStatusStopped || exitedApps[addr.Hex()]
+			return status == common.ContractAppStatusStopped || status == common.ContractAppStatusSuspended || exitedApps[addr.Hex()]
 		case "stop":
 			return status == common.ContractAppStatusStarted || exitedApps[addr.Hex()]
 		default:
@@ -751,10 +751,12 @@ func getStatusPriority(status common.AppStatus, isExited bool) int {
 		return 2 // Exited apps come second
 	case common.ContractAppStatusStopped:
 		return 3
-	case common.ContractAppStatusTerminated:
+	case common.ContractAppStatusSuspended:
 		return 4
-	default:
+	case common.ContractAppStatusTerminated:
 		return 5
+	default:
+		return 6
 	}
 }
 
@@ -765,6 +767,8 @@ func getStatusString(status common.AppStatus) string {
 		return "Running"
 	case common.ContractAppStatusStopped:
 		return "Stopped"
+	case common.ContractAppStatusSuspended:
+		return "Suspended"
 	case common.ContractAppStatusTerminated:
 		return "Terminated"
 	default:

pkg/common/contract_caller.go

@@ -290,7 +290,7 @@ func (cc *ContractCaller) GetMaxActiveAppsPerUser(ctx context.Context, user comm
 }
 
 // GetAppsByCreator retrieves a paginated list of apps created by the specified address
-func (cc *ContractCaller) GetAppsByCreator(ctx context.Context, creator common.Address, offset uint64, limit uint64) ([]common.Address, any, error) {
+func (cc *ContractCaller) GetAppsByCreator(ctx context.Context, creator common.Address, offset uint64, limit uint64) ([]common.Address, []appcontrollerV1.IAppControllerAppConfig, error) {
 	appController, err := appcontrollerV1.NewAppController(cc.environmentConfig.AppControllerAddress, cc.ethclient)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to create app controller: %w", err)