rofl: Ignore non-existent accounts if --unsigned provided

Author: matevz

cmd/common/transaction.go

@@ -39,7 +39,7 @@ var (
 	txGasPrice   string
 	txFeeDenom   string
 	txEncrypted  bool
-	txUnsigned   bool
+	TxUnsigned   bool
 	txFormat     string
 	txOutputFile string
 )
@@ -80,7 +80,7 @@ func GetTransactionConfig() *TransactionConfig {
 
 // shouldExportTransaction returns true if the transaction should be exported instead of broadcast.
 func shouldExportTransaction() bool {
-	return txOffline || txUnsigned || txOutputFile != ""
+	return txOffline || TxUnsigned || txOutputFile != ""
 }
 
 // isRuntimeTx returns true, if given object is a signed or unsigned runtime transaction.
@@ -184,7 +184,7 @@ func SignConsensusTransaction(
 	if tx.Nonce == invalidNonce || tx.Fee.Gas == invalidGasLimit {
 		return nil, fmt.Errorf("nonce and/or gas limit must be specified in offline mode")
 	}
-	if txUnsigned {
+	if TxUnsigned {
 		// Return an unsigned transaction.
 		return tx, nil
 	}
@@ -341,7 +341,7 @@ func SignParaTimeTransaction(
 		tx.Call = *encCall
 	}
 
-	if txUnsigned {
+	if TxUnsigned {
 		// Return an unsigned transaction.
 		return tx, meta, nil
 	}
@@ -630,7 +630,7 @@ func init() {
 	RuntimeTxFlags.StringVar(&txFeeDenom, "fee-denom", "", "override fee denomination (defaults to native)")
 	RuntimeTxFlags.BoolVar(&txEncrypted, "encrypted", false, "encrypt transaction call data (requires online mode)")
 	RuntimeTxFlags.AddFlagSet(AnswerYesFlag)
-	RuntimeTxFlags.BoolVar(&txUnsigned, "unsigned", false, "do not sign transaction")
+	RuntimeTxFlags.BoolVar(&TxUnsigned, "unsigned", false, "do not sign transaction")
 	RuntimeTxFlags.StringVar(&txFormat, "format", "json", "transaction output format (for offline/unsigned modes) [json, cbor, safe]")
 	RuntimeTxFlags.StringVarP(&txOutputFile, "output-file", "o", "", "output transaction into specified file instead of broadcasting")
 
@@ -640,7 +640,7 @@ func init() {
 	TxFlags.Uint64Var(&txGasLimit, "gas-limit", invalidGasLimit, "override gas limit to use (disable estimation)")
 	TxFlags.StringVar(&txGasPrice, "gas-price", "", "override gas price to use")
 	TxFlags.AddFlagSet(AnswerYesFlag)
-	TxFlags.BoolVar(&txUnsigned, "unsigned", false, "do not sign transaction")
+	TxFlags.BoolVar(&TxUnsigned, "unsigned", false, "do not sign transaction")
 	TxFlags.StringVar(&txFormat, "format", "json", "transaction output format (for offline/unsigned modes) [json, cbor]")
 	TxFlags.StringVarP(&txOutputFile, "output-file", "o", "", "output transaction into specified file instead of broadcasting")
 }

cmd/rofl/common/manifest.go

@@ -105,8 +105,8 @@ func MaybeLoadManifestAndSetNPA(cfg *cliConfig.Config, npa *common.NPASelection,
 	}
 	switch {
 	case d.Admin == "":
-		// No admin in manifest, leave unchanged.
-	case npa.AccountSetExplicitly:
+		// No admin in manifest, leave unchanged; ignore for unsigned transactions entirely.
+	case npa.AccountSetExplicitly, common.TxUnsigned:
 		// Account explicitly overridden on the command line, leave unchanged.
 	default:
 		accCfg, err := common.LoadAccountConfig(cfg, d.Admin)

cmd/rofl/deploy.go

@@ -147,8 +147,6 @@ var (
 				return
 			}
 
-			acc := common.LoadAccount(cliConfig.Global(), npa.AccountName)
-
 			ociRepository := ociRepository(deployment)
 			orcFilename := roflCommon.GetOrcFilename(manifest, roflCommon.DeploymentName)
 			fmt.Printf("Pushing ROFL app to OCI repository '%s'...\n", ociRepository)
@@ -178,6 +176,10 @@ var (
 				machineDeployment.Metadata[scheduler.MetadataKeyProxyCustomDomains] = customDomains
 			}
 
+			acc := common.LoadAccount(cliConfig.Global(), cliConfig.Global().Wallet.Default)
+			if !common.TxUnsigned {
+				acc = common.LoadAccount(cliConfig.Global(), npa.AccountName)
+			}
 			obtainMachine := func() (*buildRofl.Machine, *roflmarket.Instance, error) {
 				if deployOffer != "" {
 					machine.Offer = deployOffer