diff --git a/cashu/core/base.py b/cashu/core/base.py index 75d6a61..6310df0 100644 --- a/cashu/core/base.py +++ b/cashu/core/base.py @@ -1,12 +1,12 @@ from sqlite3 import Row -from typing import List, Union, Dict, Any -from cashu.core.crypto import derive_keyset_id, derive_keys, derive_pubkeys -from cashu.core.secp import PrivateKey, PublicKey +from typing import Any, Dict, List, Union from loguru import logger - from pydantic import BaseModel +from cashu.core.crypto import derive_keys, derive_keyset_id, derive_pubkeys +from cashu.core.secp import PrivateKey, PublicKey + class CashuError(BaseModel): code = "000" diff --git a/cashu/core/crud.py b/cashu/core/crud.py index 6c107ea..0ed3f44 100644 --- a/cashu/core/crud.py +++ b/cashu/core/crud.py @@ -1,6 +1,6 @@ from typing import Optional -from cashu.core.base import Keyset, KeyBase +from cashu.core.base import KeyBase, Keyset from cashu.core.db import Connection, Database diff --git a/cashu/core/crypto.py b/cashu/core/crypto.py index c57aa4b..76255f0 100644 --- a/cashu/core/crypto.py +++ b/cashu/core/crypto.py @@ -1,5 +1,6 @@ import hashlib from typing import Dict, List + from cashu.core.secp import PrivateKey, PublicKey from cashu.core.settings import MAX_ORDER diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py index bb689e8..e3ab10c 100644 --- a/cashu/mint/ledger.py +++ b/cashu/mint/ledger.py @@ -7,8 +7,8 @@ from typing import List, Set import cashu.core.b_dhke as b_dhke import cashu.core.bolt11 as bolt11 -from cashu.core.base import BlindedMessage, BlindedSignature, Invoice, Proof, Keyset -from cashu.core.crypto import derive_keyset_id, derive_keys, derive_pubkeys +from cashu.core.base import BlindedMessage, BlindedSignature, Invoice, Keyset, Proof +from cashu.core.crypto import derive_keys, derive_keyset_id, derive_pubkeys from cashu.core.db import Database from cashu.core.helpers import fee_reserve from cashu.core.script import verify_script diff --git a/cashu/mint/startup.py b/cashu/mint/startup.py index 043e9a0..0fdc108 100644 --- a/cashu/mint/startup.py +++ b/cashu/mint/startup.py @@ -2,10 +2,10 @@ import asyncio from loguru import logger +from cashu.core.migrations import migrate_databases from cashu.core.settings import CASHU_DIR, LIGHTNING from cashu.lightning import WALLET from cashu.mint import migrations -from cashu.core.migrations import migrate_databases from . import ledger diff --git a/cashu/wallet/wallet.py b/cashu/wallet/wallet.py index e257abf..5a42241 100644 --- a/cashu/wallet/wallet.py +++ b/cashu/wallet/wallet.py @@ -2,7 +2,7 @@ import base64 import json import secrets as scrts import uuid -from typing import List, Dict +from typing import Dict, List import requests from loguru import logger @@ -13,13 +13,14 @@ from cashu.core.base import ( BlindedSignature, CheckFeesRequest, CheckRequest, + Keyset, MeltRequest, MintRequest, P2SHScript, Proof, SplitRequest, - Keyset, ) +from cashu.core.crud import get_keyset, store_keyset from cashu.core.db import Database from cashu.core.script import ( step0_carol_checksig_redeemscrip, @@ -38,7 +39,6 @@ from cashu.wallet.crud import ( store_proof, update_proof_reserved, ) -from cashu.core.crud import store_keyset, get_keyset class LedgerAPI: