Merge branch 'master' into feature/SP-655

# Conflicts:
#	src/bitpay/models/bill/bill.py
#	src/bitpay/models/invoice/invoice.py
#	src/bitpay/models/invoice/refund.py
#	src/bitpay/models/payout/payout.py

Author: mwarzybok-sumoheavy

Pipfile

@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 ecdsa = "==0.18.0"
 requests = "==2.31.0"
+pydantic = "==2.3.0"
 
 [dev-packages]
 black = "==23.7.0"

Pipfile.lock

@@ -36,7 +36,7 @@ def create(
         :raises BillCreationException
         """
         try:
-            bill.set_token(self.__token_container.get_access_token(facade))
+            bill.token = self.__token_container.get_access_token(facade)
             response_json = self.__bitpay_client.post(
                 "bills", bill.to_json(), sign_request
             )
@@ -129,7 +129,7 @@ def update(self, bill: Bill, bill_id: str) -> Bill:
         :raises BillUpdateException
         """
         try:
-            if bill.get_token() is None:
+            if bill.token is None:
                 raise BillUpdateException("missing Bill token")
 
             response_json = self.__bitpay_client.update(

src/bitpay/clients/bill_client.py

@@ -33,7 +33,7 @@ def get_currencies(self) -> Dict[str, Currency]:
             currencies = {}
             for currency in response_json:
                 currency_obj = Currency(**currency)
-                currencies[currency_obj.get_code()] = currency_obj
+                currencies[currency_obj.code] = currency_obj
         except Exception as exe:
             raise CurrencyQueryException(
                 "failed to deserialize BitPay server response "

src/bitpay/clients/currency_client.py

@@ -52,10 +52,10 @@ def create(
         :raises InvoiceCreationException
         """
         try:
-            if invoice.get_guid() is None:
-                invoice.set_guid(self.__guid_generator.execute())
+            if invoice.guid is None:
+                invoice.guid = self.__guid_generator.execute()
 
-            invoice.set_token(self.__token_container.get_access_token(facade))
+            invoice.token = self.__token_container.get_access_token(facade)
             invoice_json = invoice.to_json()
             response_json = self.__bitpay_client.post(
                 "invoices", invoice_json, sign_request

src/bitpay/clients/invoice_client.py

@@ -33,7 +33,7 @@ def submit(self, payout: Payout) -> Payout:
         :raises PayoutCreationException
         """
         try:
-            payout.set_token(self.__token_container.get_access_token(Facade.PAYOUT))
+            payout.token = self.__token_container.get_access_token(Facade.PAYOUT)
             response_json = self.__bitpay_client.post("payouts", payout.to_json(), True)
         except BitPayException as exe:
             raise PayoutCreationException(
@@ -206,8 +206,8 @@ def get_payout_group_response(
             for fail in response_json["failed"]:
                 failed.append(PayoutGroupFailed(**fail))
 
-            return PayoutGroup(payouts, failed)
-        except:
+            return PayoutGroup(payouts=payouts, failed=failed)
+        except Exception:
             raise PayoutException("Unable to parse payouts")
 
     def create_group(self, payouts: List[Payout]) -> PayoutGroup:

src/bitpay/clients/payout_client.py

@@ -50,10 +50,10 @@ def submit(self, recipients: PayoutRecipients) -> List[PayoutRecipient]:
         :raises PayoutRecipientCreationException
         """
         try:
-            if recipients.get_guid() is None:
-                recipients.set_guid(self.__guid_generator.execute())
+            if recipients.guid is None:
+                recipients.guid = self.__guid_generator.execute()
 
-            recipients.set_token(self.__token_container.get_access_token(Facade.PAYOUT))
+            recipients.token = self.__token_container.get_access_token(Facade.PAYOUT)
 
             response_json = self.__bitpay_client.post(
                 "recipients", recipients.to_json(), True
@@ -158,8 +158,8 @@ def update(self, recipient_id: str, recipient: PayoutRecipient) -> PayoutRecipie
         :raises PayoutRecipientUpdateException
         """
         try:
-            recipient.set_token(self.__token_container.get_access_token(Facade.PAYOUT))
-            recipient.set_guid(self.__guid_generator.execute())
+            recipient.token = self.__token_container.get_access_token(Facade.PAYOUT)
+            recipient.guid = self.__guid_generator.execute()
             response_json = self.__bitpay_client.update(
                 "recipients/%s" % recipient_id, recipient.to_json()
             )

src/bitpay/clients/payout_recipient_client.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from bitpay.clients.bitpay_client import BitPayClient
 from bitpay.exceptions.bitpay_exception import BitPayException
 from bitpay.exceptions.rate_query_exception import RateQueryException
@@ -34,7 +32,7 @@ def get_rates(self) -> Rates:
             rates = []
             for rate in response_json:
                 rates.append(Rate(**rate))
-            return Rates(rates)
+            return Rates(rates=rates)
         except Exception as exe:
             raise RateQueryException(
                 "failed to deserialize BitPay server response "
@@ -69,7 +67,7 @@ def get_currency_rates(self, base_currency: str) -> Rates:
             rates = []
             for rate in response_json:
                 rates.append(Rate(**rate))
-            return Rates(rates)
+            return Rates(rates=rates)
         except Exception as exe:
             raise RateQueryException(
                 "failed to deserialize BitPay server response "