Merge pull request #2919 from OriginTrail/v6/develop

OriginTrail Devnet Prerelease v6.2.0
OriginTrail · Feb 2, 2024 · a35d851 · a35d851
2 parents a0fa9aa + 150735c
commit a35d851
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 27 deletions.
diff --git 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
 

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+hotfix.4",
+    "version": "6.2.0",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",

diff --git 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,

diff --git 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();
     }
 }
 

diff --git a/test/bdd/steps/api/datasets/requests.json b/test/bdd/steps/api/datasets/requests.json
@@ -9,26 +9,26 @@
             "_:c14n0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> ."
         ],
         "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 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> ."
         ],
         "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 @@
             "<uuid:2> <http://schema.org/user> <uuid:user:2> ."
         ],
         "blockchain": "hardhat1:31337",
-        "contract": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07",
+        "contract": "0x0aec7c174554af8aec3680bb58431f6618311510",
         "tokenId": 0
     }
 }