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

OriginTrail Mainnet Prerelease v6.0.13

.github/workflows/checks.yml

@@ -2,8 +2,7 @@ name: checks
 
 on:
   pull_request:
-    branches:
-      - v6/develop
+    types: [opened, reopened, synchronize]
 
 env:
   REPOSITORY_PASSWORD: password

config/config.json

@@ -168,6 +168,7 @@
                 }
             }
         },
+        "maximumAssertionSizeInKb": 2500,
         "commandExecutorVerboseLoggingEnabled": false,
         "appDataPath": "data",
         "logLevel": "info",
@@ -302,6 +303,7 @@
                 }
             }
         },
+        "maximumAssertionSizeInKb": 2500,
         "commandExecutorVerboseLoggingEnabled": false,
         "appDataPath": "data",
         "logLevel": "trace",
@@ -449,6 +451,7 @@
                 }
             }
         },
+        "maximumAssertionSizeInKb": 2500,
         "commandExecutorVerboseLoggingEnabled": false,
         "appDataPath": "data",
         "logLevel": "trace",
@@ -597,6 +600,7 @@
                 }
             }
         },
+        "maximumAssertionSizeInKb": 2500,
         "commandExecutorVerboseLoggingEnabled": false,
         "appDataPath": "data",
         "logLevel": "trace",

ot-node.js

@@ -69,6 +69,7 @@ class OTNode {
 
         await this.initializeCommandExecutor();
         await this.initializeRouters();
+        await this.startNetworkModule();
         this.logger.info('Node is up and running!');
     }
 
@@ -254,6 +255,11 @@ class OTNode {
         }
     }
 
