Update ALL ${ } usages across the file + feature requests 14, 25 & 26

.gitignore

@@ -10,3 +10,4 @@ data
 .vscode
 dump
 .venv
+.claude

crud.py

@@ -18,6 +18,7 @@
 from .paranoia import (
     assert_sane_string,
     assert_valid_expiration_seconds,
+    assert_valid_lud16,
     assert_valid_msats,
     assert_valid_positive_int,
     assert_valid_pubkey,
@@ -35,6 +36,8 @@ async def create_nwc(data: CreateNWCKey) -> NWCKey:
     assert_valid_wallet_id(data.wallet)
     assert_sane_string(data.description)
     assert_valid_expiration_seconds(data.expires_at)
+    if data.lud16:
+        assert_valid_lud16(data.lud16)
     for permission in data.permissions:
         assert_sane_string(permission)
 
@@ -53,6 +56,7 @@ async def create_nwc(data: CreateNWCKey) -> NWCKey:
         permissions=" ".join(data.permissions),
         created_at=int(time.time()),
         last_used=int(time.time()),
+        lud16=data.lud16,
     )
     await db.insert("nwcprovider.keys", nwckey_entry)
     if data.budgets:

migrations.py

@@ -119,3 +119,10 @@ async def m006_default_config3(db):
         """,
         {"value": "0"},
     )
+
+
+async def m007_add_lud16(db):
+    """
+    Add lud16 column to keys table for lightning address support
+    """
+    await db.execute("ALTER TABLE nwcprovider.keys ADD COLUMN lud16 TEXT")

models.py

@@ -15,6 +15,7 @@ class NWCKey(BaseModel):
     permissions: str
     created_at: int
     last_used: int
+    lud16: str | None = None
 
     def get_permissions(self) -> list[str]:
         try:
@@ -67,6 +68,7 @@ class CreateNWCKey(BaseModel):
     expires_at: int
     permissions: list[str]
     budgets: list[NWCNewBudget] | None = None
+    lud16: str | None = None
 
 
 class DeleteNWC(BaseModel):
@@ -102,13 +104,21 @@ class NWCRegistrationRequest(BaseModel):
     description: str
     expires_at: int
     budgets: list[NWCNewBudget]
+    lud16: str | None = None
 
 
 class NWCGetResponse(BaseModel):
     data: NWCKey
     budgets: list[NWCBudget]
 
 
+class NWCGetAllResponse(BaseModel):
+    data: NWCKey
+    budgets: list[NWCBudget]
+    wallet_id: str
+    wallet_name: str
+
+
 class NWCConfig(BaseModel):
     key: str
     value: str

paranoia.py

@@ -157,6 +157,26 @@ def assert_non_empty_string(v: str):
         panic("string is empty")
 
 
+# Check if string is a valid lud16 lightning address (eg. name@domain)
+def assert_valid_lud16(v: str):
+    if not ENABLE_HARDENING:
+        return
+    assert_non_empty_string(v)
+    if len(v) > 255:
+        panic("lud16 is too long")
+    name, sep, domain = v.partition("@")
+    if not (sep and name and domain):
+        panic("lud16 must be in the form name@domain")
+    # LUD-16 restricts the name to a-z0-9-_.
+    if not all(c.isascii() and (c.isalnum() or c in "-_.") for c in name):
+        panic("lud16 name contains invalid characters")
+    # domain must look like a clearnet host (eg. example.com)
+    if "." not in domain or not all(
+        c.isascii() and (c.isalnum() or c in "-.") for c in domain
+    ):
+        panic("lud16 domain is invalid")
+
+
 # Assert valid json
 def assert_valid_json(v: str):
     if not ENABLE_HARDENING:

static/js/admin.js

@@ -1,7 +1,6 @@
 window.app = Vue.createApp({
   el: '#vue',
   mixins: [windowMixin],
-  delimiters: ['${', '}'],
   data: function () {
     return {
       config: {},