Merge pull request #53 from lnbits/update-v1

feat: update to lnbits 1.0.0
2024-11-12 11:25:14 +02:00 · 2024-11-12 11:25:14 +02:00 · 432ed5299a
commit 432ed5299a
parent 73e3bab6b3 ce56a00d30
16 changed files with 1499 additions and 1455 deletions
--- a/config.json
+++ b/config.json
@ -2,7 +2,7 @@
  "name": "Withdraw Links",
  "short_description": "Make LNURL withdraw links",
  "tile": "/withdraw/static/image/lnurl-withdraw.png",
-  "min_lnbits_version": "0.12.11",
+  "min_lnbits_version": "1.0.0",
  "contributors": [
    {
      "name": "arcbtc",
--- a/crud.py
+++ b/crud.py
@ -1,6 +1,5 @@
 from datetime import datetime
-from time import time
-from typing import List, Optional, Tuple
+from typing import Optional

 import shortuuid
 from lnbits.db import Database
@ -16,107 +15,78 @@ async def create_withdraw_link(
 ) -> WithdrawLink:
    link_id = urlsafe_short_hash()[:22]
    available_links = ",".join([str(i) for i in range(data.uses)])
-    await db.execute(
-        f"""
-        INSERT INTO withdraw.withdraw_link (
-            id,
-            wallet,
-            title,
-            min_withdrawable,
-            max_withdrawable,
-            uses,
-            wait_time,
-            is_unique,
-            unique_hash,
-            k1,
-            open_time,
-            usescsv,
-            webhook_url,
-            webhook_headers,
-            webhook_body,
-            custom_url,
-            created_at
-        )
-        VALUES
-        (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, {db.timestamp_placeholder})
-        """,
-        (
-            link_id,
-            wallet_id,
-            data.title,
-            data.min_withdrawable,
-            data.max_withdrawable,
-            data.uses,
-            data.wait_time,
-            int(data.is_unique),
-            urlsafe_short_hash(),
-            urlsafe_short_hash(),
-            int(datetime.now().timestamp()) + data.wait_time,
-            available_links,
-            data.webhook_url,
-            data.webhook_headers,
-            data.webhook_body,
-            data.custom_url,
-            int(time()),
-        ),
+    withdraw_link = WithdrawLink(
+        id=link_id,
+        wallet=wallet_id,
+        unique_hash=urlsafe_short_hash(),
+        k1=urlsafe_short_hash(),
+        created_at=datetime.now(),
+        open_time=int(datetime.now().timestamp()) + data.wait_time,
+        title=data.title,
+        min_withdrawable=data.min_withdrawable,
+        max_withdrawable=data.max_withdrawable,
+        uses=data.uses,
+        wait_time=data.wait_time,
+        is_unique=data.is_unique,
+        usescsv=available_links,
+        webhook_url=data.webhook_url,
+        webhook_headers=data.webhook_headers,
+        webhook_body=data.webhook_body,
+        custom_url=data.custom_url,
+        number=0,
    )
-    link = await get_withdraw_link(link_id, 0)
-    assert link, "Newly created link couldn't be retrieved"
-    return link
+    await db.insert("withdraw.withdraw_link", withdraw_link)
+    return withdraw_link


 async def get_withdraw_link(link_id: str, num=0) -> Optional[WithdrawLink]:
-    row = await db.fetchone(
-        "SELECT * FROM withdraw.withdraw_link WHERE id = ?", (link_id,)
+    link = await db.fetchone(
+        "SELECT * FROM withdraw.withdraw_link WHERE id = :id",
+        {"id": link_id},
+        WithdrawLink,
    )
-    if not row:
+    if not link:
        return None

-    link = dict(**row)
-    link["number"] = num
-
-    return WithdrawLink.parse_obj(link)
+    link.number = num
+    return link


 async def get_withdraw_link_by_hash(unique_hash: str, num=0) -> Optional[WithdrawLink]:
-    row = await db.fetchone(
-        "SELECT * FROM withdraw.withdraw_link WHERE unique_hash = ?", (unique_hash,)
+    link = await db.fetchone(
+        "SELECT * FROM withdraw.withdraw_link WHERE unique_hash = :hash",
+        {"hash": unique_hash},
+        WithdrawLink,
    )
-    if not row:
+    if not link:
        return None

-    link = dict(**row)
-    link["number"] = num
-
-    return WithdrawLink.parse_obj(link)
+    link.number = num
+    return link


 async def get_withdraw_links(
-    wallet_ids: List[str], limit: int, offset: int
-) -> Tuple[List[WithdrawLink], int]:
-    rows = await db.fetchall(
-        """
-        SELECT * FROM withdraw.withdraw_link
-        WHERE wallet IN ({})
-        ORDER BY open_time DESC
-        LIMIT ? OFFSET ?
-        """.format(
-            ",".join("?" * len(wallet_ids))
-        ),
-        (*wallet_ids, limit, offset),
+    wallet_ids: list[str], limit: int, offset: int
+) -> tuple[list[WithdrawLink], int]:
+    q = ",".join([f"'{w}'" for w in wallet_ids])
+    links = await db.fetchall(
+        f"""
+        SELECT * FROM withdraw.withdraw_link WHERE wallet IN ({q})
+        ORDER BY open_time DESC LIMIT :limit OFFSET :offset
+        """,
+        {"limit": limit, "offset": offset},
+        WithdrawLink,
    )

-    total = await db.fetchone(
-        """
+    result = await db.execute(
+        f"""
        SELECT COUNT(*) as total FROM withdraw.withdraw_link
-        WHERE wallet IN ({})
-        """.format(
-            ",".join("?" * len(wallet_ids))
-        ),
-        (*wallet_ids,),
+        WHERE wallet IN ({q})
+        """
    )
+    total = result.mappings().first()

-    return [WithdrawLink(**row) for row in rows], total["total"]
+    return links, total.total


 async def remove_unique_withdraw_link(link: WithdrawLink, unique_hash: str) -> None:
@ -125,36 +95,25 @@ async def remove_unique_withdraw_link(link: WithdrawLink, unique_hash: str) -> N
        for x in link.usescsv.split(",")
        if unique_hash != shortuuid.uuid(name=link.id + link.unique_hash + x.strip())
    ]
-    await update_withdraw_link(
-        link.id,
-        usescsv=",".join(unique_links),
-    )
+    link.usescsv = ",".join(unique_links)
+    await update_withdraw_link(link)


 async def increment_withdraw_link(link: WithdrawLink) -> None:
-    await update_withdraw_link(
-        link.id,
-        used=link.used + 1,
-        open_time=link.wait_time + int(datetime.now().timestamp()),
-    )
+    link.used = link.used + 1
+    link.open_time = int(datetime.now().timestamp()) + link.wait_time
+    await update_withdraw_link(link)


-async def update_withdraw_link(link_id: str, **kwargs) -> Optional[WithdrawLink]:
-    if "is_unique" in kwargs:
-        kwargs["is_unique"] = int(kwargs["is_unique"])
-    q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    await db.execute(
-        f"UPDATE withdraw.withdraw_link SET {q} WHERE id = ?",
-        (*kwargs.values(), link_id),
-    )
-    row = await db.fetchone(
-        "SELECT * FROM withdraw.withdraw_link WHERE id = ?", (link_id,)
-    )
-    return WithdrawLink(**row) if row else None
+async def update_withdraw_link(link: WithdrawLink) -> WithdrawLink:
+    await db.update("withdraw.withdraw_link", link)
+    return link


 async def delete_withdraw_link(link_id: str) -> None:
-    await db.execute("DELETE FROM withdraw.withdraw_link WHERE id = ?", (link_id,))
+    await db.execute(
+        "DELETE FROM withdraw.withdraw_link WHERE id = :id", {"id": link_id}
+    )


 def chunks(lst, n):
@ -165,30 +124,29 @@ def chunks(lst, n):
 async def create_hash_check(the_hash: str, lnurl_id: str) -> HashCheck:
    await db.execute(
        """
-        INSERT INTO withdraw.hash_check (
-            id,
-            lnurl_id
-        )
-        VALUES (?, ?)
+        INSERT INTO withdraw.hash_check (id, lnurl_id)
+        VALUES (:id, :lnurl_id)
        """,
-        (the_hash, lnurl_id),
+        {"id": the_hash, "lnurl_id": lnurl_id},
    )
    hash_check = await get_hash_check(the_hash, lnurl_id)
    return hash_check


 async def get_hash_check(the_hash: str, lnurl_id: str) -> HashCheck:
-    rowid = await db.fetchone(
-        "SELECT * FROM withdraw.hash_check WHERE id = ?", (the_hash,)
+    hash_check = await db.fetchone(
+        "SELECT * FROM withdraw.hash_check WHERE id = :id", {"id": the_hash}, HashCheck
    )
-    rowlnurl = await db.fetchone(
-        "SELECT * FROM withdraw.hash_check WHERE lnurl_id = ?", (lnurl_id,)
+    hash_check_lnurl = await db.fetchone(
+        "SELECT * FROM withdraw.hash_check WHERE lnurl_id = :id",
+        {"id": lnurl_id},
+        HashCheck,
    )
-    if not rowlnurl:
+    if not hash_check_lnurl:
        await create_hash_check(the_hash, lnurl_id)
        return HashCheck(lnurl=True, hash=False)
    else:
-        if not rowid:
+        if not hash_check:
            await create_hash_check(the_hash, lnurl_id)
            return HashCheck(lnurl=True, hash=False)
        else:
@ -196,4 +154,6 @@ async def get_hash_check(the_hash: str, lnurl_id: str) -> HashCheck:


 async def delete_hash_check(the_hash: str) -> None:
-    await db.execute("DELETE FROM withdraw.hash_check WHERE id = ?", (the_hash,))
+    await db.execute(
+        "DELETE FROM withdraw.hash_check WHERE id = :hash", {"hash": the_hash}
+    )
--- a/migrations.py
+++ b/migrations.py
@ -1,6 +1,3 @@
-from time import time
-
-
 async def m001_initial(db):
    """
    Creates an improved withdraw table and migrates the existing data.
@ -142,10 +139,3 @@ async def m007_add_created_at_timestamp(db):
        "ALTER TABLE withdraw.withdraw_link "
        f"ADD COLUMN created_at TIMESTAMP DEFAULT {db.timestamp_column_default}"
    )
-    # Set created_at to current time for all existing rows
-    await db.execute(
-        f"""
-        UPDATE withdraw.withdraw_link SET created_at = {db.timestamp_placeholder}
-        """,
-        (int(time()),),
-    )
--- a/models.py
+++ b/models.py
@ -1,17 +1,15 @@
-import datetime
+from datetime import datetime

 import shortuuid
 from fastapi import Query, Request
-
-# TODO remove type: ignore when 0.12.11 is released
-from lnurl import (  # type: ignore
-    ClearnetUrl,  # type: ignore
+from lnurl import (
+    ClearnetUrl,
    Lnurl,
    LnurlWithdrawResponse,
-    MilliSatoshi,  # type: ignore
+    MilliSatoshi,
 )
 from lnurl import encode as lnurl_encode
-from pydantic import BaseModel
+from pydantic import BaseModel, Field


 class CreateWithdrawData(BaseModel):
@ -29,7 +27,6 @@ class CreateWithdrawData(BaseModel):

 class WithdrawLink(BaseModel):
    id: str
-    created_at: datetime.datetime
    wallet: str = Query(None)
    title: str = Query(None)
    min_withdrawable: int = Query(0)
@ -42,11 +39,12 @@ class WithdrawLink(BaseModel):
    open_time: int = Query(0)
    used: int = Query(0)
    usescsv: str = Query(None)
-    number: int = Query(0)
+    number: int = Field(default=0, no_database=True)
    webhook_url: str = Query(None)
    webhook_headers: str = Query(None)
    webhook_body: str = Query(None)
    custom_url: str = Query(None)
+    created_at: datetime

    @property
    def is_spent(self) -> bool:
--- a/poetry.lock
+++ b/poetry.lock
--- a/pyproject.toml
+++ b/pyproject.toml
@ -6,7 +6,7 @@ authors = ["Alan Bits <alan@lnbits.com>"]

 [tool.poetry.dependencies]
 python = "^3.10 | ^3.9"
-lnbits = "*"
+lnbits = {version = "*", allow-prereleases = true}

 [tool.poetry.group.dev.dependencies]
 black = "^24.3.0"
--- a/static/js/index.js
+++ b/static/js/index.js
@ -1,15 +1,11 @@
-/* global Vue, VueQrcode, _, Quasar, LOCALE, windowMixin, LNbits */
-
-Vue.component(VueQrcode.name, VueQrcode)
-
-var locationPath = [
+const locationPath = [
  window.location.protocol,
  '//',
  window.location.host,
  window.location.pathname
 ].join('')

-var mapWithdrawLink = function (obj) {
+const mapWithdrawLink = function (obj) {
  obj._data = _.clone(obj)
  obj.min_fsat = new Intl.NumberFormat(LOCALE).format(obj.min_withdrawable)
  obj.max_fsat = new Intl.NumberFormat(LOCALE).format(obj.max_withdrawable)
@ -22,10 +18,10 @@ var mapWithdrawLink = function (obj) {

 const CUSTOM_URL = '/static/images/default_voucher.png'

-new Vue({
+window.app = Vue.createApp({
  el: '#vue',
-  mixins: [windowMixin],
-  data: function () {
+  mixins: [window.windowMixin],
+  data() {
    return {
      checker: null,
      withdrawLinks: [],
@ -97,14 +93,14 @@ new Vue({
    }
  },
  computed: {
-    sortedWithdrawLinks: function () {
+    sortedWithdrawLinks() {
      return this.withdrawLinks.sort(function (a, b) {
        return b.uses_left - a.uses_left
      })
    }
  },
  methods: {
-    getWithdrawLinks: function (props) {
+    getWithdrawLinks(props) {
      if (props) {
        this.withdrawLinksTable.pagination = props.pagination
      }
@ -115,8 +111,6 @@ new Vue({
        offset: (pagination.page - 1) * pagination.rowsPerPage
      }

-      var self = this
-
      LNbits.api
        .request(
          'GET',
@ -124,48 +118,46 @@ new Vue({
          this.g.user.wallets[0].inkey
        )
        .then(response => {
-          this.withdrawLinks = response.data.data.map(function (obj) {
-            return mapWithdrawLink(obj)
-          })
+          this.withdrawLinks = response.data.data.map(mapWithdrawLink)
          this.withdrawLinksTable.pagination.rowsNumber = response.data.total
        })
        .catch(error => {
-          clearInterval(self.checker)
+          clearInterval(this.checker)
          LNbits.utils.notifyApiError(error)
        })
    },
-    closeFormDialog: function () {
+    closeFormDialog() {
      this.formDialog.data = {
        is_unique: false,
        use_custom: false,
        has_webhook: false
      }
    },
-    simplecloseFormDialog: function () {
+    simplecloseFormDialog() {
      this.simpleformDialog.data = {
        is_unique: false,
        use_custom: false
      }
    },
-    openQrCodeDialog: function (linkId) {
-      var link = _.findWhere(this.withdrawLinks, {id: linkId})
+    openQrCodeDialog(linkId) {
+      const link = _.findWhere(this.withdrawLinks, {id: linkId})

      this.qrCodeDialog.data = _.clone(link)
      this.qrCodeDialog.data.url =
        window.location.protocol + '//' + window.location.host
      this.qrCodeDialog.show = true
    },
-    openUpdateDialog: function (linkId) {
-      var link = _.findWhere(this.withdrawLinks, {id: linkId})
+    openUpdateDialog(linkId) {
+      let link = _.findWhere(this.withdrawLinks, {id: linkId})
      link._data.has_webhook = link._data.webhook_url ? true : false
      this.formDialog.data = _.clone(link._data)
      this.formDialog.show = true
    },
-    sendFormData: function () {
-      var wallet = _.findWhere(this.g.user.wallets, {
+    sendFormData() {
+      const wallet = _.findWhere(this.g.user.wallets, {
        id: this.formDialog.data.wallet
      })
-      var data = _.omit(this.formDialog.data, 'wallet')
+      const data = _.omit(this.formDialog.data, 'wallet')

      if (!data.use_custom) {
        data.custom_url = null
@ -189,11 +181,11 @@ new Vue({
        this.createWithdrawLink(wallet, data)
      }
    },
-    simplesendFormData: function () {
-      var wallet = _.findWhere(this.g.user.wallets, {
+    simplesendFormData() {
+      const wallet = _.findWhere(this.g.user.wallets, {
        id: this.simpleformDialog.data.wallet
      })
-      var data = _.omit(this.simpleformDialog.data, 'wallet')
+      const data = _.omit(this.simpleformDialog.data, 'wallet')

      data.wait_time = 1
      data.min_withdrawable = data.max_withdrawable
@ -214,7 +206,7 @@ new Vue({
        this.createWithdrawLink(wallet, data)
      }
    },
-    updateWithdrawLink: function (wallet, data) {
+    updateWithdrawLink(wallet, data) {
      // Remove webhook info if toggle is set to false
      if (!data.has_webhook) {
        data.webhook_url = null
@ -241,7 +233,7 @@ new Vue({
          LNbits.utils.notifyApiError(error)
        })
    },
-    createWithdrawLink: function (wallet, data) {
+    createWithdrawLink(wallet, data) {
      LNbits.api
        .request('POST', '/withdraw/api/v1/links', wallet.adminkey, data)
        .then(response => {
@ -254,21 +246,20 @@ new Vue({
          LNbits.utils.notifyApiError(error)
        })
    },
-    deleteWithdrawLink: function (linkId) {
-      var self = this
-      var link = _.findWhere(this.withdrawLinks, {id: linkId})
+    deleteWithdrawLink(linkId) {
+      const link = _.findWhere(this.withdrawLinks, {id: linkId})

      LNbits.utils
        .confirmDialog('Are you sure you want to delete this withdraw link?')
-        .onOk(function () {
+        .onOk(() => {
          LNbits.api
            .request(
              'DELETE',
              '/withdraw/api/v1/links/' + linkId,
-              _.findWhere(self.g.user.wallets, {id: link.wallet}).adminkey
+              _.findWhere(this.g.user.wallets, {id: link.wallet}).adminkey
            )
-            .then(function (response) {
-              self.withdrawLinks = _.reject(self.withdrawLinks, function (obj) {
+            .then(response => {
+              this.withdrawLinks = _.reject(this.withdrawLinks, function (obj) {
                return obj.id === linkId
              })
            })
@ -277,7 +268,7 @@ new Vue({
            })
        })
    },
-    writeNfcTag: async function (lnurl) {
+    async writeNfcTag(lnurl) {
      try {
        if (typeof NDEFReader == 'undefined') {
          throw {
@ -321,7 +312,7 @@ new Vue({
      )
    }
  },
-  created: function () {
+  created() {
    if (this.g.user.wallets.length) {
      this.getWithdrawLinks()
      this.checker = setInterval(this.getWithdrawLinks, 300000)
--- a/templates/withdraw/_api_docs.html
+++ b/templates/withdraw/_api_docs.html
@ -24,7 +24,7 @@
        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
        <code
          >curl -X GET {{ request.base_url }}withdraw/api/v1/links -H
-          "X-Api-Key: {{ user.wallets[0].inkey }}"
+          "X-Api-Key: <span v-text="g.user.wallets[0].inkey"></span>"
        </code>
      </q-card-section>
    </q-card>
@ -51,8 +51,8 @@
        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
        <code
          >curl -X GET {{ request.base_url
-          }}withdraw/api/v1/links/&lt;withdraw_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].inkey }}"
+          }}withdraw/api/v1/links/&lt;withdraw_id&gt; -H "X-Api-Key:
+          <span v-text="g.user.wallets[0].inkey"></span>"
        </code>
      </q-card-section>
    </q-card>
@ -86,7 +86,7 @@
          "max_withdrawable": &lt;integer&gt;, "uses": &lt;integer&gt;,
          "wait_time": &lt;integer&gt;, "is_unique": &lt;boolean&gt;,
          "webhook_url": &lt;string&gt;}' -H "Content-type: application/json" -H
-          "X-Api-Key: {{ user.wallets[0].adminkey }}"
+          "X-Api-Key: <span v-text="g.user.wallets[0].adminkey"></span>"
        </code>
      </q-card-section>
    </q-card>
@ -122,8 +122,8 @@
          &lt;string&gt;, "min_withdrawable": &lt;integer&gt;,
          "max_withdrawable": &lt;integer&gt;, "uses": &lt;integer&gt;,
          "wait_time": &lt;integer&gt;, "is_unique": &lt;boolean&gt;}' -H
-          "Content-type: application/json" -H "X-Api-Key: {{
-          user.wallets[0].adminkey }}"
+          "Content-type: application/json" -H "X-Api-Key:
+          <span v-text="g.user.wallets[0].adminkey"></span>"
        </code>
      </q-card-section>
    </q-card>
@ -147,8 +147,8 @@
        <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
        <code
          >curl -X DELETE {{ request.base_url
-          }}withdraw/api/v1/links/&lt;withdraw_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].adminkey }}"
+          }}withdraw/api/v1/links/&lt;withdraw_id&gt; -H "X-Api-Key:
+          <span v-text="g.user.wallets[0].adminkey"></span>"
        </code>
      </q-card-section>
    </q-card>
@ -176,7 +176,7 @@
        <code
          >curl -X GET {{ request.base_url
          }}withdraw/api/v1/links/&lt;the_hash&gt;/&lt;lnurl_id&gt; -H
-          "X-Api-Key: {{ user.wallets[0].inkey }}"
+          "X-Api-Key: <span v-text="g.user.wallets[0].inkey"></span>"
        </code>
      </q-card-section>
    </q-card>
--- a/templates/withdraw/csv.html
+++ b/templates/withdraw/csv.html
@ -2,7 +2,7 @@
 in page %} {% for one in threes %} {{one}}, {% endfor %} {% endfor %} {% endfor
 %} {% endblock %} {% block scripts %}
 <script>
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
    data: function () {
      return {}
--- a/templates/withdraw/display.html
+++ b/templates/withdraw/display.html
@ -8,14 +8,9 @@
          <q-badge color="red" class="q-mb-md">Withdraw is spent.</q-badge>
          {% endif %}
          <a class="text-secondary" href="lightning:{{ lnurl }}">
-            <q-responsive :ratio="1" class="q-mx-md">
-              <qrcode
-                :value="this.here + '/?lightning={{lnurl }}'"
-                :options="{width: 800}"
-                class="rounded-borders"
-              >
-              </qrcode>
-            </q-responsive>
+            <lnbits-qrcode
+              :value="this.here + '/?lightning={{lnurl }}'"
+            ></lnbits-qrcode>
          </a>
        </div>
        <div class="row q-mt-lg q-gutter-sm">
@ -52,12 +47,10 @@
 </div>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
+    mixins: [window.windowMixin],
+    data() {
      return {
        here: location.protocol + '//' + location.host,
        nfcTagWriting: false
--- a/templates/withdraw/index.html
+++ b/templates/withdraw/index.html
@ -1,7 +1,5 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user) }}
-<script src="/withdraw/static/js/index.js"></script>
-{% endblock %} {% block page %}
+%} {% block page %}
 <div class="row q-col-gutter-md">
  <div class="col-12 col-md-7 q-gutter-y-md">
    <q-card>
@ -9,7 +7,11 @@
        <q-btn unelevated color="primary" @click="simpleformDialog.show = true"
          >Quick vouchers</q-btn
        >
-        <q-btn unelevated color="primary" @click="formDialog.show = true"
+        <q-btn
+          unelevated
+          color="primary"
+          @click="formDialog.show = true"
+          class="q-ml-md"
          >Advanced withdraw link(s)</q-btn
        >
      </q-card-section>
@ -28,20 +30,22 @@
        <q-table
          dense
          flat
-          :data="sortedWithdrawLinks"
+          :rows="sortedWithdrawLinks"
          row-key="id"
          :columns="withdrawLinksTable.columns"
-          :pagination.sync="withdrawLinksTable.pagination"
+          v-model:pagination="withdrawLinksTable.pagination"
          @request="getWithdrawLinks"
        >
-          {% raw %}
          <template v-slot:header="props">
            <q-tr :props="props">
              <q-th auto-width></q-th>
              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
+              <q-th
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                v-text="col.label"
+              ></q-th>
              <q-th auto-width></q-th>
            </q-tr>
          </template>
@ -110,17 +114,22 @@
                  color="pink"
                ></q-btn>
              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.value }}
+              <q-td
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+                v-text="col.value"
+              >
              </q-td>
              <q-td>
                <q-icon v-if="props.row.webhook_url" size="14px" name="http">
-                  <q-tooltip>Webhook to {{ props.row.webhook_url}}</q-tooltip>
+                  <q-tooltip
+                    >Webhook to <span v-text="props.row.webhook_url"></span
+                  ></q-tooltip>
                </q-icon>
              </q-td>
            </q-tr>
          </template>
-          {% endraw %}
        </q-table>
      </q-card-section>
    </q-card>
@ -404,34 +413,29 @@

  <q-dialog v-model="qrCodeDialog.show" position="top">
    <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
-      <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode
-          :value="qrCodeDialog.data.url + '/?lightning=' + qrCodeDialog.data.lnurl"
-          :options="{width: 800}"
-          class="rounded-borders"
-        ></qrcode>
-        {% raw %}
-      </q-responsive>
+      <lnbits-qrcode
+        :value="qrCodeDialog.data.url + '/?lightning=' + qrCodeDialog.data.lnurl"
+      ></lnbits-qrcode>
      <p style="word-break: break-all">
-        <strong>ID:</strong> {{ qrCodeDialog.data.id }}<br />
-        <strong>Unique:</strong> {{ qrCodeDialog.data.is_unique }}<span
-          v-if="qrCodeDialog.data.is_unique"
-          class="text-deep-purple"
-        >
+        <strong>ID:</strong> <span v-text="qrCodeDialog.data.id"></span><br />
+        <strong>Unique:</strong>
+        <span v-text="qrCodeDialog.data.is_unique"></span>
+        <span v-if="qrCodeDialog.data.is_unique" class="text-deep-purple">
          (QR code will change after each withdrawal)</span
        ><br />
-        <strong>Max. withdrawable:</strong> {{
-        qrCodeDialog.data.max_withdrawable }} sat<br />
-        <strong>Wait time:</strong> {{ qrCodeDialog.data.wait_time }} seconds<br />
-        <strong>Withdraws:</strong> {{ qrCodeDialog.data.used }} / {{
-        qrCodeDialog.data.uses }}
+        <strong>Max. withdrawable:</strong>
+        <span v-text="qrCodeDialog.data.max_withdrawable"></span> sat<br />
+        <strong>Wait time:</strong>
+        <span v-text="qrCodeDialog.data.wait_time"></span> seconds<br />
+        <strong>Withdraws:</strong>
+        <span v-text="qrCodeDialog.data.used"></span>/
+        <span v-text="qrCodeDialog.data.uses"></span><br />
        <q-linear-progress
          :value="qrCodeDialog.data.used / qrCodeDialog.data.uses"
          color="primary"
          class="q-mt-sm"
        ></q-linear-progress>
      </p>
-      {% endraw %}
      <div class="row q-mt-lg q-gutter-sm">
        <q-btn
          outline
@ -469,4 +473,6 @@
    </q-card>
  </q-dialog>
 </div>
+{% endblock %}{% block scripts %} {{ window_vars(user) }}
+<script src="{{ static_url_for('withdraw/static', path='js/index.js') }}"></script>
 {% endblock %}
--- a/templates/withdraw/print_qr.html
+++ b/templates/withdraw/print_qr.html
@ -10,10 +10,11 @@
          {% for one in threes %}
          <td style="width: 105mm">
            <center>
-              <qrcode
+              <lnbits-qrcode
+                style="width: fit-content"
                :value="theurl + '/?lightning={{one}}'"
                :options="{width: 150}"
-              ></qrcode>
+              ></lnbits-qrcode>
            </center>
          </td>
          {% endfor %}
@ -53,11 +54,9 @@
 </style>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
-    data: function () {
+    data() {
      return {
        theurl: location.protocol + '//' + location.host,
        printDialog: {
--- a/templates/withdraw/print_qr_custom.html
+++ b/templates/withdraw/print_qr_custom.html
@ -6,13 +6,13 @@
    <page size="A4" id="pdfprint">
      {% for one in page %}
      <div class="wrapper">
-        <img src="{{custom_url}}" alt="..." />
+        <img class="lnurlw_design" src="{{custom_url}}" alt="..." />
        <span>{{ amt }} sats</span>
        <div class="lnurlw">
-          <qrcode
+          <lnbits-qrcode
            :value="theurl + '/?lightning={{one}}'"
-            :options="{width: 95, margin: 1}"
-          ></qrcode>
+            :options="{width: 98, margin: 2, logo: false}"
+          ></lnbits-qrcode>
        </div>
      </div>
      {% endfor %}
@ -52,7 +52,7 @@
    top: calc(3.2mm + 1rem);
    right: calc(4mm + 1rem);
  }
-  .wrapper img {
+  .wrapper img.lnurlw_design {
    display: block;
    width: 187mm;
    height: auto;
@ -91,9 +91,7 @@
 </style>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
    el: '#vue',
    data: function () {
      return {
--- a/views.py
+++ b/views.py
@ -20,7 +20,7 @@ def withdraw_renderer():
@withdraw_ext_generic.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
    return withdraw_renderer().TemplateResponse(
-        "withdraw/index.html", {"request": request, "user": user.dict()}
+        "withdraw/index.html", {"request": request, "user": user.json()}
    )


@ -36,7 +36,7 @@ async def display(request: Request, link_id):
        "withdraw/display.html",
        {
            "request": request,
-            "link": link.dict(),
+            "link": link.json(),
            "lnurl": link.lnurl(req=request),
            "unique": True,
        },
@ -83,7 +83,7 @@ async def print_qr(request: Request, link_id):

        return withdraw_renderer().TemplateResponse(
            "withdraw/print_qr.html",
-            {"request": request, "link": link.dict(), "unique": False},
+            {"request": request, "link": link.json(), "unique": False},
        )
    links = []
    count = 0
@ -130,7 +130,7 @@ async def csv(request: Request, link_id):

        return withdraw_renderer().TemplateResponse(
            "withdraw/csv.html",
-            {"request": request, "link": link.dict(), "unique": False},
+            {"request": request, "link": link.json(), "unique": False},
        )
    links = []
    count = 0
--- a/views_api.py
+++ b/views_api.py
@ -4,8 +4,8 @@ from typing import Optional

 from fastapi import APIRouter, Depends, HTTPException, Query, Request
 from lnbits.core.crud import get_user
-from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key
-from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl
+from lnbits.core.models import WalletTypeInfo
+from lnbits.decorators import require_admin_key, require_invoice_key

 from .crud import (
    create_withdraw_link,
@ -15,7 +15,7 @@ from .crud import (
    get_withdraw_links,
    update_withdraw_link,
 )
-from .models import CreateWithdrawData
+from .models import CreateWithdrawData, HashCheck

 withdraw_ext_api = APIRouter(prefix="/api/v1")

@ -23,37 +23,29 @@ withdraw_ext_api = APIRouter(prefix="/api/v1")
@withdraw_ext_api.get("/links", status_code=HTTPStatus.OK)
 async def api_links(
    req: Request,
-    wallet: WalletTypeInfo = Depends(get_key_type),
+    key_info: WalletTypeInfo = Depends(require_invoice_key),
    all_wallets: bool = Query(False),
    offset: int = Query(0),
    limit: int = Query(0),
 ):
-    wallet_ids = [wallet.wallet.id]
+    wallet_ids = [key_info.wallet.id]

    if all_wallets:
-        user = await get_user(wallet.wallet.user)
+        user = await get_user(key_info.wallet.user)
        wallet_ids = user.wallet_ids if user else []

-    try:
-        links, total = await get_withdraw_links(wallet_ids, limit, offset)
-        return {
-            "data": [{**link.dict(), **{"lnurl": link.lnurl(req)}} for link in links],
-            "total": total,
-        }
-
-    except LnurlInvalidUrl as exc:
-        raise HTTPException(
-            status_code=HTTPStatus.UPGRADE_REQUIRED,
-            detail="""
-                LNURLs need to be delivered over a publically
-                accessible `https` domain or Tor.
-            """,
-        ) from exc
+    links, total = await get_withdraw_links(wallet_ids, limit, offset)
+    return {
+        "data": [{**link.dict(), **{"lnurl": link.lnurl(req)}} for link in links],
+        "total": total,
+    }


@withdraw_ext_api.get("/links/{link_id}", status_code=HTTPStatus.OK)
 async def api_link_retrieve(
-    link_id: str, request: Request, wallet: WalletTypeInfo = Depends(get_key_type)
+    link_id: str,
+    request: Request,
+    key_info: WalletTypeInfo = Depends(require_invoice_key),
 ):
    link = await get_withdraw_link(link_id, 0)

@ -62,7 +54,7 @@ async def api_link_retrieve(
            detail="Withdraw link does not exist.", status_code=HTTPStatus.NOT_FOUND
        )

-    if link.wallet != wallet.wallet.id:
+    if link.wallet != key_info.wallet.id:
        raise HTTPException(
            detail="Not your withdraw link.", status_code=HTTPStatus.FORBIDDEN
        )
@ -75,7 +67,7 @@ async def api_link_create_or_update(
    req: Request,
    data: CreateWithdrawData,
    link_id: Optional[str] = None,
-    wallet: WalletTypeInfo = Depends(require_admin_key),
+    key_info: WalletTypeInfo = Depends(require_admin_key),
 ):
    if data.uses > 250:
        raise HTTPException(detail="250 uses max.", status_code=HTTPStatus.BAD_REQUEST)
@ -115,12 +107,11 @@ async def api_link_create_or_update(
            raise HTTPException(
                detail="Withdraw link does not exist.", status_code=HTTPStatus.NOT_FOUND
            )
-        if link.wallet != wallet.wallet.id:
+        if link.wallet != key_info.wallet.id:
            raise HTTPException(
                detail="Not your withdraw link.", status_code=HTTPStatus.FORBIDDEN
            )

-        data_dict = data.dict()
        if link.uses > data.uses:
            if data.uses - link.used <= 0:
                raise HTTPException(
@ -128,33 +119,35 @@ async def api_link_create_or_update(
                    status_code=HTTPStatus.BAD_REQUEST,
                )
            numbers = link.usescsv.split(",")
-            usescsv = ",".join(numbers[: data.uses - link.used])
-            data_dict["usescsv"] = usescsv
+            link.usescsv = ",".join(numbers[: data.uses - link.used])

        if link.uses < data.uses:
            numbers = link.usescsv.split(",")
-
            if numbers[-1] == "":
                current_number = int(link.uses)
                numbers[-1] = str(link.uses)
            else:
                current_number = int(numbers[-1])
-
            while len(numbers) < (data.uses - link.used):
                current_number += 1
                numbers.append(str(current_number))
-            usescsv = ",".join(numbers)
-            data_dict["usescsv"] = usescsv
+            link.usescsv = ",".join(numbers)

-        link = await update_withdraw_link(link_id, **data_dict)
+        for k, v in data.dict().items():
+            if v is not None:
+                setattr(link, k, v)
+
+        link = await update_withdraw_link(link)
    else:
-        link = await create_withdraw_link(wallet_id=wallet.wallet.id, data=data)
-    assert link
+        link = await create_withdraw_link(wallet_id=key_info.wallet.id, data=data)
+
    return {**link.dict(), **{"lnurl": link.lnurl(req)}}


@withdraw_ext_api.delete("/links/{link_id}", status_code=HTTPStatus.OK)
-async def api_link_delete(link_id, wallet: WalletTypeInfo = Depends(require_admin_key)):
+async def api_link_delete(
+    link_id: str, key_info: WalletTypeInfo = Depends(require_admin_key)
+):
    link = await get_withdraw_link(link_id)

    if not link:
@ -162,7 +155,7 @@ async def api_link_delete(link_id, wallet: WalletTypeInfo = Depends(require_admi
            detail="Withdraw link does not exist.", status_code=HTTPStatus.NOT_FOUND
        )

-    if link.wallet != wallet.wallet.id:
+    if link.wallet != key_info.wallet.id:
        raise HTTPException(
            detail="Not your withdraw link.", status_code=HTTPStatus.FORBIDDEN
        )
@ -174,8 +167,8 @@ async def api_link_delete(link_id, wallet: WalletTypeInfo = Depends(require_admi
@withdraw_ext_api.get(
    "/links/{the_hash}/{lnurl_id}",
    status_code=HTTPStatus.OK,
-    dependencies=[Depends(get_key_type)],
+    dependencies=[Depends(require_invoice_key)],
 )
-async def api_hash_retrieve(the_hash, lnurl_id):
+async def api_hash_retrieve(the_hash, lnurl_id) -> HashCheck:
    hash_check = await get_hash_check(the_hash, lnurl_id)
    return hash_check
--- a/views_lnurl.py
+++ b/views_lnurl.py
@ -9,7 +9,8 @@ import shortuuid
 from fastapi import APIRouter, HTTPException, Request, Response
 from fastapi.responses import JSONResponse
 from fastapi.routing import APIRoute
-from lnbits.core.crud import update_payment_extra
+from lnbits.core.crud import update_payment
+from lnbits.core.models import Payment
 from lnbits.core.services import pay_invoice
 from loguru import logger

@ -162,7 +163,7 @@ async def api_lnurl_callback(
        ) from exc

    try:
-        payment_hash = await pay_invoice(
+        payment = await pay_invoice(
            wallet_id=link.wallet,
            payment_request=pr,
            max_sat=link.max_withdrawable,
@ -175,7 +176,7 @@ async def api_lnurl_callback(
        await delete_hash_check(id_unique_hash or unique_hash)

        if link.webhook_url:
-            await dispatch_webhook(link, payment_hash, pr)
+            await dispatch_webhook(link, payment, pr)
        return {"status": "OK"}
    except Exception as exc:
        # If payment fails, delete the hash stored so another attempt can be made.
@ -193,14 +194,14 @@ def check_unique_link(link: WithdrawLink, unique_hash: str) -> bool:


 async def dispatch_webhook(
-    link: WithdrawLink, payment_hash: str, payment_request: str
+    link: WithdrawLink, payment: Payment, payment_request: str
 ) -> None:
    async with httpx.AsyncClient() as client:
        try:
            r: httpx.Response = await client.post(
                link.webhook_url,
                json={
-                    "payment_hash": payment_hash,
+                    "payment_hash": payment.payment_hash,
                    "payment_request": payment_request,
                    "lnurlw": link.id,
                    "body": json.loads(link.webhook_body) if link.webhook_body else "",
@ -210,24 +211,17 @@ async def dispatch_webhook(
                ),
                timeout=40,
            )
-            await update_payment_extra(
-                payment_hash=payment_hash,
-                extra={
-                    "wh_success": r.is_success,
-                    "wh_message": r.reason_phrase,
-                    "wh_response": r.text,
-                },
-                outgoing=True,
-            )
+            payment.extra["wh_success"] = r.is_success
+            payment.extra["wh_message"] = r.reason_phrase
+            payment.extra["wh_response"] = r.text
+            await update_payment(payment)
        except Exception as exc:
            # webhook fails shouldn't cause the lnurlw to fail
            # since invoice is already paid
            logger.error(f"Caught exception when dispatching webhook url: {exc!s}")
-            await update_payment_extra(
-                payment_hash=payment_hash,
-                extra={"wh_success": False, "wh_message": str(exc)},
-                outgoing=True,
-            )
+            payment.extra["wh_success"] = False
+            payment.extra["wh_message"] = str(exc)
+            await update_payment(payment)


 # FOR LNURLs WHICH ARE UNIQUE