Backwards compatibility fixes Prerelease Testnet

package.json

@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "8.0.0-sigma.7",
+    "version": "8.0.0-sigma.8",
     "description": "OTNode V8",
     "main": "index.js",
     "type": "module",

src/commands/local-store/local-store-command.js

@@ -4,7 +4,6 @@ import {
     LOCAL_STORE_TYPES,
     OPERATION_REQUEST_STATUS,
     NETWORK_MESSAGE_TYPES,
-    TRIPLE_STORE_REPOSITORIES,
     NETWORK_SIGNATURES_FOLDER,
     PUBLISHER_NODE_SIGNATURES_FOLDER,
 } from '../../constants/constants.js';
@@ -66,20 +65,16 @@ class LocalStoreCommand extends Command {
                 const storePromises = [];
 
                 if (isOperationV0) {
-                    const assertions = [cachedData.public, cachedData.private];
+                    if (cachedData.public?.assertion && cachedData.public?.assertionId) {
+                        const ual = this.ualService.deriveUAL(blockchain, contract, tokenId);
 
-                    for (const data of assertions) {
-                        if (data?.assertion && data?.assertionId) {
-                            const ual = this.ualService.deriveUAL(blockchain, contract, tokenId);
-
-                            storePromises.push(
-                                this.tripleStoreService.insertKnowledgeCollection(
-                                    TRIPLE_STORE_REPOSITORIES.DKG,
-                                    ual,
-                                    data.assertion,
-                                ),
-                            );
-                        }
+                        storePromises.push(
+                            this.tripleStoreService.createV6KnowledgeCollection(
+                                cachedData.public.assertion,
+                                ual,
+                                cachedData.private.assertion,
+                            ),
+                        );
                     }
                 }
 

src/commands/protocols/common/protocol-schedule-messages-command.js

@@ -56,7 +56,6 @@ class ProtocolScheduleMessagesCommand extends Command {
                     batchSize,
                     minAckResponses,
                     leftoverNodes: currentBatchLeftoverNodes,
-                    isOperationV0: command.data.isOperationV0,
                 },
                 period: 5000,
                 retries: 3,

src/commands/protocols/get/receiver/v1.0.0/v1-0-0-handle-get-request-command.js

@@ -118,13 +118,6 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                     ual,
                 );
 
-                if (!assertionId) {
-                    assertionId = await this.tripleStoreService.getLatestAssertionId(
-                        TRIPLE_STORE_REPOSITORIES.PRIVATE_CURRENT,
-                        ual,
-                    );
-                }
-
                 if (!assertionId) {
                     return {
                         messageType: NETWORK_MESSAGE_TYPES.RESPONSES.NACK,
@@ -144,7 +137,7 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                         operationId,
                         blockchain,
                     );
-                    return result;
+                    return result.split('\n').filter((res) => res.length > 0);
                 });
         } else {
             assertionPromise = this.tripleStoreService

src/commands/protocols/get/sender/get-validate-asset-command.js

@@ -1,6 +1,10 @@
 import ValidateAssetCommand from '../../../common/validate-asset-command.js';
 import Command from '../../../command.js';
-import { OPERATION_ID_STATUS, ERROR_TYPE } from '../../../../constants/constants.js';
+import {
+    OPERATION_ID_STATUS,
+    ERROR_TYPE,
+    OLD_CONTENT_STORAGE_MAP,
+} from '../../../../constants/constants.js';
 
 class GetValidateAssetCommand extends ValidateAssetCommand {
     constructor(ctx) {
@@ -49,30 +53,41 @@ class GetValidateAssetCommand extends ValidateAssetCommand {
             blockchain,
         );
         // TODO: Update to validate knowledge asset index
-        const isValidUal = isOperationV0
-            ? true
-            : await this.validationService.validateUal(blockchain, contract, knowledgeCollectionId);
-        this.operationIdService.emitChangeEvent(
-            OPERATION_ID_STATUS.GET.GET_VALIDATE_UAL_END,
-            operationId,
-            blockchain,
-        );
+        if (
+            !isOperationV0 &&
+            Object.values(OLD_CONTENT_STORAGE_MAP).every(
+                (ca) => !ca.toLowerCase().includes(contract.toLowerCase()),
+            )
+        ) {
+            const isValidUal = await this.validationService.validateUal(
+                blockchain,
+                contract,
+                knowledgeCollectionId,
+            );
 
-        if (!isValidUal) {
-            await this.handleError(
+            this.operationIdService.emitChangeEvent(
+                OPERATION_ID_STATUS.GET.GET_VALIDATE_UAL_END,
                 operationId,
                 blockchain,
-                `Get for operation id: ${operationId}, UAL: ${ual}: there is no asset with this UAL.`,
-                this.errorType,
             );
-            return Command.empty();
+
+            if (!isValidUal) {
+                await this.handleError(
+                    operationId,
+                    blockchain,
+                    `Get for operation id: ${operationId}, UAL: ${ual}: there is no asset with this UAL.`,
+                    this.errorType,
+                );
+                return Command.empty();
+            }
+
+            await this.operationIdService.updateOperationIdStatus(
+                operationId,
+                blockchain,
+                OPERATION_ID_STATUS.GET.GET_VALIDATE_ASSET_END,
+            );
         }
 
-        await this.operationIdService.updateOperationIdStatus(
-            operationId,
-            blockchain,
-            OPERATION_ID_STATUS.GET.GET_VALIDATE_ASSET_END,
-        );
         return this.continueSequence(
             {
                 ...command.data,

src/commands/protocols/get/sender/local-get-command.js

@@ -104,7 +104,7 @@ class LocalGetCommand extends Command {
 
         if (assertionId) {
             assertionPromise = (async () => {
-                let result = null;
+                let result = {};
                 for (const repository of [
                     TRIPLE_STORE_REPOSITORIES.PRIVATE_CURRENT,
                     TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
@@ -124,7 +124,7 @@ class LocalGetCommand extends Command {
                     );
                 }
 
-                return result;
+                return result.split('\n').filter((res) => res.length > 0);
             })();
         } else {
             assertionPromise = this.tripleStoreService

src/commands/protocols/publish/receiver/v1.0.0/v1-0-0-handle-store-request-command.js

@@ -81,13 +81,18 @@ class HandleStoreRequestCommand extends HandleProtocolMessageCommand {
             blockchain,
             OPERATION_ID_STATUS.PUBLISH.PUBLISH_LOCAL_STORE_REMOTE_CACHE_DATASET_START,
         );
-        await this.pendingStorageService.cacheDataset(
-            operationId,
-            datasetRoot,
-            dataset,
-            remotePeerId,
-        );
-
+        if (isOperationV0) {
+            const { contract, tokenId } = commandData;
+            const ual = this.ualService.deriveUAL(blockchain, contract, tokenId);
+            await this.tripleStoreService.createV6KnowledgeCollection(dataset, ual);
+        } else {
+            await this.pendingStorageService.cacheDataset(
+                operationId,
+                datasetRoot,
+                dataset,
+                remotePeerId,
+            );
+        }
         await this.operationIdService.updateOperationIdStatus(
             operationId,
             blockchain,

src/commands/protocols/publish/sender/publish-find-shard-command.js

@@ -20,9 +20,10 @@ class PublishFindShardCommand extends FindShardCommand {
 
     getOperationCommandSequence(nodePartOfShard, commandData) {
         const sequence = [];
-        sequence.push(
-            commandData.isOperationV0 ? 'validateAssetCommand' : 'publishValidateAssetCommand',
-        );
+        if (!commandData.isOperationV0) {
+            sequence.push('publishValidateAssetCommand');
+        }
+
         if (nodePartOfShard && !commandData.isOperationV0) {
             sequence.push('localStoreCommand');
         } else {

src/commands/protocols/publish/sender/publish-schedule-messages-command.js

@@ -13,6 +13,17 @@ class PublishScheduleMessagesCommand extends ProtocolScheduleMessagesCommand {
         this.errorType = ERROR_TYPE.PUBLISH.PUBLISH_START_ERROR;
     }
 
+    getNextCommandData(command) {
+        const { datasetRoot, blockchain, isOperationV0, contract, tokenId } = command.data;
+        return {
+            blockchain,
+            datasetRoot,
+            isOperationV0,
+            contract,
+            tokenId,
+        };
+    }
+
     /**
      * Builds default publishScheduleMessagesCommand
      * @param map

src/commands/protocols/publish/sender/v1.0.0/v1-0-0-publish-request-command.js

@@ -25,7 +25,7 @@ class PublishRequestCommand extends ProtocolRequestCommand {
     }
 
     async prepareMessage(command) {
-        const { datasetRoot, operationId, isOperationV0 } = command.data;
+        const { datasetRoot, operationId, isOperationV0, contract, tokenId } = command.data;
 
         // TODO: Backwards compatibility, send blockchain without chainId
         const { blockchain } = command.data;
@@ -47,6 +47,19 @@ class PublishRequestCommand extends ProtocolRequestCommand {
             datasetRoot,
             blockchain,
             isOperationV0,
+            contract,
+            tokenId,
+        };
+    }
+
+    getNextCommandData(command) {
+        const { datasetRoot, blockchain, isOperationV0, contract, tokenId } = command.data;
+        return {
+            blockchain,
+            datasetRoot,
+            isOperationV0,
+            contract,
+            tokenId,
         };
     }
 

src/commands/query/query-command.js

@@ -55,7 +55,25 @@ class QueryCommand extends Command {
                         OPERATION_ID_STATUS.QUERY.QUERY_CONSTRUCT_QUERY_START,
                         operationId,
                     );
-                    data = await this.tripleStoreService.construct(query, repository);
+
+                    if (Array.isArray(repository)) {
+                        const dataV6 = await this.tripleStoreService.construct(
+                            query,
+                            repository[0],
+                        );
+                        const dataV8 = await this.tripleStoreService.construct(
+                            query,
+                            repository[1],
+                        );
+
+                        data = this.dataService.removeDuplicateObjectsFromArray([
+                            ...dataV6,
+                            ...dataV8,
+                        ]);
+                    } else {
+                        data = await this.tripleStoreService.construct(query, repository);
+                    }
+
                     this.operationIdService.emitChangeEvent(
                         OPERATION_ID_STATUS.QUERY.QUERY_CONSTRUCT_QUERY_END,
                         operationId,

src/controllers/http-api/v0/local-store-http-api-controller-v0.js

@@ -75,7 +75,7 @@ class LocalStoreController extends BaseController {
 
         await this.operationIdService.cacheOperationIdDataToFile(operationId, cachedAssertions);
 
-        const commandSequence = ['validateAssetCommand', 'localStoreCommand'];
+        const commandSequence = ['localStoreCommand'];
 
         await this.commandExecutor.add({
             name: commandSequence[0],

src/controllers/rpc/publish-rpc-controller.js

@@ -43,6 +43,8 @@ class PublishController extends BaseController {
             datasetRoot: message.data.datasetRoot,
             blockchain: message.data.blockchain,
             isOperationV0: message.data.isOperationV0,
+            contract: message.data.contract,
+            tokenId: message.data.tokenId,
         };
 
         await this.commandExecutor.add(command);

src/service/triple-store-service.js

@@ -208,6 +208,40 @@ class TripleStoreService {
         }
     }
 
+    async createV6KnowledgeCollection(triplesPublic, ual, triplesPrivate = null) {
+        this.logger.info(
+            `Inserting Knowledge Collection with the UAL: ${ual} ` +
+                `to the Triple Store's ${TRIPLE_STORE_REPOSITORY.DKG} repository.`,
+        );
+        const publicKnowledgeAssetsTriplesGrouped = [triplesPublic];
+        const publicKnowledgeAssetsUALs = [`${ual}/1`];
+        await this.tripleStoreModuleManager.createKnowledgeCollectionNamedGraphs(
+            this.repositoryImplementations[TRIPLE_STORE_REPOSITORY.DKG],
+            TRIPLE_STORE_REPOSITORY.DKG,
+            publicKnowledgeAssetsUALs,
+            publicKnowledgeAssetsTriplesGrouped,
+            TRIPLES_VISIBILITY.PUBLIC,
+        );
+
+        if (triplesPrivate) {
+            const privateKnowledgeAssetsTriplesGrouped = [triplesPrivate];
+            await this.tripleStoreModuleManager.createKnowledgeCollectionNamedGraphs(
+                this.repositoryImplementations[TRIPLE_STORE_REPOSITORY.DKG],
+                TRIPLE_STORE_REPOSITORY.DKG,
+                publicKnowledgeAssetsUALs,
+                privateKnowledgeAssetsTriplesGrouped,
+                TRIPLES_VISIBILITY.PRIVATE,
+            );
+        }
+
+        const metadataTriples = [`<${ual}> <http://schema.org/states> "${ual}:0" .`];
+        await this.tripleStoreModuleManager.insertKnowledgeCollectionMetadata(
+            this.repositoryImplementations[TRIPLE_STORE_REPOSITORY.DKG],
+            TRIPLE_STORE_REPOSITORY.DKG,
+            metadataTriples,
+        );
+    }
+
     async insertUpdatedKnowledgeCollection(preUpdateUalNamedGraphs, ual, triples, firstNewKAIndex) {
         const preUpdateSubjectUalMap = new Map(
             preUpdateUalNamedGraphs.map((entry) => [