From c2006e75ed9ef53f06927e47258165b7b7a4fc42 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 09:54:42 +0100 Subject: [PATCH 1/6] Add error log to insert --- src/service/triple-store-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/triple-store-service.js b/src/service/triple-store-service.js index a50b1338a..f37280856 100644 --- a/src/service/triple-store-service.js +++ b/src/service/triple-store-service.js @@ -201,7 +201,7 @@ class TripleStoreService { throw new Error( `Failed to store Knowledge Collection with the UAL: ${knowledgeCollectionUAL} ` + - `to the Triple Store's ${repository} repository after maximum retries.`, + `to the Triple Store's ${repository} repository after maximum retries. Error ${error}`, ); } } From d03ac902bde339efa7a45063d8fdd603fbd11e49 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 09:58:39 +0100 Subject: [PATCH 2/6] Fix validation --- .../protocols/common/validate-assertion-metadata-command.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/commands/protocols/common/validate-assertion-metadata-command.js b/src/commands/protocols/common/validate-assertion-metadata-command.js index 31737cc7a..181330111 100644 --- a/src/commands/protocols/common/validate-assertion-metadata-command.js +++ b/src/commands/protocols/common/validate-assertion-metadata-command.js @@ -5,6 +5,7 @@ class ValidateAssertionMetadataCommand extends Command { super(ctx); this.operationIdService = ctx.operationIdService; this.blockchainModuleManager = ctx.blockchainModuleManager; + this.dataService = ctx.dataService; } async execute(command) { From cb059c52bb5f613a1f3aa56c6f948ede9a93cc57 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 10:31:27 +0100 Subject: [PATCH 3/6] Fix assertion reading for remote and publisher node --- src/commands/protocols/publish/store-assertion-command.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/protocols/publish/store-assertion-command.js b/src/commands/protocols/publish/store-assertion-command.js index 2bc8e2b14..dfd5070ec 100644 --- a/src/commands/protocols/publish/store-assertion-command.js +++ b/src/commands/protocols/publish/store-assertion-command.js @@ -25,7 +25,7 @@ class StoreAssertionCommand extends Command { OPERATION_ID_STATUS.PUBLISH_FINALIZATION.PUBLISH_FINALIZATION_STORE_ASSERTION_START, ); try { - await this._insertAssertion(assertion, ual); + await this._insertAssertion(assertion.public ?? assertion, ual); } catch (e) { await this.handleError(operationId, blockchain, e.message, this.errorType, true); return Command.empty(); // TODO: Should it end here or do a retry? From 60acb0018ea9631566fc2ca242832a6d63ca2955 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 11:25:23 +0100 Subject: [PATCH 4/6] Revert wrong fix for assertion --- src/commands/protocols/publish/store-assertion-command.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/protocols/publish/store-assertion-command.js b/src/commands/protocols/publish/store-assertion-command.js index dfd5070ec..2bc8e2b14 100644 --- a/src/commands/protocols/publish/store-assertion-command.js +++ b/src/commands/protocols/publish/store-assertion-command.js @@ -25,7 +25,7 @@ class StoreAssertionCommand extends Command { OPERATION_ID_STATUS.PUBLISH_FINALIZATION.PUBLISH_FINALIZATION_STORE_ASSERTION_START, ); try { - await this._insertAssertion(assertion.public ?? assertion, ual); + await this._insertAssertion(assertion, ual); } catch (e) { await this.handleError(operationId, blockchain, e.message, this.errorType, true); return Command.empty(); // TODO: Should it end here or do a retry? From 9a306b4d04b8d2d5a437aaa7e69f95a220556fb1 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 11:25:44 +0100 Subject: [PATCH 5/6] Version bump --- package-lock.json | 14 +++++++------- package.json | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 84e0e7312..4e209a037 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "axios": "^1.6.0", "cors": "^2.8.5", "deep-extend": "^0.6.0", - "dkg-evm-module": "^8.0.0-sigma.2", + "dkg-evm-module": "^8.0.0-sigma.3", "dotenv": "^16.0.1", "ethers": "^5.7.2", "express": "^4.18.1", @@ -9334,9 +9334,9 @@ } }, "node_modules/dkg-evm-module": { - "version": "8.0.0-sigma.2", - "resolved": "https://registry.npmjs.org/dkg-evm-module/-/dkg-evm-module-8.0.0-sigma.2.tgz", - "integrity": "sha512-o19xDVGMSuvJxrWGmyW3MPQzTspnhmgmJBVLBdteCL5v6eP6FkjJsVg90fEXbKeljP58EH683FndT7VCHCQ+EA==", + "version": "8.0.0-sigma.3", + "resolved": "https://registry.npmjs.org/dkg-evm-module/-/dkg-evm-module-8.0.0-sigma.3.tgz", + "integrity": "sha512-32vhPrSwzSZt2cG3j5nf3y0Cu3QhMhanc7DeoXQ2e5VGKLVlA3yuNGw5e1zm0z3kQputYzNJaeznBFu13tDRwQ==", "dependencies": { "@openzeppelin/contracts": "^5.1.0", "@polkadot/api": "^15.0.2", @@ -31753,9 +31753,9 @@ "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" }, "dkg-evm-module": { - "version": "8.0.0-sigma.2", - "resolved": "https://registry.npmjs.org/dkg-evm-module/-/dkg-evm-module-8.0.0-sigma.2.tgz", - "integrity": "sha512-o19xDVGMSuvJxrWGmyW3MPQzTspnhmgmJBVLBdteCL5v6eP6FkjJsVg90fEXbKeljP58EH683FndT7VCHCQ+EA==", + "version": "8.0.0-sigma.3", + "resolved": "https://registry.npmjs.org/dkg-evm-module/-/dkg-evm-module-8.0.0-sigma.3.tgz", + "integrity": "sha512-32vhPrSwzSZt2cG3j5nf3y0Cu3QhMhanc7DeoXQ2e5VGKLVlA3yuNGw5e1zm0z3kQputYzNJaeznBFu13tDRwQ==", "requires": { "@openzeppelin/contracts": "^5.1.0", "@polkadot/api": "^15.0.2", diff --git a/package.json b/package.json index 9a8c819b6..423cf926e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "8.0.0-sigma.12", + "version": "8.0.0-sigma.13", "description": "OTNode V8", "main": "index.js", "type": "module", @@ -81,7 +81,7 @@ "axios": "^1.6.0", "cors": "^2.8.5", "deep-extend": "^0.6.0", - "dkg-evm-module": "^8.0.0-sigma.2", + "dkg-evm-module": "^8.0.0-sigma.3", "dotenv": "^16.0.1", "ethers": "^5.7.2", "express": "^4.18.1", From c3765cfe15912353ef85ca122c3e32239657ca50 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 24 Dec 2024 11:27:17 +0100 Subject: [PATCH 6/6] package-lock update --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e209a037..366f111e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "8.0.0-sigma.12", + "version": "8.0.0-sigma.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "8.0.0-sigma.12", + "version": "8.0.0-sigma.13", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3",