Merge branch 'tests/redesign' into dev

# Conflicts:
#	pypergraph/__about__.py

Author: buzzgreyday

pypergraph/account/dag_account.py

@@ -253,7 +253,16 @@ async def transfer(
             return pending_tx
         return None
 
-    async def create_allow_spend(self, destination: str, amount: int, approvers: List[str], source: Optional[str] = None, fee: int = 0, currency_id: Optional[str] = None, valid_until_epoch: Optional[int] = None):
+    async def create_allow_spend(
+        self,
+        destination: str,
+        amount: int,
+        approvers: List[str],
+        source: Optional[str] = None,
+        fee: int = 0,
+        currency_id: Optional[str] = None,
+        valid_until_epoch: Optional[int] = None,
+    ):
         """
         Grants permission for another wallet or metagraph to spend up to a specified amount from the user’s wallet in a metagraph token or DAG.
 
@@ -276,19 +285,26 @@ async def create_allow_spend(self, destination: str, amount: int, approvers: Lis
             currency_id=currency_id or self.network.connected_network.metagraph_id,
             valid_until_epoch=valid_until_epoch,
             network=self.network,
-            key_trio=self.key_trio
+            key_trio=self.key_trio,
         )
         return response
 
-    async def create_token_lock(self, amount: int, fee: int = 0, unlock_epoch: int = None, source: Optional[str] = None, currency_id: Optional[str] = None):
+    async def create_token_lock(
+        self,
+        amount: int,
+        fee: int = 0,
+        unlock_epoch: int = None,
+        source: Optional[str] = None,
+        currency_id: Optional[str] = None,
+    ):
         """
         Token locking is used for:
 
         Node collateral staking
         Delegated staking participation
         Governance requirements
         Time-based vesting or escrow models
-        
+
         :param source: The wallet signing the transaction. The logged in account is the default if left empty.
         :param amount: The amount to lock.
         :param currency_id: The Metagraph identifier address for the currency to lock. Leave None, if currency is DAG.
@@ -306,7 +322,7 @@ async def create_token_lock(self, amount: int, fee: int = 0, unlock_epoch: int =
             currency_id=currency_id,
             unlock_epoch=unlock_epoch,
             network=self.network,
-            key_trio=self.key_trio
+            key_trio=self.key_trio,
         )
         return response
 

pypergraph/account/metagraph_client.py

@@ -94,7 +94,16 @@ async def get_fee_recommendation(self):
 
         return 1 / self.token_decimals
 
-    async def create_allow_spend(self, destination: str, amount: int, approvers: List[str], source: Optional[str] = None, fee: int = 0, currency_id: Optional[str] = None, valid_until_epoch: Optional[int] = None):
+    async def create_allow_spend(
+        self,
+        destination: str,
+        amount: int,
+        approvers: List[str],
+        source: Optional[str] = None,
+        fee: int = 0,
+        currency_id: Optional[str] = None,
+        valid_until_epoch: Optional[int] = None,
+    ):
         """
         Grants permission for another wallet or metagraph to spend up to a specified amount from the user’s wallet in a metagraph token or DAG.
 
@@ -113,14 +122,22 @@ async def create_allow_spend(self, destination: str, amount: int, approvers: Lis
             amount=amount,
             approvers=approvers,
             source=source or self.account.key_trio.address,
-            fee=fee, currency_id=currency_id or self.network.connected_network.metagraph_id,
+            fee=fee,
+            currency_id=currency_id or self.network.connected_network.metagraph_id,
             valid_until_epoch=valid_until_epoch,
             network=self.network,
-            key_trio=self.account.key_trio
+            key_trio=self.account.key_trio,
         )
         return response
 
-    async def create_token_lock(self, amount: int, fee: int = 0, unlock_epoch: int = None, source: str = None, currency_id: Optional[str] = None):
+    async def create_token_lock(
+        self,
+        amount: int,
+        fee: int = 0,
+        unlock_epoch: int = None,
+        source: str = None,
+        currency_id: Optional[str] = None,
+    ):
         """
         Token locking is used for:
 
@@ -146,7 +163,7 @@ async def create_token_lock(self, amount: int, fee: int = 0, unlock_epoch: int =
             currency_id=currency_id or self.network.connected_network.metagraph_id,
             unlock_epoch=unlock_epoch,
             network=self.network,
-            key_trio=self.account.key_trio
+            key_trio=self.account.key_trio,
         )
         return response
 

pypergraph/account/tests/test_account.py

@@ -137,6 +137,14 @@ async def test_login_logout(self):
         assert account.key_trio.address == "DAG0zJW14beJtZX2BY2KA9gLbpaZ8x6vgX4KVPVX"
         account.logout()
 
+
+@pytest.mark.mock
+class TestMockAccount:
+    pass
+
+
+@pytest.mark.integration
+class TestIntegrationAccount:
     @pytest.mark.asyncio
     async def test_get_balance(self):
         # TODO: Mock this
@@ -273,7 +281,12 @@ async def test_allow_spend(self):
 
         latest_snapshot = await account.network.l0_api.get_latest_snapshot()
         latest_epoch = latest_snapshot.value.epoch_progress
-        print("Latest Epoch:", latest_epoch)
-        res = await account.create_allow_spend(destination="DAG1GH7r7RX1Ca7MbuvqUPT37FAtTfGM1WYQ4otZ", amount=10000000000, approvers=["DAG1GH7r7RX1Ca7MbuvqUPT37FAtTfGM1WYQ4otZ"], valid_until_epoch=latest_epoch + 10)
-        print("Response:", res)
-
+        try:
+            res = await account.create_allow_spend(
+                destination="DAG1GH7r7RX1Ca7MbuvqUPT37FAtTfGM1WYQ4otZ",
+                amount=10000000000,
+                approvers=["DAG1GH7r7RX1Ca7MbuvqUPT37FAtTfGM1WYQ4otZ"],
+                valid_until_epoch=latest_epoch + 10,
+            )
+        except NetworkError:
+            pytest.skip("Expecting status 500.")

pypergraph/account/utils.py

@@ -4,4 +4,4 @@ def normalize_public_key(public_key: str) -> str:
     elif len(public_key) == 128:
         return public_key
     else:
-        raise ValueError("Public key has wrong length")
+        raise ValueError("Public key has wrong length")

pypergraph/keystore/utils.py

@@ -1,6 +1,7 @@
 import json
 import brotli
 
+
 def remove_nulls(obj):
     if obj is None:
         return None
@@ -16,6 +17,7 @@ def remove_nulls(obj):
         }
     return obj
 
