dkg 1.1.1__tar.gz → 8.0.0a1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkg
-Version: 1.1.1
+Version: 8.0.0a1
 Summary: Python library for interacting with the OriginTrail Decentralized Knowledge Graph
 License: Apache-2.0
 Author: Uladzislau Hubar

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

@@ -418,143 +418,6 @@ class KnowledgeAsset(Module):
             "operation": json.loads(Web3.to_json(receipt)),
         }
 
-    _update = Method(NodeRequest.update)
-
-    _get_block = Method(BlockchainRequest.get_block)
-
-    _get_service_agreement_data = Method(BlockchainRequest.get_service_agreement_data)
-    _update_asset_state = Method(BlockchainRequest.update_asset_state)
-
-    def update(
-        self,
-        ual: UAL,
-        content: dict[Literal["public", "private"], JSONLD],
-        token_amount: Wei | None = None,
-        content_type: Literal["JSON-LD", "N-Quads"] = "JSON-LD",
-    ) -> dict[str, UAL | HexStr | dict[str, str]]:
-        parsed_ual = parse_ual(ual)
-        blockchain_id, content_asset_storage_address, token_id = (
-            parsed_ual["blockchain"],
-            parsed_ual["contract_address"],
-            parsed_ual["token_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"])
-
-        if token_amount is None:
-            agreement_id = self.get_agreement_id(
-                content_asset_storage_address, token_id
-            )
-            # TODO: Dynamic types for namedtuples?
-            agreement_data: Type[AgreementData] = self._get_service_agreement_data(
-                agreement_id
-            )
-
-            timestamp_now = self._get_block("latest")["timestamp"]
-            current_epoch = math.floor(
-                (timestamp_now - agreement_data.startTime) / agreement_data.epochLength
-            )
-            epochs_left = agreement_data.epochsNumber - current_epoch
-
-            token_amount = int(
-                self._get_bid_suggestion(
-                    blockchain_id,
-                    epochs_left,
-                    public_assertion_metadata["size"],
-                    content_asset_storage_address,
-                    public_assertion_id,
-                    DEFAULT_HASH_FUNCTION_ID,
-                    token_amount or BidSuggestionRange.LOW,
-                )["bidSuggestion"]
-            )
-
-            token_amount -= agreement_data.tokens[0]
-            token_amount = token_amount if token_amount > 0 else 0
-
-        current_allowance = self.get_current_allowance()
-        if is_allowance_increased := current_allowance < token_amount:
-            self.increase_allowance(token_amount)
-
-        try:
-            self._update_asset_state(
-                token_id=token_id,
-                assertion_id=public_assertion_id,
-                size=public_assertion_metadata["size"],
-                triples_number=public_assertion_metadata["triples_number"],
-                chunks_number=public_assertion_metadata["chunks_number"],
-                update_token_amount=token_amount,
-            )
-        except ContractLogicError as err:
-            if is_allowance_increased:
-                self.decrease_allowance(token_amount)
-            raise err
-
-        assertions_list = [
-            {
-                "blockchain": blockchain_id,
-                "contract": content_asset_storage_address,
-                "tokenId": token_id,
-                "assertionId": public_assertion_id,
-                "assertion": assertions["public"],
-                "storeType": StoreTypes.PENDING,
-            }
-        ]
-
-        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.PENDING,
-                }
-            )
-
-        operation_id = self._local_store(assertions_list)["operationId"]
-        self.get_operation_result(operation_id, "local-store")
-
-        operation_id = self._update(
-            public_assertion_id,
-            assertions["public"],
-            blockchain_id,
-            content_asset_storage_address,
-            token_id,
-            DEFAULT_HASH_FUNCTION_ID,
-        )["operationId"]
-        operation_result = self.get_operation_result(operation_id, "update")
-
-        return {
-            "UAL": ual,
-            "publicAssertionId": public_assertion_id,
-            "operation": {
-                "operationId": operation_id,
-                "status": operation_result["status"],
-            },
-        }
-
-    _cancel_update = Method(BlockchainRequest.cancel_asset_state_update)
-
-    def cancel_update(self, ual: UAL) -> dict[str, UAL | TxReceipt]:
-        token_id = parse_ual(ual)["token_id"]
-
-        receipt: TxReceipt = self._cancel_update(token_id)
-
-        return {
-            "UAL": ual,
-            "operation": json.loads(Web3.to_json(receipt)),
-        }
-
     _burn_asset = Method(BlockchainRequest.burn_asset)
 
     def burn(self, ual: UAL) -> dict[str, UAL | TxReceipt]:
