mint: fix REST encoding of mint RPC

cmd/tapcli/assets.go

@@ -258,7 +258,9 @@ func listBatches(ctx *cli.Context) error {
 	}
 
 	resp, err := client.ListBatches(ctxc, &mintrpc.ListBatchRequest{
-		BatchKey: batchKey,
+		Filter: &mintrpc.ListBatchRequest_BatchKey{
+			BatchKey: batchKey,
+		},
 	})
 	if err != nil {
 		return fmt.Errorf("unable to list batches: %w", err)

itest/assets_test.go

@@ -485,7 +485,9 @@ func testMintAssetNameCollisionError(t *harnessTest) {
 	// the batch state.
 	cancelBatch, err := t.tapd.ListBatches(
 		ctxt, &mintrpc.ListBatchRequest{
-			BatchKey: collideBatchKey.BatchKey,
+			Filter: &mintrpc.ListBatchRequest_BatchKey{
+				BatchKey: collideBatchKey.BatchKey,
+			},
 		})
 	require.NoError(t.t, err)
 

rpcserver.go

@@ -406,8 +406,25 @@ func (r *rpcServer) ListBatches(_ context.Context,
 		err      error
 	)
 
-	if len(req.BatchKey) != 0 {
-		batchKey, err = btcec.ParsePubKey(req.BatchKey)
+	switch {
+	case len(req.GetBatchKey()) > 0 && len(req.GetBatchKeyStr()) > 0:
+		return nil, fmt.Errorf("cannot specify both batch_key and " +
+			"batch_key_string")
+
+	case len(req.GetBatchKey()) > 0:
+		batchKey, err = btcec.ParsePubKey(req.GetBatchKey())
+		if err != nil {
+			return nil, fmt.Errorf("invalid batch key: %w", err)
+		}
+
+	case len(req.GetBatchKeyStr()) > 0:
+		batchKeyBytes, err := hex.DecodeString(req.GetBatchKeyStr())
+		if err != nil {
+			return nil, fmt.Errorf("invalid batch key string: %w",
+				err)
+		}
+
+		batchKey, err = btcec.ParsePubKey(batchKeyBytes)
 		if err != nil {
 			return nil, fmt.Errorf("invalid batch key: %w", err)
 		}

taprpc/mintrpc/mint.proto

@@ -123,9 +123,16 @@ message CancelBatchResponse {
 }
 
 message ListBatchRequest {
-    // The optional batch key of the batch to list. When using REST this field
-    // must be encoded as base64url.
-    bytes batch_key = 1;
+    // The optional batch key of the batch to list.
+    oneof filter {
+        // The optional batch key of the batch to list, specified as raw bytes
+        // (gRPC only).
+        bytes batch_key = 1;
+
+        // The optional batch key of the batch to list, specified as a hex
+        // encoded string (use this for REST).
+        string batch_key_str = 2;
+    }
 }
 
 message ListBatchResponse {

taprpc/mintrpc/mint.swagger.json

@@ -70,11 +70,18 @@
         "parameters": [
           {
             "name": "batch_key",
-            "description": "The optional batch key of the batch to list. When using REST this field\nmust be encoded as base64url.",
+            "description": "The optional batch key of the batch to list, specified as raw bytes\n(gRPC only).",
             "in": "path",
             "required": true,
             "type": "string",
             "format": "byte"
+          },
+          {
+            "name": "batch_key_str",
+            "description": "The optional batch key of the batch to list, specified as a hex\nencoded string (use this for REST).",
+            "in": "query",
+            "required": false,
+            "type": "string"
           }
         ],
         "tags": [

taprpc/universerpc/universe.proto

@@ -130,16 +130,17 @@ message MerkleSumNode {
 
 message ID {
     oneof id {
-        // The 32-byte asset ID.
+        // The 32-byte asset ID specified as raw bytes (gRPC only).
         bytes asset_id = 1;
 
-        // The 32-byte asset ID encoded as a hex string.
+        // The 32-byte asset ID encoded as a hex string (use this for REST).
         string asset_id_str = 2;
 
-        // The 32-byte asset group key.
+        // The 32-byte asset group key specified as raw bytes (gRPC only).
         bytes group_key = 3;
 
-        // The 32-byte asset group key encoded as hex string.
+        // The 32-byte asset group key encoded as hex string (use this for
+        // REST).
         string group_key_str = 4;
     }
 }