dkg 8.0.0a1__tar.gz → 8.0.0a2__tar.gz

{dkg-8.0.0a1 → dkg-8.0.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkg
-Version: 8.0.0a1
+Version: 8.0.0a2
 Summary: Python library for interacting with the OriginTrail Decentralized Knowledge Graph
 License: Apache-2.0
 Author: Uladzislau Hubar
@@ -11,14 +11,15 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: eth-abi (>=5.0.1,<6.0.0)
-Requires-Dist: eth-account (>=0.11.0,<0.12.0)
-Requires-Dist: hexbytes (>=0.3.0,<0.4.0)
+Requires-Dist: eth-abi (>=5.1.0,<6.0.0)
+Requires-Dist: eth-account (>=0.13.4,<0.14.0)
+Requires-Dist: eth-typing (>=5.0.0,<6.0.0)
+Requires-Dist: hexbytes (>=1.2.1,<2.0.0)
 Requires-Dist: ot-pyld (>=2.1.1,<3.0.0)
-Requires-Dist: pandas (>=1.5.3,<2.0.0)
-Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
+Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: rdflib (>=6.3.2,<7.0.0)
-Requires-Dist: web3 (>=6.19.0,<7.0.0)
+Requires-Dist: web3 (>=7.3.0,<8.0.0)
 Description-Content-Type: text/markdown
 
 <a name="readme-top"></a>

{dkg-8.0.0a1 → dkg-8.0.0a2}/dkg/asset.py

@@ -360,6 +360,135 @@ class KnowledgeAsset(Module):
             }
 
         return result
+    
+
+    def local_store(
+        self,
+        content: dict[Literal["public", "private"], JSONLD],
+        epochs_number: int,
+        token_amount: Wei | None = None,
+        immutable: bool = False,
+        content_type: Literal["JSON-LD", "N-Quads"] = "JSON-LD",
+        paranet_ual: UAL | None = None,
+    ) -> dict[str, UAL | HexStr | dict[str, dict[str, str] | TxReceipt]]:
+        blockchain_id = self.manager.blockchain_provider.blockchain_id
+        assertions = format_content(content, content_type)
+
+        public_assertion_id = MerkleTree(
+            hash_assertion_with_indexes(assertions["public"]),
+            sort_pairs=True,
+        ).root
+        public_assertion_metadata = generate_assertion_metadata(assertions["public"])
+
+        content_asset_storage_address = self._get_asset_storage_address(
+            "ContentAssetStorage"
+        )
+
+        if token_amount is None:
+            token_amount = int(
+                self._get_bid_suggestion(
+                    blockchain_id,
+                    epochs_number,
+                    public_assertion_metadata["size"],
+                    content_asset_storage_address,
+                    public_assertion_id,
+                    DEFAULT_HASH_FUNCTION_ID,
+                    token_amount or BidSuggestionRange.LOW,
+                )["bidSuggestion"]
+            )
+
+        current_allowance = self.get_current_allowance()
+        if is_allowance_increased := current_allowance < token_amount:
+            self.increase_allowance(token_amount)
+
+        result = {"publicAssertionId": public_assertion_id, "operation": {}}
+
+        try:
+            receipt: TxReceipt = self._create(
+                {
+                    "assertionId": Web3.to_bytes(hexstr=public_assertion_id),
+                    "size": public_assertion_metadata["size"],
+                    "triplesNumber": public_assertion_metadata["triples_number"],
+                    "chunksNumber": public_assertion_metadata["chunks_number"],
+                    "tokenAmount": token_amount,
+                    "epochsNumber": epochs_number,
+                    "scoreFunctionId": DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS[
+                        self.manager.blockchain_provider.environment
+                    ][blockchain_id],
+                    "immutable_": immutable,
+                }
+            )
+        except ContractLogicError as err:
+            if is_allowance_increased:
+                self.decrease_allowance(token_amount)
+            raise err
+
+        events = self.manager.blockchain_provider.decode_logs_event(
+            receipt,
+            "ContentAsset",
+            "AssetMinted",
+        )
+        token_id = events[0].args["tokenId"]
+
+        result["UAL"] = format_ual(
+            blockchain_id, content_asset_storage_address, token_id
+        )
+        result["operation"]["mintKnowledgeAsset"] = json.loads(Web3.to_json(receipt))
+
+        assertions_list = [
+            {
+                "blockchain": blockchain_id,
+                "contract": content_asset_storage_address,
+                "tokenId": token_id,
+                "assertionId": public_assertion_id,
+                "assertion": assertions["public"],
+                "storeType": StoreTypes.TRIPLE_PARANET,
+                "paranetUAL": paranet_ual,
+            }
+        ]
+
+        if content.get("private", None):
+            assertions_list.append(
+                {
+                    "blockchain": blockchain_id,
+                    "contract": content_asset_storage_address,
+                    "tokenId": token_id,
+                    "assertionId": MerkleTree(
+                        hash_assertion_with_indexes(assertions["private"]),
+                        sort_pairs=True,
+                    ).root,
+                    "assertion": assertions["private"],
+                    "storeType": StoreTypes.TRIPLE_PARANET,
+                    "paranetUAL": paranet_ual,
+                }
+            )
+
+        operation_id = self._local_store(assertions_list)["operationId"]
+        operation_result = self.get_operation_result(operation_id, "local-store")
+
+        result["operation"]["localStore"] = {
+            "operationId": operation_id,
+            "status": operation_result["status"],
+        }
+
+        if operation_result["status"] == OperationStatus.COMPLETED:
+            parsed_paranet_ual = parse_ual(paranet_ual)
+            paranet_knowledge_asset_storage, paranet_knowledge_asset_token_id = (
+                parsed_paranet_ual["contract_address"],
+                parsed_paranet_ual["token_id"],
+            )
+
+            receipt: TxReceipt = self._submit_knowledge_asset(
+                paranet_knowledge_asset_storage,
+                paranet_knowledge_asset_token_id,
+                content_asset_storage_address,
+                token_id,
+            )
+
+            result["operation"]["submitToParanet"] = json.loads(Web3.to_json(receipt))
+
+        return result
+
 
     _submit_knowledge_asset = Method(BlockchainRequest.submit_knowledge_asset)
 
