Merge remote-tracking branch 'lnbits/fix/offlineshop_fiat_decimals' into fix/offlineshop_fiat_decimals

2022-07-28 11:09:06 +01:00 · 2022-07-28 11:09:06 +01:00 · 4ca701a442
commit 4ca701a442
parent 56cac668ca 85db59c359
34 changed files with 91 additions and 45 deletions
--- a/.github/workflows/regtest.yml
+++ b/.github/workflows/regtest.yml
@ -16,9 +16,9 @@ jobs:
          python-version: ${{ matrix.python-version }}
      - name: Setup Regtest
        run: |
-          docker build -t lnbits-legend .
          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
          cd docker
+          git checkout removelnbits
          chmod +x ./tests
          ./tests
          sudo chmod -R a+rwx .
@ -39,8 +39,8 @@ jobs:
          LNBITS_DATA_FOLDER: ./data
          LNBITS_BACKEND_WALLET_CLASS: LndRestWallet
          LND_REST_ENDPOINT: https://localhost:8081/
-          LND_REST_CERT: docker/data/lnd-1/tls.cert
-          LND_REST_MACAROON: docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
+          LND_REST_CERT: ./docker/data/lnd-1/tls.cert
+          LND_REST_MACAROON: ./docker/data/lnd-1/data/chain/bitcoin/regtest/admin.macaroon
        run: |
          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
          make test-real-wallet
@ -57,9 +57,9 @@ jobs:
          python-version: ${{ matrix.python-version }}
      - name: Setup Regtest
        run: |
-          docker build -t lnbits-legend .
          git clone https://github.com/lnbits/legend-regtest-enviroment.git docker
          cd docker
+          git checkout removelnbits
          chmod +x ./tests
          ./tests
          sudo chmod -R a+rwx .
@ -79,7 +79,7 @@ jobs:
          PORT: 5123
          LNBITS_DATA_FOLDER: ./data
          LNBITS_BACKEND_WALLET_CLASS: CLightningWallet
-          CLIGHTNING_RPC: docker/data/clightning-1/regtest/lightning-rpc
+          CLIGHTNING_RPC: ./docker/data/clightning-1/regtest/lightning-rpc
        run: |
          sudo chmod -R a+rwx . && rm -rf ./data && mkdir -p ./data
          make test-real-wallet
