From ed9aa877b14d510df3b0b664c0bd73bb1abf74d2 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Tue, 13 Feb 2024 18:17:39 +0100 Subject: [PATCH 1/4] Remove non-archival rpc --- config/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/config/config.json b/config/config.json index 51238c9293..3653858bd1 100644 --- 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 } } From f998938147b4333647071f670a8ac4a923c3376f Mon Sep 17 00:00:00 2001 From: zeroxbt Date: Wed, 14 Feb 2024 07:28:16 +0100 Subject: [PATCH 2/4] add overflow warnings to linear sum, fix max distance calculation --- src/service/proximity-scoring-service.js | 6 ++++++ src/service/service-agreement-service.js | 11 +++++------ src/service/sharding-table-service.js | 5 ++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/service/proximity-scoring-service.js b/src/service/proximity-scoring-service.js index 09b545af06..74327f5e9b 100644 --- a/src/service/proximity-scoring-service.js +++ b/src/service/proximity-scoring-service.js @@ -156,6 +156,9 @@ 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)); } @@ -163,6 +166,9 @@ class ProximityScoringService { .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 index de4ecd9076..dd59d5d38a 100644 --- 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 index 7f06165562..72bef67128 100644 --- 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( From 414e91eb002370ec1f5f7186b1d6c6481b8d719a Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Wed, 14 Feb 2024 09:48:44 +0100 Subject: [PATCH 3/4] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6c070c571..363f98e5fd 100644 --- 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", From 187ff636a94b72ae36f7977455b5b6cc707490a2 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Wed, 14 Feb 2024 10:20:11 +0100 Subject: [PATCH 4/4] Add package-lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 64b3698161..c60dfb6da4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.2.0", + "version": "6.2.0+hotfix.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.2.0", + "version": "6.2.0+hotfix.12", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3",