Merge pull request #1755 from IntersectMBO/fix/fix-metadata-parsing

fix: fix parsing metadata validation
IntersectMBO · Aug 17, 2024 · 2b18235 · 2b18235
2 parents bd283d6 + e47e3a9
commit 2b18235
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/govtool/metadata-validation/src/app.service.ts b/govtool/metadata-validation/src/app.service.ts
@@ -32,12 +32,7 @@ export class AppService {
         await validateMetadataStandard(data, standard);
         metadata = parseMetadata(data.body, standard);
       }
-
-      const hashedMetadata = blake.blake2bHex(
-        !standard ? data : metadata,
-        undefined,
-        32,
-      );
+      const hashedMetadata = blake.blake2bHex(data, undefined, 32);
 
       if (hashedMetadata !== hash) {
         throw MetadataValidationStatus.INVALID_HASH;

diff --git a/govtool/metadata-validation/src/utils/parseMetadata.ts b/govtool/metadata-validation/src/utils/parseMetadata.ts
@@ -13,26 +13,27 @@ export const parseMetadata = (
     case MetadataStandard.CIP108:
       for (const [key, value] of Object.entries(metadata)) {
         if (CIP_108_VALUE_KEYS.includes(key)) {
-          parsedMetadata[key] = value['@value'];
+          parsedMetadata[key] = value;
         }
 
         if (key === 'references') {
           parsedMetadata[key] = (Array.isArray(value) ? value : [])?.map(
-            (reference) => reference?.uri['@value'],
+            (reference) => reference?.uri,
           );
         }
       }
 
       return parsedMetadata;
 
     case MetadataStandard.CIPQQQ:
+      console.log({ metadataRaw: metadata });
       for (const [key, value] of Object.entries(metadata)) {
         if (CIP_QQQ_VALUE_KEYS.includes(key)) {
-          parsedMetadata[key] = value['@value'];
+          parsedMetadata[key] = value;
         }
         if (key === 'references') {
           parsedMetadata[key] = (Array.isArray(value) ? value : [])?.map(
-            (reference) => reference?.uri['@value'],
+            (reference) => reference?.uri,
           );
         }
       }