aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat: NWC use coincurve instead of secp (#3455)

Browse source
This commit is contained in:
dni ⚡ 2025-10-30 08:06:31 +01:00 • committed by GitHub
parent 2b603bdc48
commit 39ca9da870
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 41 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/api/test_auth.py
View file

@ -6,8 +6,8 @@ from uuid import uuid4
import jwt
import pytest
import secp256k1
import shortuuid
from coincurve import PrivateKey
from httpx import AsyncClient
from lnbits.core.crud.users import (
@ -42,11 +42,11 @@ nostr_event = {
"sig": "fb7eb47fa8355747f6837e55620103d73ba47b2c3164ab8319d2f164022a9f25"
"6e00ecda7d3c8945f07b7d6ecc18cfff34c07bc99677309e2b9310d9fc1bb138",
}
private_key = secp256k1.PrivateKey(
private_key = PrivateKey(
bytes.fromhex("6e00ecda7d3c8945f07b7d6ecc18cfff34c07bc99677309e2b9310d9fc1bb138")
)
assert private_key.pubkey, "Pubkey not created."
pubkey_hex = private_key.pubkey.serialize().hex()[2:]
assert private_key.public_key, "Pubkey not created."
pubkey_hex = private_key.public_key.format().hex()[2:]
################################ LOGIN ################################
@ -552,9 +552,9 @@ async def test_register_nostr_ok(http_client: AsyncClient, settings: Settings):
event = {**nostr_event}
event["created_at"] = int(time.time())
private_key = secp256k1.PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.pubkey, "Pubkey not created."
pubkey_hex = private_key.pubkey.serialize().hex()[2:]
private_key = PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.public_key, "Pubkey not created."
pubkey_hex = private_key.public_key.format().hex()[2:]
event_signed = sign_event(event, pubkey_hex, private_key)
base64_event = base64.b64encode(json.dumps(event_signed).encode()).decode("ascii")
response = await http_client.post(
@ -759,9 +759,9 @@ async def test_change_pubkey_npub_ok(http_client: AsyncClient, settings: Setting
payload: dict = jwt.decode(access_token, settings.auth_secret_key, ["HS256"])
access_token_payload = AccessTokenPayload(**payload)
private_key = secp256k1.PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.pubkey, "Pubkey not created."
pubkey_hex = private_key.pubkey.serialize().hex()[2:]
private_key = PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.public_key, "Pubkey not created."
pubkey_hex = private_key.public_key.format().hex()[2:]
npub = hex_to_npub(pubkey_hex)
response = await http_client.put(
@ -802,9 +802,9 @@ async def test_change_pubkey_ok(
payload: dict = jwt.decode(access_token, settings.auth_secret_key, ["HS256"])
access_token_payload = AccessTokenPayload(**payload)
private_key = secp256k1.PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.pubkey, "Pubkey not created."
pubkey_hex = private_key.pubkey.serialize().hex()[2:]
private_key = PrivateKey(bytes.fromhex(os.urandom(32).hex()))
assert private_key.public_key, "Pubkey not created."
pubkey_hex = private_key.public_key.format().hex()[2:]
response = await http_client.put(
"/api/v1/auth/pubkey",

14
tests/wallets/test_nwc_wallets.py
View file

@ -5,7 +5,7 @@ import time
from typing import cast
import pytest
import secp256k1
from coincurve import PrivateKey, PublicKey
from Cryptodome import Random
from Cryptodome.Cipher import AES
from Cryptodome.Util.Padding import pad, unpad
@ -23,8 +23,8 @@ from tests.wallets.helpers import (
def encrypt_content(priv_key, dest_pub_key, content):
p = secp256k1.PublicKey(bytes.fromhex("02" + dest_pub_key), True)
shared = p.tweak_mul(bytes.fromhex(priv_key)).serialize()[1:]
p = PublicKey(bytes.fromhex("02" + dest_pub_key))
shared = p.multiply(bytes.fromhex(priv_key)).format()[1:]
iv = Random.new().read(AES.block_size)
aes = AES.new(shared, AES.MODE_CBC, iv)
@ -38,8 +38,8 @@ def encrypt_content(priv_key, dest_pub_key, content):
def decrypt_content(priv_key, source_pub_key, content):
p = secp256k1.PublicKey(bytes.fromhex("02" + source_pub_key), True)
shared = p.tweak_mul(bytes.fromhex(priv_key)).serialize()[1:]
p = PublicKey(bytes.fromhex("02" + source_pub_key))
shared = p.multiply(bytes.fromhex(priv_key)).format()[1:]
(encrypted_content_b64, iv_b64) = content.split("?iv=")
encrypted_content = base64.b64decode(encrypted_content_b64.encode("ascii"))
iv = base64.b64decode(iv_b64.encode("ascii"))
@ -69,8 +69,8 @@ def sign_event(pub_key, priv_key, event):
event_id = hashlib.sha256(signature_data.encode()).hexdigest()
event["id"] = event_id
event["pubkey"] = pub_key
s = secp256k1.PrivateKey(bytes.fromhex(priv_key))
signature = (s.schnorr_sign(bytes.fromhex(event_id), None, raw=True)).hex()
s = PrivateKey(bytes.fromhex(priv_key))
signature = s.sign_schnorr(bytes.fromhex(event_id)).hex()
event["sig"] = signature
return event