Merge pull request #218 from OriginTrail/fix/commit-managers-and-formula

Fixed CommitManagerV1/V1U1 bugs, fixed LinearSum score calculation to avoid underflows, added tests for CommitManagerV1 and LinearSum
OriginTrail · Feb 1, 2024 · 145a78a · 145a78a
2 parents 6de1293 + 9160c83
commit 145a78a
Show file tree

Hide file tree

Showing 13 changed files with 702 additions and 176 deletions.
diff --git a/abi/CommitManagerV2.json b/abi/CommitManagerV2.json
@@ -135,6 +135,11 @@
         "name": "leftEdgeNodeIndex",
         "type": "uint72"
       },
+      {
+        "internalType": "uint72",
+        "name": "rightEdgeNodeAdjacentIndex",
+        "type": "uint72"
+      },
       {
         "internalType": "uint256",
         "name": "leftEdgeNodeDistance",
@@ -243,6 +248,11 @@
         "name": "rightEdgeNodeIndex",
         "type": "uint72"
       },
+      {
+        "internalType": "uint72",
+        "name": "leftEdgeNodeAdjacentIndex",
+        "type": "uint72"
+      },
       {
         "internalType": "uint256",
         "name": "rightEdgeNodeDistance",
@@ -503,19 +513,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "hashingProxy",
-    "outputs": [
-      {
-        "internalType": "contract HashingProxy",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "hub",
@@ -714,19 +711,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "stakingContract",
-    "outputs": [
-      {
-        "internalType": "contract StakingV2",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "stakingStorage",

diff --git a/abi/CommitManagerV2U1.json b/abi/CommitManagerV2U1.json
@@ -140,6 +140,11 @@
         "name": "leftEdgeNodeIndex",
         "type": "uint72"
       },
+      {
+        "internalType": "uint72",
+        "name": "rightEdgeNodeAdjacentIndex",
+        "type": "uint72"
+      },
       {
         "internalType": "uint256",
         "name": "leftEdgeNodeDistance",
@@ -248,6 +253,11 @@
         "name": "rightEdgeNodeIndex",
         "type": "uint72"
       },
+      {
+        "internalType": "uint72",
+        "name": "leftEdgeNodeAdjacentIndex",
+        "type": "uint72"
+      },
       {
         "internalType": "uint256",
         "name": "rightEdgeNodeDistance",
@@ -443,13 +453,13 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "address",
         "name": "assetContract",
         "type": "address"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint256",
         "name": "tokenId",
         "type": "uint256"
@@ -479,7 +489,7 @@
         "type": "uint256"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint72",
         "name": "identityId",
         "type": "uint72"
@@ -498,13 +508,13 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "address",
         "name": "assetContract",
         "type": "address"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint256",
         "name": "tokenId",
         "type": "uint256"
@@ -607,19 +617,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "hashingProxy",
-    "outputs": [
-      {
-        "internalType": "contract HashingProxy",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "hub",
@@ -847,19 +844,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "stakingContract",
-    "outputs": [
-      {
-        "internalType": "contract StakingV2",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "stakingStorage",

diff --git a/abi/ShardingTableStorageV2.json b/abi/ShardingTableStorageV2.json
@@ -17,6 +17,11 @@
         "name": "hashRingPosition",
         "type": "uint256"
       },
+      {
+        "internalType": "bytes",
+        "name": "nodeId",
+        "type": "bytes"
+      },
       {
         "internalType": "uint72",
         "name": "identityId",
@@ -150,6 +155,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",
@@ -196,6 +206,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",
@@ -218,6 +233,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",
@@ -240,6 +260,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",
@@ -276,6 +301,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",
@@ -312,6 +342,11 @@
             "name": "hashRingPosition",
             "type": "uint256"
           },
+          {
+            "internalType": "bytes",
+            "name": "nodeId",
+            "type": "bytes"
+          },
           {
             "internalType": "uint72",
             "name": "index",