feat: update june 2024

Author: Insmael

cryptomarket/args.py

@@ -156,6 +156,7 @@ class OrderBy(Checker):
     CREATED_AT = 'created_at'
     UPDATED_AT = 'updated_at'
     LAST_ACTIVITY_UP = 'last_activity_up'
+    ID = 'id'
 
 
 class Depth(Checker):
@@ -261,6 +262,9 @@ def symbols(self, val: Optional[Union[str, List[str]]]):
     def currency(self, val: Optional[str]):
         return self.add("currency", val)
 
+    def network_code(self, val: Optional[str]):
+        return self.add("network_code", val)
+
     def from_(self, val: Optional[str]):
         return self.add("from", val)
 
@@ -474,6 +478,9 @@ def preferred_network(self, val: Optional[str]):
     def type(self, val: Optional[str]):
         return self.add('type', val)
 
+    def group_transactions(self, val: Optional[bool]):
+        return self.add('group_transactions', val)
+
     def acl_settings(self, val: ACLSettings):
         self.add(
             'deposit_address_generation_enabled',

cryptomarket/client.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass
 class CommitRisk:
-    score: int
-    rbf: str
-    low_fee: str
+    score: Optional[int] = None
+    rbf: Optional[str] = None
+    low_fee: Optional[str] = None

cryptomarket/dataclasses/CommitRisk.py

@@ -1,13 +1,14 @@
 from dataclasses import dataclass
 from typing import Any, Dict, Optional
 
+
 @dataclass
 class Fee:
-    fee: Optional[str]
+    fee: str
     network_fee: Optional[str]
-    amount: Optional[str]
-    currency: Optional[str]
+    amount: str
+    currency: str
 
     @classmethod
     def from_dict(cls, data: Dict[str, Any]):
-        return cls(data.get('fee'), data.get('networkFee'), data.get('amount'), data.get('currency'))
+        return cls(data['fee'], data.get('networkFee'), data['amount'], data['currency'])

cryptomarket/dataclasses/fee.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+from typing import Mapping, Optional
 
 
 @dataclass
@@ -21,3 +21,9 @@ class Network:
     avg_processing_time: Optional[str] = None
     crypto_payment_id_name: Optional[str] = None
     crypto_explorer: Optional[str] = None
+    code: Optional[str] = None
+    is_ens_available: Optional[bool] = None
+    network_name: Optional[str] = None
+    contract_address: Optional[str] = None
+    is_multichain: Optional[bool] = None
+    asset_id: Optional[Mapping[str,str]] = None

cryptomarket/dataclasses/network.py

@@ -11,9 +11,9 @@
 
 class HttpClient:
 
-    def __init__(self, api_key: str, secret_key: str, window: Optional[int] = None):
+    def __init__(self, api_key: str, api_secret: str, window: Optional[int] = None):
         self.api_key = api_key
-        self.secret_key = secret_key
+        self.api_secret = api_secret
         self.window = window
         self.session_is_open = False
         session = requests.session()
@@ -25,10 +25,10 @@ def close_session(self):
         self.session.close()
         self.session_is_open = False
 
-    def authorize(self):
+    def reset_authorization(self):
         assert self.session_is_open == True
         self.session.auth = HmacAuth(
-            self.api_key, self.secret_key, window=self.window)
+            self.api_key, self.api_secret, window=self.window)
 
     def get(self, endpoint, params=None):
         response = self.session.get(api_url + endpoint, params=params)
@@ -55,7 +55,7 @@ def delete(self, endpoint, params=None):
 
     def _handle_response(self, response):
         """Internal helper for handling API responses from the CryptoMarket server.
-        Raises the appropriate exceptions when necessary; otherwise, returns the
+        Raises the appropriate exceptions when necessary; otherwise, return the
         response.
         """
         if not str(response.status_code).startswith('2'):

cryptomarket/http_client.py

@@ -7,7 +7,7 @@
 
 class CallbackCache:
     def __init__(self):
-        self.callbacks: Dict[int, ReusableCallback] = {}
+        self.reusable_callbacks: Dict[int, ReusableCallback[Any]] = {}
         self.subscription_callbacks: Dict[int, Callback[Any]] = {}
         self._id = 1
 
@@ -19,16 +19,16 @@ def next_id(self):
 
     def save_callback(self, callback: Callback[Any], call_count: int = 1) -> int:
         id = self.next_id()
-        self.callbacks[id] = ReusableCallback(callback, call_count)
+        self.reusable_callbacks[id] = ReusableCallback(callback, call_count)
         return id
 
     def get_callback(self, id: int) -> Optional[Callback[Any]]:
-        if id not in self.callbacks:
+        if id not in self.reusable_callbacks:
             return None
-        reusable_callback = self.callbacks[id]
+        reusable_callback = self.reusable_callbacks[id]
         callback, done = reusable_callback.get_callback()
         if done:
-            del self.callbacks[id]
+            del self.reusable_callbacks[id]
         return callback
 
     def save_subscription_callback(self, key: int, callback: Callback[Any]):
@@ -40,5 +40,5 @@ def get_subscription_callback(self, key: int) -> Optional[Callback[Any]]:
         return self.subscription_callbacks[key]
 
     def delete_subscription_callback(self, key: str):
-        if key in self.callbacks:
-            del self.callbacks[key]
+        if key in self.reusable_callbacks:
+            del self.reusable_callbacks[key]

cryptomarket/websockets/callback_cache.py

@@ -69,7 +69,7 @@ def authenticate(self, callback: Optional[Callable[[Any, Any], Any]] = None):
 
         :param callback: Optional. A callable to call with the result data. It takes two arguments, err and result. err is None for successful calls, result is None for calls with error: callback(err, result).
 
-        :returns: The transaction status as result argument for the callback.
+        :return: The transaction status as result argument for the callback.
 
         .. code-block:: python
         True

cryptomarket/websockets/client_auth.py

@@ -1,18 +1,18 @@
 from dataclasses import dataclass
-from typing import Any, Callable, Optional, Tuple
+from typing import Optional, Tuple, Generic
 
-from cryptomarket.websockets.callback import Callback
+from cryptomarket.websockets.callback import T, Callback
 
 
 @dataclass
-class ReusableCallback:
-    callback: Callable
+class ReusableCallback(Generic[T]):
+    callback: Callback[T]
     call_count: int
 
     def is_done(self) -> bool:
         return self.call_count < 1
 
-    def get_callback(self) -> Tuple[Optional[Callback[Any]], bool]:
+    def get_callback(self) -> Tuple[Optional[Callback[T]], bool]:
         if self.is_done():
             return None, True
         self.call_count -= 1

cryptomarket/websockets/reusable_callback.py

@@ -364,7 +364,7 @@ def intercept_result(err, response):
             params=params)
 
     def cancel_spot_orders(self, callback: Optional[Callback[List[Report]]] = None):
-        """cancel all active spot orders and returns the ones that could not be canceled
+        """cancel all active spot orders and return the ones that could not be canceled
 
         https://api.exchange.cryptomkt.com/#cancel-spot-orders