@@ -838,7 +701,10 @@ 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)
     _get_assertion_size = Method(BlockchainRequest.get_assertion_size)
     _add_tokens = Method(BlockchainRequest.increase_asset_token_amount)
 
@@ -900,64 +766,6 @@ class KnowledgeAsset(Module):
             "operation": json.loads(Web3.to_json(receipt)),
         }
 
-    _add_update_tokens = Method(BlockchainRequest.increase_asset_update_token_amount)
-
-    def add_update_tokens(
-        self,
-        ual: UAL,
-        token_amount: Wei | None = None,
-    ) -> dict[str, UAL | TxReceipt]:
-        parsed_ual = parse_ual(ual)
-        blockchain_id, content_asset_storage_address, token_id = (
-            parsed_ual["blockchain"],
-            parsed_ual["contract_address"],
-            parsed_ual["token_id"],
-        )
-
-        if token_amount is None:
-            agreement_id = self.get_agreement_id(
-                content_asset_storage_address, token_id
-            )
-            # TODO: Dynamic types for namedtuples?
-            agreement_data: Type[AgreementData] = self._get_service_agreement_data(
-                agreement_id
-            )
-
-            timestamp_now = self._get_block("latest")["timestamp"]
-            current_epoch = math.floor(
-                (timestamp_now - agreement_data.startTime) / agreement_data.epochLength
-            )
-            epochs_left = agreement_data.epochsNumber - current_epoch
-
-            unfinalized_state = self._get_latest_assertion_id(token_id)
-            unfinalized_state_size = self._get_assertion_size(unfinalized_state)
-
-            token_amount = int(
-                self._get_bid_suggestion(
-                    blockchain_id,
-                    epochs_left,
-                    unfinalized_state_size,
-                    content_asset_storage_address,
-                    unfinalized_state,
-                    DEFAULT_HASH_FUNCTION_ID,
-                    token_amount or BidSuggestionRange.LOW,
-                )["bidSuggestion"]
-            ) - sum(agreement_data.tokensInfo)
-
-            if token_amount <= 0:
-                raise InvalidTokenAmount(
-                    "Token amount is bigger than default suggested amount, "
-                    "please specify exact token_amount if you still want to add "
-                    "more update tokens!"
-                )
-
-        receipt: TxReceipt = self._add_update_tokens(token_id, token_amount)
-
-        return {
-            "UAL": ual,
-            "operation": json.loads(Web3.to_json(receipt)),
-        }
-
     def get_owner(self, ual: UAL) -> Address:
         token_id = parse_ual(ual)["token_id"]
 

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

@@ -31,59 +31,18 @@ BLOCKCHAINS = {
         },
     },
     "devnet": {
-        "otp:2160": {
-            "hub": "0x833048F6e6BEa78E0AAdedeCd2Dc2231dda443FB",
-            "rpc": "https://lofar-tm-rpc.origin-trail.network",
-        },
-        "gnosis:10200": {
-            "hub": "0xD2bA102A0b11944d00180eE8136208ccF87bC39A",
-            "rpc": "https://rpc.chiadochain.net",
-            "gas_price_oracle": "https://blockscout.chiadochain.net/api/v1/gas-price-oracle",
-        },
         "base:84532": {
-            "hub": "0x6C861Cb69300C34DfeF674F7C00E734e840C29C0",
+            "hub": "0xaA849CAC4FA86f6b7484503f3c7a314772AED6d4",
             "rpc": "https://sepolia.base.org",
         }
     },
     "testnet": {
-        "otp:20430": {
-            "hub": "0xBbfF7Ea6b2Addc1f38A0798329e12C08f03750A6",
-            "rpc": "https://lofar-testnet.origin-trail.network",
-        },
-        "gnosis:10200": {
-            "hub": "0xC06210312C9217A0EdF67453618F5eB96668679A",
-            "rpc": "https://rpc.chiadochain.net",
-            "gas_price_oracle": "https://blockscout.chiadochain.net/api/v1/gas-price-oracle",
-        },
         "base:84532": {
-            "hub": "0x144eDa5cbf8926327cb2cceef168A121F0E4A299",
+            "hub": "0xCca0eA14540588A09c85cD6A6Fc53eA3A7010692",
             "rpc": "https://sepolia.base.org",
         }
     },
