fix: support direct rofl set-admin

Author: uniyalabhishek

cmd/rofl/set_admin.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/client"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/connection"
 	"github.com/oasisprotocol/oasis-sdk/client-sdk/go/modules/rofl"
 
@@ -16,45 +17,51 @@ import (
 )
 
 var setAdminCmd = &cobra.Command{
-	Use:     "set-admin <new-admin>",
-	Short:   "Change the administrator of the application in ROFL",
+	Use:     "set-admin [<app-id>] <new-admin>",
+	Short:   "Change the administrator of a ROFL application",
 	Aliases: []string{"change-admin"},
-	Args:    cobra.ExactArgs(1),
+	Args:    cobra.RangeArgs(1, 2),
 	Run: func(_ *cobra.Command, args []string) {
+		cfg := cliConfig.Global()
+		npa := common.GetNPASelection(cfg)
 		txCfg := common.GetTransactionConfig()
 
-		manifest, deployment, npa := roflCommon.LoadManifestAndSetNPA(&roflCommon.ManifestOptions{
-			NeedAppID: true,
-			NeedAdmin: true,
-		})
+		var (
+			rawAppID      string
+			newAdminArg   string
+			manifest      *buildRofl.Manifest
+			deployment    *buildRofl.Deployment
+			useManifest   bool
+		)
+		switch len(args) {
+		case 2:
+			// Direct mode: oasis rofl set-admin <app-id> <new-admin>
+			rawAppID = args[0]
+			newAdminArg = args[1]
+		case 1:
+			// Manifest mode: oasis rofl set-admin <new-admin>
+			newAdminArg = args[0]
+			manifest, deployment, npa = roflCommon.LoadManifestAndSetNPA(&roflCommon.ManifestOptions{
+				NeedAppID: true,
+				NeedAdmin: true,
+			})
+			rawAppID = deployment.AppID
+			useManifest = true
+		}
 
 		var appID rofl.AppID
-		if err := appID.UnmarshalText([]byte(deployment.AppID)); err != nil {
+		if err := appID.UnmarshalText([]byte(rawAppID)); err != nil {
 			cobra.CheckErr(fmt.Errorf("malformed ROFL app ID: %w", err))
 		}
 
 		npa.MustHaveAccount()
 		npa.MustHaveParaTime()
 
-		if deployment.Policy == nil {
-			cobra.CheckErr("no policy configured in the manifest")
-		}
-
-		oldAdminAddr, _, err := common.ResolveLocalAccountOrAddress(npa.Network, deployment.Admin)
-		if err != nil {
-			cobra.CheckErr(fmt.Errorf("bad current administrator address: %w", err))
-		}
-
-		newAdminAddr, newAdminEthAddr, err := common.ResolveLocalAccountOrAddress(npa.Network, args[0])
+		newAdminAddr, newAdminEthAddr, err := common.ResolveLocalAccountOrAddress(npa.Network, newAdminArg)
 		if err != nil {
 			cobra.CheckErr(fmt.Errorf("invalid new admin address: %w", err))
 		}
 
-		if *oldAdminAddr == *newAdminAddr {
-			fmt.Println("New admin is the same as the current admin, nothing to do.")
-			return
-		}
-
 		// When not in offline mode, connect to the given network endpoint.
 		ctx := context.Background()
 		var conn connection.Connection
@@ -63,45 +70,88 @@ var setAdminCmd = &cobra.Command{
 			cobra.CheckErr(err)
 		}
 
+		// Build the update body.
+		updateBody := rofl.Update{
+			ID:    appID,
+			Admin: newAdminAddr,
+		}
+
+		if useManifest {
+			// Manifest mode: use local policy, metadata, secrets.
+			if deployment.Policy == nil {
+				cobra.CheckErr("no policy configured in the manifest")
+			}
+
+			oldAdminAddr, _, err := common.ResolveLocalAccountOrAddress(npa.Network, deployment.Admin)
+			if err != nil {
+				cobra.CheckErr(fmt.Errorf("bad current administrator address: %w", err))
+			}
+
+			if *oldAdminAddr == *newAdminAddr {
+				fmt.Println("New admin is the same as the current admin, nothing to do.")
+				return
+			}
+
+			fmt.Printf("Old admin: %s\n", common.PrettyAddress(oldAdminAddr.String()))
+
+			updateBody.Policy = *deployment.Policy.AsDescriptor()
+			updateBody.Metadata = manifest.GetMetadata(roflCommon.DeploymentName)
+			updateBody.Secrets = buildRofl.PrepareSecrets(deployment.Secrets)
+		} else {
+			// Direct mode: fetch current app config from chain.
+			if txCfg.Offline {
+				cobra.CheckErr("direct mode requires network access")
+			}
+
+			appCfg, err := conn.Runtime(npa.ParaTime).ROFL.App(ctx, client.RoundLatest, appID)
+			cobra.CheckErr(err)
+
+			if appCfg.Admin != nil && *appCfg.Admin == *newAdminAddr {
+				fmt.Println("New admin is the same as the current admin, nothing to do.")
+				return
+			}
+
+			if appCfg.Admin != nil {
+				fmt.Printf("Old admin: %s\n", common.PrettyAddress(appCfg.Admin.String()))
+			}
+
+			updateBody.Policy = appCfg.Policy
+			updateBody.Metadata = appCfg.Metadata
+			updateBody.Secrets = appCfg.Secrets
+		}
+
 		newAdminStr := newAdminAddr.String()
 		if newAdminEthAddr != nil {
 			newAdminStr = newAdminEthAddr.Hex()
 		}
 
-		fmt.Printf("App ID:    %s\n", deployment.AppID)
-		fmt.Printf("Old admin: %s\n", common.PrettyAddress(oldAdminAddr.String()))
+		fmt.Printf("App ID:    %s\n", appID)
 		fmt.Printf("New admin: %s\n", common.PrettyAddress(newAdminStr))
 
-		secrets := buildRofl.PrepareSecrets(deployment.Secrets)
-
-		tx := rofl.NewUpdateTx(nil, &rofl.Update{
-			ID:       appID,
-			Policy:   *deployment.Policy.AsDescriptor(),
-			Admin:    newAdminAddr,
-			Metadata: manifest.GetMetadata(roflCommon.DeploymentName),
-			Secrets:  secrets,
-		})
+		tx := rofl.NewUpdateTx(nil, &updateBody)
 
-		acc := common.LoadAccount(cliConfig.Global(), npa.AccountName)
+		acc := common.LoadAccount(cfg, npa.AccountName)
 		sigTx, meta, err := common.SignParaTimeTransaction(ctx, npa, acc, conn, tx, nil)
 		cobra.CheckErr(err)
 
 		if !common.BroadcastOrExportTransaction(ctx, npa, conn, sigTx, meta, nil) {
 			return
 		}
 
-		// Transaction succeeded — update the manifest with the new admin.
-		deployment.Admin = args[0]
-		if err = manifest.Save(); err != nil {
-			cobra.CheckErr(fmt.Errorf("failed to update manifest: %w", err))
+		// Transaction succeeded — update the manifest if available.
+		if manifest != nil {
+			deployment.Admin = newAdminArg
+			if err = manifest.Save(); err != nil {
+				cobra.CheckErr(fmt.Errorf("failed to update manifest: %w", err))
+			}
 		}
 
 		fmt.Printf("ROFL admin changed to %s.\n", common.PrettyAddress(newAdminStr))
 	},
 }
 
 func init() {
-	common.AddAccountFlag(setAdminCmd)
+	common.AddSelectorFlags(setAdminCmd)
 	setAdminCmd.Flags().AddFlagSet(common.RuntimeTxFlags)
 	setAdminCmd.Flags().AddFlagSet(roflCommon.DeploymentFlags)
 }

docs/rofl.md

@@ -328,11 +328,22 @@ their latest versions. This includes:
 ### Change ROFL app administrator {#set-admin}
 
 Run `rofl set-admin` to transfer ownership of a ROFL app to a new
-administrator. The transaction is signed by the current admin and, on success,
-the manifest is updated with the new admin.
+administrator. The transaction must be signed by the current admin.
+
+If the current directory contains a ROFL manifest, the manifest is updated with
+the new admin after a successful transaction.
 
 ![code shell](../examples/rofl/set-admin.in.static)
 
+To change the administrator directly on an existing app without a local
+manifest, run:
+
+```bash
+oasis rofl set-admin <app-id> <new-admin>
+```
+
+This mode requires network access and does not modify local files.
+
 ### Change ROFL machine administrator {#machine-set-admin}
 
 Run `rofl machine set-admin` to change the administrator of an individual

examples/rofl/machine-set-admin.in.static

@@ -1 +1 @@
-oasis rofl machine set-admin [<machine-name> | <provider-address>:<machine-id>] <new-admin>
+oasis rofl machine set-admin bob

examples/rofl/set-admin.in.static

@@ -1 +1 @@
-oasis rofl set-admin <new-admin>
+oasis rofl set-admin bob