@@ -452,24 +581,13 @@ class KnowledgeAsset(Module):
 
         token_id = parse_ual(ual)["token_id"]
 
-        def handle_latest_state(token_id: int) -> tuple[HexStr, bool]:
-            unfinalized_state = Web3.to_hex(self._get_unfinalized_state(token_id))
-
-            if unfinalized_state and unfinalized_state != HASH_ZERO:
-                return unfinalized_state, False
-            else:
-                return handle_latest_finalized_state(token_id)
-
         def handle_latest_finalized_state(token_id: int) -> tuple[HexStr, bool]:
             return Web3.to_hex(self._get_latest_assertion_id(token_id)), True
 
         is_state_finalized = False
 
         match state:
-            case KnowledgeAssetEnumStates.LATEST:
-                public_assertion_id, is_state_finalized = handle_latest_state(token_id)
-
-            case KnowledgeAssetEnumStates.LATEST_FINALIZED:
+            case KnowledgeAssetEnumStates.LATEST | KnowledgeAssetEnumStates.LATEST_FINALIZED:
                 public_assertion_id, is_state_finalized = handle_latest_finalized_state(
                     token_id
                 )
@@ -701,7 +819,7 @@ class KnowledgeAsset(Module):
             "UAL": ual,
             "operation": json.loads(Web3.to_json(receipt)),
         }
-    
+
     _get_block = Method(BlockchainRequest.get_block)
 
     _get_service_agreement_data = Method(BlockchainRequest.get_service_agreement_data)

{dkg-8.0.0a1 → dkg-8.0.0a2}/dkg/constants.py