-    "mainnet": {
-        "otp:2043": {
-            "hub": "0x5fA7916c48Fe6D5F1738d12Ad234b78c90B4cAdA",
-            "rpc": "https://astrosat-parachain-rpc.origin-trail.network",
-        },
-        "gnosis:100": {
-            "hub": "0xbEF14fc04F870c2dD65c13Df4faB6ba01A9c746b",
-            "rpc": "https://rpc.gnosischain.com/",
-            "gas_price_oracle": [
-                "https://api.gnosisscan.io/api?module=proxy&action=eth_gasPrice",
-                "https://blockscout.com/xdai/mainnet/api/v1/gas-price-oracle",
-            ],
-        },
-        "base:8453": {
-            "hub": "0xaBfcf2ad1718828E7D3ec20435b0d0b5EAfbDf2c",
-            "rpc": "https://mainnet.base.org",
-        },
-    },
-}
-
-DEFAULT_GAS_PRICE_GWEI = {
-    "otp": 1,
-    "gnosis": 20,
-    "base": 20,
+    "mainnet": {},
 }
 
 DEFAULT_HASH_FUNCTION_ID = 1

{dkg-1.1.1 → dkg-8.0.0a1}/dkg/paranet.py

@@ -424,37 +424,6 @@ class Paranet(Module):
     _get_updating_knowledge_asset_states = Method(
         BlockchainRequest.get_updating_knowledge_asset_states
     )
-    _process_updated_knowledge_asset_states_metadata = Method(
-        BlockchainRequest.process_updated_knowledge_asset_states_metadata
-    )
-
-    def update_claimable_rewards(self, ual: UAL) -> dict[str, str | HexStr | TxReceipt]:
-        parsed_ual = parse_ual(ual)
-        knowledge_asset_storage, knowledge_asset_token_id = (
-            parsed_ual["contract_address"],
-            parsed_ual["token_id"],
-        )
-
-        paranet_id = Web3.solidity_keccak(
-            ["address", "uint256"], [knowledge_asset_storage, knowledge_asset_token_id]
-        )
-
-        updating_states = self._get_updating_knowledge_asset_states(
-            self.manager.blockchain_provider.account.address,
-            paranet_id,
-        )
-        receipt: TxReceipt = self._process_updated_knowledge_asset_states_metadata(
-            knowledge_asset_storage,
-            knowledge_asset_token_id,
-            0,
-            len(updating_states),
-        )
-
-        return {
-            "paranetUAL": ual,
-            "paranetId": paranet_id,
-            "operation": json.loads(Web3.to_json(receipt)),
-        }
 
     def _get_incentives_pool_contract(
         self,

{dkg-1.1.1 → dkg-8.0.0a1}/dkg/providers/blockchain.py

@@ -23,7 +23,7 @@ from pathlib import Path
 from typing import Any, Type
 
 import requests
-from dkg.constants import BLOCKCHAINS, DEFAULT_GAS_PRICE_GWEI
+from dkg.constants import BLOCKCHAINS
 from dkg.exceptions import (
     AccountMissing,
     EnvironmentNotSupported,
@@ -181,13 +181,15 @@ class BlockchainProvider:
                     "account."
                 )
 
-            gas_price = self.gas_price or gas_price or self._get_network_gas_price()
-
             options = {
-                "gasPrice": gas_price,
                 "gas": gas_limit or contract_function(**args).estimate_gas(),
             }
 
+            gas_price = self.gas_price or gas_price or self._get_network_gas_price()
+
+            if gas_price is not None:
+                options["gasPrice"] = gas_price
+
             tx_hash = contract_function(**args).transact(options)
             tx_receipt = self.w3.eth.wait_for_transaction_receipt(tx_hash)
 
@@ -213,12 +215,6 @@ class BlockchainProvider:
         if self.environment == "development":
             return None
 
-        blockchain_name, _ = self.blockchain_id.split(":")
-
-        default_gas_price = self.w3.to_wei(
-            DEFAULT_GAS_PRICE_GWEI[blockchain_name], "gwei"
-        )
-
         def fetch_gas_price(oracle_url: str) -> Wei | None:
             try:
                 response = requests.get(oracle_url)
@@ -244,7 +240,7 @@ class BlockchainProvider:
                 if gas_price is not None:
                     return gas_price
 
-        return default_gas_price
+        return None
 
     def _init_contracts(self):
         for contract in self.abi.keys():

{dkg-1.1.1 → dkg-8.0.0a1}/dkg/utils/blockchain_request.py

@@ -93,23 +93,6 @@ class BlockchainRequest:
         function="burnAsset",
         args={"tokenId": int},
     )
