Merge pull request #24 from cryptomkt/feat/update-june-2024

Feat/update june 2024

Author: ppbustamante

cryptomarket/args.py

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

cryptomarket/client.py

@@ -1,16 +1,14 @@
 from dataclasses import dataclass
-from typing import Any, Dict, List
-
-from cryptomarket.dataclasses.orderBookLevel import OrderBookLevel
+from typing import Any, Dict, Optional
 
 
 @dataclass
 class Fee:
     fee: str
-    network_fee: str
+    network_fee: 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/CommitRisk.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/fee.py

@@ -3,6 +3,7 @@
 
 from cryptomarket.args import (TransactionStatus, TransactionSubType,
                                TransactionType)
+from cryptomarket.dataclasses.CommitRisk import CommitRisk
 from cryptomarket.dataclasses.metaTransaction import MetaTransaction
 from cryptomarket.dataclasses.nativeTransaction import NativeTransaction
 
@@ -15,5 +16,7 @@ class Transaction:
     subtype: TransactionSubType
     created_at: str
     updated_at: str
+    last_activity_at: str
     native: Optional[NativeTransaction] = None
     meta: Optional[MetaTransaction] = None
+    commit_risk: Optional[CommitRisk] = None

cryptomarket/dataclasses/network.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 
 class CryptomarketSDKException(Exception):
@@ -46,7 +46,7 @@ def __str__(self):
 
 
 class ArgumentFormatException(CryptomarketSDKException):
-    def __init__(self, message, valid_options: List[str] = None):
+    def __init__(self, message, valid_options: Optional[List[str]] = None):
         self.message = message
         if valid_options is not None:
             self.message += ' Valid options are:'

cryptomarket/dataclasses/transaction.py

@@ -2,13 +2,14 @@
 from hashlib import sha256
 from hmac import HMAC
 from time import time
+from typing import Optional
 from urllib.parse import urlsplit
 
 from requests.auth import AuthBase
 
 
 class HmacAuth(AuthBase):
-    def __init__(self, api_key: str, secret_key: str, window: int = None):
+    def __init__(self, api_key: str, secret_key: str, window: Optional[int] = None):
         self.api_key = api_key
         self.secret_key = secret_key
         self.window = window

cryptomarket/exceptions.py

@@ -1,4 +1,5 @@
 import json
+from typing import Optional
 
 import requests
 
@@ -10,16 +11,11 @@
 
 class HttpClient:
 
-    def __init__(self, api_key: str, secret_key: str, window: 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
-        self.session = None
-        self._init_session()
-
-    def _init_session(self):
-        assert self.session_is_open == False
         session = requests.session()
         session.headers.update({'User-Agent': 'cryptomarket/python'})
         self.session = session
@@ -29,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)
@@ -59,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/hmac_auth.py

@@ -0,0 +1,7 @@
+from typing import Callable, Generic, Optional, TypeVar
+from dacite.data import Data
+
+from cryptomarket.exceptions import CryptomarketAPIException
+
+T = TypeVar('T')
+Callback = Callable[[Optional[CryptomarketAPIException], Optional[T]], None]