diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz new file mode 100644 index 0000000..6f5abd1 Binary files /dev/null and b/.yarn/install-state.gz differ diff --git a/package.json b/package.json index 81b27ba..2ea7d73 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { "name": "gtcr-subgraph", - "version": "1.0.0", + "version": "1.1.4", "description": "Subgraph for Generalized TCR contracts", "scripts": { + "clean": "graph clean", "fix-schema.ts": "replace-in-file '/(;\\s*if \\()value === null/mg' '$1value === null || value.kind === ValueKind.NULL' generated/schema.ts --isRegex", "codegen:gnosis": "node render-templates.js gnosis && graph codegen && yarn fix-schema.ts", "build:gnosis": "yarn codegen:gnosis && graph build", @@ -30,7 +31,6 @@ }, "author": "Kleros", "license": "MIT", - "private": false, "bugs": { "url": "https://github.com/kleros/gtcr-subgraph/issues" }, diff --git a/src/fileHandlers/EvidenceMetadataHandler.ts b/src/fileHandlers/EvidenceMetadataHandler.ts index f2e005b..883423c 100644 --- a/src/fileHandlers/EvidenceMetadataHandler.ts +++ b/src/fileHandlers/EvidenceMetadataHandler.ts @@ -8,15 +8,16 @@ export function handleGTCREvidenceMetadata(content: Bytes): void { const evidenceId = context.getString('evidenceId'); const evidence = new EvidenceMetadata(`${id}-${evidenceId}`); - const value = json.fromBytes(content).toObject(); + const parsedResult = json.try_fromBytes(content); log.debug(`ipfs hash : {}, content : {}`, [id, content.toString()]); - if (!value) { + if (!parsedResult.isOk || parsedResult.isError) { log.warning(`Error converting object for evidence {}`, [id]); evidence.save(); return; } + const value = parsedResult.value.toObject(); const nameValue = value.get('name'); if (!nameValue) { diff --git a/src/fileHandlers/LEvidenceMetadataHandler.ts b/src/fileHandlers/LEvidenceMetadataHandler.ts index c41e782..99634ae 100644 --- a/src/fileHandlers/LEvidenceMetadataHandler.ts +++ b/src/fileHandlers/LEvidenceMetadataHandler.ts @@ -7,15 +7,16 @@ export function handleLGTCREvidenceMetadata(content: Bytes): void { const evidenceId = context.getString('evidenceId'); const evidence = new EvidenceMetadata(`${id}-${evidenceId}`); - const value = json.fromBytes(content).toObject(); + const parsedResult = json.try_fromBytes(content); log.debug(`ipfs hash : {}, content : {}`, [id, content.toString()]); - if (!value) { + if (!parsedResult.isOk || parsedResult.isError) { log.warning(`Error converting object for evidence {}`, [id]); evidence.save(); return; } + const value = parsedResult.value.toObject(); const nameValue = value.get('name'); if (!nameValue) { diff --git a/src/fileHandlers/LItemMetadataHandler.ts b/src/fileHandlers/LItemMetadataHandler.ts index f432baa..31fa421 100644 --- a/src/fileHandlers/LItemMetadataHandler.ts +++ b/src/fileHandlers/LItemMetadataHandler.ts @@ -5,7 +5,7 @@ import { JSONValueToBool, JSONValueToMaybeString } from '../utils'; export function handleLItemMetadata(content: Bytes): void { const ipfsHash = dataSource.stringParam(); - const value = json.fromBytes(content).toObject(); + const parsedResult = json.try_fromBytes(content); const context = dataSource.context(); const graphItemID = context.getString('graphItemID'); @@ -19,15 +19,18 @@ export function handleLItemMetadata(content: Bytes): void { log.debug(`ipfs hash : {}, content : {}`, [ipfsHash, content.toString()]); - if (!value) { + if (!parsedResult.isOk || parsedResult.isError) { log.warning(`Error converting object for graphItemId {}`, [graphItemID]); metadata.save(); return; } + const value = parsedResult.value.toObject(); const columnsValue = value.get('columns'); if (!columnsValue) { - log.error(`Error getting column values for graphItemID {}`, [graphItemID]); + log.warning(`Error getting column values for graphItemID {}`, [ + graphItemID, + ]); metadata.save(); return; } @@ -35,7 +38,7 @@ export function handleLItemMetadata(content: Bytes): void { const valuesValue = value.get('values'); if (!valuesValue) { - log.error(`Error getting valuesValue for graphItemID {}`, [graphItemID]); + log.warning(`Error getting valuesValue for graphItemID {}`, [graphItemID]); metadata.save(); return; } diff --git a/src/fileHandlers/LRegistryMetadataHandler.ts b/src/fileHandlers/LRegistryMetadataHandler.ts index 4719540..86ab3ca 100644 --- a/src/fileHandlers/LRegistryMetadataHandler.ts +++ b/src/fileHandlers/LRegistryMetadataHandler.ts @@ -5,7 +5,7 @@ import { JSONValueToBool, JSONValueToMaybeString } from '../utils'; export function handleLRegistryMetadata(content: Bytes): void { const ipfsHash = dataSource.stringParam(); - const value = json.fromBytes(content).toObject(); + const parsedResult = json.try_fromBytes(content); const context = dataSource.context(); const count = context.getBigInt('count'); @@ -17,15 +17,17 @@ export function handleLRegistryMetadata(content: Bytes): void { log.debug(`ipfs hash : {}, content : {}`, [ipfsHash, content.toString()]); - if (!value) { + if (!parsedResult.isOk || parsedResult.isError) { log.warning(`Error converting object for hash {}`, [ipfsHash]); metadata.save(); return; } + const value = parsedResult.value.toObject(); + const metadataValue = value.get('metadata'); if (!metadataValue) { - log.error(`Error getting metadata values from ipfs hash {}`, [ipfsHash]); + log.warning(`Error getting metadata values from ipfs hash {}`, [ipfsHash]); metadata.save(); return; }