--- a/README.md
+++ b/README.md
@ -7,7 +7,7 @@ LNbits

 ![Lightning network wallet](https://i.imgur.com/EHvK6Lq.png)

-# LNbits v0.3 BETA, free and open-source lightning-network wallet/accounts system
+# LNbits v0.9 BETA, free and open-source lightning-network wallet/accounts system

 (Join us on [https://t.me/lnbits](https://t.me/lnbits))

--- a/docs/guide/wallets.md
+++ b/docs/guide/wallets.md
@ -17,7 +17,6 @@ A backend wallet can be configured using the following LNbits environment variab
 ### CLightning

 Using this wallet requires the installation of the `pylightning` Python package.
-If you want to use LNURLp you should use SparkWallet because of an issue with description_hash and CLightning.

 - `LNBITS_BACKEND_WALLET_CLASS`: **CLightningWallet**
 - `CLIGHTNING_RPC`: /file/path/lightning-rpc
--- a/lnbits/app.py
+++ b/lnbits/app.py
@ -45,7 +45,14 @@ def create_app(config_object="lnbits.settings") -> FastAPI:
    """
    configure_logger()

-    app = FastAPI()
+    app = FastAPI(
+        title="LNbits API",
+        description="API for LNbits, the free and open source bitcoin wallet and accounts system with plugins.",
+        license_info={
+            "name": "MIT License",
+            "url": "https://raw.githubusercontent.com/lnbits/lnbits-legend/main/LICENSE",
+        },
+    )
    app.mount("/static", StaticFiles(packages=[("lnbits", "static")]), name="static")
    app.mount(
        "/core/static",
--- a/lnbits/extensions/bleskomat/templates/bleskomat/_api_docs.html
+++ b/lnbits/extensions/bleskomat/templates/bleskomat/_api_docs.html
@ -62,4 +62,5 @@
      </p>
    </q-card-section>
  </q-card>
+  <q-btn flat label="Swagger API" type="a" href="../docs#/Bleskomat"></q-btn>
 </q-expansion-item>
--- a/lnbits/extensions/copilot/templates/copilot/_api_docs.html
+++ b/lnbits/extensions/copilot/templates/copilot/_api_docs.html
@ -14,6 +14,7 @@
    label="API info"
    :content-inset-level="0.5"
  >
+    <q-btn flat label="Swagger API" type="a" href="../docs#/copilot"></q-btn>
    <q-expansion-item group="api" dense expand-separator label="Create copilot">
      <q-card>
        <q-card-section>
--- a/lnbits/extensions/discordbot/templates/discordbot/_api_docs.html
+++ b/lnbits/extensions/discordbot/templates/discordbot/_api_docs.html
@ -34,6 +34,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/discordbot"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="GET users">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/events/crud.py
+++ b/lnbits/extensions/events/crud.py
@ -16,7 +16,7 @@ async def create_ticket(
        INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
        VALUES (?, ?, ?, ?, ?, ?, ?)
        """,
-        (payment_hash, wallet, event, name, email, False, False),
+        (payment_hash, wallet, event, name, email, False, True),
    )

    ticket = await get_ticket(payment_hash)
--- a/lnbits/extensions/events/templates/events/_api_docs.html
+++ b/lnbits/extensions/events/templates/events/_api_docs.html
@ -20,4 +20,5 @@
      </p>
    </q-card-section>
  </q-card>
+  <q-btn flat label="Swagger API" type="a" href="../docs#/events"></q-btn>
 </q-expansion-item>
--- a/lnbits/extensions/events/templates/events/display.html
+++ b/lnbits/extensions/events/templates/events/display.html
@ -135,15 +135,7 @@
        var self = this
        axios

-          .post(
-            '/events/api/v1/tickets/' + '{{ event_id }}/{{ event_price }}',
-            {
-              event: '{{ event_id }}',
-              event_name: '{{ event_name }}',
-              name: self.formDialog.data.name,
-              email: self.formDialog.data.email
-            }
-          )
+          .get('/events/api/v1/tickets/' + '{{ event_id }}')
          .then(function (response) {
            self.paymentReq = response.data.payment_request
            self.paymentCheck = response.data.payment_hash
@ -161,7 +153,17 @@

            paymentChecker = setInterval(function () {
              axios
-                .get('/events/api/v1/tickets/' + self.paymentCheck)
+                .post(
+                  '/events/api/v1/tickets/' +
+                    '{{ event_id }}/' +
+                    self.paymentCheck,
+                  {
+                    event: '{{ event_id }}',
+                    event_name: '{{ event_name }}',
+                    name: self.formDialog.data.name,
+                    email: self.formDialog.data.email
+                  }
+                )
                .then(function (res) {
                  if (res.data.paid) {
                    clearInterval(paymentChecker)
--- a/lnbits/extensions/events/templates/events/register.html
+++ b/lnbits/extensions/events/templates/events/register.html
@ -133,7 +133,10 @@
        var self = this

        LNbits.api
-          .request('GET', '/events/api/v1/register/ticket/' + res)
+          .request(
+            'GET',
+            '/events/api/v1/register/ticket/' + res.split('//')[1]
+          )
          .then(function (response) {
            self.$q.notify({
              type: 'positive',
--- a/lnbits/extensions/events/templates/events/ticket.html
+++ b/lnbits/extensions/events/templates/events/ticket.html
@ -13,9 +13,8 @@
          <br />

          <qrcode
-            :value="'{{ ticket_id }}'"
-            :options="{width: 340}"
-            class="rounded-borders"
+            :value="'ticket://{{ ticket_id }}'"
+            :options="{width: 500}"
          ></qrcode>
          <br />
          <q-btn @click="printWindow" color="grey" class="q-ml-auto">
--- a/lnbits/extensions/events/views_api.py
+++ b/lnbits/extensions/events/views_api.py
@ -97,8 +97,8 @@ async def api_tickets(
    return [ticket.dict() for ticket in await get_tickets(wallet_ids)]


-@events_ext.post("/api/v1/tickets/{event_id}/{sats}")
-async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):
+@events_ext.get("/api/v1/tickets/{event_id}")
+async def api_ticket_make_ticket(event_id):
    event = await get_event(event_id)
    if not event:
        raise HTTPException(
@ -107,13 +107,22 @@ async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):
    try:
        payment_hash, payment_request = await create_invoice(
            wallet_id=event.wallet,
-            amount=int(sats),
+            amount=event.price_per_ticket,
            memo=f"{event_id}",
            extra={"tag": "events"},
        )
    except Exception as e:
        raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))

+    return {"payment_hash": payment_hash, "payment_request": payment_request}
+
+
+@events_ext.post("/api/v1/tickets/{event_id}/{payment_hash}")
+async def api_ticket_send_ticket(event_id, payment_hash, data: CreateTicket):
+    event = await get_event(event_id)
+    try:
+        status = await api_payment(payment_hash)
+        if status["paid"]:
            ticket = await create_ticket(
                payment_hash=payment_hash,
                wallet=event.wallet,
@ -124,20 +133,10 @@ async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):

            if not ticket:
                raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail=f"Event could not be fetched."
+                    status_code=HTTPStatus.NOT_FOUND,
+                    detail=f"Event could not be fetched.",
                )

-    return {"payment_hash": payment_hash, "payment_request": payment_request}
-
-
-@events_ext.get("/api/v1/tickets/{payment_hash}")
-async def api_ticket_send_ticket(payment_hash):
-    ticket = await get_ticket(payment_hash)
-
-    try:
-        status = await api_payment(payment_hash)
-        if status["paid"]:
-            await set_ticket_paid(payment_hash=payment_hash)
            return {"paid": True, "ticket_id": ticket.id}
    except Exception:
        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Not paid")
--- a/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/_api_docs.html
@ -24,6 +24,8 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/jukebox"></q-btn>
+
  <q-expansion-item group="api" dense expand-separator label="List jukeboxes">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/livestream/templates/livestream/_api_docs.html
+++ b/lnbits/extensions/livestream/templates/livestream/_api_docs.html
@ -17,6 +17,8 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/livestream"></q-btn>
+
  <q-expansion-item
    group="api"
    dense
--- a/lnbits/extensions/lnaddress/templates/lnaddress/_api_docs.html
+++ b/lnbits/extensions/lnaddress/templates/lnaddress/_api_docs.html
@ -31,6 +31,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/lnaddress"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="GET domains">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/lndhub/templates/lndhub/_instructions.html
+++ b/lnbits/extensions/lndhub/templates/lndhub/_instructions.html
@ -31,5 +31,6 @@
        </li>
      </ul>
    </q-card-section>
+    <q-btn flat label="Swagger API" type="a" href="../docs#/lndhub"></q-btn>
  </q-card>
 </q-expansion-item>
--- a/lnbits/extensions/lnticket/templates/lnticket/_api_docs.html
+++ b/lnbits/extensions/lnticket/templates/lnticket/_api_docs.html
@ -19,4 +19,5 @@
      </p>
    </q-card-section>
  </q-card>
+  <q-btn flat label="Swagger API" type="a" href="../docs#/lnticket"></q-btn>
 </q-expansion-item>
--- a/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
+++ b/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
@ -17,6 +17,12 @@
    label="API info"
    :content-inset-level="0.5"
  >
+    <q-btn
+      flat
+      label="Swagger API"
+      type="a"
+      href="../docs#/lnurldevice"
+    ></q-btn>
    <q-expansion-item
      group="api"
      dense
--- a/lnbits/extensions/lnurlp/templates/lnurlp/_api_docs.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/lnurlp"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="List pay links">
    <q-card>
      <q-card-section>
@ -51,6 +52,7 @@
    expand-separator
    label="Create a pay link"
  >
+    <q-btn flat label="Swagger API" type="a" href="../docs#/lnurlp"></q-btn>
    <q-card>
      <q-card-section>
        <code><span class="text-green">POST</span> /lnurlp/api/v1/links</code>
--- a/lnbits/extensions/lnurlpayout/config.json.example
+++ b/lnbits/extensions/lnurlpayout/config.json.example
@ -2,5 +2,5 @@
  "name": "LNURLPayout",
  "short_description": "Autodump wallet funds to LNURLpay",
  "icon": "exit_to_app",
-  "contributors": ["arcbtc"]
+  "contributors": ["arcbtc","talvasconcelos"]
 }
--- a/lnbits/extensions/lnurlpayout/templates/lnurlpayout/_api_docs.html
+++ b/lnbits/extensions/lnurlpayout/templates/lnurlpayout/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/lnurlpayout"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="List lnurlpayout">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/offlineshop/templates/offlineshop/_api_docs.html
+++ b/lnbits/extensions/offlineshop/templates/offlineshop/_api_docs.html
@ -47,6 +47,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/offlineshop"></q-btn>
  <q-expansion-item
    group="api"
    dense
--- a/lnbits/extensions/paywall/templates/paywall/_api_docs.html
+++ b/lnbits/extensions/paywall/templates/paywall/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/paywall"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="List paywalls">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/satsdice/templates/satsdice/_api_docs.html
+++ b/lnbits/extensions/satsdice/templates/satsdice/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/satsdice"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="List satsdices">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/satspay/templates/satspay/_api_docs.html
+++ b/lnbits/extensions/satspay/templates/satspay/_api_docs.html
@ -15,6 +15,7 @@
    label="API info"
    :content-inset-level="0.5"
  >
+    <q-btn flat label="Swagger API" type="a" href="../docs#/satspay"></q-btn>
    <q-expansion-item group="api" dense expand-separator label="Create charge">
      <q-card>
        <q-card-section>
--- a/lnbits/extensions/splitpayments/templates/splitpayments/_api_docs.html
+++ b/lnbits/extensions/splitpayments/templates/splitpayments/_api_docs.html
@ -28,6 +28,12 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn
+    flat
+    label="Swagger API"
+    type="a"
+    href="../docs#/splitpayments"
+  ></q-btn>
  <q-expansion-item
    group="api"
    dense
--- a/lnbits/extensions/streamalerts/templates/streamalerts/_api_docs.html
+++ b/lnbits/extensions/streamalerts/templates/streamalerts/_api_docs.html
@ -15,4 +15,5 @@
      >
    </p>
  </q-card-section>
+  <q-btn flat label="Swagger API" type="a" href="../docs#/streamalerts"></q-btn>
 </q-card>
--- a/lnbits/extensions/subdomains/templates/subdomains/_api_docs.html
+++ b/lnbits/extensions/subdomains/templates/subdomains/_api_docs.html
@ -22,5 +22,6 @@
        >
      </p>
    </q-card-section>
+    <q-btn flat label="Swagger API" type="a" href="../docs#/subdomains"></q-btn>
  </q-card>
 </q-expansion-item>
--- a/lnbits/extensions/tipjar/templates/tipjar/_api_docs.html
+++ b/lnbits/extensions/tipjar/templates/tipjar/_api_docs.html
@ -12,4 +12,5 @@
      >
    </p>
  </q-card-section>
+  <q-btn flat label="Swagger API" type="a" href="../docs#/tipjar"></q-btn>
 </q-card>
--- a/lnbits/extensions/tpos/templates/tpos/_api_docs.html
+++ b/lnbits/extensions/tpos/templates/tpos/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/tpos"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="List TPoS">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
+++ b/lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
@ -28,6 +28,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/usermanager"></q-btn>
  <q-expansion-item group="api" dense expand-separator label="GET users">
    <q-card>
      <q-card-section>
--- a/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
@ -20,6 +20,7 @@
    label="API info"
    :content-inset-level="0.5"
  >
+    <q-btn flat label="Swagger API" type="a" href="../docs#/watchonly"></q-btn>
    <q-expansion-item group="api" dense expand-separator label="List wallets">
      <q-card>
        <q-card-section>
--- a/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/_api_docs.html
@ -4,6 +4,7 @@
  label="API info"
  :content-inset-level="0.5"
 >
+  <q-btn flat label="Swagger API" type="a" href="../docs#/withdraw"></q-btn>
  <q-expansion-item
    group="api"
    dense