From 6fe0b485499d7d6bb8100bb619126d2eb84d46cd Mon Sep 17 00:00:00 2001
From: Jonathan Harvey-Buschel <j.s.harbus@gmail.com>
Date: Wed, 12 Jul 2023 13:45:38 -0400
Subject: [PATCH] tapcli: fix flag checking for universe proof cmds

---
 cmd/tapcli/universe.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/cmd/tapcli/universe.go b/cmd/tapcli/universe.go
index d85be6536..22477641d 100644
--- a/cmd/tapcli/universe.go
+++ b/cmd/tapcli/universe.go
@@ -310,14 +310,17 @@ var universeProofQueryCommand = cli.Command{
 	Usage: "query for a universe proof",
 	Description: `
 	Attempt to query the target universe for a given proof based on a top
-	level asset id or group key, and the leaf key of: outpoint || script
-	key.
+	level asset id or group key, and the leaf key of: outpoint || script key.
 	`,
 	Flags:  universeProofArgs,
 	Action: universeProofQuery,
 }
 
 func parseAssetKey(ctx *cli.Context) (*universerpc.AssetKey, error) {
+	if !ctx.IsSet(outpointName) || !ctx.IsSet(scriptKeyName) {
+		return nil, fmt.Errorf("outpoint and script key must be set")
+	}
+
 	outpoint, err := tap.UnmarshalOutpoint(ctx.String(outpointName))
 	if err != nil {
 		return nil, err
@@ -341,15 +344,15 @@ func universeProofQuery(ctx *cli.Context) error {
 	client, cleanUp := getUniverseClient(ctx)
 	defer cleanUp()
 
-	universeID, err := parseUniverseID(ctx, true)
+	assetKey, err := parseAssetKey(ctx)
 	if err != nil {
 		return err
 	}
-	assetKey, err := parseAssetKey(ctx)
+
+	universeID, err := parseUniverseID(ctx, true)
 	if err != nil {
 		return err
 	}
-
 	uProof, err := client.QueryProof(ctxc, &universerpc.UniverseKey{
 		Id:      universeID,
 		LeafKey: assetKey,
@@ -382,15 +385,15 @@ func universeProofInsert(ctx *cli.Context) error {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 
-	universeID, err := parseUniverseID(ctx, true)
+	assetKey, err := parseAssetKey(ctx)
 	if err != nil {
 		return err
 	}
-	assetKey, err := parseAssetKey(ctx)
+
+	universeID, err := parseUniverseID(ctx, true)
 	if err != nil {
 		return err
 	}
-
 	filePath := lncfg.CleanAndExpandPath(ctx.String(proofPathName))
 	rawFile, err := readFile(filePath)
 	if err != nil {