From f4e7d62ca3291e3c3395ee684433350bf721cfdc Mon Sep 17 00:00:00 2001
From: calle <93376500+callebtc@users.noreply.github.com>
Date: Sat, 16 Jul 2022 14:23:03 +0200
Subject: [PATCH] `make format` everything (#743)

---
 .github/workflows/formatting.yml               | 12 +++++++++++-
 lnbits/__main__.py                             |  8 +++-----
 lnbits/bolt11.py                               | 15 ++++++++-------
 lnbits/commands.py                             | 13 +++++++------
 lnbits/core/crud.py                            | 10 +++++-----
 lnbits/core/models.py                          | 14 +++++++-------
 lnbits/core/services.py                        |  4 +---
 lnbits/core/tasks.py                           |  2 +-
 lnbits/core/views/api.py                       |  4 +---
 lnbits/core/views/generic.py                   |  3 +--
 lnbits/core/views/public_api.py                |  3 +--
 lnbits/db.py                                   |  1 -
 lnbits/decorators.py                           |  4 ++--
 lnbits/extensions/bleskomat/exchange_rates.py  |  3 ++-
 lnbits/extensions/bleskomat/lnurl_api.py       |  3 +--
 lnbits/extensions/bleskomat/models.py          |  5 ++---
 lnbits/extensions/bleskomat/views_api.py       |  3 +--
 lnbits/extensions/copilot/models.py            | 16 +++++++++-------
 lnbits/extensions/discordbot/models.py         |  2 +-
 lnbits/extensions/jukebox/models.py            |  6 +++---
 lnbits/extensions/livestream/views.py          |  4 ++--
 lnbits/extensions/lnaddress/lnurl.py           |  4 +---
 lnbits/extensions/lndhub/decorators.py         |  6 ++----
 lnbits/extensions/lndhub/views.py              |  6 ++++--
 lnbits/extensions/lndhub/views_api.py          |  5 ++---
 lnbits/extensions/lnticket/crud.py             |  7 ++++---
 lnbits/extensions/lnticket/models.py           |  1 +
 lnbits/extensions/lnurldevice/lnurl.py         | 14 +++++---------
 lnbits/extensions/lnurlp/crud.py               |  3 ++-
 lnbits/extensions/lnurlp/models.py             | 14 ++++++++------
 lnbits/extensions/lnurlpayout/__init__.py      |  1 +
 lnbits/extensions/lnurlpayout/crud.py          |  2 +-
 lnbits/extensions/lnurlpayout/tasks.py         |  2 --
 lnbits/extensions/offlineshop/crud.py          |  3 ++-
 lnbits/extensions/offlineshop/helpers.py       |  2 +-
 lnbits/extensions/offlineshop/models.py        |  7 ++++---
 lnbits/extensions/offlineshop/views.py         |  8 ++++----
 lnbits/extensions/subdomains/cloudflare.py     |  5 ++++-
 lnbits/extensions/tpos/__init__.py             |  2 +-
 lnbits/extensions/tpos/views.py                |  5 +----
 lnbits/extensions/tpos/views_api.py            |  3 +--
 lnbits/extensions/usermanager/models.py        |  2 +-
 lnbits/extensions/withdraw/lnurl.py            |  6 ++----
 lnbits/proxy_fix.py                            |  6 +++---
 lnbits/tasks.py                                | 14 ++++++--------
 lnbits/utils/exchange_rates.py                 |  3 +--
 lnbits/wallets/base.py                         |  2 +-
 lnbits/wallets/clightning.py                   |  5 +++--
 lnbits/wallets/eclair.py                       |  3 +--
 lnbits/wallets/fake.py                         | 14 +++++++-------
 lnbits/wallets/lnbits.py                       |  6 +++---
 lnbits/wallets/lnd_grpc_files/lightning_pb2.py |  2 +-
 lnbits/wallets/lndgrpc.py                      | 10 +++++-----
 lnbits/wallets/lndrest.py                      | 12 ++++++------
 lnbits/wallets/lnpay.py                        | 12 ++++++------
 lnbits/wallets/lntxbot.py                      |  6 +++---
 lnbits/wallets/macaroon/__init__.py            |  2 +-
 lnbits/wallets/macaroon/macaroon.py            |  8 ++++----
 lnbits/wallets/opennode.py                     | 14 +++++++-------
 lnbits/wallets/spark.py                        |  6 +++---
 60 files changed, 182 insertions(+), 186 deletions(-)

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 18c8d5d68..23d7ae3e7 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -15,6 +15,16 @@ jobs:
       - run: python3 -m venv venv
       - run: ./venv/bin/pip install black
       - run: make checkblack
+  isort:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+      - run: sudo apt-get install python3-venv
+      - run: python3 -m venv venv
+      - run: ./venv/bin/pip install isort
+      - run: make checkisort
+            
   prettier:
     runs-on: ubuntu-latest
     steps:
@@ -23,4 +33,4 @@ jobs:
       - run: sudo apt-get install python3-venv
       - run: python3 -m venv venv
       - run: npm install prettier
-      - run: ./node_modules/.bin/prettier --check lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js
\ No newline at end of file
+      - run: ./node_modules/.bin/prettier --check lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js
diff --git a/lnbits/__main__.py b/lnbits/__main__.py
index 93e2181c6..90464a64b 100644
--- a/lnbits/__main__.py
+++ b/lnbits/__main__.py
@@ -1,21 +1,19 @@
 import asyncio
 
 import uvloop
-from starlette.requests import Request
-
 from loguru import logger
+from starlette.requests import Request
 
 from .commands import bundle_vendored, migrate_databases, transpile_scss
 from .settings import (
     DEBUG,
+    HOST,
     LNBITS_COMMIT,
     LNBITS_DATA_FOLDER,
+    LNBITS_DATABASE_URL,
     LNBITS_SITE_TITLE,
-    HOST,
     PORT,
     WALLET,
-    LNBITS_DATABASE_URL,
-    LNBITS_DATA_FOLDER,
 )
 
 uvloop.install()
diff --git a/lnbits/bolt11.py b/lnbits/bolt11.py
index e52219840..cc8415852 100644
--- a/lnbits/bolt11.py
+++ b/lnbits/bolt11.py
@@ -1,15 +1,16 @@
-import bitstring  # type: ignore
-import re
 import hashlib
-from typing import List, NamedTuple, Optional
-from bech32 import bech32_encode, bech32_decode, CHARSET
-from ecdsa import SECP256k1, VerifyingKey  # type: ignore
-from ecdsa.util import sigdecode_string  # type: ignore
-from binascii import unhexlify
+import re
 import time
+from binascii import unhexlify
 from decimal import Decimal
+from typing import List, NamedTuple, Optional
+
+import bitstring  # type: ignore
 import embit
 import secp256k1
+from bech32 import CHARSET, bech32_decode, bech32_encode
+from ecdsa import SECP256k1, VerifyingKey  # type: ignore
+from ecdsa.util import sigdecode_string  # type: ignore
 
 
 class Route(NamedTuple):
diff --git a/lnbits/commands.py b/lnbits/commands.py
index 13e926e84..0f7454f23 100644
--- a/lnbits/commands.py
+++ b/lnbits/commands.py
@@ -1,18 +1,19 @@
 import asyncio
-import warnings
-import click
 import importlib
-import re
 import os
+import re
+import warnings
 
+import click
 from loguru import logger
 
-from .db import SQLITE, POSTGRES, COCKROACH
-from .core import db as core_db, migrations as core_migrations
+from .core import db as core_db
+from .core import migrations as core_migrations
+from .db import COCKROACH, POSTGRES, SQLITE
 from .helpers import (
-    get_valid_extensions,
     get_css_vendored,
     get_js_vendored,
+    get_valid_extensions,
     url_for_vendored,
 )
 from .settings import LNBITS_PATH
diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py
index 1493d4e4d..770e2906a 100644
--- a/lnbits/core/crud.py
+++ b/lnbits/core/crud.py
@@ -1,15 +1,15 @@
-import json
 import datetime
-from uuid import uuid4
-from typing import List, Optional, Dict, Any
+import json
+from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
+from uuid import uuid4
 
 from lnbits import bolt11
-from lnbits.db import Connection, POSTGRES, COCKROACH
+from lnbits.db import COCKROACH, POSTGRES, Connection
 from lnbits.settings import DEFAULT_WALLET_NAME, LNBITS_ADMIN_USERS
 
 from . import db
-from .models import User, Wallet, Payment, BalanceCheck
+from .models import BalanceCheck, Payment, User, Wallet
 
 # accounts
 # --------
diff --git a/lnbits/core/models.py b/lnbits/core/models.py
index a6cdb23bd..ab73b7020 100644
--- a/lnbits/core/models.py
+++ b/lnbits/core/models.py
@@ -1,15 +1,15 @@
-import json
-import hmac
 import hashlib
-from lnbits.helpers import url_for
+import hmac
+import json
+from sqlite3 import Row
+from typing import Dict, List, NamedTuple, Optional
+
 from ecdsa import SECP256k1, SigningKey  # type: ignore
 from lnurl import encode as lnurl_encode  # type: ignore
-from typing import List, NamedTuple, Optional, Dict
-from sqlite3 import Row
+from loguru import logger
 from pydantic import BaseModel
 
-from loguru import logger
-
+from lnbits.helpers import url_for
 from lnbits.settings import WALLET
 
 
diff --git a/lnbits/core/services.py b/lnbits/core/services.py
index 6a24348eb..84bc98e3b 100644
--- a/lnbits/core/services.py
+++ b/lnbits/core/services.py
@@ -3,14 +3,12 @@ import json
 from binascii import unhexlify
 from io import BytesIO
 from typing import Dict, Optional, Tuple
-
-from loguru import logger
-
 from urllib.parse import parse_qs, urlparse
 
 import httpx
 from lnurl import LnurlErrorResponse
 from lnurl import decode as decode_lnurl  # type: ignore
+from loguru import logger
 
 from lnbits import bolt11
 from lnbits.db import Connection
diff --git a/lnbits/core/tasks.py b/lnbits/core/tasks.py
index bb258958a..5fea769d4 100644
--- a/lnbits/core/tasks.py
+++ b/lnbits/core/tasks.py
@@ -1,7 +1,7 @@
 import asyncio
-import httpx
 from typing import List
 
+import httpx
 from loguru import logger
 
 from lnbits.tasks import register_invoice_listener
diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 2a4cc3e80..f5b580414 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -7,13 +7,11 @@ from typing import Dict, List, Optional, Union
 from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
 
 import httpx
-
-from loguru import logger
-
 from fastapi import Header, Query, Request
 from fastapi.exceptions import HTTPException
 from fastapi.param_functions import Depends
 from fastapi.params import Body
+from loguru import logger
 from pydantic import BaseModel
 from pydantic.fields import Field
 from sse_starlette.sse import EventSourceResponse
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py
index b6750c95f..4366028d7 100644
--- a/lnbits/core/views/generic.py
+++ b/lnbits/core/views/generic.py
@@ -7,11 +7,10 @@ from fastapi.exceptions import HTTPException
 from fastapi.params import Depends, Query
 from fastapi.responses import FileResponse, RedirectResponse
 from fastapi.routing import APIRouter
+from loguru import logger
 from pydantic.types import UUID4
 from starlette.responses import HTMLResponse, JSONResponse
 
-from loguru import logger
-
 from lnbits.core import db
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists
diff --git a/lnbits/core/views/public_api.py b/lnbits/core/views/public_api.py
index 0b84243e1..2d2cdd66c 100644
--- a/lnbits/core/views/public_api.py
+++ b/lnbits/core/views/public_api.py
@@ -4,11 +4,10 @@ from http import HTTPStatus
 from urllib.parse import urlparse
 
 from fastapi import HTTPException
+from loguru import logger
 from starlette.requests import Request
 from starlette.responses import HTMLResponse
 
-from loguru import logger
-
 from lnbits import bolt11
 
 from .. import core_app
diff --git a/lnbits/db.py b/lnbits/db.py
index bed9397fa..669817842 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -6,7 +6,6 @@ from contextlib import asynccontextmanager
 from typing import Optional
 
 from loguru import logger
-
 from sqlalchemy import create_engine
 from sqlalchemy_aio.base import AsyncConnection
 from sqlalchemy_aio.strategy import ASYNCIO_STRATEGY  # type: ignore
diff --git a/lnbits/decorators.py b/lnbits/decorators.py
index d6f73f406..e65b9041a 100644
--- a/lnbits/decorators.py
+++ b/lnbits/decorators.py
@@ -14,9 +14,9 @@ from lnbits.core.crud import get_user, get_wallet_for_key
 from lnbits.core.models import User, Wallet
 from lnbits.requestvars import g
 from lnbits.settings import (
-    LNBITS_ALLOWED_USERS,
-    LNBITS_ADMIN_USERS,
     LNBITS_ADMIN_EXTENSIONS,
+    LNBITS_ADMIN_USERS,
+    LNBITS_ALLOWED_USERS,
 )
 
 
diff --git a/lnbits/extensions/bleskomat/exchange_rates.py b/lnbits/extensions/bleskomat/exchange_rates.py
index dcdaa2205..e5eb843f7 100644
--- a/lnbits/extensions/bleskomat/exchange_rates.py
+++ b/lnbits/extensions/bleskomat/exchange_rates.py
@@ -1,7 +1,8 @@
-import httpx
 import json
 import os
 
+import httpx
+
 fiat_currencies = json.load(
     open(
         os.path.join(
diff --git a/lnbits/extensions/bleskomat/lnurl_api.py b/lnbits/extensions/bleskomat/lnurl_api.py
index 212f9b4a9..33e33a700 100644
--- a/lnbits/extensions/bleskomat/lnurl_api.py
+++ b/lnbits/extensions/bleskomat/lnurl_api.py
@@ -3,9 +3,8 @@ import math
 import traceback
 from http import HTTPStatus
 
-from starlette.requests import Request
-
 from loguru import logger
+from starlette.requests import Request
 
 from . import bleskomat_ext
 from .crud import (
diff --git a/lnbits/extensions/bleskomat/models.py b/lnbits/extensions/bleskomat/models.py
index ab952b55e..364cbe223 100644
--- a/lnbits/extensions/bleskomat/models.py
+++ b/lnbits/extensions/bleskomat/models.py
@@ -3,13 +3,12 @@ import time
 from typing import Dict
 
 from fastapi.params import Query
+from loguru import logger
 from pydantic import BaseModel, validator
 from starlette.requests import Request
 
-from loguru import logger
-
 from lnbits import bolt11
-from lnbits.core.services import pay_invoice, PaymentFailure
+from lnbits.core.services import PaymentFailure, pay_invoice
 
 from . import db
 from .exchange_rates import exchange_rate_providers, fiat_currencies
diff --git a/lnbits/extensions/bleskomat/views_api.py b/lnbits/extensions/bleskomat/views_api.py
index 81efa4abf..e29e3fe76 100644
--- a/lnbits/extensions/bleskomat/views_api.py
+++ b/lnbits/extensions/bleskomat/views_api.py
@@ -1,9 +1,8 @@
 from http import HTTPStatus
 
 from fastapi import Depends, Query
-from starlette.exceptions import HTTPException
-
 from loguru import logger
+from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.decorators import WalletTypeInfo, require_admin_key
diff --git a/lnbits/extensions/copilot/models.py b/lnbits/extensions/copilot/models.py
index a279879dc..b9b43ccfb 100644
--- a/lnbits/extensions/copilot/models.py
+++ b/lnbits/extensions/copilot/models.py
@@ -1,12 +1,14 @@
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
-from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
-from pydantic import BaseModel
 import json
 from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
+from fastapi.param_functions import Query
+from lnurl.types import LnurlPayMetadata  # type: ignore
+from pydantic import BaseModel
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class CreateCopilotData(BaseModel):
diff --git a/lnbits/extensions/discordbot/models.py b/lnbits/extensions/discordbot/models.py
index 985eb096f..8b9cd822a 100644
--- a/lnbits/extensions/discordbot/models.py
+++ b/lnbits/extensions/discordbot/models.py
@@ -1,8 +1,8 @@
 from sqlite3 import Row
+from typing import Optional
 
 from fastapi.param_functions import Query
 from pydantic import BaseModel
-from typing import Optional
 
 
 class CreateUserData(BaseModel):
diff --git a/lnbits/extensions/jukebox/models.py b/lnbits/extensions/jukebox/models.py
index 093961e42..90984b036 100644
--- a/lnbits/extensions/jukebox/models.py
+++ b/lnbits/extensions/jukebox/models.py
@@ -1,9 +1,9 @@
-from typing import NamedTuple
 from sqlite3 import Row
+from typing import NamedTuple, Optional
+
 from fastapi.param_functions import Query
-from pydantic.main import BaseModel
 from pydantic import BaseModel
-from typing import Optional
+from pydantic.main import BaseModel
 
 
 class CreateJukeLinkData(BaseModel):
diff --git a/lnbits/extensions/livestream/views.py b/lnbits/extensions/livestream/views.py
index ef0354315..97f803a31 100644
--- a/lnbits/extensions/livestream/views.py
+++ b/lnbits/extensions/livestream/views.py
@@ -1,7 +1,5 @@
 from http import HTTPStatus
 
-# from mmap import MAP_DENYWRITE
-
 from fastapi.param_functions import Depends
 from fastapi.params import Query
 from starlette.exceptions import HTTPException
@@ -15,6 +13,8 @@ from lnbits.decorators import check_user_exists
 from . import livestream_ext, livestream_renderer
 from .crud import get_livestream_by_track, get_track
 
+# from mmap import MAP_DENYWRITE
+
 
 @livestream_ext.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py
index 2b064e0a1..e6a1ff486 100644
--- a/lnbits/extensions/lnaddress/lnurl.py
+++ b/lnbits/extensions/lnaddress/lnurl.py
@@ -3,15 +3,13 @@ import json
 from datetime import datetime, timedelta
 
 import httpx
-
-from loguru import logger
-
 from fastapi.params import Query
 from lnurl import (  # type: ignore
     LnurlErrorResponse,
     LnurlPayActionResponse,
     LnurlPayResponse,
 )
+from loguru import logger
 from starlette.requests import Request
 from starlette.responses import HTMLResponse
 
diff --git a/lnbits/extensions/lndhub/decorators.py b/lnbits/extensions/lndhub/decorators.py
index 149311643..4698e9b90 100644
--- a/lnbits/extensions/lndhub/decorators.py
+++ b/lnbits/extensions/lndhub/decorators.py
@@ -1,14 +1,12 @@
 from base64 import b64decode
-from fastapi.param_functions import Security
-
-from fastapi.security.api_key import APIKeyHeader
 
 from fastapi import Request, status
+from fastapi.param_functions import Security
+from fastapi.security.api_key import APIKeyHeader
 from starlette.exceptions import HTTPException
 
 from lnbits.decorators import WalletTypeInfo, get_key_type  # type: ignore
 
-
 api_key_header_auth = APIKeyHeader(
     name="AUTHORIZATION",
     auto_error=False,
diff --git a/lnbits/extensions/lndhub/views.py b/lnbits/extensions/lndhub/views.py
index 4b015c09f..38a33a34a 100644
--- a/lnbits/extensions/lndhub/views.py
+++ b/lnbits/extensions/lndhub/views.py
@@ -1,8 +1,10 @@
-from lnbits.decorators import check_user_exists
-from . import lndhub_ext, lndhub_renderer
 from fastapi import Request
 from fastapi.params import Depends
+
 from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+
+from . import lndhub_ext, lndhub_renderer
 
 
 @lndhub_ext.get("/")
diff --git a/lnbits/extensions/lndhub/views_api.py b/lnbits/extensions/lndhub/views_api.py
index 8cbf5b01c..a3160fa9a 100644
--- a/lnbits/extensions/lndhub/views_api.py
+++ b/lnbits/extensions/lndhub/views_api.py
@@ -1,6 +1,5 @@
-import time
 import asyncio
-
+import time
 from base64 import urlsafe_b64encode
 from http import HTTPStatus
 
@@ -13,7 +12,7 @@ from lnbits import bolt11
 from lnbits.core.crud import delete_expired_invoices, get_payments
 from lnbits.core.services import create_invoice, pay_invoice
 from lnbits.decorators import WalletTypeInfo
-from lnbits.settings import WALLET, LNBITS_SITE_TITLE
+from lnbits.settings import LNBITS_SITE_TITLE, WALLET
 
 from . import lndhub_ext
 from .decorators import check_wallet, require_admin_key
diff --git a/lnbits/extensions/lnticket/crud.py b/lnbits/extensions/lnticket/crud.py
index 8fe170905..3254ad438 100644
--- a/lnbits/extensions/lnticket/crud.py
+++ b/lnbits/extensions/lnticket/crud.py
@@ -1,11 +1,12 @@
-from lnbits.core.models import Wallet
 from typing import List, Optional, Union
 
+import httpx
+
+from lnbits.core.models import Wallet
 from lnbits.helpers import urlsafe_short_hash
 
 from . import db
-from .models import CreateFormData, CreateTicketData, Tickets, Forms
-import httpx
+from .models import CreateFormData, CreateTicketData, Forms, Tickets
 
 
 async def create_ticket(
diff --git a/lnbits/extensions/lnticket/models.py b/lnbits/extensions/lnticket/models.py
index 50ffc1e1d..a7a3cf8c3 100644
--- a/lnbits/extensions/lnticket/models.py
+++ b/lnbits/extensions/lnticket/models.py
@@ -1,4 +1,5 @@
 from typing import Optional
+
 from fastapi.param_functions import Query
 from pydantic import BaseModel
 
diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py
index 26a127f19..5e25dadbe 100644
--- a/lnbits/extensions/lnurldevice/lnurl.py
+++ b/lnbits/extensions/lnurldevice/lnurl.py
@@ -1,30 +1,26 @@
 import base64
 import hashlib
+import hmac
 from http import HTTPStatus
+from io import BytesIO
 from typing import Optional
 
-from embit import bech32
-from embit import compact
-import base64
-from io import BytesIO
-import hmac
-
+from embit import bech32, compact
 from fastapi import Request
 from fastapi.param_functions import Query
 from starlette.exceptions import HTTPException
 
 from lnbits.core.services import create_invoice
-from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
 from lnbits.core.views.api import pay_invoice
-
+from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
 
 from . import lnurldevice_ext
 from .crud import (
     create_lnurldevicepayment,
     get_lnurldevice,
     get_lnurldevicepayment,
-    update_lnurldevicepayment,
     get_lnurlpayload,
+    update_lnurldevicepayment,
 )
 
 
diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py
index c70465881..9cb01fdef 100644
--- a/lnbits/extensions/lnurlp/crud.py
+++ b/lnbits/extensions/lnurlp/crud.py
@@ -1,8 +1,9 @@
 from typing import List, Optional, Union
 
 from lnbits.db import SQLITE
+
 from . import db
-from .models import PayLink, CreatePayLinkData
+from .models import CreatePayLinkData, PayLink
 
 
 async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink:
diff --git a/lnbits/extensions/lnurlp/models.py b/lnbits/extensions/lnurlp/models.py
index bd121cc84..4bd438a4f 100644
--- a/lnbits/extensions/lnurlp/models.py
+++ b/lnbits/extensions/lnurlp/models.py
@@ -1,12 +1,14 @@
 import json
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
-from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
+from fastapi.param_functions import Query
+from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode  # type: ignore
 
 
 class CreatePayLinkData(BaseModel):
diff --git a/lnbits/extensions/lnurlpayout/__init__.py b/lnbits/extensions/lnurlpayout/__init__.py
index 1626e2e53..9962290cd 100644
--- a/lnbits/extensions/lnurlpayout/__init__.py
+++ b/lnbits/extensions/lnurlpayout/__init__.py
@@ -1,4 +1,5 @@
 import asyncio
+
 from fastapi import APIRouter
 
 from lnbits.db import Database
diff --git a/lnbits/extensions/lnurlpayout/crud.py b/lnbits/extensions/lnurlpayout/crud.py
index 6cbf6c547..0f9f98acb 100644
--- a/lnbits/extensions/lnurlpayout/crud.py
+++ b/lnbits/extensions/lnurlpayout/crud.py
@@ -3,7 +3,7 @@ from typing import List, Optional, Union
 from lnbits.helpers import urlsafe_short_hash
 
 from . import db
-from .models import lnurlpayout, CreateLnurlPayoutData
+from .models import CreateLnurlPayoutData, lnurlpayout
 
 
 async def create_lnurlpayout(
diff --git a/lnbits/extensions/lnurlpayout/tasks.py b/lnbits/extensions/lnurlpayout/tasks.py
index d2b3809b4..b621876cb 100644
--- a/lnbits/extensions/lnurlpayout/tasks.py
+++ b/lnbits/extensions/lnurlpayout/tasks.py
@@ -2,9 +2,7 @@ import asyncio
 from http import HTTPStatus
 
 import httpx
-
 from loguru import logger
-
 from starlette.exceptions import HTTPException
 
 from lnbits.core import db as core_db
diff --git a/lnbits/extensions/offlineshop/crud.py b/lnbits/extensions/offlineshop/crud.py
index 0ecb3d526..bc4f3f14a 100644
--- a/lnbits/extensions/offlineshop/crud.py
+++ b/lnbits/extensions/offlineshop/crud.py
@@ -1,9 +1,10 @@
 from typing import List, Optional
 
 from lnbits.db import SQLITE
+
 from . import db
+from .models import Item, Shop
 from .wordlists import animals
-from .models import Shop, Item
 
 
 async def create_shop(*, wallet_id: str) -> int:
diff --git a/lnbits/extensions/offlineshop/helpers.py b/lnbits/extensions/offlineshop/helpers.py
index 6b56cf559..86a653aa2 100644
--- a/lnbits/extensions/offlineshop/helpers.py
+++ b/lnbits/extensions/offlineshop/helpers.py
@@ -1,6 +1,6 @@
 import base64
-import struct
 import hmac
+import struct
 import time
 
 
diff --git a/lnbits/extensions/offlineshop/models.py b/lnbits/extensions/offlineshop/models.py
index 06225351c..0128fdb84 100644
--- a/lnbits/extensions/offlineshop/models.py
+++ b/lnbits/extensions/offlineshop/models.py
@@ -1,14 +1,15 @@
-import json
 import base64
 import hashlib
+import json
 from collections import OrderedDict
+from typing import Dict, List, Optional
 
-from typing import Optional, List, Dict
 from lnurl import encode as lnurl_encode  # type: ignore
-from lnurl.types import LnurlPayMetadata  # type: ignore
 from lnurl.models import LnurlPaySuccessAction, UrlAction  # type: ignore
+from lnurl.types import LnurlPayMetadata  # type: ignore
 from pydantic import BaseModel
 from starlette.requests import Request
+
 from .helpers import totp
 
 shop_counters: Dict = {}
diff --git a/lnbits/extensions/offlineshop/views.py b/lnbits/extensions/offlineshop/views.py
index e1d3a66e3..34bb7a03e 100644
--- a/lnbits/extensions/offlineshop/views.py
+++ b/lnbits/extensions/offlineshop/views.py
@@ -3,18 +3,18 @@ from datetime import datetime
 from http import HTTPStatus
 from typing import List
 
+from fastapi import HTTPException, Request
 from fastapi.params import Depends, Query
 from starlette.responses import HTMLResponse
 
-from lnbits.decorators import check_user_exists
-from lnbits.core.models import Payment, User
 from lnbits.core.crud import get_standalone_payment
+from lnbits.core.models import Payment, User
 from lnbits.core.views.api import api_payment
+from lnbits.decorators import check_user_exists
 
 from . import offlineshop_ext, offlineshop_renderer
-from .models import Item
 from .crud import get_item, get_shop
-from fastapi import Request, HTTPException
+from .models import Item
 
 
 @offlineshop_ext.get("/", response_class=HTMLResponse)
diff --git a/lnbits/extensions/subdomains/cloudflare.py b/lnbits/extensions/subdomains/cloudflare.py
index 8ada2a908..679ca8436 100644
--- a/lnbits/extensions/subdomains/cloudflare.py
+++ b/lnbits/extensions/subdomains/cloudflare.py
@@ -1,5 +1,8 @@
+import json
+
+import httpx
+
 from lnbits.extensions.subdomains.models import Domains
-import httpx, json
 
 
 async def cloudflare_create_subdomain(
diff --git a/lnbits/extensions/tpos/__init__.py b/lnbits/extensions/tpos/__init__.py
index 1aed95bac..3ce618aa6 100644
--- a/lnbits/extensions/tpos/__init__.py
+++ b/lnbits/extensions/tpos/__init__.py
@@ -16,8 +16,8 @@ def tpos_renderer():
 
 
 from .tasks import wait_for_paid_invoices
-from .views_api import *  # noqa
 from .views import *  # noqa
+from .views_api import *  # noqa
 
 
 def tpos_start():
diff --git a/lnbits/extensions/tpos/views.py b/lnbits/extensions/tpos/views.py
index 21a471c4a..e1f1d21e3 100644
--- a/lnbits/extensions/tpos/views.py
+++ b/lnbits/extensions/tpos/views.py
@@ -8,10 +8,7 @@ from starlette.responses import HTMLResponse
 
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists
-from lnbits.settings import (
-    LNBITS_CUSTOM_LOGO,
-    LNBITS_SITE_TITLE,
-)
+from lnbits.settings import LNBITS_CUSTOM_LOGO, LNBITS_SITE_TITLE
 
 from . import tpos_ext, tpos_renderer
 from .crud import get_tpos
diff --git a/lnbits/extensions/tpos/views_api.py b/lnbits/extensions/tpos/views_api.py
index 6a4e5c43e..9567f98a6 100644
--- a/lnbits/extensions/tpos/views_api.py
+++ b/lnbits/extensions/tpos/views_api.py
@@ -2,9 +2,8 @@ from http import HTTPStatus
 
 from fastapi import Query
 from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
 from loguru import logger
+from starlette.exceptions import HTTPException
 
 from lnbits.core.crud import get_user
 from lnbits.core.services import create_invoice
diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py
index 67facec68..15f50e288 100644
--- a/lnbits/extensions/usermanager/models.py
+++ b/lnbits/extensions/usermanager/models.py
@@ -1,8 +1,8 @@
 from sqlite3 import Row
+from typing import Optional
 
 from fastapi.param_functions import Query
 from pydantic import BaseModel
-from typing import Optional
 
 
 class CreateUserData(BaseModel):
diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py
index 05b3908c2..18a99599c 100644
--- a/lnbits/extensions/withdraw/lnurl.py
+++ b/lnbits/extensions/withdraw/lnurl.py
@@ -1,15 +1,13 @@
 import json
 import traceback
-import httpx
-
 from datetime import datetime
 from http import HTTPStatus
 
-from loguru import logger
-
+import httpx
 import shortuuid  # type: ignore
 from fastapi import HTTPException
 from fastapi.param_functions import Query
+from loguru import logger
 from starlette.requests import Request
 from starlette.responses import HTMLResponse  # type: ignore
 
diff --git a/lnbits/proxy_fix.py b/lnbits/proxy_fix.py
index ec2a85b1a..897835e0d 100644
--- a/lnbits/proxy_fix.py
+++ b/lnbits/proxy_fix.py
@@ -1,11 +1,11 @@
-from typing import Optional, List, Callable
 from functools import partial
-from urllib.request import parse_http_list as _parse_list_header
+from typing import Callable, List, Optional
 from urllib.parse import urlparse
-from werkzeug.datastructures import Headers
+from urllib.request import parse_http_list as _parse_list_header
 
 from quart import Request
 from quart_trio.asgi import TrioASGIHTTPConnection
+from werkzeug.datastructures import Headers
 
 
 class ASGIProxyFix(TrioASGIHTTPConnection):
diff --git a/lnbits/tasks.py b/lnbits/tasks.py
index 69aa19066..86863f98f 100644
--- a/lnbits/tasks.py
+++ b/lnbits/tasks.py
@@ -1,22 +1,20 @@
-import time
 import asyncio
+import time
 import traceback
 from http import HTTPStatus
-from typing import List, Callable
-
-from loguru import logger
+from typing import Callable, List
 
 from fastapi.exceptions import HTTPException
+from loguru import logger
 
-from lnbits.settings import WALLET
 from lnbits.core.crud import (
-    get_payments,
-    get_standalone_payment,
     delete_expired_invoices,
     get_balance_checks,
+    get_payments,
+    get_standalone_payment,
 )
 from lnbits.core.services import redeem_lnurl_withdraw
-
+from lnbits.settings import WALLET
 
 deferred_async: List[Callable] = []
 
diff --git a/lnbits/utils/exchange_rates.py b/lnbits/utils/exchange_rates.py
index b836a9091..cec0216a7 100644
--- a/lnbits/utils/exchange_rates.py
+++ b/lnbits/utils/exchange_rates.py
@@ -1,9 +1,8 @@
 import asyncio
 from typing import Callable, NamedTuple
 
-from loguru import logger
-
 import httpx
+from loguru import logger
 
 currencies = {
     "AED": "United Arab Emirates Dirham",
diff --git a/lnbits/wallets/base.py b/lnbits/wallets/base.py
index 39c687594..f35eb3704 100644
--- a/lnbits/wallets/base.py
+++ b/lnbits/wallets/base.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import NamedTuple, Optional, AsyncGenerator, Coroutine
+from typing import AsyncGenerator, Coroutine, NamedTuple, Optional
 
 
 class StatusResponse(NamedTuple):
diff --git a/lnbits/wallets/clightning.py b/lnbits/wallets/clightning.py
index f8c2b16cf..fc79b3e32 100644
--- a/lnbits/wallets/clightning.py
+++ b/lnbits/wallets/clightning.py
@@ -5,10 +5,12 @@ except ImportError:  # pragma: nocover
 
 import asyncio
 import random
+import time
 from functools import partial, wraps
 from os import getenv
 from typing import AsyncGenerator, Optional
-import time
+
+from lnbits import bolt11 as lnbits_bolt11
 
 from .base import (
     InvoiceResponse,
@@ -18,7 +20,6 @@ from .base import (
     Unsupported,
     Wallet,
 )
-from lnbits import bolt11 as lnbits_bolt11
 
 
 def async_wrap(func):
diff --git a/lnbits/wallets/eclair.py b/lnbits/wallets/eclair.py
index 9ae910e93..0ac3fd2a0 100644
--- a/lnbits/wallets/eclair.py
+++ b/lnbits/wallets/eclair.py
@@ -5,9 +5,8 @@ import urllib.parse
 from os import getenv
 from typing import AsyncGenerator, Dict, Optional
 
-from loguru import logger
-
 import httpx
+from loguru import logger
 from websockets import connect
 from websockets.exceptions import (
     ConnectionClosed,
diff --git a/lnbits/wallets/fake.py b/lnbits/wallets/fake.py
index 635e75108..ff64bd613 100644
--- a/lnbits/wallets/fake.py
+++ b/lnbits/wallets/fake.py
@@ -1,20 +1,20 @@
 import asyncio
-
-from os import getenv
-from datetime import datetime
-from typing import Optional, Dict, AsyncGenerator
+import hashlib
 import random
+from datetime import datetime
+from os import getenv
+from typing import AsyncGenerator, Dict, Optional
 
 from loguru import logger
 
 from lnbits.helpers import urlsafe_short_hash
-import hashlib
-from ..bolt11 import encode, decode
+
+from ..bolt11 import decode, encode
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
 
diff --git a/lnbits/wallets/lnbits.py b/lnbits/wallets/lnbits.py
index 7af252983..551861961 100644
--- a/lnbits/wallets/lnbits.py
+++ b/lnbits/wallets/lnbits.py
@@ -1,16 +1,16 @@
 import asyncio
 import json
-import httpx
 from os import getenv
-from typing import Optional, Dict, AsyncGenerator
+from typing import AsyncGenerator, Dict, Optional
 
+import httpx
 from loguru import logger
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
 
diff --git a/lnbits/wallets/lnd_grpc_files/lightning_pb2.py b/lnbits/wallets/lnd_grpc_files/lightning_pb2.py
index 6a1cf8fe3..9065e3f68 100644
--- a/lnbits/wallets/lnd_grpc_files/lightning_pb2.py
+++ b/lnbits/wallets/lnd_grpc_files/lightning_pb2.py
@@ -2,11 +2,11 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: lightning.proto
 """Generated protocol buffer code."""
-from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import enum_type_wrapper
 
 # @@protoc_insertion_point(imports)
 
diff --git a/lnbits/wallets/lndgrpc.py b/lnbits/wallets/lndgrpc.py
index 137d4e33b..44fee78c3 100644
--- a/lnbits/wallets/lndgrpc.py
+++ b/lnbits/wallets/lndgrpc.py
@@ -1,30 +1,30 @@
 imports_ok = True
 try:
-    from google import protobuf
     import grpc
+    from google import protobuf
 except ImportError:  # pragma: nocover
     imports_ok = False
 
 
-import binascii
 import base64
+import binascii
 import hashlib
 from os import environ, error, getenv
-from typing import Optional, Dict, AsyncGenerator
+from typing import AsyncGenerator, Dict, Optional
 
 from loguru import logger
 
-from .macaroon import load_macaroon, AESCipher
+from .macaroon import AESCipher, load_macaroon
 
 if imports_ok:
     import lnbits.wallets.lnd_grpc_files.lightning_pb2 as ln
     import lnbits.wallets.lnd_grpc_files.lightning_pb2_grpc as lnrpc
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
 
diff --git a/lnbits/wallets/lndrest.py b/lnbits/wallets/lndrest.py
index 3cf5d5b75..56d18dc42 100644
--- a/lnbits/wallets/lndrest.py
+++ b/lnbits/wallets/lndrest.py
@@ -1,23 +1,23 @@
 import asyncio
-from pydoc import describe
-import httpx
-import json
 import base64
+import json
 from os import getenv
-from typing import Optional, Dict, AsyncGenerator
+from pydoc import describe
+from typing import AsyncGenerator, Dict, Optional
 
+import httpx
 from loguru import logger
 
 from lnbits import bolt11 as lnbits_bolt11
-from .macaroon import load_macaroon, AESCipher
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
+from .macaroon import AESCipher, load_macaroon
 
 
 class LndRestWallet(Wallet):
diff --git a/lnbits/wallets/lnpay.py b/lnbits/wallets/lnpay.py
index 7089241e1..807d72538 100644
--- a/lnbits/wallets/lnpay.py
+++ b/lnbits/wallets/lnpay.py
@@ -1,18 +1,18 @@
-import json
 import asyncio
-from fastapi.exceptions import HTTPException
-import httpx
-from os import getenv
+import json
 from http import HTTPStatus
-from typing import Optional, Dict, AsyncGenerator
+from os import getenv
+from typing import AsyncGenerator, Dict, Optional
 
+import httpx
+from fastapi.exceptions import HTTPException
 from loguru import logger
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
 
diff --git a/lnbits/wallets/lntxbot.py b/lnbits/wallets/lntxbot.py
index 3ec571ec9..47a1f6c1b 100644
--- a/lnbits/wallets/lntxbot.py
+++ b/lnbits/wallets/lntxbot.py
@@ -1,16 +1,16 @@
 import asyncio
 import json
-import httpx
 from os import getenv
-from typing import Optional, Dict, AsyncGenerator
+from typing import AsyncGenerator, Dict, Optional
 
+import httpx
 from loguru import logger
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )
 
diff --git a/lnbits/wallets/macaroon/__init__.py b/lnbits/wallets/macaroon/__init__.py
index 4967c1008..16617aa65 100644
--- a/lnbits/wallets/macaroon/__init__.py
+++ b/lnbits/wallets/macaroon/__init__.py
@@ -1 +1 @@
-from .macaroon import load_macaroon, AESCipher
+from .macaroon import AESCipher, load_macaroon
diff --git a/lnbits/wallets/macaroon/macaroon.py b/lnbits/wallets/macaroon/macaroon.py
index 5e62da0cf..2183dacb8 100644
--- a/lnbits/wallets/macaroon/macaroon.py
+++ b/lnbits/wallets/macaroon/macaroon.py
@@ -1,9 +1,9 @@
+import base64
+import getpass
+from hashlib import md5
+
 from Cryptodome import Random
 from Cryptodome.Cipher import AES
-import base64
-from hashlib import md5
-import getpass
-
 from loguru import logger
 
 BLOCK_SIZE = 16
diff --git a/lnbits/wallets/opennode.py b/lnbits/wallets/opennode.py
index f1008e626..6d3fb02c9 100644
--- a/lnbits/wallets/opennode.py
+++ b/lnbits/wallets/opennode.py
@@ -1,22 +1,22 @@
 import asyncio
-
-from fastapi.exceptions import HTTPException
-from lnbits.helpers import url_for
 import hmac
-import httpx
 from http import HTTPStatus
 from os import getenv
-from typing import Optional, AsyncGenerator
+from typing import AsyncGenerator, Optional
 
+import httpx
+from fastapi.exceptions import HTTPException
 from loguru import logger
 
+from lnbits.helpers import url_for
+
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
-    Wallet,
+    StatusResponse,
     Unsupported,
+    Wallet,
 )
 
 
diff --git a/lnbits/wallets/spark.py b/lnbits/wallets/spark.py
index d12addc4c..142e388d2 100644
--- a/lnbits/wallets/spark.py
+++ b/lnbits/wallets/spark.py
@@ -1,17 +1,17 @@
 import asyncio
 import json
-import httpx
 import random
 from os import getenv
-from typing import Optional, AsyncGenerator
+from typing import AsyncGenerator, Optional
 
+import httpx
 from loguru import logger
 
 from .base import (
-    StatusResponse,
     InvoiceResponse,
     PaymentResponse,
     PaymentStatus,
+    StatusResponse,
     Wallet,
 )