@@ -21,11 +21,11 @@ PRIVATE_ASSERTION_PREDICATE = (
 
 BLOCKCHAINS = {
     "development": {
-        "hardhat1:31337":  {
+        "hardhat1:31337": {
             "hub": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
             "rpc": "http://localhost:8545",
         },
-        "hardhat2:31337":  {
+        "hardhat2:31337": {
             "hub": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
             "rpc": "http://localhost:9545",
         },
@@ -47,11 +47,7 @@ BLOCKCHAINS = {
 
 DEFAULT_HASH_FUNCTION_ID = 1
 DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS = {
-    "development": {
-        "hardhat1:31337": 2,
-        "hardhat2:31337": 2,
-        "otp:2043": 2
-    },
+    "development": {"hardhat1:31337": 2, "hardhat2:31337": 2, "otp:2043": 2},
     "devnet": {
         "otp:2160": 2,
         "gnosis:10200": 2,

{dkg-8.0.0a1 → dkg-8.0.0a2}/dkg/data/interfaces/ContentAsset.json

@@ -352,7 +352,7 @@
         "type": "uint256"
       }
     ],
-    "name": "cancelAssetStateUpdateFromContract",
+    "name": "clearOldCommitsMetadata",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -421,79 +421,7 @@
       }
     ],
     "name": "createAsset",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "originalSender",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "bytes32",
-            "name": "assertionId",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "uint128",
-            "name": "size",
-            "type": "uint128"
-          },
-          {
-            "internalType": "uint32",
-            "name": "triplesNumber",
-            "type": "uint32"
-          },
-          {
-            "internalType": "uint96",
-            "name": "chunksNumber",
-            "type": "uint96"
-          },
-          {
-            "internalType": "uint16",
-            "name": "epochsNumber",
-            "type": "uint16"
-          },
-          {
-            "internalType": "uint96",
-            "name": "tokenAmount",
-            "type": "uint96"
-          },
-          {
-            "internalType": "uint8",
-            "name": "scoreFunctionId",
-            "type": "uint8"
-          },
-          {
-            "internalType": "bool",
-            "name": "immutable_",
-            "type": "bool"
-          }
-        ],
-        "internalType": "struct ContentAssetStructs.AssetInputArgs",
-        "name": "args",
-        "type": "tuple"
-      }
-    ],
-    "name": "createAssetFromContract",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
@@ -541,13 +469,7 @@
       }
     ],
     "name": "createAssetWithVariables",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
+    "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
@@ -592,7 +514,7 @@
     "name": "hub",
     "outputs": [
       {
-        "internalType": "contract HubV2",
+        "internalType": "contract Hub",
         "name": "",
         "type": "address"
       }
@@ -671,36 +593,10 @@
   },
   {
     "inputs": [],
-    "name": "paranetKnowledgeAssetsRegistry",
-    "outputs": [
-      {
-        "internalType": "contract ParanetKnowledgeAssetsRegistry",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "paranetKnowledgeMinersRegistry",
-    "outputs": [
-      {
-        "internalType": "contract ParanetKnowledgeMinersRegistry",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "paranetsRegistry",
+    "name": "serviceAgreementStorageProxy",
     "outputs": [
       {
-        "internalType": "contract ParanetsRegistry",
+        "internalType": "contract ServiceAgreementStorageProxy",
         "name": "",
         "type": "address"
       }
@@ -710,10 +606,10 @@
   },
   {
     "inputs": [],
-    "name": "serviceAgreementStorageProxy",
+    "name": "serviceAgreementV1",
     "outputs": [
       {
-        "internalType": "contract ServiceAgreementStorageProxy",
+        "internalType": "contract ServiceAgreementV1",
         "name": "",
         "type": "address"
       }
@@ -722,16 +618,16 @@
     "type": "function"
   },
   {
-    "inputs": [],
-    "name": "serviceAgreementV1",
-    "outputs": [
+    "inputs": [
       {
-        "internalType": "contract ServiceAgreementV1",
-        "name": "",
-        "type": "address"
+        "internalType": "bool",
+        "name": "_flag",
+        "type": "bool"
       }
     ],
-    "stateMutability": "view",
+    "name": "setOldMetadataClearingFlag",
+    "outputs": [],
+    "stateMutability": "nonpayable",
     "type": "function"
   },
   {

{dkg-8.0.0a1 → dkg-8.0.0a2}/dkg/data/interfaces/ContentAssetStorage.json

@@ -10,11 +10,6 @@
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
-  {
-    "inputs": [],
-    "name": "NoMintedAssets",
-    "type": "error"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -65,38 +60,6 @@
     "name": "ApprovalForAll",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_fromTokenId",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_toTokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "BatchMetadataUpdate",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "MetadataUpdate",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -475,19 +438,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "lastTokenId",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -648,19 +598,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "baseURI",
-        "type": "string"
-      }
-    ],
-    "name": "setBaseURI",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -711,19 +648,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "tokenBaseURI",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {

{dkg-8.0.0a1 → dkg-8.0.0a2}/dkg/data/interfaces/Hub.json

@@ -111,7 +111,7 @@
             "type": "address"
           }
         ],
-        "internalType": "struct UnorderedNamedContractDynamicSetStructs.Contract[]",
+        "internalType": "struct UnorderedNamedContractDynamicSetLib.Contract[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -136,7 +136,7 @@
             "type": "address"
           }
         ],
-        "internalType": "struct UnorderedNamedContractDynamicSetStructs.Contract[]",
+        "internalType": "struct UnorderedNamedContractDynamicSetLib.Contract[]",
         "name": "",
         "type": "tuple[]"
       }