Merge pull request #217 from OriginTrail/fix/sharding-table-v2-rework

Reworked ShardingTableV2
OriginTrail · Jan 30, 2024 · 316b67a · 316b67a
2 parents 86642fa + 645e328
commit 316b67a
Show file tree

Hide file tree

Showing 22 changed files with 979 additions and 902 deletions.
diff --git a/abi/CommitManagerV2.json b/abi/CommitManagerV2.json
@@ -262,6 +262,32 @@
     "name": "InvalidRightEdgeNode",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "agreementId",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint16",
+        "name": "epoch",
+        "type": "uint16"
+      },
+      {
+        "internalType": "uint8",
+        "name": "agreementScoreFunctionId",
+        "type": "uint8"
+      },
+      {
+        "internalType": "uint256",
+        "name": "timeNow",
+        "type": "uint256"
+      }
+    ],
+    "name": "InvalidScoreFunctionId",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -549,23 +575,23 @@
   },
   {
     "inputs": [],
-    "name": "name",
+    "name": "linearSum",
     "outputs": [
       {
-        "internalType": "string",
+        "internalType": "contract LinearSum",
         "name": "",
-        "type": "string"
+        "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
-    "name": "parametersStorage",
+    "name": "log2pldsf",
     "outputs": [
       {
-        "internalType": "contract ParametersStorage",
+        "internalType": "contract Log2PLDSF",
         "name": "",
         "type": "address"
       }
@@ -575,10 +601,23 @@
   },
   {
     "inputs": [],
-    "name": "profileStorage",
+    "name": "name",
     "outputs": [
       {
-        "internalType": "contract ProfileStorage",
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "parametersStorage",
+    "outputs": [
+      {
+        "internalType": "contract ParametersStorage",
         "name": "",
         "type": "address"
       }
@@ -588,10 +627,10 @@
   },
   {
     "inputs": [],
-    "name": "proximityScoringProxy",
+    "name": "profileStorage",
     "outputs": [
       {
-        "internalType": "contract ProximityScoringProxy",
+        "internalType": "contract ProfileStorage",
         "name": "",
         "type": "address"
       }
@@ -714,6 +753,46 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "assetContract",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "tokenId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "keyword",
+            "type": "bytes"
+          },
+          {
+            "internalType": "uint8",
+            "name": "hashFunctionId",
+            "type": "uint8"
+          },
+          {
+            "internalType": "uint16",
+            "name": "epoch",
+            "type": "uint16"
+          }
+        ],
+        "internalType": "struct ServiceAgreementStructsV1.CommitInputArgs",
+        "name": "args",
+        "type": "tuple"
+      }
+    ],
+    "name": "submitCommit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/abi/CommitManagerV2U1.json b/abi/CommitManagerV2U1.json
@@ -267,6 +267,32 @@
     "name": "InvalidRightEdgeNode",
     "type": "error"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "agreementId",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint16",
+        "name": "epoch",
+        "type": "uint16"
+      },
+      {
+        "internalType": "uint8",
+        "name": "agreementScoreFunctionId",
+        "type": "uint8"
+      },
+      {
+        "internalType": "uint256",
+        "name": "timeNow",
+        "type": "uint256"
+      }
+    ],
+    "name": "InvalidScoreFunctionId",
+    "type": "error"
+  },
   {
     "inputs": [
       {
@@ -682,23 +708,23 @@
   },
   {
     "inputs": [],
-    "name": "name",
+    "name": "linearSum",
     "outputs": [
       {
-        "internalType": "string",
+        "internalType": "contract LinearSum",
         "name": "",
-        "type": "string"
+        "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
-    "name": "parametersStorage",
+    "name": "log2pldsf",
     "outputs": [
       {
-        "internalType": "contract ParametersStorage",
+        "internalType": "contract Log2PLDSF",
         "name": "",
         "type": "address"
       }
@@ -708,10 +734,23 @@
   },
   {
     "inputs": [],
-    "name": "profileStorage",
+    "name": "name",
     "outputs": [
       {
-        "internalType": "contract ProfileStorage",
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "parametersStorage",
+    "outputs": [
+      {
+        "internalType": "contract ParametersStorage",
         "name": "",
         "type": "address"
       }
@@ -721,10 +760,10 @@
   },
   {
     "inputs": [],
-    "name": "proximityScoringProxy",
+    "name": "profileStorage",
     "outputs": [
       {
-        "internalType": "contract ProximityScoringProxy",
+        "internalType": "contract ProfileStorage",
         "name": "",
         "type": "address"
       }
@@ -847,6 +886,46 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "assetContract",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "tokenId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "keyword",
+            "type": "bytes"
+          },
+          {
+            "internalType": "uint8",
+            "name": "hashFunctionId",
+            "type": "uint8"
+          },
+          {
+            "internalType": "uint16",
+            "name": "epoch",
+            "type": "uint16"
+          }
+        ],
+        "internalType": "struct ServiceAgreementStructsV1.CommitInputArgs",
+        "name": "args",
+        "type": "tuple"
+      }
+    ],
+    "name": "submitCommit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -902,6 +981,46 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "assetContract",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "tokenId",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "keyword",
+            "type": "bytes"
+          },
+          {
+            "internalType": "uint8",
+            "name": "hashFunctionId",
+            "type": "uint8"
+          },
+          {
+            "internalType": "uint16",
+            "name": "epoch",
+            "type": "uint16"
+          }
+        ],
+        "internalType": "struct ServiceAgreementStructsV1.CommitInputArgs",
+        "name": "args",
+        "type": "tuple"
+      }
+    ],
+    "name": "submitUpdateCommit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {