From 3051971db7a0ce416b5bf15ee0d61fb637a34453 Mon Sep 17 00:00:00 2001 From: Tiago Vasconcelos Date: Wed, 30 Nov 2022 12:37:15 +0000 Subject: [PATCH] add a check if generateKeys gets called from merchant --- .../extensions/diagonalley/templates/diagonalley/index.html | 2 +- lnbits/extensions/diagonalley/views_api.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lnbits/extensions/diagonalley/templates/diagonalley/index.html b/lnbits/extensions/diagonalley/templates/diagonalley/index.html index 43efe2816..dacd5e25a 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', + '/diagonalley/api/v1/keys/merchant', 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 e2bd9ab32..1d9ca81ce 100644 --- a/lnbits/extensions/diagonalley/views_api.py +++ b/lnbits/extensions/diagonalley/views_api.py @@ -489,8 +489,10 @@ async def api_diagonalley_generate_keys(payment_hash: str): private_key = PrivateKey() public_key = private_key.pubkey.serialize().hex() - # set pubkey in order - await set_diagonalley_order_pubkey(payment_hash, pubkey=public_key[2:]) + # 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:]}