feat(cmd/rofl): Allow explicit account override

Author: kostko

cmd/common/selector.go

@@ -43,8 +43,9 @@ type NPASelection struct {
 	ParaTimeName string
 	ParaTime     *config.ParaTime
 
-	AccountName string
-	Account     *cliConfig.Account
+	AccountName          string
+	Account              *cliConfig.Account
+	AccountSetExplicitly bool
 }
 
 // GetNPASelection returns the user-selected network/ParaTime/account combination.
@@ -78,6 +79,7 @@ func GetNPASelection(cfg *cliConfig.Config) *NPASelection {
 	s.AccountName = cfg.Wallet.Default
 	if selectedAccount != "" {
 		s.AccountName = selectedAccount
+		s.AccountSetExplicitly = true
 	}
 	if s.AccountName != "" {
 		accCfg, err := LoadAccountConfig(cfg, s.AccountName)

cmd/rofl/common/manifest.go

@@ -76,8 +76,11 @@ func MaybeLoadManifestAndSetNPA(cfg *cliConfig.Config, npa *common.NPASelection,
 		}
 		npa.ParaTimeName = d.ParaTime
 	}
-	switch d.Admin {
-	case "":
+	switch {
+	case d.Admin == "":
+		// No admin in manifest, leave unchanged.
+	case npa.AccountSetExplicitly:
+		// Account explicitly overridden on the command line, leave unchanged.
 	default:
 		accCfg, err := common.LoadAccountConfig(cfg, d.Admin)
 		switch {