-    update_asset_state = ContractTransaction(
-        contract="ContentAsset",
-        function="updateAssetState",
-        args={
-            "tokenId": int,
-            "assertionId": bytes | HexStr,
-            "size": int,
-            "triplesNumber": int,
-            "chunksNumber": int,
-            "updateTokenAmount": int,
-        },
-    )
-    cancel_asset_state_update = ContractTransaction(
-        contract="ContentAsset",
-        function="cancelAssetStateUpdate",
-        args={"tokenId": int},
-    )
     extend_asset_storing_period = ContractTransaction(
         contract="ContentAsset",
         function="extendAssetStoringPeriod",
@@ -120,11 +103,6 @@ class BlockchainRequest:
         function="increaseAssetTokenAmount",
         args={"tokenId": int, "tokenAmount": int},
     )
-    increase_asset_update_token_amount = ContractTransaction(
-        contract="ContentAsset",
-        function="increaseAssetUpdateTokenAmount",
-        args={"tokenId": int, "tokenAmount": int},
-    )
 
     transfer_asset = ContractTransaction(
         contract="ContentAssetStorage",
@@ -249,16 +227,6 @@ class BlockchainRequest:
             "paranetId": HexStr,
         },
     )
-    process_updated_knowledge_asset_states_metadata = ContractTransaction(
-        contract="Paranet",
-        function="processUpdatedKnowledgeAssetStatesMetadata",
-        args={
-            "paranetKAStorageContract": Address,
-            "paranetKATokenId": int,
-            "start": int,
-            "end": int,
-        },
-    )
 
     is_knowledge_miner_registered = ContractCall(
         contract="ParanetsRegistry",

{dkg-1.1.1 → dkg-8.0.0a1}/dkg/utils/node_request.py

@@ -69,18 +69,6 @@ class NodeRequest:
             "hashFunctionId": int,
         },
     )
-    update = NodeCall(
-        method=HTTPRequestMethod.POST,
-        path="update",
-        data={
-            "assertionId": str,
-            "assertion": NQuads,
-            "blockchain": str,
-            "contract": Address,
-            "tokenId": int,
-            "hashFunctionId": int,
-        },
-    )
     get = NodeCall(
         method=HTTPRequestMethod.POST,
         path="get",
@@ -115,17 +103,6 @@ class PublishOperationStatus(Enum):
     PUBLISH_END = auto()
 
 
-class UpdateOperationStatus(AutoStrEnumUpperCase):
-    UPDATE_START = auto()
-    UPDATE_INIT_START = auto()
-    UPDATE_INIT_END = auto()
-    UPDATE_REPLICATE_START = auto()
-    UPDATE_REPLICATE_END = auto()
-    VALIDATING_UPDATE_ASSERTION_REMOTE_START = auto()
-    VALIDATING_UPDATE_ASSERTION_REMOTE_END = auto()
-    UPDATE_END = auto()
-
-
 class StoreTypes(AutoStrEnumUpperCase):
     TRIPLE = auto()
     PENDING = auto()
@@ -171,7 +148,6 @@ class OperationStatus(AutoStrEnumUpperCase):
     DIAL_PROTOCOL_END = auto()
     LOCAL_STORE = LocalStoreOperationStatus
     PUBLISH = PublishOperationStatus
-    UPDATE = UpdateOperationStatus
     GET = GetOperationStatus
     QUERY = QueryOperationStatus
 

{dkg-1.1.1 → dkg-8.0.0a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dkg"
-version = "1.1.1"
+version = "8.0.0a1"
 description = "Python library for interacting with the OriginTrail Decentralized Knowledge Graph"
 authors = ["Uladzislau Hubar <hubar.uladzislau@gmail.com>"]
 license = "Apache-2.0"

dkg-1.1.1/dkg/data/interfaces/UnfinalizedStateStorage.json

@@ -1,171 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "hubAddress",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "deleteIssuer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "deleteUnfinalizedState",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getIssuer",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getUnfinalizedState",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "hasPendingUpdate",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "hub",
-    "outputs": [
-      {
-        "internalType": "contract Hub",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "issuer",
-        "type": "address"
-      }
-    ],
-    "name": "setIssuer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "state",
-        "type": "bytes32"
-      }
-    ],
-    "name": "setUnfinalizedState",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  }
-]