Merge pull request #445 from lightninglabs/bug-fixes

Fix REST parameter issue in GET call

rpcserver.go

@@ -2253,6 +2253,25 @@ func (r *rpcServer) FetchAssetMeta(ctx context.Context,
 			ctx, assetID,
 		)
 
+	case in.GetAssetIdStr() != "":
+		if len(in.GetAssetIdStr()) != hex.EncodedLen(sha256.Size) {
+			return nil, fmt.Errorf("asset ID must be 32 bytes")
+		}
+
+		var assetIDBytes []byte
+		assetIDBytes, err = hex.DecodeString(in.GetAssetIdStr())
+		if err != nil {
+			return nil, fmt.Errorf("error hex decoding asset ID: "+
+				"%w", err)
+		}
+
+		var assetID asset.ID
+		copy(assetID[:], assetIDBytes)
+
+		assetMeta, err = r.cfg.AssetStore.FetchAssetMetaForAsset(
+			ctx, assetID,
+		)
+
 	case in.GetMetaHash() != nil:
 		if len(in.GetMetaHash()) != sha256.Size {
 			return nil, fmt.Errorf("meta hash must be 32 bytes")
@@ -2265,6 +2284,25 @@ func (r *rpcServer) FetchAssetMeta(ctx context.Context,
 			ctx, metaHash,
 		)
 
+	case in.GetMetaHashStr() != "":
+		if len(in.GetMetaHashStr()) != hex.EncodedLen(sha256.Size) {
+			return nil, fmt.Errorf("meta hash must be 32 bytes")
+		}
+
+		var metaHashBytes []byte
+		metaHashBytes, err = hex.DecodeString(in.GetMetaHashStr())
+		if err != nil {
+			return nil, fmt.Errorf("error hex decoding meta hash: "+
+				"%w", err)
+		}
+
+		var metaHash [asset.MetaHashLen]byte
+		copy(metaHash[:], metaHashBytes)
+
+		assetMeta, err = r.cfg.AssetStore.FetchAssetMetaByHash(
+			ctx, metaHash,
+		)
+
 	default:
 		return nil, fmt.Errorf("either asset ID or meta hash must " +
 			"be set")

taprpc/taprootassets.proto

@@ -872,5 +872,11 @@ message FetchAssetMetaRequest {
 
         // The 32-byte meta hash of the asset meta.
         bytes meta_hash = 2;
+
+        // The hex encoded asset ID of the asset to fetch the meta for.
+        string asset_id_str = 3;
+
+        // The hex encoded meta hash of the asset meta.
+        string meta_hash_str = 4;
     }
 }