+
 def sort_object_keys(obj):
     if isinstance(obj, dict):
         # Sort keys and recursively process values
@@ -25,6 +27,7 @@ def sort_object_keys(obj):
         return [sort_object_keys(item) for item in obj]
     return obj
 
+
 def normalize_object(obj, sort=True, remove=True):
     processed = obj
     if remove:
@@ -33,12 +36,9 @@ def normalize_object(obj, sort=True, remove=True):
         processed = sort_object_keys(processed)
     return processed
 
+
 def serialize_brotli(content, compression_level=2):
     normalized = normalize_object(content)
-    normalized_json = json.dumps(
-        normalized,
-        separators=(',', ':'),
-        ensure_ascii=False
-    )
-    utf8_bytes = normalized_json.encode('utf-8')
-    return brotli.compress(utf8_bytes, quality=compression_level)
+    normalized_json = json.dumps(normalized, separators=(",", ":"), ensure_ascii=False)
+    utf8_bytes = normalized_json.encode("utf-8")
+    return brotli.compress(utf8_bytes, quality=compression_level)

pypergraph/network/api/layer_0_api.py

@@ -8,11 +8,23 @@
 from pypergraph.network.models.network import PeerInfo, TotalSupply
 from pypergraph.network.models.account import Balance
 from pypergraph.network.models.network import Ordinal
-from pypergraph.network.models.node_param import SignedUpdateNodeParameters, NodeParametersInfo, UpdateNodeParameters
+from pypergraph.network.models.node_param import (
+    SignedUpdateNodeParameters,
+    NodeParametersInfo,
+    UpdateNodeParameters,
+)
 from pypergraph.network.models.snapshot import SignedGlobalIncrementalSnapshot
 from pypergraph.network.models.transaction import TransactionReference
-from pypergraph.network.models.node_collateral import NodeCollateralsInfo, SignedCreateNodeCollateral, SignedWithdrawNodeCollateral
-from pypergraph.network.models.delegated_stake import DelegatedStakesInfo, SignedCreateDelegatedStake, SignedWithdrawDelegatedStake
+from pypergraph.network.models.node_collateral import (
+    NodeCollateralsInfo,
+    SignedCreateNodeCollateral,
+    SignedWithdrawNodeCollateral,
+)
+from pypergraph.network.models.delegated_stake import (
+    DelegatedStakesInfo,
+    SignedCreateDelegatedStake,
+    SignedWithdrawDelegatedStake,
+)
 
 
 def _handle_metrics(response: str) -> List[Dict[str, Any]]:
@@ -151,34 +163,56 @@ async def post_node_collateral(self, tx: SignedCreateNodeCollateral):
 
     async def post_node_parameters(self, tx: SignedUpdateNodeParameters):
         """Register validator parameters for delegated staking"""
