Project import generated by Copybara.

GitOrigin-RevId: 40bfe2dadc0ee36b7b6466e23f1b0be04b3ea50d

Author: Lightspark Eng

lightspark/lightspark_client.py

@@ -481,7 +481,7 @@ def pay_uma_invoice(
             self.get_signing_key(node_id),
         )
         return OutgoingPayment_from_json(
-            self._requester, json["pay_invoice"]["payment"]
+            self._requester, json["pay_uma_invoice"]["payment"]
         )
 
     def send_payment(

uma/__tests__/test_uma.py

@@ -7,11 +7,11 @@
 from unittest.mock import patch
 
 import pytest
-from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric.ec import SECP256K1, generate_private_key
 from ecies import PrivateKey, decrypt
 from uma.currency import Currency
+from uma.exceptions import InvalidSignatureException
 from uma.kyc_status import KycStatus
 from uma.payer_data import PayerDataOptions
 from uma.public_key_cache import InMemoryPublicKeyCache, PubkeyResponse
@@ -116,7 +116,7 @@ def test_pay_request_create_and_parse() -> None:
     pay_request.payer_data.compliance.signature = (  # pyre-ignore: [16]
         secrets.token_hex()
     )
-    with pytest.raises(InvalidSignature):
+    with pytest.raises(InvalidSignatureException):
         verify_pay_request_signature(pay_request, sender_signing_public_key_bytes)
 
     # verify encryption
@@ -191,7 +191,7 @@ def test_lnurlp_request_url_create_and_parse() -> None:
 
     # test invalid signature
     request.signature = secrets.token_hex()
-    with pytest.raises(InvalidSignature):
+    with pytest.raises(InvalidSignatureException):
         verify_uma_lnurlp_query_signature(request, sender_signing_public_key_bytes)
 
 
@@ -341,7 +341,7 @@ def test_lnurlp_response_create_and_parse() -> None:
 
     # test invalid signature
     result_response.compliance.signature = secrets.token_hex()
-    with pytest.raises(InvalidSignature):
+    with pytest.raises(InvalidSignatureException):
         verify_uma_lnurlp_response_signature(
             result_response, receiver_signing_public_key_bytes
         )

uma/uma.py

@@ -5,6 +5,7 @@
 from urllib.parse import parse_qs, urlparse
 
 import requests
+from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric.ec import ECDSA
 from ecies import encrypt
@@ -105,7 +106,7 @@ def _verify_signature(payload: bytes, signature: str, signing_pubkey: bytes) ->
             data=payload,
             signature_algorithm=ECDSA(hashes.SHA256()),
         )
-    except ValueError as ex:
+    except (ValueError, InvalidSignature) as ex:
         raise InvalidSignatureException() from ex