+    async startNetworkModule() {
+        const networkModuleManager = this.container.resolve('networkModuleManager');
+        await networkModuleManager.start();
+    }
+
     async executePrivateAssetsMetadataMigration() {
         if (
             process.env.NODE_ENV === NODE_ENVIRONMENTS.DEVELOPMENT ||

package.json

@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "6.0.12",
+    "version": "6.0.13",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",
@@ -12,6 +12,7 @@
         "lint-staged": "lint-staged",
         "create-account-mapping-signature": "node tools/ot-parachain-account-mapping/create-account-mapping-signature.js ",
         "start:local_blockchain": "npm explore dkg-evm-module -- npm run dev",
+        "kill:local_blockchain": "npx kill-port 8545",
         "test:bdd": "cucumber-js --fail-fast --format progress --format-options '{\"colorsEnabled\": true}' test/bdd/ --import test/bdd/steps/ --exit",
         "test:unit": "nyc --all mocha --exit $(find test/unit -name '*.js')",
         "test:modules": "nyc --all mocha --exit $(find test/modules -name '*.js')",
@@ -74,7 +75,7 @@
         "axios": "^0.27.2",
         "cors": "^2.8.5",
         "deep-extend": "^0.6.0",
-        "dkg-evm-module": "^4.0.5",
+        "dkg-evm-module": "^4.0.7",
         "dotenv": "^16.0.1",
         "ethers": "^5.7.2",
         "express": "^4.18.1",

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

@@ -93,8 +93,11 @@ class LocalStoreCommand extends Command {
                 await this.commandExecutor.add({
                     name: 'deletePendingStateCommand',
                     sequence: [],
-                    delay: updateCommitWindowDuration * 1000,
-                    data: { ...command.data, repository: PENDING_STORAGE_REPOSITORIES.PRIVATE },
+                    delay: (updateCommitWindowDuration + 60) * 1000,
+                    data: {
+                        ...command.data,
+                        assertionId: cachedData.public.assertionId,
+                    },
                     transactional: false,
                 });
             }

src/commands/protocols/common/handle-protocol-message-command.js

@@ -1,5 +1,5 @@
 import Command from '../../command.js';
-import { NETWORK_MESSAGE_TYPES } from '../../../constants/constants.js';
+import { BYTES_IN_KILOBYTE, NETWORK_MESSAGE_TYPES } from '../../../constants/constants.js';
 
 class HandleProtocolMessageCommand extends Command {
     constructor(ctx) {
@@ -127,6 +127,18 @@ class HandleProtocolMessageCommand extends Command {
                 this.blockchainModuleManager.getR0(blockchain),
                 getAsk(),
             ]);
+        const blockchainAssertionSizeInKb = blockchainAssertionSize / BYTES_IN_KILOBYTE;
+        if (blockchainAssertionSizeInKb > this.config.maximumAssertionSizeInKb) {
+            this.logger.warn(
+                `The size of the received assertion exceeds the maximum limit allowed.. Maximum allowed assertion size in kb: ${this.config.maximumAssertionSizeInKb}, assertion size read from blockchain in kb: ${blockchainAssertionSizeInKb}`,
+            );
+            return {
+                errorMessage:
+                    'The size of the received assertion exceeds the maximum limit allowed.',
+                agreementId,
+                agreementData,
+            };
+        }
 
         const now = await this.blockchainModuleManager.getBlockchainTimestamp(blockchain);
 
@@ -143,8 +155,7 @@ class HandleProtocolMessageCommand extends Command {
             .mul(epochsLeft)
             .mul(blockchainAssertionSize);
 
-        const serviceAgreementBid = this.blockchainModuleManager
-            .toBigNumber(blockchain, agreementData.tokenAmount)
+        const serviceAgreementBid = agreementData.tokenAmount
             .add(agreementData.updateTokenAmount)
             .mul(1024)
             .div(divisor)

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

@@ -42,22 +42,24 @@ class HandleGetInitCommand extends HandleProtocolMessageCommand {
                 blockchain,
                 contract,
                 tokenId,
+                assertionId,
             );
         }
 
-        for (const repository of [
-            TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
-            TRIPLE_STORE_REPOSITORIES.PUBLIC_HISTORY,
-        ]) {
-            if (assertionExists) {
-                break;
+        if (!assertionExists) {
+            for (const repository of [
+                TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
+                TRIPLE_STORE_REPOSITORIES.PUBLIC_HISTORY,
+            ]) {
+                // eslint-disable-next-line no-await-in-loop
+                assertionExists = await this.tripleStoreService.assertionExists(
+                    repository,
+                    assertionId,
+                );
+                if (assertionExists) {
+                    break;
+                }
             }
-
-            // eslint-disable-next-line no-await-in-loop
-            assertionExists = await this.tripleStoreService.assertionExists(
-                repository,
-                assertionId,
-            );
         }
 
         await this.operationIdService.updateOperationIdStatus(

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

@@ -26,6 +26,7 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
             OPERATION_ID_STATUS.GET.GET_REMOTE_START,
         );
 
+        let nquads;
         if (
             state !== GET_STATES.FINALIZED &&
             blockchain != null &&
@@ -37,26 +38,24 @@ class HandleGetRequestCommand extends HandleProtocolMessageCommand {
                 blockchain,
                 contract,
                 tokenId,
+                assertionId,
                 operationId,
             );
             if (cachedAssertion?.public?.assertion?.length) {
-                return {
-                    messageType: NETWORK_MESSAGE_TYPES.RESPONSES.ACK,
-                    messageData: { nquads: cachedAssertion.public.assertion },
-                };
+                nquads = cachedAssertion.public.assertion;
             }
         }
 
-        let nquads;
-        for (const repository of [
-            TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
-            TRIPLE_STORE_REPOSITORIES.PUBLIC_HISTORY,
-        ]) {
-            // eslint-disable-next-line no-await-in-loop
-            nquads = await this.tripleStoreService.getAssertion(repository, assertionId);
-
-            if (nquads.length) {
-                break;
+        if (!nquads?.length) {
+            for (const repository of [
+                TRIPLE_STORE_REPOSITORIES.PUBLIC_CURRENT,
+                TRIPLE_STORE_REPOSITORIES.PUBLIC_HISTORY,
+            ]) {
+                // eslint-disable-next-line no-await-in-loop
+                nquads = await this.tripleStoreService.getAssertion(repository, assertionId);
+                if (nquads.length) {
+                    break;
+                }
             }
         }
 

src/commands/protocols/get/sender/get-assertion-id-command.js

@@ -75,10 +75,7 @@ class GetAssertionIdCommand extends Command {
             }
         }
 
-        return this.continueSequence(
-            { ...command.data, state: assertionId, assertionId },
-            command.sequence,
-        );
+        return this.continueSequence({ ...command.data, state, assertionId }, command.sequence);
     }
 
     async handleError(operationId, errorMessage, errorType) {