-        return await self._make_request(
-        "POST", "/node-params", payload=tx.model_dump()
-        )
+        return await self._make_request("POST", "/node-params", payload=tx.model_dump())
 
     @staticmethod
     def _get_node_parameters_search_and_sort_path_and_params(
         search_name_or_id: Optional[str],
-        sort: Optional[Literal["name", "peerID", "address", "totalAddressesAssigned", "totalAmountDelegated"]],
-        sort_order: Optional[Literal["ASC", "DESC"]]
+        sort: Optional[
+            Literal[
+                "name",
+                "peerID",
+                "address",
+                "totalAddressesAssigned",
+                "totalAmountDelegated",
+            ]
+        ],
+        sort_order: Optional[Literal["ASC", "DESC"]],
     ) -> Dict:
         params = {}
 
         if isinstance(search_name_or_id, str):
             params["search"] = search_name_or_id
-        if sort in ("name", "peerID", "address", "totalAddressesAssigned", "totalAmountDelegated"):
+        if sort in (
+            "name",
+            "peerID",
+            "address",
+            "totalAddressesAssigned",
+            "totalAmountDelegated",
+        ):
             params["sort"] = sort
         if sort_order in ("ASC", "DESC"):
             params["sortOrder"] = sort_order
 
         return {"params": params}
 
     async def get_node_parameters(
-            self,
-            search_name_or_id: Optional[str] = None,
-            sort: Optional[Literal["name", "peerID", "address", "totalAddressesAssigned", "totalAmountDelegated"]] = None,
-            sort_order: Optional[Literal["ASC", "DESC"]] = None
+        self,
+        search_name_or_id: Optional[str] = None,
+        sort: Optional[
+            Literal[
+                "name",
+                "peerID",
+                "address",
+                "totalAddressesAssigned",
+                "totalAmountDelegated",
+            ]
+        ] = None,
+        sort_order: Optional[Literal["ASC", "DESC"]] = None,
     ):
-        request = self._get_node_parameters_search_and_sort_path_and_params(search_name_or_id, sort, sort_order)
+        request = self._get_node_parameters_search_and_sort_path_and_params(
+            search_name_or_id, sort, sort_order
+        )
         result = await self._make_request(
             "GET", "/node-params", params=request["params"]
         )

pypergraph/network/api/layer_1_api.py

@@ -11,7 +11,7 @@
 from pypergraph.network.models.transaction import (
     PendingTransaction,
     SignedTransaction,
-    TransactionReference
+    TransactionReference,
 )
 
 
@@ -96,17 +96,25 @@ async def post_transaction(self, tx: SignedTransaction):
         )
 
     async def get_allow_spend_last_reference(self, address: str) -> AllowSpendReference:
-        result = await self._make_request("GET", f"/allow-spends/last-reference/{address}")
+        result = await self._make_request(
+            "GET", f"/allow-spends/last-reference/{address}"
+        )
         return AllowSpendReference(**result)
 
     async def post_allow_spend(self, tx: SignedAllowSpend):
-        result = await self._make_request("POST", "/allow-spends", payload=tx.model_dump())
+        result = await self._make_request(
+            "POST", "/allow-spends", payload=tx.model_dump()
+        )
         return result
 
     async def get_token_lock_last_reference(self, address: str) -> TokenLockReference:
-        result = await self._make_request("GET", f"/token-locks/last-reference/{address}")
+        result = await self._make_request(
+            "GET", f"/token-locks/last-reference/{address}"
+        )
         return TokenLockReference(**result)
 
     async def post_token_lock(self, tx: SignedTokenLock):
-        result = await self._make_request("POST", "/token-locks", payload=tx.model_dump(by_alias=True))
+        result = await self._make_request(
+            "POST", "/token-locks", payload=tx.model_dump(by_alias=True)
+        )
         return result

pypergraph/network/models/allow_spend.py

@@ -11,16 +11,17 @@ class AllowSpendReference(BaseModel):
 
 
 class AllowSpend(BaseModel):
-
     source: str
     destination: str
     currency: Optional[str] = Field(default=None, serialization_alias="currencyId")
     amount: int
     fee: int
     parent: AllowSpendReference
-    last_valid_epoch_progress: Optional[int] = Field(default=None, serialization_alias="lastValidEpochProgress")
+    last_valid_epoch_progress: Optional[int] = Field(
+        default=None, serialization_alias="lastValidEpochProgress"
+    )
     approvers: List[str]
-    #ordinal: Optional[int]
+    # ordinal: Optional[int]
 
 
 class SignedAllowSpend(BaseModel):