From 4aecac8d53a2d41afb2c018a594d2b95364b288b Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 18 Feb 2025 13:04:38 +0100 Subject: [PATCH 1/4] Fix private merkle root validation --- src/service/validation-service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/service/validation-service.js b/src/service/validation-service.js index 2ac58c733..42d313a49 100644 --- a/src/service/validation-service.js +++ b/src/service/validation-service.js @@ -102,6 +102,10 @@ class ValidationService { async validateDatasetRoot(dataset, datasetRoot) { const calculatedDatasetRoot = await this.validationModuleManager.calculateRoot(dataset); + this.logger.error(`calculatedDatasetRoot ${calculatedDatasetRoot}`); + this.logger.error(`datasetRoot ${datasetRoot}`); + this.logger.error(`equals ${datasetRoot !== calculatedDatasetRoot}`); + if (datasetRoot !== calculatedDatasetRoot) { throw new Error( `Merkle Root validation failed. Received Merkle Root: ${datasetRoot}; Calculated Merkle Root: ${calculatedDatasetRoot}`, @@ -115,7 +119,7 @@ class ValidationService { ); if (privateAssertionTriple) { - const privateAssertionRoot = privateAssertionTriple.split(' ')[2].slice(1, -1); + const privateAssertionRoot = privateAssertionTriple.split(' ')[2].replace(/['"]/g, ''); await this.validateDatasetRoot(privateAssertion, privateAssertionRoot); } else { From 4bd884a50e23871486e20eee3b8bff9f1b81d9ae Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 18 Feb 2025 13:09:13 +0100 Subject: [PATCH 2/4] hotfix version upgrade --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b37a568c7..b0af81f14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "8.0.1+hotfix.6", + "version": "8.0.1+hotfix.7", "description": "OTNode V8", "main": "index.js", "type": "module", From 10a54c71ebf5ea9b874e4c4fb621275b9e12d67b Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Tue, 18 Feb 2025 13:26:24 +0100 Subject: [PATCH 3/4] remove comments --- src/service/validation-service.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/service/validation-service.js b/src/service/validation-service.js index 42d313a49..af2e5c8ef 100644 --- a/src/service/validation-service.js +++ b/src/service/validation-service.js @@ -102,10 +102,6 @@ class ValidationService { async validateDatasetRoot(dataset, datasetRoot) { const calculatedDatasetRoot = await this.validationModuleManager.calculateRoot(dataset); - this.logger.error(`calculatedDatasetRoot ${calculatedDatasetRoot}`); - this.logger.error(`datasetRoot ${datasetRoot}`); - this.logger.error(`equals ${datasetRoot !== calculatedDatasetRoot}`); - if (datasetRoot !== calculatedDatasetRoot) { throw new Error( `Merkle Root validation failed. Received Merkle Root: ${datasetRoot}; Calculated Merkle Root: ${calculatedDatasetRoot}`, From e57db96bf908f620a51bba71aa069f9a60d7ee3b Mon Sep 17 00:00:00 2001 From: Zvonimir Date: Wed, 19 Feb 2025 12:53:43 +0100 Subject: [PATCH 4/4] Bump up version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0af81f14..bccab322c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "8.0.1+hotfix.7", + "version": "8.0.1+hotfix.8", "description": "OTNode V8", "main": "index.js", "type": "module",