Merge pull request #1208 from OriginTrail/prerelease/mainnet

OriginTrail Release v4.0.8
OriginTrail · Mar 12, 2020 · 6cbe337 · 6cbe337
2 parents 685d9fe + 8702fc2
commit 6cbe337
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 176 deletions.
diff --git a/config/config.json b/config/config.json
@@ -81,7 +81,8 @@
         "cooldownBaseTimeout": "5m",
         "cooldownMultiplier": 2,
         "cooldownResetTime": "1s"
-      }
+      },
+      "bucket_size": 4
     },
     "bugSnag": {
       "releaseStage": "development"
@@ -180,7 +181,6 @@
       "hostname": "127.0.0.1",
       "id": "TestnetV4.0",
       "bootstraps": [
-        "https://rinkeby-mariner-bootstrap-01.origin-trail.network:5278/#f4092d1795e2fd442308911db2c1df31faf4fe2f",
         "https://rinkeby-mariner-bootstrap-02.origin-trail.network:5278/#d3951837f8100e6ea4a74417d560bcc8c6d4ffe5",
         "https://rinkeby-mariner-bootstrap-03.origin-trail.network:5278/#ad3c3325e50c3bedcb5c6ee6a73592b2ca7e07aa"
       ],
@@ -191,7 +191,8 @@
         "cooldownBaseTimeout": "5m",
         "cooldownMultiplier": 2,
         "cooldownResetTime": "1s"
-      }
+      },
+      "bucket_size": 4
     },
     "bugSnag": {
       "releaseStage": "testnet"
@@ -303,7 +304,8 @@
         "cooldownBaseTimeout": "5m",
         "cooldownMultiplier": 2,
         "cooldownResetTime": "1s"
-      }
+      },
+      "bucket_size": 20
     },
     "bugSnag": {
       "releaseStage": "mainnet"

diff --git a/modules/EventEmitter.js b/modules/EventEmitter.js
@@ -605,13 +605,8 @@ class EventEmitter {
         this._on('kad-replication-request', async (request, response) => {
             const message = transport.extractMessage(request);
             const { offerId, wallet, dhIdentity } = message;
-            const { wallet: senderWallet } = transport.extractSenderInfo(request);
             const identity = transport.extractSenderID(request);
 
-            if (senderWallet !== wallet) {
-                logger.warn(`Wallet in the message differs from replication request for offer ID ${offerId}.`);
-            }
-
             try {
                 await dcService.handleReplicationRequest(
                     offerId, wallet, identity, dhIdentity,
@@ -668,11 +663,17 @@ class EventEmitter {
             try {
                 const dhNodeId = transport.extractSenderID(request);
                 const replicationFinishedMessage = transport.extractMessage(request);
-                const { wallet } = transport.extractSenderInfo(request);
-                const { offerId, messageSignature, dhIdentity } = replicationFinishedMessage;
+                const {
+                    offerId, messageSignature, dhIdentity,
+                } = replicationFinishedMessage;
+
+                let dhWallet = replicationFinishedMessage.wallet;
+                if (!dhWallet) {
+                    dhWallet = transport.extractSenderInfo(request).wallet;
+                }
                 await dcService.verifyDHReplication(
                     offerId, messageSignature,
-                    dhNodeId, dhIdentity, wallet, false,
+                    dhNodeId, dhIdentity, dhWallet, false,
                 );
             } catch (e) {
                 const errorMessage = `Failed to handle replication finished request. ${e}.`;

diff --git a/modules/command/dc/dc-challenge-check-command.js b/modules/command/dc/dc-challenge-check-command.js
@@ -69,7 +69,6 @@ class DCChallengeCheckCommand extends Command {
             severity: 'info',
         });
 
-
         this.logger.info(`Wrong answer to challenge '${challenge.id}' for DH ID ${challenge.dh_id}. Got ${challenge.answer} for expected answer ${challenge.expected_answer}.`);
         return {
             commands: [

diff --git a/modules/command/dh/dh-replication-import-command.js b/modules/command/dh/dh-replication-import-command.js
@@ -151,6 +151,7 @@ class DhReplicationImportCommand extends Command {
             offerId,
             dhIdentity: this.config.erc725Identity,
             messageSignature: messageSignature.signature,
+            wallet: this.config.node_wallet,
         };
 
         await this.transport.replicationFinished(replicationFinishedMessage, dcNodeId);

diff --git a/modules/constants.js b/modules/constants.js
@@ -12,7 +12,7 @@ exports.DEFAULT_CHALLENGE_BLOCK_SIZE_BYTES = 31;
 /**
  * @constant {number} DEFAULT_CHALLENGE_RESPONSE_TIME_MILLS - Challenge response time
  */
-exports.DEFAULT_CHALLENGE_RESPONSE_TIME_MILLS = 60000;
+exports.DEFAULT_CHALLENGE_RESPONSE_TIME_MILLS = 300000;
 
 /**
  * @constant {number} DEFAULT_REPUTATION_UPDATE_PERIOD_MILLS - Period for updating reputation table