From e47e3a97935730271c0c406465043e095898d2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= Date: Sat, 17 Aug 2024 09:39:26 -0700 Subject: [PATCH] fix: fix parsing metadata validation --- govtool/metadata-validation/src/app.service.ts | 7 +------ govtool/metadata-validation/src/utils/parseMetadata.ts | 9 +++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/govtool/metadata-validation/src/app.service.ts b/govtool/metadata-validation/src/app.service.ts index 04dd67976..9f7abfd36 100644 --- 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 index b606c50ce..a6560a987 100644 --- a/govtool/metadata-validation/src/utils/parseMetadata.ts +++ b/govtool/metadata-validation/src/utils/parseMetadata.ts @@ -13,12 +13,12 @@ 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, ); } } @@ -26,13 +26,14 @@ export const parseMetadata = ( 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, ); } }