From 1357b17b643a6bd34fc0dbba6dd09356a091c3f6 Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 15 Dec 2022 23:32:49 +0000 Subject: [PATCH] keys now working --- .../extensions/diagonalley/templates/diagonalley/index.html | 2 +- lnbits/extensions/diagonalley/views_api.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html index dacd5e25..43efe281 100644 --- a/lnbits/extensions/diagonalley/templates/diagonalley/index.html +++ b/lnbits/extensions/diagonalley/templates/diagonalley/index.html @@ -1443,7 +1443,7 @@ LNbits.api .request( 'GET', - '/diagonalley/api/v1/keys/merchant', + '/diagonalley/api/v1/keys', this.g.user.wallets[0].adminkey ) .then(response => { diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py index 5408a6a4..b4208847 100644 --- a/lnbits/extensions/diagonalley/views_api.py +++ b/lnbits/extensions/diagonalley/views_api.py @@ -488,11 +488,6 @@ async def api_diagonalley_generate_keys(): while not public_key.startswith("02"): private_key = PrivateKey() public_key = private_key.pubkey.serialize().hex() - - # if the call is made from merchant's side skip adding pubkey to order - if(payment_hash != "merchant"): - # set pubkey in order - await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:]) return {"privkey": private_key.serialize(), "pubkey": public_key[2:]}