Merge pull request #3642 from OriginTrail/v6/release/testnet

V8.0.0+hotfix.3 Mainnet Prerelease

package.json

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

src/commands/blockchain-event-listener/blockchain-event-listener-command.js

@@ -209,12 +209,12 @@ class BlockchainEventListenerCommand extends Command {
     }
 
     async handleParameterChangedEvent(event) {
-        const { blockchainId, contract, data } = event;
+        const { blockchain, contract, data } = event;
         const { parameterName, parameterValue } = JSON.parse(data);
         switch (contract) {
             case CONTRACTS.PARAMETERS_STORAGE:
                 this.blockchainModuleManager.setContractCallCache(
-                    blockchainId,
+                    blockchain,
                     CONTRACTS.PARAMETERS_STORAGE,
                     parameterName,
                     parameterValue,

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

@@ -40,6 +40,7 @@ class ProtocolScheduleMessagesCommand extends Command {
                 currentBatchNodes.length
             }, leftover for retry: ${currentBatchLeftoverNodes.length}`,
         );
+        const nextCommandData = this.getNextCommandData(command);
 
         const addCommandPromises = currentBatchNodes.map(async (node) => {
             const commandSequence = this.protocolService.getSenderCommandSequence(node.protocol);
@@ -48,7 +49,7 @@ class ProtocolScheduleMessagesCommand extends Command {
                 sequence: commandSequence.slice(1),
                 delay: 0,
                 data: {
-                    ...this.getNextCommandData(command),
+                    ...nextCommandData,
                     blockchain,
                     operationId,
                     node,

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

@@ -173,7 +173,15 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                         burned: [],
                     };
                 }
+            } else {
+                // kaId is number, so transform it to range
+                knowledgeAssetId = {
+                    startTokenId: knowledgeAssetId,
+                    endTokenId: knowledgeAssetId,
+                    burned: [],
+                };
             }
+
             assertionPromise = this.tripleStoreService
                 .getAssertion(
                     blockchain,

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

@@ -155,7 +155,15 @@ class LocalGetCommand extends Command {
                         burned: [],
                     };
                 }
+            } else {
+                // kaId is number, so transform it to range
+                knowledgeAssetId = {
+                    startTokenId: knowledgeAssetId,
+                    endTokenId: knowledgeAssetId,
+                    burned: [],
+                };
             }
+
             assertionPromise = this.tripleStoreService
                 .getAssertion(
                     blockchain,

src/modules/blockchain/blockchain-module-manager.js

@@ -6,12 +6,8 @@ class BlockchainModuleManager extends BaseModuleManager {
     }
 
     callImplementationFunction(blockchain, functionName, args = []) {
-        if (blockchain) {
-            if (this.getImplementation(blockchain)) {
-                return this.getImplementation(blockchain).module[functionName](...args);
-            }
-        } else {
-            return this.getImplementation().module[functionName](...args);
+        if (this.getImplementation(blockchain)) {
+            return this.getImplementation(blockchain).module[functionName](...args);
         }
     }
 
@@ -282,6 +278,14 @@ class BlockchainModuleManager extends BaseModuleManager {
             tokenId,
         ]);
     }
+
+    getImplementation(name = null) {
+        const keys = Object.keys(this.handlers);
+        if (!keys.includes(name)) {
+            throw new Error(`Blockchain: ${name} implementation is not enabled.`);
+        }
+        return this.handlers[name];
+    }
 }
 
 export default BlockchainModuleManager;