From 70b706ed92937d2a956b2d734db0d27eee4b00eb Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 8 Jul 2024 10:25:19 +0300
Subject: [PATCH 01/25] feat: improve messages

---
 services.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services.py b/services.py
index 3c28961..2505e7e 100644
--- a/services.py
+++ b/services.py
@@ -104,8 +104,8 @@ async def create_address(
 
     identifier_status = await get_identifier_status(domain, identifier)
 
-    assert identifier_status.available, "Identifier not available."
-    assert identifier_status.price, f"Cannot compute price for {identifier}"
+    assert identifier_status.available, f"Identifier '{identifier}' not available."
+    assert identifier_status.price, f"Cannot compute price for '{identifier}'."
 
     owner_id = owner_id_from_user_id(user_id)
     existing_address = await get_address_for_owner(owner_id, domain.id, identifier)

From 603ddcb9dc038483fbdc72e961ba97ec5cc4452b Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 8 Jul 2024 11:45:26 +0300
Subject: [PATCH 02/25] feat: extra check when activating addrees

---
 crud.py       | 20 ++++++++++++++------
 migrations.py |  9 ++++++++-
 models.py     | 13 ++++++++++++-
 services.py   | 22 ++++++++++++++++++++++
 tasks.py      |  8 ++------
 views_api.py  |  2 +-
 6 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/crud.py b/crud.py
index ec85de7..7cbdd9d 100644
--- a/crud.py
+++ b/crud.py
@@ -7,6 +7,7 @@
 from .helpers import normalize_identifier
 from .models import (
     Address,
+    AddressConfig,
     AddressFilters,
     CreateAddressData,
     CreateDomainData,
@@ -159,15 +160,19 @@ async def get_all_addresses_paginated(
     )
 
 
-async def activate_address(domain_id: str, address_id: str) -> Address:
+async def activate_domain_address(
+    domain_id: str, address_id: str, config: AddressConfig
+) -> Address:
+    extra = json.dumps(config, default=lambda o: o.__dict__)
     await db.execute(
         """
         UPDATE nostrnip5.addresses
-        SET active = true
+        SET active = true, extra = ?
         WHERE domain_id = ?
         AND id = ?
         """,
         (
+            extra,
             domain_id,
             address_id,
         ),
@@ -232,15 +237,17 @@ async def delete_address(domain_id, address_id):
 
 
 async def create_address_internal(
-    data: CreateAddressData, owner_id: Optional[str] = None
+    data: CreateAddressData,
+    owner_id: Optional[str] = None,
+    config: Optional[AddressConfig] = None,
 ) -> Address:
     address_id = urlsafe_short_hash()
-
+    extra = json.dumps(config or AddressConfig(), default=lambda o: o.__dict__)
     await db.execute(
         """
         INSERT INTO nostrnip5.addresses
-        (id, domain_id, owner_id, local_part, pubkey, active)
-        VALUES (?, ?, ?, ?, ?, ?)
+        (id, domain_id, owner_id, local_part, pubkey, active, extra)
+        VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
         (
             address_id,
@@ -249,6 +256,7 @@ async def create_address_internal(
             normalize_identifier(data.local_part),
             data.pubkey,
             False,
+            extra,
         ),
     )
 
diff --git a/migrations.py b/migrations.py
index 5626371..26d6e94 100644
--- a/migrations.py
+++ b/migrations.py
@@ -44,7 +44,7 @@ async def m002_add_owner_id_to_addresess(db):
 
 async def m003_add_cost_extra_column_to_domains(db):
     """
-    Adds cost_extra column to  addresses.
+    Adds cost_extra column to domains.
     """
     await db.execute("ALTER TABLE nostrnip5.domains ADD COLUMN cost_extra TEXT")
 
@@ -93,3 +93,10 @@ async def m006_make_amount_type_real(db):
         )
 
     await db.execute("ALTER TABLE nostrnip5.domains DROP COLUMN amount")
+
+
+async def m007_add_cost_extra_column_to_addresses(db):
+    """
+    Adds extra column to  addresses.
+    """
+    await db.execute("ALTER TABLE nostrnip5.addresses ADD COLUMN extra TEXT")
diff --git a/models.py b/models.py
index 57cee14..d8dfedd 100644
--- a/models.py
+++ b/models.py
@@ -111,6 +111,12 @@ def from_row(cls, row: Row) -> "Domain":
         return domain
 
 
+class AddressConfig(BaseModel):
+    payment_hash: Optional[str] = None
+    activated_by_owner: bool = False
+    relays: List[str] = []
+
+
 class Address(FromRowModel):
     id: str
     owner_id: Optional[str] = None
@@ -120,9 +126,14 @@ class Address(FromRowModel):
     active: bool
     time: int
 
+    config: AddressConfig = AddressConfig()
+
     @classmethod
     def from_row(cls, row: Row) -> "Address":
-        return cls(**dict(row))
+        address = cls(**dict(row))
+        if row["extra"]:
+            address.config = AddressConfig(**json.loads(row["extra"]))
+        return address
 
 
 class AddressStatus(BaseModel):
diff --git a/services.py b/services.py
index 2505e7e..b770451 100644
--- a/services.py
+++ b/services.py
@@ -7,9 +7,11 @@
 from loguru import logger
 
 from .crud import (
+    activate_domain_address,
     create_address_internal,
     create_identifier_ranking,
     delete_inferior_ranking,
+    get_address,
     get_address_by_local_part,
     get_address_for_owner,
     get_all_addresses,
@@ -123,6 +125,26 @@ async def create_address(
     return address, price_in_sats
 
 
+async def activate_address(
+    domain_id: str, address_id: str, payment_hash: Optional[str] = None
+) -> bool:
+    logger.info(f"Activating NOSTR NIP-05 '{address_id}' for {domain_id}")
+    try:
+        address = await get_address(domain_id, address_id)
+        assert address, f"Cannot find address '{address_id}' for {domain_id}."
+        assert not address.active, f"Address '{address_id}' already active."
+
+        address.config.activated_by_owner = payment_hash is None
+        address.config.payment_hash = payment_hash
+        await activate_domain_address(domain_id, address_id, address.config)
+
+        return True
+    except Exception as exc:
+        logger.warning(exc)
+        logger.info(f"Failed to acivate NOSTR NIP-05 '{address_id}' for {domain_id}.")
+        return False
+
+
 async def check_address_payment(domain_id: str, payment_hash: str) -> bool:
     payment = await get_standalone_payment(payment_hash, incoming=True)
     assert payment, "Payment does not exist."
diff --git a/tasks.py b/tasks.py
index b6bf018..1f04922 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,9 +2,8 @@
 
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
-from loguru import logger
 
-from .crud import activate_address
+from .services import activate_address
 
 
 async def wait_for_paid_invoices():
@@ -24,9 +23,6 @@ async def on_invoice_paid(payment: Payment) -> None:
     address_id = payment.extra.get("address_id")
 
     if domain_id and address_id:
-        logger.info("Activating NOSTR NIP-05")
-        logger.info(domain_id)
-        logger.info(address_id)
-        await activate_address(domain_id, address_id)
+        await activate_address(domain_id, address_id, payment_hash=payment.payment_hash)
 
     return
diff --git a/views_api.py b/views_api.py
index f08f788..8c7af4e 100644
--- a/views_api.py
+++ b/views_api.py
@@ -19,7 +19,6 @@
 from starlette.exceptions import HTTPException
 
 from .crud import (
-    activate_address,
     create_domain_internal,
     create_settings,
     delete_address,
@@ -52,6 +51,7 @@
     RotateAddressData,
 )
 from .services import (
+    activate_address,
     check_address_payment,
     create_address,
     get_identifier_status,

From a16eeceb2d420f12666856ae96219d3404734569 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 8 Jul 2024 16:11:40 +0300
Subject: [PATCH 03/25] feat: introduce reimbursement

---
 crud.py       | 42 +++++++++++++++++++++++++++++++++++++---
 migrations.py |  4 ++++
 models.py     |  3 ++-
 services.py   | 30 +++++++++++++++++++++--------
 tasks.py      | 32 ++++++++++++++++++++++++++++---
 views_api.py  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 149 insertions(+), 15 deletions(-)

diff --git a/crud.py b/crud.py
index 7cbdd9d..d3f6584 100644
--- a/crud.py
+++ b/crud.py
@@ -1,5 +1,5 @@
 import json
-from typing import List, Optional, Union
+from typing import Any, List, Optional, Union
 
 from lnbits.db import Database, Filters, Page
 from lnbits.helpers import urlsafe_short_hash
@@ -78,11 +78,14 @@ async def get_address(domain_id: str, address_id: str) -> Optional[Address]:
     return Address.from_row(row) if row else None
 
 
-async def get_address_by_local_part(
+async def get_active_address_by_local_part(
     domain_id: str, local_part: str
 ) -> Optional[Address]:
     row = await db.fetchone(
-        "SELECT * FROM nostrnip5.addresses WHERE domain_id = ? AND local_part = ?",
+        """
+            SELECT * FROM nostrnip5.addresses
+            WHERE active = true AND domain_id = ? AND local_part = ?
+        """,
         (
             domain_id,
             normalize_identifier(local_part),
@@ -203,6 +206,39 @@ async def rotate_address(domain_id: str, address_id: str, pubkey: str) -> Addres
     return address
 
 
+async def update_address(domain_id: str, address_id: str, **kwargs) -> Address:
+    set_clause: List[str] = []
+    set_variables: List[Any] = []
+    valid_keys = [k for k in vars(Address) if not k.startswith("__")]
+    for key, value in kwargs.items():
+        if key not in valid_keys:
+            continue
+        if key == "config":
+            extra = json.dumps(value or AddressConfig(), default=lambda o: o.__dict__)
+            set_clause.append("extra = ?")
+            set_variables.append(extra)
+        else:
+            set_clause.append(f"{key} = ?")
+            set_variables.append(value)
+
+        set_variables.append(domain_id)
+        set_variables.append(address_id)
+
+    await db.execute(
+        f"""
+            UPDATE nostrnip5.addresses
+            SET {', '.join(set_clause)}
+            WHERE domain_id = ?
+            AND id = ?
+        """,
+        tuple(set_variables),
+    )
+
+    address = await get_address(domain_id, address_id)
+    assert address, "Newly updated address couldn't be retrieved"
+    return address
+
+
 async def delete_domain(domain_id: str, wallet_id: str) -> bool:
     domain = await get_domain(domain_id, wallet_id)
     if not domain:
diff --git a/migrations.py b/migrations.py
index 26d6e94..9d15fa3 100644
--- a/migrations.py
+++ b/migrations.py
@@ -100,3 +100,7 @@ async def m007_add_cost_extra_column_to_addresses(db):
     Adds extra column to  addresses.
     """
     await db.execute("ALTER TABLE nostrnip5.addresses ADD COLUMN extra TEXT")
+    await db.execute(
+        "ALTER TABLE nostrnip5.addresses ADD COLUMN "
+        "reimburse_amount REAL NOT NULL DEFAULT 0"
+    )
diff --git a/models.py b/models.py
index d8dfedd..e9f29f7 100644
--- a/models.py
+++ b/models.py
@@ -113,6 +113,7 @@ def from_row(cls, row: Row) -> "Domain":
 
 class AddressConfig(BaseModel):
     payment_hash: Optional[str] = None
+    reimburse_payment_hash: Optional[str] = None
     activated_by_owner: bool = False
     relays: List[str] = []
 
@@ -125,6 +126,7 @@ class Address(FromRowModel):
     pubkey: str
     active: bool
     time: int
+    reimburse_amount: int = 0
 
     config: AddressConfig = AddressConfig()
 
@@ -139,7 +141,6 @@ def from_row(cls, row: Row) -> "Address":
 class AddressStatus(BaseModel):
     identifier: str
     available: bool = False
-    reserved: bool = False
     price: Optional[float] = None
     price_reason: Optional[str] = None
     currency: Optional[str] = None
diff --git a/services.py b/services.py
index b770451..5b28cd1 100644
--- a/services.py
+++ b/services.py
@@ -2,6 +2,7 @@
 
 import httpx
 from lnbits.core.crud import get_standalone_payment, get_user
+from lnbits.core.models import Payment
 from lnbits.db import Filters, Page
 from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
 from loguru import logger
@@ -11,8 +12,8 @@
     create_address_internal,
     create_identifier_ranking,
     delete_inferior_ranking,
+    get_active_address_by_local_part,
     get_address,
-    get_address_by_local_part,
     get_address_for_owner,
     get_all_addresses,
     get_all_addresses_paginated,
@@ -71,10 +72,9 @@ async def get_user_addresses_paginated(
 
 async def get_identifier_status(domain: Domain, identifier: str) -> AddressStatus:
     identifier = normalize_identifier(identifier)
-    address = await get_address_by_local_part(domain.id, identifier)
-    reserved = address is not None
-    if address and address.active:
-        return AddressStatus(identifier=identifier, available=False, reserved=reserved)
+    address = await get_active_address_by_local_part(domain.id, identifier)
+    if address:
+        return AddressStatus(identifier=identifier, available=False)
 
     rank = None
     if domain.cost_config.enable_custom_cost:
@@ -82,14 +82,13 @@ async def get_identifier_status(domain: Domain, identifier: str) -> AddressStatu
         rank = identifier_ranking.rank if identifier_ranking else None
 
     if rank == 0:
-        return AddressStatus(identifier=identifier, available=False, reserved=True)
+        return AddressStatus(identifier=identifier, available=False)
 
     price, reason = domain.price_for_identifier(identifier, rank)
 
     return AddressStatus(
         identifier=identifier,
         available=True,
-        reserved=reserved,
         price=price,
         price_reason=reason,
         currency=domain.currency,
@@ -132,7 +131,10 @@ async def activate_address(
     try:
         address = await get_address(domain_id, address_id)
         assert address, f"Cannot find address '{address_id}' for {domain_id}."
-        assert not address.active, f"Address '{address_id}' already active."
+        active_address = await get_active_address_by_local_part(
+            domain_id, address.local_part
+        )
+        assert not active_address, f"Address '{address.local_part}' already active."
 
         address.config.activated_by_owner = payment_hash is None
         address.config.payment_hash = payment_hash
@@ -162,6 +164,18 @@ async def check_address_payment(domain_id: str, payment_hash: str) -> bool:
     return status.success
 
 
+async def reimburse_payment(payment: Payment):
+    reimburse_wallet_ids = payment.extra.get("reimburse_wallet_ids", [])
+    domain_id = payment.extra.get("domain_id")
+    address_id = payment.extra.get("address_id")
+
+    if len(reimburse_wallet_ids) == 0:
+        logger.info(
+            f"Cannot reimburse failed activation for payment '{payment.payment_hash}'"
+            f"Info: domain ID ({domain_id}), address ID ({address_id})."
+        )
+
+
 async def update_identifiers(identifiers: List[str], bucket: int):
     for identifier in identifiers:
         await update_identifier(identifier, bucket)
diff --git a/tasks.py b/tasks.py
index 1f04922..aa5bdaa 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,7 +2,9 @@
 
 from lnbits.core.models import Payment
 from lnbits.tasks import register_invoice_listener
+from loguru import logger
 
+from .crud import get_address, update_address
 from .services import activate_address
 
 
@@ -21,8 +23,32 @@ async def on_invoice_paid(payment: Payment) -> None:
 
     domain_id = payment.extra.get("domain_id")
     address_id = payment.extra.get("address_id")
+    action = payment.extra.get("action")
 
-    if domain_id and address_id:
-        await activate_address(domain_id, address_id, payment_hash=payment.payment_hash)
+    if not domain_id or not address_id or not action:
+        logger.info(
+            f"Cannot {action} for payment '{payment.payment_hash}'."
+            f"Missing domain ID ({domain_id}) or address ID ({address_id})."
+        )
+        return
+
+    address = await get_address(domain_id, address_id)
+    if not address:
+        logger.info(
+            f"Cannot find address for payment '{payment.payment_hash}'."
+            f"Missing domain ID ({domain_id}) or address ID ({address_id})."
+        )
+        return
 
-    return
+    if action == "activate":
+        activated = await activate_address(domain_id, address_id, payment.payment_hash)
+        if not activated:
+            address.config.reimburse_payment_hash = payment.payment_hash
+            await update_address(
+                domain_id,
+                address_id,
+                reimburse_amount=payment.amount,
+                config=address.config,
+            )
+    elif action == "reimburse":
+        await update_address(domain_id, address_id, reimburse_amount=0)
diff --git a/views_api.py b/views_api.py
index 8c7af4e..1681d76 100644
--- a/views_api.py
+++ b/views_api.py
@@ -3,6 +3,7 @@
 
 import httpx
 from fastapi import APIRouter, Depends, Query, Request, Response
+from lnbits.core.crud import get_standalone_payment, get_wallets
 from lnbits.core.models import User, WalletTypeInfo
 from lnbits.core.services import create_invoice
 from lnbits.db import Filters, Page
@@ -23,6 +24,7 @@
     create_settings,
     delete_address,
     delete_domain,
+    get_address,
     get_addresses,
     get_addresses_for_owner,
     get_domain,
@@ -220,6 +222,52 @@ async def api_address_rotate(
     return True
 
 
+@http_try_except
+@nostrnip5_api_router.put(
+    "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",
+    dependencies=[Depends(check_admin)],
+    status_code=HTTPStatus.CREATED,
+)
+async def api_address_reimburse(
+    domain_id: str,
+    adddress_id: str,
+):
+
+    # make sure the address belongs to the user
+    domain = await get_domain_by_id(domain_id)
+    assert domain, "Domain does not exist."
+
+    address = await get_address(domain_id, adddress_id)
+
+    assert address and address.domain_id == domain_id, "Domain ID missmatch"
+    payment_hash = address.config.reimburse_payment_hash
+    assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
+
+    payment = get_standalone_payment(checking_id_or_hash=payment_hash)
+    assert payment, f"No payment found to reimburse '{payment_hash}'."
+    wallet_id = payment.extra.get("reimburse_wallet_id")
+    assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."
+
+    payment_hash, payment_request = await create_invoice(
+        wallet_id=wallet_id,
+        amount=address.reimburse_amount,
+        memo=f"Reimbursement for NIP-05 for {address.local_part}@{domain.domain}",
+        extra={
+            "tag": "nostrnip5",
+            "domain_id": domain_id,
+            "address_id": address.id,
+            "local_part": address.local_part,
+            "action": "reimburse",
+        },
+    )
+
+    return {
+        "payment_hash": payment_hash,
+        "payment_request": payment_request,
+        "address_id": address.id,
+    }
+
+
 @http_try_except
 @nostrnip5_api_router.post(
     "/api/v1/domain/{domain_id}/address", status_code=HTTPStatus.CREATED
@@ -237,6 +285,9 @@ async def api_address_create(
     assert address_data.domain_id == domain_id, "Domain ID missmatch"
     address, price_in_sats = await create_address(domain, address_data, user_id)
 
+    # in case the user pays, but the identifier is no longer available
+    wallet_id = await get_wallets(user_id)[0] if user_id else None
+
     payment_hash, payment_request = await create_invoice(
         wallet_id=domain.wallet,
         amount=price_in_sats,
@@ -245,6 +296,8 @@ async def api_address_create(
             "tag": "nostrnip5",
             "domain_id": domain_id,
             "address_id": address.id,
+            "action": "activate",
+            "reimburse_wallet_id": wallet_id,
         },
     )
 

From 80e704eabd2cb4b808457e8cc5b4ad72f11517ef Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 8 Jul 2024 16:14:29 +0300
Subject: [PATCH 04/25] fix: missing await

---
 views_api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views_api.py b/views_api.py
index 1681d76..fb19368 100644
--- a/views_api.py
+++ b/views_api.py
@@ -243,7 +243,7 @@ async def api_address_reimburse(
     payment_hash = address.config.reimburse_payment_hash
     assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
 
-    payment = get_standalone_payment(checking_id_or_hash=payment_hash)
+    payment = await get_standalone_payment(checking_id_or_hash=payment_hash)
     assert payment, f"No payment found to reimburse '{payment_hash}'."
     wallet_id = payment.extra.get("reimburse_wallet_id")
     assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."
@@ -286,7 +286,7 @@ async def api_address_create(
     address, price_in_sats = await create_address(domain, address_data, user_id)
 
     # in case the user pays, but the identifier is no longer available
-    wallet_id = await get_wallets(user_id)[0] if user_id else None
+    wallet_id = (await get_wallets(user_id))[0] if user_id else None
 
     payment_hash, payment_request = await create_invoice(
         wallet_id=domain.wallet,

From 6c0c5e8f14978744a3a26425311d0129ae9c14d3 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 8 Jul 2024 17:04:42 +0300
Subject: [PATCH 05/25] fix: update address for reimbursment

---
 crud.py      |  6 +++---
 views_api.py | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/crud.py b/crud.py
index d3f6584..18f8e84 100644
--- a/crud.py
+++ b/crud.py
@@ -209,7 +209,7 @@ async def rotate_address(domain_id: str, address_id: str, pubkey: str) -> Addres
 async def update_address(domain_id: str, address_id: str, **kwargs) -> Address:
     set_clause: List[str] = []
     set_variables: List[Any] = []
-    valid_keys = [k for k in vars(Address) if not k.startswith("__")]
+    valid_keys = [k for k in Address.__fields__.keys() if not k.startswith("_")]
     for key, value in kwargs.items():
         if key not in valid_keys:
             continue
@@ -221,8 +221,8 @@ async def update_address(domain_id: str, address_id: str, **kwargs) -> Address:
             set_clause.append(f"{key} = ?")
             set_variables.append(value)
 
-        set_variables.append(domain_id)
-        set_variables.append(address_id)
+    set_variables.append(domain_id)
+    set_variables.append(address_id)
 
     await db.execute(
         f"""
diff --git a/views_api.py b/views_api.py
index fb19368..8a9d2ba 100644
--- a/views_api.py
+++ b/views_api.py
@@ -32,6 +32,7 @@
     get_identifier_ranking,
     get_settings,
     rotate_address,
+    update_address,
     update_domain_internal,
     update_identifier_ranking,
 )
@@ -223,27 +224,27 @@ async def api_address_rotate(
 
 
 @http_try_except
-@nostrnip5_api_router.put(
+@nostrnip5_api_router.get(
     "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",
     dependencies=[Depends(check_admin)],
     status_code=HTTPStatus.CREATED,
 )
 async def api_address_reimburse(
     domain_id: str,
-    adddress_id: str,
+    address_id: str,
 ):
 
     # make sure the address belongs to the user
     domain = await get_domain_by_id(domain_id)
     assert domain, "Domain does not exist."
 
-    address = await get_address(domain_id, adddress_id)
+    address = await get_address(domain_id, address_id)
 
     assert address and address.domain_id == domain_id, "Domain ID missmatch"
     payment_hash = address.config.reimburse_payment_hash
     assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
 
-    payment = await get_standalone_payment(checking_id_or_hash=payment_hash)
+    payment = await get_standalone_payment(checking_id_or_hash=payment_hash, incoming=True)
     assert payment, f"No payment found to reimburse '{payment_hash}'."
     wallet_id = payment.extra.get("reimburse_wallet_id")
     assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."
@@ -286,7 +287,7 @@ async def api_address_create(
     address, price_in_sats = await create_address(domain, address_data, user_id)
 
     # in case the user pays, but the identifier is no longer available
-    wallet_id = (await get_wallets(user_id))[0] if user_id else None
+    wallet_id = (await get_wallets(user_id))[0].id if user_id else None
 
     payment_hash, payment_request = await create_invoice(
         wallet_id=domain.wallet,

From b5b07460d384c46a852c4cf47d609d4f96c4810a Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 9 Jul 2024 11:32:55 +0300
Subject: [PATCH 06/25] feat: show reimburse qr code

---
 templates/nostrnip5/index.html | 89 ++++++++++++++++++++++++++++++++--
 views_api.py                   |  7 +--
 2 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index 183baca..b954c13 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -177,9 +177,19 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
                   @click="deleteAddress(props.row.id)"
                 ></q-btn>
               </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
+
+              <q-td v-text="props.row.id"></q-td>
+              <q-td v-text="props.row.active"></q-td>
+              <q-td v-text="props.row.domain_id"></q-td>
+              <q-td v-text="props.row.local_part"></q-td>
+              <q-td v-text="props.row.pubkey"></q-td>
+              <q-td
+                v-text="props.row.reimburse_amount"
+                @click="showReimburseInvoice(props.row)"
+                class="cursor-pointer"
+              >
               </q-td>
+              <q-td v-text="props.row.time"></q-td>
             </q-tr>
           </template>
           {% endraw %}
@@ -239,10 +249,10 @@ <h6 class="text-subtitle1 q-my-none">
         <q-input
           filled
           dense
-          v-model.trim="formDialog.data.cost"
+          v-model="formDialog.data.cost"
           type="number"
           min="0"
-          step="1"
+          step="any"
           label="Price"
           placeholder="How much do you want to charge per address?"
         ></q-input>
@@ -580,6 +590,30 @@ <h6 class="q-mt-none">Settings</h6>
       </q-form>
     </q-card>
   </q-dialog>
+
+  <q-dialog v-model="qrCodeDialog.show" position="top">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card text-center">
+      <a
+        class="text-secondary"
+        :href="'lightning:' + qrCodeDialog.data.payment_request"
+      >
+        <q-responsive :ratio="1" class="q-mx-xs">
+          <qrcode
+            :value="qrCodeDialog.data.payment_request"
+            :options="{width: 400}"
+            class="rounded-borders"
+          ></qrcode>
+        </q-responsive>
+      </a>
+      <br />
+      <q-btn
+        outline
+        color="grey"
+        @click="copyText('lightning:' + qrCodeDialog.data.payment_request, 'Invoice copied to clipboard!')"
+        >Copy Invoice</q-btn
+      >
+    </q-card>
+  </q-dialog>
 </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script>
@@ -589,11 +623,12 @@ <h6 class="q-mt-none">Settings</h6>
       'YYYY-MM-DD HH:mm'
     )
 
-    obj.cost = parseFloat(obj.cost).toFixed(2)
+    // obj.cost = parseFloat(obj.cost).toFixed(2)
 
     return obj
   }
 
+  Vue.component(VueQrcode.name, VueQrcode)
   new Vue({
     el: '#vue',
     mixins: [windowMixin],
@@ -828,6 +863,13 @@ <h6 class="q-mt-none">Settings</h6>
               field: 'pubkey',
               sortable: true
             },
+            {
+              name: 'reimburse_amount',
+              align: 'left',
+              label: 'Reimburse',
+              field: 'reimburse_amount',
+              sortable: true
+            },
             {
               name: 'time',
               align: 'left',
@@ -862,6 +904,10 @@ <h6 class="q-mt-none">Settings</h6>
         settingsFormDialog: {
           show: false,
           data: {}
+        },
+        qrCodeDialog: {
+          show: false,
+          data: {}
         }
       }
     },
@@ -888,6 +934,10 @@ <h6 class="q-mt-none">Settings</h6>
           identifier: ''
         }
         this.settingsFormDialog.show = false
+        this.qrCodeDialog.show = false
+        this.qrCodeDialog.data = {
+          payment_request: ''
+        }
       },
       closeAddressFormDialog: function () {
         this.resetFormDialog()
@@ -1070,6 +1120,35 @@ <h6 class="q-mt-none">Settings</h6>
               })
           })
       },
+      showReimburseInvoice: function (address) {
+        console.log('### address', address)
+        if (!address || address.reimburse_amount <= 0) {
+          this.$q.notify({
+            type: 'warning',
+            message: 'Nothing to reimburse.'
+          })
+          return
+        }
+        var self = this
+        self.$q.notify({
+          type: 'positive',
+          message: 'Generating reimbursement invoice.'
+        })
+        return LNbits.api
+          .request(
+            'GET',
+            `/nostrnip5/api/v1/domain/${address.domain_id}` +
+              `/address/${address.id}/reimburse`,
+            self.g.user.wallets[0].adminkey
+          )
+          .then(function (response) {
+            self.qrCodeDialog.show = true
+            self.qrCodeDialog.data = response.data
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
       refreshDomainRanking: function (braket) {
         var self = this
         return LNbits.api
diff --git a/views_api.py b/views_api.py
index 8a9d2ba..52a5a87 100644
--- a/views_api.py
+++ b/views_api.py
@@ -32,7 +32,6 @@
     get_identifier_ranking,
     get_settings,
     rotate_address,
-    update_address,
     update_domain_internal,
     update_identifier_ranking,
 )
@@ -239,12 +238,14 @@ async def api_address_reimburse(
     assert domain, "Domain does not exist."
 
     address = await get_address(domain_id, address_id)
+    assert address and (address.domain_id == domain_id), "Domain ID missmatch"
 
-    assert address and address.domain_id == domain_id, "Domain ID missmatch"
     payment_hash = address.config.reimburse_payment_hash
     assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
 
-    payment = await get_standalone_payment(checking_id_or_hash=payment_hash, incoming=True)
+    payment = await get_standalone_payment(
+        checking_id_or_hash=payment_hash, incoming=True
+    )
     assert payment, f"No payment found to reimburse '{payment_hash}'."
     wallet_id = payment.extra.get("reimburse_wallet_id")
     assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."

From 55ee65860e2314e8dd75bcf33fb932473c8f5ddf Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 9 Jul 2024 11:43:31 +0300
Subject: [PATCH 07/25] feat: nicer address in table

---
 templates/nostrnip5/index.html | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index b954c13..f79682b 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -181,7 +181,9 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
               <q-td v-text="props.row.id"></q-td>
               <q-td v-text="props.row.active"></q-td>
               <q-td v-text="props.row.domain_id"></q-td>
-              <q-td v-text="props.row.local_part"></q-td>
+              <q-td>
+                <span v-text="addressFullName(props.row)"></span>
+              </q-td>
               <q-td v-text="props.row.pubkey"></q-td>
               <q-td
                 v-text="props.row.reimburse_amount"
@@ -852,7 +854,7 @@ <h6 class="q-mt-none">Settings</h6>
             {
               name: 'local_part',
               align: 'left',
-              label: 'Local Part',
+              label: 'Address',
               field: 'local_part',
               sortable: true
             },
@@ -1285,6 +1287,19 @@ <h6 class="q-mt-none">Settings</h6>
           this.formDialog.data.cost_config.rank_cost.splice(index, 1)
         }
       },
+      domainNameFromId: function (domainId) {
+        console.log('### domainId', domainId)
+        const domain = this.domains.find(d => d.id === domainId) || {}
+        return domain.domain || ''
+      },
+      addressFullName: function (address) {
+        console.log('### ', address)
+        if (!address) {
+          return ''
+        }
+        const domain = this.domainNameFromId(address.domain_id)
+        return `${address.local_part}@${domain}`
+      },
       exportCSV: function () {
         LNbits.utils.exportCSV(this.domainsTable.columns, this.domains)
       },

From 2e4968fd44d7c86ed9cd775ec6beb81275b58813 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 9 Jul 2024 11:59:27 +0300
Subject: [PATCH 08/25] fix: sort by reimburse amount

---
 models.py                      |  1 +
 templates/nostrnip5/index.html | 16 +++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/models.py b/models.py
index e9f29f7..07c6ef2 100644
--- a/models.py
+++ b/models.py
@@ -156,6 +156,7 @@ def price_formatted(self) -> str:
 class AddressFilters(FilterModel):
     domain_id: str
     local_part: str
+    reimburse_amount: str
     pubkey: str
     active: bool
     time: int
diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index f79682b..b329249 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -180,8 +180,12 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
 
               <q-td v-text="props.row.id"></q-td>
               <q-td v-text="props.row.active"></q-td>
-              <q-td v-text="props.row.domain_id"></q-td>
+
               <q-td>
+                <q-tooltip>
+                  <span>Domain ID:</span>
+                  <span v-text="props.row.domain_id"></span
+                ></q-tooltip>
                 <span v-text="addressFullName(props.row)"></span>
               </q-td>
               <q-td v-text="props.row.pubkey"></q-td>
@@ -844,13 +848,6 @@ <h6 class="q-mt-none">Settings</h6>
               field: 'active',
               sortable: true
             },
-            {
-              name: 'domain_id',
-              align: 'left',
-              label: 'Domain',
-              field: 'domain_id',
-              sortable: true
-            },
             {
               name: 'local_part',
               align: 'left',
@@ -1123,7 +1120,6 @@ <h6 class="q-mt-none">Settings</h6>
           })
       },
       showReimburseInvoice: function (address) {
-        console.log('### address', address)
         if (!address || address.reimburse_amount <= 0) {
           this.$q.notify({
             type: 'warning',
@@ -1288,12 +1284,10 @@ <h6 class="q-mt-none">Settings</h6>
         }
       },
       domainNameFromId: function (domainId) {
-        console.log('### domainId', domainId)
         const domain = this.domains.find(d => d.id === domainId) || {}
         return domain.domain || ''
       },
       addressFullName: function (address) {
-        console.log('### ', address)
         if (!address) {
           return ''
         }

From 9b3c8cac0c9582477db56706f4fbaf682617d34b Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 11 Jul 2024 11:46:49 +0300
Subject: [PATCH 09/25] refactor: extract `get_reimburse_wallet_id`

---
 services.py  | 13 +++++++++++++
 views_api.py | 17 +++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/services.py b/services.py
index 5b28cd1..0246b3d 100644
--- a/services.py
+++ b/services.py
@@ -164,6 +164,19 @@ async def check_address_payment(domain_id: str, payment_hash: str) -> bool:
     return status.success
 
 
+async def get_reimburse_wallet_id(address: Address) -> str:
+    payment_hash = address.config.reimburse_payment_hash
+    assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
+
+    payment = await get_standalone_payment(
+        checking_id_or_hash=payment_hash, incoming=True
+    )
+    assert payment, f"No payment found to reimburse '{payment_hash}'."
+    wallet_id = payment.extra.get("reimburse_wallet_id")
+    assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."
+    return wallet_id
+
+
 async def reimburse_payment(payment: Payment):
     reimburse_wallet_ids = payment.extra.get("reimburse_wallet_ids", [])
     domain_id = payment.extra.get("domain_id")
diff --git a/views_api.py b/views_api.py
index 52a5a87..24e0f40 100644
--- a/views_api.py
+++ b/views_api.py
@@ -3,7 +3,7 @@
 
 import httpx
 from fastapi import APIRouter, Depends, Query, Request, Response
-from lnbits.core.crud import get_standalone_payment, get_wallets
+from lnbits.core.crud import get_wallets
 from lnbits.core.models import User, WalletTypeInfo
 from lnbits.core.services import create_invoice
 from lnbits.db import Filters, Page
@@ -57,6 +57,7 @@
     check_address_payment,
     create_address,
     get_identifier_status,
+    get_reimburse_wallet_id,
     get_user_addresses,
     get_user_addresses_paginated,
     get_user_domains,
@@ -237,18 +238,10 @@ async def api_address_reimburse(
     domain = await get_domain_by_id(domain_id)
     assert domain, "Domain does not exist."
 
-    address = await get_address(domain_id, address_id)
-    assert address and (address.domain_id == domain_id), "Domain ID missmatch"
+    address = await get_address(domain.id, address_id)
+    assert address and (address.domain_id == domain.id), "Domain ID missmatch"
 
-    payment_hash = address.config.reimburse_payment_hash
-    assert payment_hash, f"No payment hash found to reimburse '{address.id}'."
-
-    payment = await get_standalone_payment(
-        checking_id_or_hash=payment_hash, incoming=True
-    )
-    assert payment, f"No payment found to reimburse '{payment_hash}'."
-    wallet_id = payment.extra.get("reimburse_wallet_id")
-    assert wallet_id, f"No wallet found to reimburse payment {payment_hash}."
+    wallet_id = await get_reimburse_wallet_id(address)
 
     payment_hash, payment_request = await create_invoice(
         wallet_id=wallet_id,

From 8f3ee6e4f6eca477c863eacae031893683319a8e Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 11 Jul 2024 12:23:52 +0300
Subject: [PATCH 10/25] feat: add address edit button

---
 templates/nostrnip5/index.html | 16 +++++++++++++++-
 views_api.py                   |  5 +++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index b329249..4559a18 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -153,7 +153,7 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
                   unelevated
                   dense
                   size="xs"
-                  icon="edit"
+                  icon="link"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
                   target="_blank"
@@ -168,6 +168,14 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
                   :disable="props.row.active == true"
                   @click="activateAddress(props.row.domain_id, props.row.id)"
                 ></q-btn>
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="edit"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  @click="activateAddress(props.row.domain_id, props.row.id)"
+                ></q-btn>
                 <q-btn
                   unelevated
                   dense
@@ -1112,6 +1120,12 @@ <h6 class="q-mt-none">Settings</h6>
                 _.findWhere(self.g.user.wallets, {id: domain.wallet}).adminkey
               )
               .then(function (response) {
+                if (response.data.success) {
+                  self.$q.notify({
+                    type: 'positive',
+                    message: 'Address activated'
+                  })
+                }
                 self.getAddresses()
               })
               .catch(function (error) {
diff --git a/views_api.py b/views_api.py
index 24e0f40..90f970d 100644
--- a/views_api.py
+++ b/views_api.py
@@ -4,7 +4,7 @@
 import httpx
 from fastapi import APIRouter, Depends, Query, Request, Response
 from lnbits.core.crud import get_wallets
-from lnbits.core.models import User, WalletTypeInfo
+from lnbits.core.models import SimpleStatus, User, WalletTypeInfo
 from lnbits.core.services import create_invoice
 from lnbits.db import Filters, Page
 from lnbits.decorators import (  # type: ignore[attr-defined]
@@ -199,7 +199,8 @@ async def api_activate_address(
     domain = await get_domain(domain_id, w.wallet.id)
     assert domain, "Domain does not exist."
 
-    return await activate_address(domain_id, address_id)
+    success = await activate_address(domain_id, address_id)
+    return SimpleStatus(success=success, message="")
 
 
 @http_try_except

From 305d63b61d3f3986163d27c4e755ba3d37e0f7f5 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 11 Jul 2024 14:39:38 +0300
Subject: [PATCH 11/25] feat: add relays to addresses

---
 models.py                      |  6 +++
 templates/nostrnip5/index.html | 90 ++++++++++++++++++++++++++++++++--
 views_api.py                   | 30 +++++++++++-
 3 files changed, 120 insertions(+), 6 deletions(-)

diff --git a/models.py b/models.py
index 07c6ef2..193c7f8 100644
--- a/models.py
+++ b/models.py
@@ -19,10 +19,16 @@ class RotateAddressData(BaseModel):
     pubkey: str
 
 
+class UpdateAddressData(BaseModel):
+    pubkey: Optional[str] = None
+    relays: Optional[List[str]] = None
+
+
 class CreateAddressData(BaseModel):
     domain_id: str
     local_part: str
     pubkey: str
+    relays: Optional[List[str]] = None
 
 
 class DomainCostConfig(BaseModel):
diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index 4559a18..6b79a36 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -174,7 +174,7 @@ <h5 class="text-subtitle1 q-my-none">Addresses</h5>
                   size="xs"
                   icon="edit"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
-                  @click="activateAddress(props.row.domain_id, props.row.id)"
+                  @click="editAddress(props.row)"
                 ></q-btn>
                 <q-btn
                   unelevated
@@ -424,6 +424,7 @@ <h6 class="text-subtitle1 q-my-none">
     <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
       <q-form @submit="saveAddress" class="q-gutter-md">
         <q-select
+          v-if="!addressFormDialog.data.id"
           filled
           dense
           emit-value
@@ -439,12 +440,34 @@ <h6 class="text-subtitle1 q-my-none">
           placeholder="npub or hex"
         ></q-input>
         <q-input
+          v-if="!addressFormDialog.data.id"
           filled
           dense
           v-model.trim="addressFormDialog.data.local_part"
           label="Local Part"
           placeholder="benarc"
         ></q-input>
+        <q-input
+          filled
+          dense
+          v-model="addressFormDialog.data.relay"
+          @keydown.enter="addRelayForAddress"
+          type="text"
+          label="Relay"
+        >
+          <q-btn @click="addRelayForAddress" dense flat icon="add"></q-btn>
+        </q-input>
+        <div>
+          <q-chip
+            v-for="relay in addressFormDialog.data.config.relays"
+            :key="relay"
+            removable
+            @remove="removeRelayForAddress(relay)"
+            color="primary"
+            text-color="white"
+            ><span v-text="relay"></span
+          ></q-chip>
+        </div>
 
         <div class="row q-mt-lg">
           <q-btn
@@ -452,7 +475,9 @@ <h6 class="text-subtitle1 q-my-none">
             color="primary"
             :disable="addressFormDialog.data.domain_id == null || addressFormDialog.data.pubkey == null || addressFormDialog.data.local_part == null"
             type="submit"
-            >Create Address</q-btn
+          >
+            <span v-if="!addressFormDialog.data.id"> Create Address</span>
+            <span v-else> Update Address</span></q-btn
           >
           <q-btn v-close-popup flat color="grey" class="q-ml-auto"
             >Cancel</q-btn
@@ -929,6 +954,15 @@ <h6 class="q-mt-none">Settings</h6>
             rank_cost: []
           }
         }
+        this.addressFormDialog.show = false
+        this.addressFormDialog.data = {
+          relay: '',
+          config: {
+            relays: []
+          },
+          pubkey: '',
+          local_part: ''
+        }
         this.rankingFormDialog.show = false
         this.rankingFormDialog.data = {
           bucket: 0,
@@ -997,6 +1031,25 @@ <h6 class="q-mt-none">Settings</h6>
             })
           })
       },
+      editAddress: function (address) {
+        this.addressFormDialog.show = true
+        this.addressFormDialog.data = address
+      },
+      addRelayForAddress: function (event) {
+        event.preventDefault()
+        this.removeRelayForAddress(this.addressFormDialog.data.relay)
+        if (this.addressFormDialog.data.relay) {
+          this.addressFormDialog.data.config.relays.push(
+            this.addressFormDialog.data.relay
+          )
+        }
+        this.addressFormDialog.data.relay = ''
+      },
+      removeRelayForAddress: function (relay) {
+        this.addressFormDialog.data.config.relays = (
+          this.addressFormDialog.data.config.relays || []
+        ).filter(r => r !== relay)
+      },
       saveDomain: function () {
         var data = this.formDialog.data
         var self = this
@@ -1047,8 +1100,11 @@ <h6 class="q-mt-none">Settings</h6>
       saveAddress: function () {
         var self = this
         var formDialog = this.addressFormDialog
+        if (formDialog.data.id) {
+          this.updateAddress()
+          return
+        }
         var domain = _.findWhere(this.domains, {id: formDialog.data.domain_id})
-
         axios
           .post(
             '/nostrnip5/api/v1/domain/' +
@@ -1068,8 +1124,32 @@ <h6 class="q-mt-none">Settings</h6>
             )
           })
           .then(function (response) {
-            self.addressFormDialog.data = {}
-            self.addressFormDialog.show = false
+            self.resetFormDialog()
+            self.getAddresses()
+          })
+          .catch(function (error) {
+            LNbits.utils.notifyApiError(error)
+          })
+      },
+      updateAddress: function () {
+        var self = this
+        var data = this.addressFormDialog.data
+        var domain = _.findWhere(this.domains, {id: data.domain_id})
+        return LNbits.api
+          .request(
+            'PUT',
+            '/nostrnip5/api/v1/domain/' +
+              data.domain_id +
+              '/address/' +
+              data.id,
+            _.findWhere(self.g.user.wallets, {id: domain.wallet}).adminkey,
+            {
+              pubkey: data.pubkey,
+              relays: data.config.relays
+            }
+          )
+          .then(function (response) {
+            self.resetFormDialog()
             self.getAddresses()
           })
           .catch(function (error) {
diff --git a/views_api.py b/views_api.py
index 90f970d..10d908d 100644
--- a/views_api.py
+++ b/views_api.py
@@ -32,6 +32,7 @@
     get_identifier_ranking,
     get_settings,
     rotate_address,
+    update_address,
     update_domain_internal,
     update_identifier_ranking,
 )
@@ -51,6 +52,7 @@
     IdentifierRanking,
     Nip5Settings,
     RotateAddressData,
+    UpdateAddressData,
 )
 from .services import (
     activate_address,
@@ -171,7 +173,8 @@ async def api_domain_delete(
 
 @http_try_except
 @nostrnip5_api_router.delete(
-    "/api/v1/address/{domain_id}/{address_id}", status_code=HTTPStatus.GONE
+    "/api/v1/address/{domain_id}/{address_id}",
+    status_code=HTTPStatus.GONE,  # todo add /address
 )
 async def api_delete_address(
     domain_id: str,
@@ -224,6 +227,31 @@ async def api_address_rotate(
     return True
 
 
+# todo: anonimous
+@http_try_except
+@nostrnip5_api_router.put(
+    "/api/v1/domain/{domain_id}/address/{address_id}",
+    status_code=HTTPStatus.OK,
+)
+async def api_set_address_update(
+    domain_id: str,
+    address_id: str,
+    data: UpdateAddressData,
+    w: WalletTypeInfo = Depends(require_admin_key),  # todo: change my own address
+):
+    # make sure the address belongs to the user
+    domain = await get_domain(domain_id, w.wallet.id)
+    assert domain, "Domain does not exist."
+
+    address = await get_address(domain.id, address_id)
+    assert address and (address.domain_id == domain.id), "Domain ID missmatch"
+
+    pubkey = data.pubkey if data.pubkey else address.pubkey
+    if data.relays:
+        address.config.relays = data.relays
+    await update_address(domain.id, address.id, pubkey=pubkey, config=address.config)
+
+
 @http_try_except
 @nostrnip5_api_router.get(
     "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",

From 9031409d2c914661dc467602b83ba0a4fbe63ba7 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Fri, 12 Jul 2024 16:33:20 +0300
Subject: [PATCH 12/25] feat: improvements based on UI testing

---
 views_api.py | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/views_api.py b/views_api.py
index 10d908d..34c3e78 100644
--- a/views_api.py
+++ b/views_api.py
@@ -119,14 +119,18 @@ async def api_get_addresses_paginated(
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/addresses/user", status_code=HTTPStatus.OK)
 async def api_get_user_addresses(
-    user_id: Optional[str] = Depends(optional_user_id),
+    user_id: Optional[str] = Depends(optional_user_id), local_part: Optional[str] = None
 ):
     if not user_id:
         raise HTTPException(HTTPStatus.UNAUTHORIZED)
 
     owner_id = owner_id_from_user_id(user_id)
     assert owner_id
-    return [address.dict() for address in await get_addresses_for_owner(owner_id)]
+    return [
+        address.dict()
+        for address in await get_addresses_for_owner(owner_id)
+        if not local_part or address.local_part == local_part
+    ]
 
 
 @http_try_except
@@ -233,23 +237,29 @@ async def api_address_rotate(
     "/api/v1/domain/{domain_id}/address/{address_id}",
     status_code=HTTPStatus.OK,
 )
-async def api_set_address_update(
+async def api_update_address(
     domain_id: str,
     address_id: str,
     data: UpdateAddressData,
-    w: WalletTypeInfo = Depends(require_admin_key),  # todo: change my own address
-):
-    # make sure the address belongs to the user
-    domain = await get_domain(domain_id, w.wallet.id)
-    assert domain, "Domain does not exist."
+    user_id: Optional[str] = Depends(optional_user_id),
+) -> Address:
 
-    address = await get_address(domain.id, address_id)
-    assert address and (address.domain_id == domain.id), "Domain ID missmatch"
+    if not user_id:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED)
+
+    address = await get_address(domain_id, address_id)
+    assert address, "Address not found"
+    assert address.domain_id == domain_id, "Domain ID missmatch"
+
+    owner_id = owner_id_from_user_id(user_id)  # todo: allow for admins
+    assert address.owner_id == owner_id, "Address does not belong to this user"
 
     pubkey = data.pubkey if data.pubkey else address.pubkey
     if data.relays:
         address.config.relays = data.relays
-    await update_address(domain.id, address.id, pubkey=pubkey, config=address.config)
+    await update_address(domain_id, address.id, pubkey=pubkey, config=address.config)
+
+    return address
 
 
 @http_try_except

From 4603de05dd11686b1d04b8bf41513d6a79bba6b0 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 15 Jul 2024 12:11:26 +0300
Subject: [PATCH 13/25] feat: take into account the number of years

---
 models.py                       | 20 +++++++++++----
 services.py                     | 45 +++++++++++++++++++++++----------
 templates/nostrnip5/index.html  | 14 +++++++++-
 templates/nostrnip5/signup.html | 21 +++++++++++++--
 views.py                        |  9 +++++--
 views_api.py                    |  4 +--
 6 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/models.py b/models.py
index 193c7f8..3e69085 100644
--- a/models.py
+++ b/models.py
@@ -28,10 +28,12 @@ class CreateAddressData(BaseModel):
     domain_id: str
     local_part: str
     pubkey: str
+    years: int
     relays: Optional[List[str]] = None
 
 
 class DomainCostConfig(BaseModel):
+    max_years: int = 1
     enable_custom_cost: bool = False
     char_count_cost: List[CustomCost] = []
     rank_cost: List[CustomCost] = []
@@ -82,13 +84,17 @@ class Domain(PublicDomain):
     time: int
 
     def price_for_identifier(
-        self, identifier: str, rank: Optional[int] = None
+        self, identifier: str, years: int, rank: Optional[int] = None
     ) -> Tuple[float, str]:
+        assert (
+            1 <= years <= self.cost_config.max_years
+        ), f"Number of years must be between '1' and '{self.cost_config.max_years}'."
+
         identifier = normalize_identifier(identifier)
         max_amount = self.cost
         reason = ""
         if not self.cost_config.enable_custom_cost:
-            return max_amount, reason
+            return max_amount * years, reason
 
         for char_cost in self.cost_config.char_count_cost:
             if len(identifier) <= char_cost.bracket and max_amount < char_cost.amount:
@@ -96,17 +102,19 @@ def price_for_identifier(
                 reason = f"{len(identifier)} characters"
 
         if not rank:
-            return max_amount, reason
+            return max_amount * years, reason
 
         for rank_cost in self.cost_config.rank_cost:
             if rank <= rank_cost.bracket and max_amount < rank_cost.amount:
                 max_amount = rank_cost.amount
                 reason = f"Top {rank_cost.bracket} identifier"
 
-        return max_amount, reason
+        return max_amount * years, reason
 
     def public_data(self):
-        return PublicDomain(**dict(self))
+        data = dict(PublicDomain(**dict(self)))
+        data["max_years"] = self.cost_config.max_years
+        return data
 
     @classmethod
     def from_row(cls, row: Row) -> "Domain":
@@ -118,6 +126,8 @@ def from_row(cls, row: Row) -> "Domain":
 
 
 class AddressConfig(BaseModel):
+    price: Optional[float] = None
+    price_in_sats: Optional[float] = None
     payment_hash: Optional[str] = None
     reimburse_payment_hash: Optional[str] = None
     activated_by_owner: bool = False
diff --git a/services.py b/services.py
index 0246b3d..af1e75a 100644
--- a/services.py
+++ b/services.py
@@ -19,13 +19,21 @@
     get_all_addresses_paginated,
     get_domains,
     get_identifier_ranking,
+    update_address,
 )
 from .helpers import (
     normalize_identifier,
     owner_id_from_user_id,
     validate_pub_key,
 )
-from .models import Address, AddressFilters, AddressStatus, CreateAddressData, Domain
+from .models import (
+    Address,
+    AddressConfig,
+    AddressFilters,
+    AddressStatus,
+    CreateAddressData,
+    Domain,
+)
 
 
 async def get_user_domains(
@@ -70,7 +78,9 @@ async def get_user_addresses_paginated(
     return await get_all_addresses_paginated(wallet_ids, filters)
 
 
-async def get_identifier_status(domain: Domain, identifier: str) -> AddressStatus:
+async def get_identifier_status(
+    domain: Domain, identifier: str, years: int
+) -> AddressStatus:
     identifier = normalize_identifier(identifier)
     address = await get_active_address_by_local_part(domain.id, identifier)
     if address:
@@ -84,7 +94,7 @@ async def get_identifier_status(domain: Domain, identifier: str) -> AddressStatu
     if rank == 0:
         return AddressStatus(identifier=identifier, available=False)
 
-    price, reason = domain.price_for_identifier(identifier, rank)
+    price, reason = domain.price_for_identifier(identifier, years, rank)
 
     return AddressStatus(
         identifier=identifier,
@@ -96,30 +106,37 @@ async def get_identifier_status(domain: Domain, identifier: str) -> AddressStatu
 
 
 async def create_address(
-    domain: Domain, address_data: CreateAddressData, user_id: Optional[str] = None
+    domain: Domain, data: CreateAddressData, user_id: Optional[str] = None
 ) -> Tuple[Address, float]:
 
-    identifier = normalize_identifier(address_data.local_part)
-    address_data.local_part = identifier
-    address_data.pubkey = validate_pub_key(address_data.pubkey)
+    identifier = normalize_identifier(data.local_part)
+    data.local_part = identifier
+    data.pubkey = validate_pub_key(data.pubkey)
 
-    identifier_status = await get_identifier_status(domain, identifier)
+    identifier_status = await get_identifier_status(domain, identifier, data.years)
 
     assert identifier_status.available, f"Identifier '{identifier}' not available."
     assert identifier_status.price, f"Cannot compute price for '{identifier}'."
 
-    owner_id = owner_id_from_user_id(user_id)
-    existing_address = await get_address_for_owner(owner_id, domain.id, identifier)
-
-    address = existing_address or await create_address_internal(address_data, owner_id)
-
     price_in_sats = (
         identifier_status.price
         if domain.currency == "sats"
         else await fiat_amount_as_satoshis(identifier_status.price, domain.currency)
     )
+    assert price_in_sats, f"Cannot compute price for '{identifier}'."
 
-    assert price_in_sats, f"Cannot compute price for {identifier}"
+    owner_id = owner_id_from_user_id(user_id)
+    existing_address = await get_address_for_owner(owner_id, domain.id, identifier)
+    if existing_address:
+        config = existing_address.config
+        config.price = identifier_status.price
+        config.price_in_sats = price_in_sats
+        address = await update_address(domain.id, existing_address.id, config=config)
+    else:
+        config = AddressConfig(
+            price=identifier_status.price, price_in_sats=price_in_sats
+        )
+        address = await create_address_internal(data, owner_id, config=config)
 
     return address, price_in_sats
 
diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index 6b79a36..f65749a 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -267,9 +267,20 @@ <h6 class="text-subtitle1 q-my-none">
           type="number"
           min="0"
           step="any"
-          label="Price"
+          label="Price per Year"
           placeholder="How much do you want to charge per address?"
         ></q-input>
+        <q-input
+          filled
+          dense
+          v-model="formDialog.data.cost_config.max_years"
+          type="number"
+          min="1"
+          step="1"
+          label="Max Years"
+          hint="Maximum number of years a user can have an address before renewing."
+        ></q-input>
+
         <q-toggle
           v-model="formDialog.data.cost_config.enable_custom_cost"
           label="Advanced cost configurations"
@@ -949,6 +960,7 @@ <h6 class="q-mt-none">Settings</h6>
         this.domainTab = 'charCount'
         this.formDialog.data = {
           cost_config: {
+            max_years: 1,
             enable_custom_cost: false,
             char_count_cost: [],
             rank_cost: []
diff --git a/templates/nostrnip5/signup.html b/templates/nostrnip5/signup.html
index a36dea3..a692880 100644
--- a/templates/nostrnip5/signup.html
+++ b/templates/nostrnip5/signup.html
@@ -77,7 +77,7 @@ <h3>Important!</h3>
           <div class="col">
             <p>
               The price for this identifier is
-              <strong> {{identifier_cost}} {{domain.currency}} </strong>
+              <strong> {{identifier_cost}} {{domain.currency}} per year</strong>
               and will be tied to this nostr pubkey:
             </p>
           </div>
@@ -99,6 +99,21 @@ <h3>Important!</h3>
           </div>
           <div class="col-md-2 col-sm-1 q-mt-sm"><span></span></div>
         </div>
+        <div class="row">
+          <div class="col-md-2 col-sm-11 q-mt-sm">
+            <q-select
+              filled
+              dense
+              :options="Array.from({length: maxYears}, (_, i) => i + 1)"
+              v-model="formDialog.data.years"
+              label="Years"
+              hint="Buy for this number of years."
+              class="q-mr-md"
+            >
+            </q-select>
+          </div>
+          <div class="col-md-10 col-sm-1 q-mt-sm"><span></span></div>
+        </div>
 
         <div class="row q-mt-lg">
           <q-btn
@@ -110,7 +125,7 @@ <h3>Important!</h3>
           >
         </div>
       </div>
-      <div v-else>
+      <div v-else-if="identifier">
         <p>This identifier is not available.</p>
       </div>
     </q-form>
@@ -158,6 +173,7 @@ <h3>Important!</h3>
         domain_id: '{{ domain_id }}',
         wallet: '{{ domain.wallet }}',
         currency: '{{ domain.currency }}',
+        maxYears: '{{ domain.max_years }}',
         identifier: '{{ identifier }}',
         identifierCost: '{{ identifier_cost }}',
         identifierAvailable: '{{ identifier_available }}' === 'True',
@@ -175,6 +191,7 @@ <h3>Important!</h3>
         formDialog: {
           data: {
             local_part: '{{ identifier or "" }}',
+            years: 1,
             pubkey: ''
           }
         },
diff --git a/views.py b/views.py
index a1e25e6..4d255da 100644
--- a/views.py
+++ b/views.py
@@ -41,14 +41,19 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
 
 
 @nostrnip5_generic_router.get("/signup/{domain_id}", response_class=HTMLResponse)
-async def signup(request: Request, domain_id: str, identifier: Optional[str] = None):
+async def signup(
+    request: Request,
+    domain_id: str,
+    identifier: Optional[str] = None,
+    years: Optional[int] = None,
+):
     domain = await get_domain_by_id(domain_id)
 
     if not domain:
         raise HTTPException(HTTPStatus.NOT_FOUND, "Domain does not exist.")
 
     status = (
-        await get_identifier_status(domain, identifier)
+        await get_identifier_status(domain, identifier, years or 1)
         if identifier
         else AddressStatus(identifier="", available=True)
     )
diff --git a/views_api.py b/views_api.py
index 34c3e78..787afc0 100644
--- a/views_api.py
+++ b/views_api.py
@@ -356,7 +356,7 @@ async def api_check_address_payment(domain_id: str, payment_hash: str):
     "/api/v1/domain/{domain_id}/search", status_code=HTTPStatus.OK
 )
 async def api_search_identifier(
-    domain_id: str, q: Optional[str] = None
+    domain_id: str, q: Optional[str] = None, years: Optional[int] = None
 ) -> AddressStatus:
 
     if not q:
@@ -365,7 +365,7 @@ async def api_search_identifier(
     domain = await get_domain_by_id(domain_id)
     assert domain, "Unknown domain id."
 
-    return await get_identifier_status(domain, q)
+    return await get_identifier_status(domain, q, years or 1)
 
 
 @http_try_except

From e2610aea2b8e366d7377af2a84048dd14cb75c1d Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Mon, 15 Jul 2024 16:22:26 +0300
Subject: [PATCH 14/25] feat: get_valid_addresses_for_owner

---
 crud.py      |  6 +++++-
 models.py    |  2 ++
 services.py  | 39 +++++++++++++++++++++++++++++++++++++++
 views_api.py | 13 ++++++-------
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/crud.py b/crud.py
index 18f8e84..204baf8 100644
--- a/crud.py
+++ b/crud.py
@@ -116,7 +116,11 @@ async def get_address_for_owner(
 
 async def get_addresses_for_owner(owner_id: str) -> List[Address]:
     rows = await db.fetchall(
-        "SELECT * FROM nostrnip5.addresses WHERE owner_id = ?", (owner_id,)
+        """
+            SELECT * FROM nostrnip5.addresses WHERE owner_id = ?
+            ORDER BY time DESC
+        """,
+        (owner_id,),
     )
 
     return [Address.from_row(row) for row in rows]
diff --git a/models.py b/models.py
index 3e69085..d20bf5b 100644
--- a/models.py
+++ b/models.py
@@ -126,6 +126,7 @@ def from_row(cls, row: Row) -> "Domain":
 
 
 class AddressConfig(BaseModel):
+    currency: Optional[str] = None
     price: Optional[float] = None
     price_in_sats: Optional[float] = None
     payment_hash: Optional[str] = None
@@ -158,6 +159,7 @@ class AddressStatus(BaseModel):
     identifier: str
     available: bool = False
     price: Optional[float] = None
+    price_in_sats: Optional[float] = None
     price_reason: Optional[str] = None
     currency: Optional[str] = None
 
diff --git a/services.py b/services.py
index af1e75a..7bc92a1 100644
--- a/services.py
+++ b/services.py
@@ -15,8 +15,10 @@
     get_active_address_by_local_part,
     get_address,
     get_address_for_owner,
+    get_addresses_for_owner,
     get_all_addresses,
     get_all_addresses_paginated,
+    get_domain_by_id,
     get_domains,
     get_identifier_ranking,
     update_address,
@@ -96,10 +98,17 @@ async def get_identifier_status(
 
     price, reason = domain.price_for_identifier(identifier, years, rank)
 
+    price_in_sats = (
+        price
+        if domain.currency == "sats"
+        else await fiat_amount_as_satoshis(price, domain.currency)
+    )
+
     return AddressStatus(
         identifier=identifier,
         available=True,
         price=price,
+        price_in_sats=price_in_sats,
         price_reason=reason,
         currency=domain.currency,
     )
@@ -164,6 +173,36 @@ async def activate_address(
         return False
 
 
+async def get_valid_addresses_for_owner(
+    owner_id: str, local_part: Optional[str] = None, active: Optional[bool] = None
+) -> List[Address]:
+
+    valid_addresses = []
+    addresses = await get_addresses_for_owner(owner_id)
+    for address in addresses:
+        if active is not None and active != address.active:
+            continue
+        if local_part and address.local_part != local_part:
+            continue
+        domain = await get_domain_by_id(address.domain_id)
+        if not domain:
+            continue
+        status = await get_identifier_status(domain, address.local_part, years=1)
+
+        if status.available:
+            # update to latest price
+            address.config.price_in_sats = status.price_in_sats
+            address.config.price = status.price
+        elif not address.active:
+            # do not return addresses which cannot be sold
+            continue
+
+        address.config.currency = domain.currency
+        valid_addresses.append(address)
+
+    return valid_addresses
+
+
 async def check_address_payment(domain_id: str, payment_hash: str) -> bool:
     payment = await get_standalone_payment(payment_hash, incoming=True)
     assert payment, "Payment does not exist."
diff --git a/views_api.py b/views_api.py
index 787afc0..7f885bf 100644
--- a/views_api.py
+++ b/views_api.py
@@ -26,7 +26,6 @@
     delete_domain,
     get_address,
     get_addresses,
-    get_addresses_for_owner,
     get_domain,
     get_domain_by_id,
     get_identifier_ranking,
@@ -63,6 +62,7 @@
     get_user_addresses,
     get_user_addresses_paginated,
     get_user_domains,
+    get_valid_addresses_for_owner,
     refresh_buckets,
     update_identifiers,
 )
@@ -119,18 +119,16 @@ async def api_get_addresses_paginated(
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/addresses/user", status_code=HTTPStatus.OK)
 async def api_get_user_addresses(
-    user_id: Optional[str] = Depends(optional_user_id), local_part: Optional[str] = None
+    user_id: Optional[str] = Depends(optional_user_id),
+    local_part: Optional[str] = None,
+    active: Optional[bool] = None,
 ):
     if not user_id:
         raise HTTPException(HTTPStatus.UNAUTHORIZED)
 
     owner_id = owner_id_from_user_id(user_id)
     assert owner_id
-    return [
-        address.dict()
-        for address in await get_addresses_for_owner(owner_id)
-        if not local_part or address.local_part == local_part
-    ]
+    return await get_valid_addresses_for_owner(owner_id, local_part, active)
 
 
 @http_try_except
@@ -170,6 +168,7 @@ async def api_domain_delete(
     domain_id: str,
     w: WalletTypeInfo = Depends(require_admin_key),
 ):
+    # make sure the address belongs to the user
     deleted = await delete_domain(domain_id, w.wallet.id)
 
     return deleted

From 7677d3b6c4935990c7a6650f2d5e64388068dfd6 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 16 Jul 2024 09:20:55 +0300
Subject: [PATCH 15/25] feat: generate invoice only if `pubkey` pressent

---
 models.py    |  9 +++++++--
 services.py  | 13 ++++++++-----
 views_api.py | 40 +++++++++++++++++++++++-----------------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/models.py b/models.py
index d20bf5b..8a6f747 100644
--- a/models.py
+++ b/models.py
@@ -27,8 +27,8 @@ class UpdateAddressData(BaseModel):
 class CreateAddressData(BaseModel):
     domain_id: str
     local_part: str
-    pubkey: str
-    years: int
+    pubkey: str = ""
+    years: int = 1
     relays: Optional[List[str]] = None
 
 
@@ -144,9 +144,14 @@ class Address(FromRowModel):
     active: bool
     time: int
     reimburse_amount: int = 0
+    # todo: expire
 
     config: AddressConfig = AddressConfig()
 
+    @property
+    def has_pubkey(self):
+        return self.pubkey != ""
+
     @classmethod
     def from_row(cls, row: Row) -> "Address":
         address = cls(**dict(row))
diff --git a/services.py b/services.py
index 7bc92a1..7af7ea7 100644
--- a/services.py
+++ b/services.py
@@ -1,4 +1,4 @@
-from typing import List, Optional, Tuple
+from typing import List, Optional
 
 import httpx
 from lnbits.core.crud import get_standalone_payment, get_user
@@ -116,11 +116,12 @@ async def get_identifier_status(
 
 async def create_address(
     domain: Domain, data: CreateAddressData, user_id: Optional[str] = None
-) -> Tuple[Address, float]:
+) -> Address:
 
     identifier = normalize_identifier(data.local_part)
     data.local_part = identifier
-    data.pubkey = validate_pub_key(data.pubkey)
+    if data.pubkey != "":
+        data.pubkey = validate_pub_key(data.pubkey)
 
     identifier_status = await get_identifier_status(domain, identifier, data.years)
 
@@ -140,14 +141,16 @@ async def create_address(
         config = existing_address.config
         config.price = identifier_status.price
         config.price_in_sats = price_in_sats
-        address = await update_address(domain.id, existing_address.id, config=config)
+        address = await update_address(
+            domain.id, existing_address.id, config=config, pubkey=data.pubkey
+        )
     else:
         config = AddressConfig(
             price=identifier_status.price, price_in_sats=price_in_sats
         )
         address = await create_address_internal(data, owner_id, config=config)
 
-    return address, price_in_sats
+    return address
 
 
 async def activate_address(
diff --git a/views_api.py b/views_api.py
index 7f885bf..1576151 100644
--- a/views_api.py
+++ b/views_api.py
@@ -316,23 +316,29 @@ async def api_address_create(
     assert domain, "Domain does not exist."
 
     assert address_data.domain_id == domain_id, "Domain ID missmatch"
-    address, price_in_sats = await create_address(domain, address_data, user_id)
-
-    # in case the user pays, but the identifier is no longer available
-    wallet_id = (await get_wallets(user_id))[0].id if user_id else None
-
-    payment_hash, payment_request = await create_invoice(
-        wallet_id=domain.wallet,
-        amount=price_in_sats,
-        memo=f"Payment for NIP-05 for {address_data.local_part}@{domain.domain}",
-        extra={
-            "tag": "nostrnip5",
-            "domain_id": domain_id,
-            "address_id": address.id,
-            "action": "activate",
-            "reimburse_wallet_id": wallet_id,
-        },
-    )
+    address = await create_address(domain, address_data, user_id)
+    assert (
+        address.config.price_in_sats
+    ), f"Cannot compute price for '{address_data.local_part}'."
+
+    if address.has_pubkey:
+        # in case the user pays, but the identifier is no longer available
+        wallet_id = (await get_wallets(user_id))[0].id if user_id else None
+        payment_hash, payment_request = await create_invoice(
+            wallet_id=domain.wallet,
+            amount=int(address.config.price_in_sats),
+            memo=f"Payment of {address.config.price} {address.config.currency} "
+            f"for NIP-05 for {address_data.local_part}@{domain.domain}",
+            extra={
+                "tag": "nostrnip5",
+                "domain_id": domain_id,
+                "address_id": address.id,
+                "action": "activate",
+                "reimburse_wallet_id": wallet_id,
+            },
+        )
+    else:
+        payment_hash, payment_request = None, None
 
     return {
         "payment_hash": payment_hash,

From 139e18615828e6ca7be551ffab26a6f9d9f96f8f Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 16 Jul 2024 11:37:06 +0300
Subject: [PATCH 16/25] feat: delete address

---
 crud.py      | 10 ++++------
 models.py    |  1 +
 services.py  |  7 ++++++-
 views_api.py | 15 ++++++++-------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/crud.py b/crud.py
index 204baf8..fb34b6a 100644
--- a/crud.py
+++ b/crud.py
@@ -264,15 +264,13 @@ async def delete_domain(domain_id: str, wallet_id: str) -> bool:
     return True
 
 
-async def delete_address(domain_id, address_id):
+async def delete_address(domain_id, address_id, owner_id):
     await db.execute(
         """
-        DELETE FROM nostrnip5.addresses WHERE domain_id = ? AND id = ?
+        DELETE FROM nostrnip5.addresses
+        WHERE domain_id = ? AND id = ? AND owner_id = ?
         """,
-        (
-            domain_id,
-            address_id,
-        ),
+        (domain_id, address_id, owner_id),
     )
 
 
diff --git a/models.py b/models.py
index 8a6f747..9d7271c 100644
--- a/models.py
+++ b/models.py
@@ -132,6 +132,7 @@ class AddressConfig(BaseModel):
     payment_hash: Optional[str] = None
     reimburse_payment_hash: Optional[str] = None
     activated_by_owner: bool = False
+    years: int = 1
     relays: List[str] = []
 
 
diff --git a/services.py b/services.py
index 7af7ea7..34df2ef 100644
--- a/services.py
+++ b/services.py
@@ -141,12 +141,17 @@ async def create_address(
         config = existing_address.config
         config.price = identifier_status.price
         config.price_in_sats = price_in_sats
+        config.currency = domain.currency
+        config.years = data.years
         address = await update_address(
             domain.id, existing_address.id, config=config, pubkey=data.pubkey
         )
     else:
         config = AddressConfig(
-            price=identifier_status.price, price_in_sats=price_in_sats
+            price=identifier_status.price,
+            price_in_sats=price_in_sats,
+            currency=domain.currency,
+            years=data.years,
         )
         address = await create_address_internal(data, owner_id, config=config)
 
diff --git a/views_api.py b/views_api.py
index 1576151..b54bd54 100644
--- a/views_api.py
+++ b/views_api.py
@@ -177,18 +177,19 @@ async def api_domain_delete(
 @http_try_except
 @nostrnip5_api_router.delete(
     "/api/v1/address/{domain_id}/{address_id}",
-    status_code=HTTPStatus.GONE,  # todo add /address
+    status_code=HTTPStatus.OK,
 )
 async def api_delete_address(
     domain_id: str,
     address_id: str,
-    w: WalletTypeInfo = Depends(require_admin_key),
+    user_id: Optional[str] = Depends(optional_user_id),
 ):
-    # make sure the address belongs to the user
-    domain = await get_domain(domain_id, w.wallet.id)
-    assert domain, "Domain does not exist."
 
-    return await delete_address(domain_id, address_id)
+    if not user_id:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED)
+
+    owner_id = owner_id_from_user_id(user_id)  # todo: allow for admins
+    return await delete_address(domain_id, address_id, owner_id)
 
 
 @http_try_except
@@ -343,7 +344,7 @@ async def api_address_create(
     return {
         "payment_hash": payment_hash,
         "payment_request": payment_request,
-        "address_id": address.id,
+        **dict(address),
     }
 
 

From f60a0badb3f068963caede2c0bee13373933085e Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 16 Jul 2024 16:31:04 +0300
Subject: [PATCH 17/25] fix: use address years

---
 services.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services.py b/services.py
index 34df2ef..a1fced4 100644
--- a/services.py
+++ b/services.py
@@ -195,7 +195,9 @@ async def get_valid_addresses_for_owner(
         domain = await get_domain_by_id(address.domain_id)
         if not domain:
             continue
-        status = await get_identifier_status(domain, address.local_part, years=1)
+        status = await get_identifier_status(
+            domain, address.local_part, address.config.years
+        )
 
         if status.available:
             # update to latest price

From 23ade3d22893e6deeb292c5c23d63c934c5ae5dc Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 17 Jul 2024 12:24:19 +0300
Subject: [PATCH 18/25] feat: add expires_at and validate ws url

---
 crud.py       | 16 +++++++++++++---
 helpers.py    | 19 +++++++++++++++++--
 migrations.py |  3 ++-
 models.py     | 13 +++++++++++--
 services.py   | 26 ++++++++++++--------------
 views_api.py  |  6 ++++--
 6 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/crud.py b/crud.py
index fb34b6a..415b750 100644
--- a/crud.py
+++ b/crud.py
@@ -1,3 +1,4 @@
+import datetime
 import json
 from typing import Any, List, Optional, Union
 
@@ -218,9 +219,16 @@ async def update_address(domain_id: str, address_id: str, **kwargs) -> Address:
         if key not in valid_keys:
             continue
         if key == "config":
-            extra = json.dumps(value or AddressConfig(), default=lambda o: o.__dict__)
+            config = value or AddressConfig()
+            extra = json.dumps(config, default=lambda o: o.__dict__)
             set_clause.append("extra = ?")
             set_variables.append(extra)
+
+            expires_at = datetime.datetime.now() + datetime.timedelta(
+                days=365 * config.years
+            )
+            set_clause.append("expires_at = ?")
+            set_variables.append(expires_at)
         else:
             set_clause.append(f"{key} = ?")
             set_variables.append(value)
@@ -281,11 +289,12 @@ async def create_address_internal(
 ) -> Address:
     address_id = urlsafe_short_hash()
     extra = json.dumps(config or AddressConfig(), default=lambda o: o.__dict__)
+    expires_at = datetime.datetime.now() + datetime.timedelta(days=365 * data.years)
     await db.execute(
         """
         INSERT INTO nostrnip5.addresses
-        (id, domain_id, owner_id, local_part, pubkey, active, extra)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        (id, domain_id, owner_id, local_part, pubkey, active, extra, expires_at)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             address_id,
@@ -295,6 +304,7 @@ async def create_address_internal(
             data.pubkey,
             False,
             extra,
+            expires_at,
         ),
     )
 
diff --git a/helpers.py b/helpers.py
index 587466b..7a94555 100644
--- a/helpers.py
+++ b/helpers.py
@@ -3,6 +3,7 @@
 from hashlib import sha256
 from http import HTTPStatus
 from typing import Optional
+from urllib.parse import urlparse
 
 from bech32 import bech32_decode, convertbits
 from loguru import logger
@@ -39,9 +40,13 @@ def validate_pub_key(pubkey: str):
             decoded_data = convertbits(data, 5, 8, False)
             if decoded_data:
                 pubkey = bytes(decoded_data).hex()
+    try:
+        _hex = bytes.fromhex(pubkey)
+    except Exception as exc:
+        raise ValueError("Pubkey must be in npub or hex format.") from exc
 
-    if len(bytes.fromhex(pubkey)) != 32:
-        raise ValueError("Pubkey must be in npub or hex format.")
+    if len(_hex) != 32:
+        raise ValueError("Pubkey length incorrect.")
 
     return pubkey
 
@@ -57,6 +62,16 @@ def validate_local_part(local_part: str):
         )
 
 
+def is_ws_url(url):
+    try:
+        result = urlparse(url)
+        if not all([result.scheme, result.netloc]):
+            return False
+        return result.scheme in ["ws", "wss"]
+    except ValueError:
+        return False
+
+
 def owner_id_from_user_id(user_id: Optional[str] = None) -> str:
     return sha256((user_id or "").encode("utf-8")).hexdigest()
 
diff --git a/migrations.py b/migrations.py
index 9d15fa3..1338aec 100644
--- a/migrations.py
+++ b/migrations.py
@@ -97,9 +97,10 @@ async def m006_make_amount_type_real(db):
 
 async def m007_add_cost_extra_column_to_addresses(db):
     """
-    Adds extra column to  addresses.
+    Adds extra, expires_at and reimburse_amount columns to  addresses.
     """
     await db.execute("ALTER TABLE nostrnip5.addresses ADD COLUMN extra TEXT")
+    await db.execute("ALTER TABLE nostrnip5.addresses ADD COLUMN expires_at TIMESTAMP")
     await db.execute(
         "ALTER TABLE nostrnip5.addresses ADD COLUMN "
         "reimburse_amount REAL NOT NULL DEFAULT 0"
diff --git a/models.py b/models.py
index 9d7271c..1eaa653 100644
--- a/models.py
+++ b/models.py
@@ -6,7 +6,7 @@
 from lnbits.db import FilterModel, FromRowModel
 from pydantic import BaseModel
 
-from .helpers import format_amount, normalize_identifier
+from .helpers import format_amount, is_ws_url, normalize_identifier
 
 
 class CustomCost(BaseModel):
@@ -23,6 +23,13 @@ class UpdateAddressData(BaseModel):
     pubkey: Optional[str] = None
     relays: Optional[List[str]] = None
 
+    def validate_relays_urls(self):
+        if not self.relays:
+            return
+        for r in self.relays:
+            if not is_ws_url(r):
+                raise ValueError(f"Relay '{r}' is not valid!")
+
 
 class CreateAddressData(BaseModel):
     domain_id: str
@@ -30,6 +37,7 @@ class CreateAddressData(BaseModel):
     pubkey: str = ""
     years: int = 1
     relays: Optional[List[str]] = None
+    create_invoice: bool = False
 
 
 class DomainCostConfig(BaseModel):
@@ -133,6 +141,7 @@ class AddressConfig(BaseModel):
     reimburse_payment_hash: Optional[str] = None
     activated_by_owner: bool = False
     years: int = 1
+    max_years: int = 1
     relays: List[str] = []
 
 
@@ -145,7 +154,7 @@ class Address(FromRowModel):
     active: bool
     time: int
     reimburse_amount: int = 0
-    # todo: expire
+    expires_at: Optional[float]
 
     config: AddressConfig = AddressConfig()
 
diff --git a/services.py b/services.py
index a1fced4..1dba8ef 100644
--- a/services.py
+++ b/services.py
@@ -136,23 +136,21 @@ async def create_address(
     assert price_in_sats, f"Cannot compute price for '{identifier}'."
 
     owner_id = owner_id_from_user_id(user_id)
-    existing_address = await get_address_for_owner(owner_id, domain.id, identifier)
-    if existing_address:
-        config = existing_address.config
-        config.price = identifier_status.price
-        config.price_in_sats = price_in_sats
-        config.currency = domain.currency
-        config.years = data.years
+    addresss = await get_address_for_owner(owner_id, domain.id, identifier)
+
+    config = addresss.config if addresss else AddressConfig()
+    config.price = identifier_status.price
+    config.price_in_sats = price_in_sats
+    config.currency = domain.currency
+    config.years = data.years
+    config.max_years = domain.cost_config.max_years
+
+    if addresss:
+        assert not addresss.active, f"Identifier '{data.local_part}' already activated."
         address = await update_address(
-            domain.id, existing_address.id, config=config, pubkey=data.pubkey
+            domain.id, addresss.id, config=config, pubkey=data.pubkey
         )
     else:
-        config = AddressConfig(
-            price=identifier_status.price,
-            price_in_sats=price_in_sats,
-            currency=domain.currency,
-            years=data.years,
-        )
         address = await create_address_internal(data, owner_id, config=config)
 
     return address
diff --git a/views_api.py b/views_api.py
index b54bd54..1637329 100644
--- a/views_api.py
+++ b/views_api.py
@@ -247,6 +247,8 @@ async def api_update_address(
     if not user_id:
         raise HTTPException(HTTPStatus.UNAUTHORIZED)
 
+    data.validate_relays_urls()
+
     address = await get_address(domain_id, address_id)
     assert address, "Address not found"
     assert address.domain_id == domain_id, "Domain ID missmatch"
@@ -306,7 +308,7 @@ async def api_address_reimburse(
 @nostrnip5_api_router.post(
     "/api/v1/domain/{domain_id}/address", status_code=HTTPStatus.CREATED
 )
-async def api_address_create(
+async def api_request_address(
     address_data: CreateAddressData,
     domain_id: str,
     user_id: Optional[str] = Depends(optional_user_id),
@@ -322,7 +324,7 @@ async def api_address_create(
         address.config.price_in_sats
     ), f"Cannot compute price for '{address_data.local_part}'."
 
-    if address.has_pubkey:
+    if address_data.create_invoice:
         # in case the user pays, but the identifier is no longer available
         wallet_id = (await get_wallets(user_id))[0].id if user_id else None
         payment_hash, payment_request = await create_invoice(

From ca05a36eb681c67319df51c6535cb7d9b7d9f96b Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 17 Jul 2024 14:15:57 +0300
Subject: [PATCH 19/25] chore: code clean-up

---
 templates/nostrnip5/index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index f65749a..ee0ebbb 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -673,8 +673,6 @@ <h6 class="q-mt-none">Settings</h6>
       'YYYY-MM-DD HH:mm'
     )
 
-    // obj.cost = parseFloat(obj.cost).toFixed(2)
-
     return obj
   }
 

From 3f574655fafcc93b45a7b679660539bf28f53528 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 17 Jul 2024 15:32:02 +0300
Subject: [PATCH 20/25] fix: only return the searched identifier

---
 views_api.py | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/views_api.py b/views_api.py
index 1637329..3f65f02 100644
--- a/views_api.py
+++ b/views_api.py
@@ -24,8 +24,8 @@
     create_settings,
     delete_address,
     delete_domain,
+    get_active_address_by_local_part,
     get_address,
-    get_addresses,
     get_domain,
     get_domain_by_id,
     get_identifier_ranking,
@@ -37,7 +37,6 @@
 )
 from .helpers import (
     http_try_except,
-    normalize_identifier,
     owner_id_from_user_id,
     validate_pub_key,
 )
@@ -118,13 +117,13 @@ async def api_get_addresses_paginated(
 
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/addresses/user", status_code=HTTPStatus.OK)
-async def api_get_user_addresses(
+async def api_get_addresses_for_owner(
     user_id: Optional[str] = Depends(optional_user_id),
     local_part: Optional[str] = None,
     active: Optional[bool] = None,
 ):
     if not user_id:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED)
+        raise HTTPException(HTTPStatus.FORBIDDEN)
 
     owner_id = owner_id_from_user_id(user_id)
     assert owner_id
@@ -136,7 +135,7 @@ async def api_get_user_addresses(
     "/api/v1/domain/{domain_id}",
     status_code=HTTPStatus.OK,
 )
-async def api_get_domaint(domain_id: str, w: WalletTypeInfo = Depends(get_key_type)):
+async def api_get_domains(domain_id: str, w: WalletTypeInfo = Depends(get_key_type)):
     domain = await get_domain(domain_id, w.wallet.id)
     assert domain, "Domain does not exist."
     return domain
@@ -145,7 +144,7 @@ async def api_get_domaint(domain_id: str, w: WalletTypeInfo = Depends(get_key_ty
 @http_try_except
 @nostrnip5_api_router.post("/api/v1/domain", status_code=HTTPStatus.CREATED)
 async def api_create_domain(
-    data: CreateDomainData, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: CreateDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
 
     return await create_domain_internal(wallet_id=wallet.wallet.id, data=data)
@@ -154,7 +153,7 @@ async def api_create_domain(
 @http_try_except
 @nostrnip5_api_router.put("/api/v1/domain", status_code=HTTPStatus.OK)
 async def api_update_domain(
-    data: EditDomainData, wallet: WalletTypeInfo = Depends(get_key_type)
+    data: EditDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
 ):
 
     return await update_domain_internal(wallet_id=wallet.wallet.id, data=data)
@@ -186,7 +185,7 @@ async def api_delete_address(
 ):
 
     if not user_id:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED)
+        raise HTTPException(HTTPStatus.FORBIDDEN)
 
     owner_id = owner_id_from_user_id(user_id)  # todo: allow for admins
     return await delete_address(domain_id, address_id, owner_id)
@@ -245,7 +244,7 @@ async def api_update_address(
 ) -> Address:
 
     if not user_id:
-        raise HTTPException(HTTPStatus.UNAUTHORIZED)
+        raise HTTPException(HTTPStatus.FORBIDDEN)
 
     data.validate_relays_urls()
 
@@ -267,7 +266,7 @@ async def api_update_address(
 @http_try_except
 @nostrnip5_api_router.get(
     "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",
-    dependencies=[Depends(check_admin)],
+    dependencies=[Depends(require_admin_key)],
     status_code=HTTPStatus.CREATED,
 )
 async def api_address_reimburse(
@@ -355,6 +354,7 @@ async def api_request_address(
     "/api/v1/domain/{domain_id}/payments/{payment_hash}", status_code=HTTPStatus.OK
 )
 async def api_check_address_payment(domain_id: str, payment_hash: str):
+    # todo: can it be replaced with websocket?
     paid = await check_address_payment(domain_id, payment_hash)
     return {"paid": paid}
 
@@ -383,27 +383,21 @@ async def api_search_identifier(
 async def api_get_nostr_json(
     response: Response, domain_id: str, name: str = Query(None)
 ):
-    addresses = [address.dict() for address in await get_addresses(domain_id)]
-    output = {}
-
-    for address in addresses:
-        local_part = address.get("local_part")
-        if not local_part:
-            continue
-        local_part = normalize_identifier(local_part)
+    response.headers["Access-Control-Allow-Origin"] = "*"
+    response.headers["Access-Control-Allow-Methods"] = "GET,OPTIONS"
 
-        if address.get("active") is False:
-            continue
+    if not name:
+        return {"names": {}, "relays": {}}
 
-        if name and normalize_identifier(name) != local_part:
-            continue
+    address = await get_active_address_by_local_part(domain_id, name)
 
-        output[local_part] = address.get("pubkey")
+    if not address:
+        return {"names": {}, "relays": {}}
 
-    response.headers["Access-Control-Allow-Origin"] = "*"
-    response.headers["Access-Control-Allow-Methods"] = "GET,OPTIONS"
-
-    return {"names": output}
+    return {
+        "names": {address.local_part: address.pubkey},
+        "relays": {address.pubkey: address.config.relays},
+    }
 
 
 @http_try_except

From ef01e8cbde2cc921c755caa6b5943282e8f22e8e Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Jul 2024 10:52:49 +0300
Subject: [PATCH 21/25] fix: do not raise if payment not found

---
 services.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services.py b/services.py
index 1dba8ef..50b2563 100644
--- a/services.py
+++ b/services.py
@@ -213,7 +213,9 @@ async def get_valid_addresses_for_owner(
 
 async def check_address_payment(domain_id: str, payment_hash: str) -> bool:
     payment = await get_standalone_payment(payment_hash, incoming=True)
-    assert payment, "Payment does not exist."
+    if not payment:
+        logger.debug(f"No payment found for hash {payment_hash}")
+        return False
 
     payment_address_id = payment.extra.get("address_id")
     assert payment_address_id, "Payment does not exist for this address."

From 30261eb0ec918b8c71df227c5167fb67af2d3d88 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Jul 2024 11:05:43 +0300
Subject: [PATCH 22/25] chore: re-order

---
 views_api.py | 92 ++++++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 43 deletions(-)

diff --git a/views_api.py b/views_api.py
index 3f65f02..09f3bb9 100644
--- a/views_api.py
+++ b/views_api.py
@@ -71,6 +71,9 @@
 address_filters = parse_filters(AddressFilters)
 
 
+##################################### DOMAINS #####################################
+
+
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/domains", status_code=HTTPStatus.OK)
 async def api_domains(
@@ -81,6 +84,52 @@ async def api_domains(
     return [domain.dict() for domain in domains]
 
 
+@http_try_except
+@nostrnip5_api_router.get(
+    "/api/v1/domain/{domain_id}",
+    status_code=HTTPStatus.OK,
+)
+async def api_get_domains(domain_id: str, w: WalletTypeInfo = Depends(get_key_type)):
+    domain = await get_domain(domain_id, w.wallet.id)
+    assert domain, "Domain does not exist."
+    return domain
+
+
+@http_try_except
+@nostrnip5_api_router.post("/api/v1/domain", status_code=HTTPStatus.CREATED)
+async def api_create_domain(
+    data: CreateDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+
+    return await create_domain_internal(wallet_id=wallet.wallet.id, data=data)
+
+
+@http_try_except
+@nostrnip5_api_router.put("/api/v1/domain", status_code=HTTPStatus.OK)
+async def api_update_domain(
+    data: EditDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+
+    return await update_domain_internal(wallet_id=wallet.wallet.id, data=data)
+
+
+@http_try_except
+@nostrnip5_api_router.delete(
+    "/api/v1/domain/{domain_id}", status_code=HTTPStatus.CREATED
+)
+async def api_domain_delete(
+    domain_id: str,
+    w: WalletTypeInfo = Depends(require_admin_key),
+):
+    # make sure the address belongs to the user
+    deleted = await delete_domain(domain_id, w.wallet.id)
+
+    return deleted
+
+
+##################################### ADDRESSES #####################################
+
+
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/addresses", status_code=HTTPStatus.OK)
 async def api_get_addresses(
@@ -130,49 +179,6 @@ async def api_get_addresses_for_owner(
     return await get_valid_addresses_for_owner(owner_id, local_part, active)
 
 
-@http_try_except
-@nostrnip5_api_router.get(
-    "/api/v1/domain/{domain_id}",
-    status_code=HTTPStatus.OK,
-)
-async def api_get_domains(domain_id: str, w: WalletTypeInfo = Depends(get_key_type)):
-    domain = await get_domain(domain_id, w.wallet.id)
-    assert domain, "Domain does not exist."
-    return domain
-
-
-@http_try_except
-@nostrnip5_api_router.post("/api/v1/domain", status_code=HTTPStatus.CREATED)
-async def api_create_domain(
-    data: CreateDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-
-    return await create_domain_internal(wallet_id=wallet.wallet.id, data=data)
-
-
-@http_try_except
-@nostrnip5_api_router.put("/api/v1/domain", status_code=HTTPStatus.OK)
-async def api_update_domain(
-    data: EditDomainData, wallet: WalletTypeInfo = Depends(require_admin_key)
-):
-
-    return await update_domain_internal(wallet_id=wallet.wallet.id, data=data)
-
-
-@http_try_except
-@nostrnip5_api_router.delete(
-    "/api/v1/domain/{domain_id}", status_code=HTTPStatus.CREATED
-)
-async def api_domain_delete(
-    domain_id: str,
-    w: WalletTypeInfo = Depends(require_admin_key),
-):
-    # make sure the address belongs to the user
-    deleted = await delete_domain(domain_id, w.wallet.id)
-
-    return deleted
-
-
 @http_try_except
 @nostrnip5_api_router.delete(
     "/api/v1/address/{domain_id}/{address_id}",

From 447357e6b3dd7f6da4538c91467c409bf92777e8 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Jul 2024 11:39:02 +0300
Subject: [PATCH 23/25] refactor: revisit endpoints

---
 crud.py                        |  10 ++
 services.py                    |  26 ++--
 templates/nostrnip5/index.html |   4 +-
 views_api.py                   | 232 ++++++++++++++++++---------------
 4 files changed, 150 insertions(+), 122 deletions(-)

diff --git a/crud.py b/crud.py
index 415b750..2a36076 100644
--- a/crud.py
+++ b/crud.py
@@ -282,6 +282,16 @@ async def delete_address(domain_id, address_id, owner_id):
     )
 
 
+async def delete_address_by_id(domain_id, address_id):
+    await db.execute(
+        """
+        DELETE FROM nostrnip5.addresses
+        WHERE domain_id = ? AND id = ?
+        """,
+        (domain_id, address_id),
+    )
+
+
 async def create_address_internal(
     data: CreateAddressData,
     owner_id: Optional[str] = None,
diff --git a/services.py b/services.py
index 50b2563..ec89080 100644
--- a/services.py
+++ b/services.py
@@ -158,25 +158,19 @@ async def create_address(
 
 async def activate_address(
     domain_id: str, address_id: str, payment_hash: Optional[str] = None
-) -> bool:
+) -> Address:
     logger.info(f"Activating NOSTR NIP-05 '{address_id}' for {domain_id}")
-    try:
-        address = await get_address(domain_id, address_id)
-        assert address, f"Cannot find address '{address_id}' for {domain_id}."
-        active_address = await get_active_address_by_local_part(
-            domain_id, address.local_part
-        )
-        assert not active_address, f"Address '{address.local_part}' already active."
 
-        address.config.activated_by_owner = payment_hash is None
-        address.config.payment_hash = payment_hash
-        await activate_domain_address(domain_id, address_id, address.config)
+    address = await get_address(domain_id, address_id)
+    assert address, f"Cannot find address '{address_id}' for {domain_id}."
+    active_address = await get_active_address_by_local_part(
+        domain_id, address.local_part
+    )
+    assert not active_address, f"Address '{address.local_part}' already active."
 
-        return True
-    except Exception as exc:
-        logger.warning(exc)
-        logger.info(f"Failed to acivate NOSTR NIP-05 '{address_id}' for {domain_id}.")
-        return False
+    address.config.activated_by_owner = payment_hash is None
+    address.config.payment_hash = payment_hash
+    return await activate_domain_address(domain_id, address_id, address.config)
 
 
 async def get_valid_addresses_for_owner(
diff --git a/templates/nostrnip5/index.html b/templates/nostrnip5/index.html
index ee0ebbb..afce365 100644
--- a/templates/nostrnip5/index.html
+++ b/templates/nostrnip5/index.html
@@ -1070,7 +1070,7 @@ <h6 class="q-mt-none">Settings</h6>
             method,
             '/nostrnip5/api/v1/domain',
             _.findWhere(this.g.user.wallets, {id: this.formDialog.data.wallet})
-              .inkey,
+              .adminkey,
             data
           )
           .then(function (response) {
@@ -1177,7 +1177,7 @@ <h6 class="q-mt-none">Settings</h6>
             LNbits.api
               .request(
                 'DELETE',
-                `/nostrnip5/api/v1/address/${domain.id}/${address_id}`,
+                `/nostrnip5/api/v1/domain/${domain.id}/address/${address_id}`,
                 _.findWhere(self.g.user.wallets, {id: domain.wallet}).adminkey
               )
               .then(function (response) {
diff --git a/views_api.py b/views_api.py
index 09f3bb9..8215da2 100644
--- a/views_api.py
+++ b/views_api.py
@@ -23,6 +23,7 @@
     create_domain_internal,
     create_settings,
     delete_address,
+    delete_address_by_id,
     delete_domain,
     get_active_address_by_local_part,
     get_address,
@@ -124,7 +125,48 @@ async def api_domain_delete(
     # make sure the address belongs to the user
     deleted = await delete_domain(domain_id, w.wallet.id)
 
-    return deleted
+    return SimpleStatus(success=deleted, message="Deleted")
+
+
+@http_try_except
+@nostrnip5_api_router.get(
+    "/api/v1/domain/{domain_id}/nostr.json", status_code=HTTPStatus.OK
+)
+async def api_get_nostr_json(
+    response: Response, domain_id: str, name: str = Query(None)
+):
+    response.headers["Access-Control-Allow-Origin"] = "*"
+    response.headers["Access-Control-Allow-Methods"] = "GET,OPTIONS"
+
+    if not name:
+        return {"names": {}, "relays": {}}
+
+    address = await get_active_address_by_local_part(domain_id, name)
+
+    if not address:
+        return {"names": {}, "relays": {}}
+
+    return {
+        "names": {address.local_part: address.pubkey},
+        "relays": {address.pubkey: address.config.relays},
+    }
+
+
+@http_try_except
+@nostrnip5_api_router.get(
+    "/api/v1/domain/{domain_id}/search", status_code=HTTPStatus.OK
+)
+async def api_search_identifier(
+    domain_id: str, q: Optional[str] = None, years: Optional[int] = None
+) -> AddressStatus:
+
+    if not q:
+        return AddressStatus(identifier="")
+
+    domain = await get_domain_by_id(domain_id)
+    assert domain, "Unknown domain id."
+
+    return await get_identifier_status(domain, q, years or 1)
 
 
 ##################################### ADDRESSES #####################################
@@ -165,7 +207,85 @@ async def api_get_addresses_paginated(
 
 
 @http_try_except
-@nostrnip5_api_router.get("/api/v1/addresses/user", status_code=HTTPStatus.OK)
+@nostrnip5_api_router.delete(
+    "/api/v1/domain/{domain_id}/address/{address_id}",
+    status_code=HTTPStatus.OK,
+)
+async def api_delete_address(
+    domain_id: str,
+    address_id: str,
+    w: WalletTypeInfo = Depends(get_key_type),
+):
+
+    # make sure the address belongs to the user
+    domain = await get_domain(domain_id, w.wallet.id)
+    assert domain, "Domain does not exist."
+
+    await delete_address_by_id(domain_id, address_id)
+
+
+@http_try_except
+@nostrnip5_api_router.put(
+    "/api/v1/domain/{domain_id}/address/{address_id}/activate",
+    status_code=HTTPStatus.OK,
+)
+async def api_activate_address(
+    domain_id: str,
+    address_id: str,
+    w: WalletTypeInfo = Depends(require_admin_key),
+) -> Address:
+    # make sure the address belongs to the user
+    domain = await get_domain(domain_id, w.wallet.id)
+    assert domain, "Domain does not exist."
+
+    return await activate_address(domain_id, address_id)
+
+
+@http_try_except
+@nostrnip5_api_router.get(
+    "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",
+    dependencies=[Depends(require_admin_key)],
+    status_code=HTTPStatus.CREATED,
+)
+async def api_address_reimburse(
+    domain_id: str,
+    address_id: str,
+):
+
+    # make sure the address belongs to the user
+    domain = await get_domain_by_id(domain_id)
+    assert domain, "Domain does not exist."
+
+    address = await get_address(domain.id, address_id)
+    assert address and (address.domain_id == domain.id), "Domain ID missmatch"
+
+    wallet_id = await get_reimburse_wallet_id(address)
+
+    payment_hash, payment_request = await create_invoice(
+        wallet_id=wallet_id,
+        amount=address.reimburse_amount,
+        memo=f"Reimbursement for NIP-05 for {address.local_part}@{domain.domain}",
+        extra={
+            "tag": "nostrnip5",
+            "domain_id": domain_id,
+            "address_id": address.id,
+            "local_part": address.local_part,
+            "action": "reimburse",
+        },
+    )
+
+    return {
+        "payment_hash": payment_hash,
+        "payment_request": payment_request,
+        "address_id": address.id,
+    }
+
+
+##################################### USER ADDRESSES ###################################
+
+
+@http_try_except
+@nostrnip5_api_router.get("/api/v1/user/addresses", status_code=HTTPStatus.OK)
 async def api_get_addresses_for_owner(
     user_id: Optional[str] = Depends(optional_user_id),
     local_part: Optional[str] = None,
@@ -181,10 +301,10 @@ async def api_get_addresses_for_owner(
 
 @http_try_except
 @nostrnip5_api_router.delete(
-    "/api/v1/address/{domain_id}/{address_id}",
+    "/api/v1/user/address/{domain_id}/{address_id}",
     status_code=HTTPStatus.OK,
 )
-async def api_delete_address(
+async def api_delete_user_address(
     domain_id: str,
     address_id: str,
     user_id: Optional[str] = Depends(optional_user_id),
@@ -197,24 +317,6 @@ async def api_delete_address(
     return await delete_address(domain_id, address_id, owner_id)
 
 
-@http_try_except
-@nostrnip5_api_router.put(
-    "/api/v1/domain/{domain_id}/address/{address_id}/activate",
-    status_code=HTTPStatus.OK,
-)
-async def api_activate_address(
-    domain_id: str,
-    address_id: str,
-    w: WalletTypeInfo = Depends(require_admin_key),
-):
-    # make sure the address belongs to the user
-    domain = await get_domain(domain_id, w.wallet.id)
-    assert domain, "Domain does not exist."
-
-    success = await activate_address(domain_id, address_id)
-    return SimpleStatus(success=success, message="")
-
-
 @http_try_except
 @nostrnip5_api_router.put(
     "/api/v1/domain/{domain_id}/address/{address_id}/rotate",
@@ -239,7 +341,7 @@ async def api_address_rotate(
 # todo: anonimous
 @http_try_except
 @nostrnip5_api_router.put(
-    "/api/v1/domain/{domain_id}/address/{address_id}",
+    "/api/v1/user/domain/{domain_id}/address/{address_id}",
     status_code=HTTPStatus.OK,
 )
 async def api_update_address(
@@ -269,49 +371,9 @@ async def api_update_address(
     return address
 
 
-@http_try_except
-@nostrnip5_api_router.get(
-    "/api/v1/domain/{domain_id}/address/{address_id}/reimburse",
-    dependencies=[Depends(require_admin_key)],
-    status_code=HTTPStatus.CREATED,
-)
-async def api_address_reimburse(
-    domain_id: str,
-    address_id: str,
-):
-
-    # make sure the address belongs to the user
-    domain = await get_domain_by_id(domain_id)
-    assert domain, "Domain does not exist."
-
-    address = await get_address(domain.id, address_id)
-    assert address and (address.domain_id == domain.id), "Domain ID missmatch"
-
-    wallet_id = await get_reimburse_wallet_id(address)
-
-    payment_hash, payment_request = await create_invoice(
-        wallet_id=wallet_id,
-        amount=address.reimburse_amount,
-        memo=f"Reimbursement for NIP-05 for {address.local_part}@{domain.domain}",
-        extra={
-            "tag": "nostrnip5",
-            "domain_id": domain_id,
-            "address_id": address.id,
-            "local_part": address.local_part,
-            "action": "reimburse",
-        },
-    )
-
-    return {
-        "payment_hash": payment_hash,
-        "payment_request": payment_request,
-        "address_id": address.id,
-    }
-
-
 @http_try_except
 @nostrnip5_api_router.post(
-    "/api/v1/domain/{domain_id}/address", status_code=HTTPStatus.CREATED
+    "/api/v1/user/domain/{domain_id}/address", status_code=HTTPStatus.CREATED
 )
 async def api_request_address(
     address_data: CreateAddressData,
@@ -357,7 +419,7 @@ async def api_request_address(
 
 @http_try_except
 @nostrnip5_api_router.get(
-    "/api/v1/domain/{domain_id}/payments/{payment_hash}", status_code=HTTPStatus.OK
+    "/api/v1/user/domain/{domain_id}/payments/{payment_hash}", status_code=HTTPStatus.OK
 )
 async def api_check_address_payment(domain_id: str, payment_hash: str):
     # todo: can it be replaced with websocket?
@@ -365,45 +427,7 @@ async def api_check_address_payment(domain_id: str, payment_hash: str):
     return {"paid": paid}
 
 
-@http_try_except
-@nostrnip5_api_router.get(
-    "/api/v1/domain/{domain_id}/search", status_code=HTTPStatus.OK
-)
-async def api_search_identifier(
-    domain_id: str, q: Optional[str] = None, years: Optional[int] = None
-) -> AddressStatus:
-
-    if not q:
-        return AddressStatus(identifier="")
-
-    domain = await get_domain_by_id(domain_id)
-    assert domain, "Unknown domain id."
-
-    return await get_identifier_status(domain, q, years or 1)
-
-
-@http_try_except
-@nostrnip5_api_router.get(
-    "/api/v1/domain/{domain_id}/nostr.json", status_code=HTTPStatus.OK
-)
-async def api_get_nostr_json(
-    response: Response, domain_id: str, name: str = Query(None)
-):
-    response.headers["Access-Control-Allow-Origin"] = "*"
-    response.headers["Access-Control-Allow-Methods"] = "GET,OPTIONS"
-
-    if not name:
-        return {"names": {}, "relays": {}}
-
-    address = await get_active_address_by_local_part(domain_id, name)
-
-    if not address:
-        return {"names": {}, "relays": {}}
-
-    return {
-        "names": {address.local_part: address.pubkey},
-        "relays": {address.pubkey: address.config.relays},
-    }
+##################################### RANKING #####################################
 
 
 @http_try_except

From b6729fa8302427f79a0a942c4b88218e92608487 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Jul 2024 11:52:05 +0300
Subject: [PATCH 24/25] refactor: re-order functons

---
 views_api.py | 58 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/views_api.py b/views_api.py
index 8215da2..8d02f9f 100644
--- a/views_api.py
+++ b/views_api.py
@@ -169,6 +169,16 @@ async def api_search_identifier(
     return await get_identifier_status(domain, q, years or 1)
 
 
+@http_try_except
+@nostrnip5_api_router.get(
+    "/api/v1/domain/{domain_id}/payments/{payment_hash}", status_code=HTTPStatus.OK
+)
+async def api_check_address_payment(domain_id: str, payment_hash: str):
+    # todo: can it be replaced with websocket?
+    paid = await check_address_payment(domain_id, payment_hash)
+    return {"paid": paid}
+
+
 ##################################### ADDRESSES #####################################
 
 
@@ -281,12 +291,42 @@ async def api_address_reimburse(
     }
 
 
+@http_try_except
+@nostrnip5_api_router.put(
+    "/api/v1/domain/{domain_id}/address/{address_id}",
+    status_code=HTTPStatus.OK,
+)
+async def api_update_address(
+    domain_id: str,
+    address_id: str,
+    data: UpdateAddressData,
+    w: WalletTypeInfo = Depends(require_admin_key),
+) -> Address:
+
+    data.validate_relays_urls()
+
+    # make sure the domain belongs to the user
+    domain = await get_domain(domain_id, w.wallet.id)
+    assert domain, "Domain does not exist."
+
+    address = await get_address(domain_id, address_id)
+    assert address, "Address not found"
+    assert address.domain_id == domain_id, "Domain ID missmatch"
+
+    pubkey = data.pubkey if data.pubkey else address.pubkey
+    if data.relays:
+        address.config.relays = data.relays
+    await update_address(domain_id, address.id, pubkey=pubkey, config=address.config)
+
+    return address
+
+
 ##################################### USER ADDRESSES ###################################
 
 
 @http_try_except
 @nostrnip5_api_router.get("/api/v1/user/addresses", status_code=HTTPStatus.OK)
-async def api_get_addresses_for_owner(
+async def api_get_user_addresses(
     user_id: Optional[str] = Depends(optional_user_id),
     local_part: Optional[str] = None,
     active: Optional[bool] = None,
@@ -322,7 +362,7 @@ async def api_delete_user_address(
     "/api/v1/domain/{domain_id}/address/{address_id}/rotate",
     status_code=HTTPStatus.OK,
 )
-async def api_address_rotate(
+async def api_rotate_user_address(
     domain_id: str,
     address_id: str,
     post_data: RotateAddressData,
@@ -344,7 +384,7 @@ async def api_address_rotate(
     "/api/v1/user/domain/{domain_id}/address/{address_id}",
     status_code=HTTPStatus.OK,
 )
-async def api_update_address(
+async def api_update_user_address(
     domain_id: str,
     address_id: str,
     data: UpdateAddressData,
@@ -375,7 +415,7 @@ async def api_update_address(
 @nostrnip5_api_router.post(
     "/api/v1/user/domain/{domain_id}/address", status_code=HTTPStatus.CREATED
 )
-async def api_request_address(
+async def api_request_user_address(
     address_data: CreateAddressData,
     domain_id: str,
     user_id: Optional[str] = Depends(optional_user_id),
@@ -417,16 +457,6 @@ async def api_request_address(
     }
 
 
-@http_try_except
-@nostrnip5_api_router.get(
-    "/api/v1/user/domain/{domain_id}/payments/{payment_hash}", status_code=HTTPStatus.OK
-)
-async def api_check_address_payment(domain_id: str, payment_hash: str):
-    # todo: can it be replaced with websocket?
-    paid = await check_address_payment(domain_id, payment_hash)
-    return {"paid": paid}
-
-
 ##################################### RANKING #####################################
 
 

From 57aaa11861bd9205824040cfdec9cdf30b52b45c Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Jul 2024 12:06:58 +0300
Subject: [PATCH 25/25] fix: make endpoint consistent

---
 views_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views_api.py b/views_api.py
index 8d02f9f..a53f215 100644
--- a/views_api.py
+++ b/views_api.py
@@ -341,7 +341,7 @@ async def api_get_user_addresses(
 
 @http_try_except
 @nostrnip5_api_router.delete(
-    "/api/v1/user/address/{domain_id}/{address_id}",
+    "/api/v1/user/domain/{domain_id}/address/{address_id}",
     status_code=HTTPStatus.OK,
 )
 async def api_delete_user_address(