black and isort

.github/workflows/formatting.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Check black
         run: poetry run black --check .
       - name: Check isort
-        run: poetry run isort --check-only .
+        run: poetry run isort --profile black --check-only .

cashu/core/helpers.py

@@ -1,8 +1,7 @@
 import asyncio
 from functools import partial, wraps
 
-from cashu.core.settings import (LIGHTNING_FEE_PERCENT,
+from cashu.core.settings import LIGHTNING_FEE_PERCENT, LIGHTNING_RESERVE_FEE_MIN
-                                 LIGHTNING_RESERVE_FEE_MIN)
 
 
 def async_wrap(func):

cashu/core/script.py

@@ -6,12 +6,15 @@ COIN = 100_000_000
 TXID = "bff785da9f8169f49be92fa95e31f0890c385bfb1bd24d6b94d7900057c617ae"
 SEED = b"__not__used"
 
-from bitcoin.core import (CMutableTxIn, CMutableTxOut, COutPoint, CTransaction,
+from bitcoin.core import CMutableTxIn, CMutableTxOut, COutPoint, CTransaction, lx
-                          lx)
 from bitcoin.core.script import *
 from bitcoin.core.script import CScript
-from bitcoin.core.scripteval import (SCRIPT_VERIFY_P2SH, EvalScriptError,
+from bitcoin.core.scripteval import (
-                                     VerifyScript, VerifyScriptError)
+    SCRIPT_VERIFY_P2SH,
+    EvalScriptError,
+    VerifyScript,
+    VerifyScriptError,
+)
 from bitcoin.wallet import CBitcoinSecret, P2SHBitcoinAddress
 
 

cashu/lightning/lnbits.py

@@ -8,8 +8,13 @@ import requests
 
 from cashu.core.settings import LNBITS_ENDPOINT, LNBITS_KEY
 
-from .base import (InvoiceResponse, PaymentResponse, PaymentStatus,
+from .base import (
-                   StatusResponse, Wallet)
+    InvoiceResponse,
+    PaymentResponse,
+    PaymentStatus,
+    StatusResponse,
+    Wallet,
+)
 
 
 class LNbitsWallet(Wallet):

cashu/mint/ledger.py

@@ -16,9 +16,14 @@ from cashu.core.secp import PrivateKey, PublicKey
 from cashu.core.settings import LIGHTNING, MAX_ORDER
 from cashu.core.split import amount_split
 from cashu.lightning import WALLET
-from cashu.mint.crud import (get_lightning_invoice, get_proofs_used,
+from cashu.mint.crud import (
-                             invalidate_proof, store_lightning_invoice,
+    get_lightning_invoice,
-                             store_promise, update_lightning_invoice)
+    get_proofs_used,
+    invalidate_proof,
+    store_lightning_invoice,
+    store_promise,
+    update_lightning_invoice,
+)
 
 
 class Ledger:

cashu/mint/router.py

@@ -3,9 +3,16 @@ from typing import Union
 from fastapi import APIRouter
 from secp256k1 import PublicKey
 
-from cashu.core.base import (CashuError, CheckRequest, GetMeltResponse,
+from cashu.core.base import (
-                             GetMintResponse, MeltRequest, MintRequest,
+    CashuError,
-                             PostSplitResponse, SplitRequest)
+    CheckRequest,
+    GetMeltResponse,
+    GetMintResponse,
+    MeltRequest,
+    MintRequest,
+    PostSplitResponse,
+    SplitRequest,
+)
 from cashu.mint import ledger
 
 router: APIRouter = APIRouter()

cashu/wallet/cli.py

@@ -20,8 +20,7 @@ from cashu.core.base import Proof
 from cashu.core.bolt11 import Invoice
 from cashu.core.helpers import fee_reserve
 from cashu.core.migrations import migrate_databases
-from cashu.core.settings import (CASHU_DIR, DEBUG, ENV_FILE, LIGHTNING,
+from cashu.core.settings import CASHU_DIR, DEBUG, ENV_FILE, LIGHTNING, MINT_URL, VERSION
-                                 MINT_URL, VERSION)
 from cashu.wallet import migrations
 from cashu.wallet.crud import get_reserved_proofs, get_unused_locks
 from cashu.wallet.wallet import Wallet as Wallet

cashu/wallet/wallet.py

@@ -8,19 +8,34 @@ import requests
 from loguru import logger
 
 import cashu.core.b_dhke as b_dhke
-from cashu.core.base import (BlindedMessage, BlindedSignature, CheckRequest,
+from cashu.core.base import (
-                             MeltRequest, MintRequest, P2SHScript, Proof,
+    BlindedMessage,
-                             SplitRequest)
+    BlindedSignature,
+    CheckRequest,
+    MeltRequest,
+    MintRequest,
+    P2SHScript,
+    Proof,
+    SplitRequest,
+)
 from cashu.core.db import Database
-from cashu.core.script import (step0_carol_checksig_redeemscrip,
+from cashu.core.script import (
-                               step0_carol_privkey,
+    step0_carol_checksig_redeemscrip,
-                               step1_carol_create_p2sh_address,
+    step0_carol_privkey,
-                               step2_carol_sign_tx)
+    step1_carol_create_p2sh_address,
+    step2_carol_sign_tx,
+)
 from cashu.core.secp import PublicKey
 from cashu.core.settings import DEBUG
 from cashu.core.split import amount_split
-from cashu.wallet.crud import (get_proofs, invalidate_proof, secret_used,
+from cashu.wallet.crud import (
-                               store_p2sh, store_proof, update_proof_reserved)
+    get_proofs,
+    invalidate_proof,
+    secret_used,
+    store_p2sh,
+    store_proof,
+    update_proof_reserved,
+)
 
 
 class LedgerAPI: