Merge pull request #2982 from OriginTrail/v6/develop

OriginTrail Devnet Prerelease v6.2.0 Hotfix 12
OriginTrail · Feb 14, 2024 · 9be7a2d · 9be7a2d
2 parents 7e0207e + fc2d418
commit 9be7a2d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/config/config.json b/config/config.json
@@ -754,7 +754,6 @@
                         "config": {
                             "hubContractAddress": "0xbEF14fc04F870c2dD65c13Df4faB6ba01A9c746b",
                             "gasPriceOracleLink": "https://api.gnosisscan.io/api?module=proxy&action=eth_gasPrice",
-                            "rpcEndpoints": ["https://rpc.gnosischain.com/"],
                             "operatorFee": 0
                         }
                     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "6.2.0",
+    "version": "6.2.0+hotfix.12",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",

diff --git a/src/service/proximity-scoring-service.js b/src/service/proximity-scoring-service.js
@@ -156,13 +156,19 @@ class ProximityScoringService {
 
         let normalizedDistance = scaledDistance.div(adjustedDivisor);
         if (normalizedDistance.gt(UINT64_MAX_BN)) {
+            this.logger.warn(
+                `Invalid normalized distance: ${normalizedDistance.toString()}. Max value: ${UINT64_MAX_BN.toString()}`,
+            );
             normalizedDistance = normalizedDistance.mod(UINT64_MAX_BN.add(1));
         }
 
         let normalizedStake = stakeScaleFactor
             .mul(mappedStake.sub(mappedMinStake))
             .div(mappedMaxStake.sub(mappedMinStake));
         if (normalizedStake.gt(UINT64_MAX_BN)) {
+            this.logger.warn(
+                `Invalid normalized stake: ${normalizedDistance.toString()}. Max value: ${UINT64_MAX_BN.toString()}`,
+            );
             normalizedStake = normalizedStake.mod(UINT64_MAX_BN.add(1));
         }
 

diff --git a/src/service/service-agreement-service.js b/src/service/service-agreement-service.js
@@ -90,12 +90,11 @@ class ServiceAgreementService {
         );
         let maxNeighborhoodDistance;
         if (neighbourhoodEdges) {
-            maxNeighborhoodDistance = await this.proximityScoringService.callProximityFunction(
-                blockchainId,
-                proximityScoreFunctionsPairId,
-                neighbourhoodEdges.leftEdge[hashFunctionName],
-                neighbourhoodEdges.rightEdge[hashFunctionName],
-            );
+            maxNeighborhoodDistance = neighbourhoodEdges.leftEdge.distance.gt(
+                neighbourhoodEdges.rightEdge.distance,
+            )
+                ? neighbourhoodEdges.leftEdge.distance
+                : neighbourhoodEdges.rightEdge.distance;
         }
 
         return this.proximityScoringService.callScoreFunction(

diff --git a/src/service/sharding-table-service.js b/src/service/sharding-table-service.js
@@ -140,7 +140,7 @@ class ShardingTableService {
         const hashFunctionName = this.hashingService.getHashFunctionName(hashFunctionId);
         const peersWithDistance = await Promise.all(
             peers.map(async (peer) => ({
-                peer,
+                ...peer,
                 distance: await this.proximityScoringService.callProximityFunction(
                     blockchainId,
                     proximityScoreFunctionsPairId,
@@ -158,8 +158,7 @@ class ShardingTableService {
             }
             return 0;
         });
-        const result = peersWithDistance.slice(0, count).map((pd) => pd.peer);
-        return result;
+        return peersWithDistance.slice(0, count);
     }
 
     async getBidSuggestion(