Merge branch 'main' into media

This commit is contained in:
Believethehype
2023-11-28 16:56:09 +01:00
5 changed files with 51 additions and 48 deletions

View File

@@ -248,14 +248,20 @@ def zap(lud16: str, amount: int, content, zapped_event: Event, keys, dvm_config,
return None
def parse_cashu(cashu_token):
def parse_cashu(cashu_token: str):
try:
prefix = "cashuA"
assert cashu_token.startswith(prefix), Exception(
f"Token prefix not valid. Expected {prefix}."
)
token_base64 = cashu_token[len(prefix):]
cashu = json.loads(base64.urlsafe_b64decode(token_base64))
try:
prefix = "cashuA"
assert cashu_token.startswith(prefix), Exception(
f"Token prefix not valid. Expected {prefix}."
)
if not cashu_token.endswith("="):
cashu_token = cashu_token + "="
token_base64 = cashu_token[len(prefix):]
cashu = json.loads(base64.urlsafe_b64decode(token_base64))
except Exception as e:
print(e)
token = cashu["token"][0]
proofs = token["proofs"]
@@ -299,9 +305,9 @@ def redeem_cashu(cashu, required_amount, config, client) -> (bool, str):
request = requests.post(url, data=request_body, headers=headers)
tree = json.loads(request.text)
print(request.text)
is_paid = tree["paid"] if tree.get("paid") else "false"
is_paid = tree["paid"] if tree.get("paid") else False
print(is_paid)
if is_paid == "true":
if is_paid:
print("token redeemed")
return True, "success"
else: