Skip to content

fix: metadata-parsing #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 23, 2025
Merged

fix: metadata-parsing #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b8c218
fix: metadata-parsing
tractorss Jan 22, 2025
d34a26f
chore: version
jaybuidl Jan 22, 2025
3cfd64d
fix: explicit-error-check
tractorss Jan 22, 2025
02862b9
fix: use-is-ok-method
tractorss Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -30,7 +31,6 @@
},
"author": "Kleros",
"license": "MIT",
"private": false,
"bugs": {
"url": "https://github.com/kleros/gtcr-subgraph/issues"
},
Expand Down
5 changes: 3 additions & 2 deletions src/fileHandlers/EvidenceMetadataHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions src/fileHandlers/LEvidenceMetadataHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 7 additions & 4 deletions src/fileHandlers/LItemMetadataHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -19,23 +19,26 @@ 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;
}
const columns = columnsValue.toArray();

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;
}
Expand Down
8 changes: 5 additions & 3 deletions src/fileHandlers/LRegistryMetadataHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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;
}
Expand Down
Loading