From 45744fa94d4ca27e988ac037578fdffa2966bdab Mon Sep 17 00:00:00 2001 From: Nikola Todorovic Date: Fri, 2 Feb 2024 09:56:28 +0100 Subject: [PATCH 1/4] Update otnode.service (#2911) --- installer/data/otnode.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/data/otnode.service b/installer/data/otnode.service index 1d2168c8f8..92fbc8d5ed 100755 --- a/installer/data/otnode.service +++ b/installer/data/otnode.service @@ -1,7 +1,7 @@ #/lib/systemd/system/otnode.service [Unit] -Description=OriginTrail V6 Stage 1 Beta Node +Description=OriginTrail V6 Node Documentation=https://github.com/OriginTrail/ot-node/ After=network.target graphdb.service blazegraph.service From 2039e20da4754993f5e7a4992cf3b30503e97abe Mon Sep 17 00:00:00 2001 From: zeroxbt <89495162+zeroxbt@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:56:48 +0100 Subject: [PATCH 2/4] V6/bug fix/scoring function result (#2914) * fix score function return type * convert linearSum return type to number --------- Co-authored-by: djordjekovac --- src/service/proximity-scoring-service.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/service/proximity-scoring-service.js b/src/service/proximity-scoring-service.js index 4e06f6197a..3dd72c7317 100644 --- a/src/service/proximity-scoring-service.js +++ b/src/service/proximity-scoring-service.js @@ -103,16 +103,10 @@ class ProximityScoringService { const dividend = mappedStake.pow(stakeExponent).mul(a).add(b); const divisor = mappedDistance.pow(distanceExponent).mul(c).add(d); - return { - mappedDistance, - mappedStake, - score: Math.floor( - Number(multiplier) * - Math.log2( - Number(logArgumentConstant) + dividend.toNumber() / divisor.toNumber(), - ), - ), - }; + return Math.floor( + Number(multiplier) * + Math.log2(Number(logArgumentConstant) + dividend.toNumber() / divisor.toNumber()), + ); } async linearSum( @@ -197,7 +191,7 @@ class ProximityScoringService { finalScore = finalScore.mod(UINT40_MAX_BN.add(1)); } - return finalScore; + return finalScore.toNumber(); } } From 11112a4994f6d3e5fd8dd49b5909d5d9605a3342 Mon Sep 17 00:00:00 2001 From: Nikola Todorovic Date: Fri, 2 Feb 2024 10:32:42 +0100 Subject: [PATCH 3/4] Increase gas limit for set stake (#2918) --- scripts/set-stake.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/set-stake.js b/scripts/set-stake.js index 4db4be7fb0..01f01f76a0 100644 --- a/scripts/set-stake.js +++ b/scripts/set-stake.js @@ -95,7 +95,7 @@ async function setStake( // TODO: Add ABI instead of hard-coded function definition tx = await stakingContract['addStake(uint72,uint96)'](identityId, stakeWei, { gasPrice: gasPrice ? gasPrice * 100 : undefined, - gasLimit: 500_000, + gasLimit: 3_000_000, }); await provider.waitForTransaction( tx.hash, From 150735c05d8729d1fcf6506dfc881b460b2c7c6d Mon Sep 17 00:00:00 2001 From: djordjekovac Date: Fri, 2 Feb 2024 10:50:00 +0100 Subject: [PATCH 4/4] Version updated (#2917) * Version updated * Updated request for bdd tests --- package-lock.json | 4 ++-- package.json | 2 +- test/bdd/steps/api/datasets/requests.json | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4614741313..9d3780f6a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.2.0+hotfix.4", + "version": "6.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.2.0+hotfix.4", + "version": "6.2.0", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index a7a985cfcf..4e6c99b95e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.2.0+hotfix.4", + "version": "6.2.0", "description": "OTNode V6", "main": "index.js", "type": "module", diff --git a/test/bdd/steps/api/datasets/requests.json b/test/bdd/steps/api/datasets/requests.json index ac5eefe732..d0ca535d19 100644 --- a/test/bdd/steps/api/datasets/requests.json +++ b/test/bdd/steps/api/datasets/requests.json @@ -9,26 +9,26 @@ "_:c14n0 ." ], "blockchain": "hardhat1:31337", - "contract": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07", + "contract": "0x0aec7c174554af8aec3680bb58431f6618311510", "tokenId": 0 }, "validGetFirstStateRequestBody": { - "id": "did:dkg:blockchain/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:blockchain/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": "0xe3a6733d7b999ca6f0d141afe3e38ac59223a4dfde7a5458932d2094ed4193cf" }, "validGetUpdatedStateRequestBody": { - "id": "did:dkg:blockchain/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0" + "id": "did:dkg:blockchain/0x0aec7c174554af8aec3680bb58431f6618311510/0" }, "getFirstStateRequestBody": { - "id": "did:dkg:blockchain/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:blockchain/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": "0xe3a6733d7b999ca6f0d141afe3e38ac59223a4dfde7a5458932d2094ed4193cf" }, "getSecondStateRequestBody": { - "id": "did:dkg:blockchain/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:blockchain/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": "0x591503a1c8ba4667dd7afd203025c1bf594d817d8eec71274fe960d69fb8584f" }, "getThirdStateRequestBody": { - "id": "did:dkg:blockchain/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:blockchain/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": "0x759c285786b95622dad67a6be857a4eec3d9ba0caec991ed4297629ae6abbc0d" }, "blockchainNotDefinedRequestBody": { @@ -42,21 +42,21 @@ "_:c14n0 ." ], "blockchain": null, - "contract": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07", + "contract": "0x0aec7c174554af8aec3680bb58431f6618311510", "tokenId": 0 }, "nonExistentUAL": { - "id": "did:dkg:hardhat1:31337/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/1" + "id": "did:dkg:hardhat1:31337/0x0aec7c174554af8aec3680bb58431f6618311510/1" }, "invalidUAL": { "id": "did:dkg:hardhat1:31337/0xB0D4afd8879eD9F/52b28595d31B441D079B2Ca07/1" }, "nonExistentState": { - "id": "did:dkg:hardhat1:31337/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:hardhat1:31337/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": -1 }, "invalidStateHash": { - "id": "did:dkg:hardhat1:31337/0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07/0", + "id": "did:dkg:hardhat1:31337/0x0aec7c174554af8aec3680bb58431f6618311510/0", "state": "0x591503a1c8ba4667dd7afd203025c1bf594d817d8eec71274fe960d69fb8584e" }, "validUpdateRequestBody": { @@ -67,7 +67,7 @@ " ." ], "blockchain": "hardhat1:31337", - "contract": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07", + "contract": "0x0aec7c174554af8aec3680bb58431f6618311510", "tokenId": 0 } }