From fe9de4cbca40fc1b2459519628dbf09764f36e61 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Tue, 11 Oct 2022 10:08:05 +0200
Subject: [PATCH] restart imports

---
 cashu/mint/__init__.py |  4 ----
 cashu/mint/app.py      |  6 +++---
 cashu/mint/ledger.py   | 20 +++++++++++---------
 cashu/mint/router.py   | 10 +++++-----
 cashu/mint/startup.py  | 12 +++++++++---
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/cashu/mint/__init__.py b/cashu/mint/__init__.py
index 50d1a38..e69de29 100644
--- a/cashu/mint/__init__.py
+++ b/cashu/mint/__init__.py
@@ -1,4 +0,0 @@
-from cashu.core.settings import MINT_PRIVATE_KEY
-from cashu.mint.ledger import Ledger
-
-ledger = Ledger(MINT_PRIVATE_KEY, "data/mint", derivation_path="0/0/0/0")
diff --git a/cashu/mint/app.py b/cashu/mint/app.py
index 002d03e..ccd5b13 100644
--- a/cashu/mint/app.py
+++ b/cashu/mint/app.py
@@ -11,7 +11,7 @@ from starlette_context.middleware import RawContextMiddleware
 from cashu.core.settings import DEBUG, VERSION
 
 from .router import router
-from .startup import load_ledger
+from .startup import start_mint_init
 
 
 class CustomHeaderMiddleware(BaseHTTPMiddleware):
@@ -86,5 +86,5 @@ app.include_router(router=router)
 
 
 @app.on_event("startup")
-async def startup_load_ledger():
-    await load_ledger()
+async def startup_mint():
+    await start_mint_init()
diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py
index 83b6b31..f6efe5d 100644
--- a/cashu/mint/ledger.py
+++ b/cashu/mint/ledger.py
@@ -40,11 +40,11 @@ from cashu.mint.crud import (
 
 
 class Ledger:
-    def __init__(self, secret_key: str, db: str, derivation_path=""):
+    def __init__(self, db: Database, seed: str, derivation_path=""):
         self.proofs_used: Set[str] = set()
-        self.master_key = secret_key
+        self.master_key = seed
         self.derivation_path = derivation_path
-        self.db: Database = Database("mint", db)
+        self.db = db
 
     async def load_used_proofs(self):
         """Load all used proofs from database."""
@@ -86,8 +86,8 @@ class Ledger:
 
     async def _generate_promise(self, amount: int, B_: PublicKey):
         """Generates a promise for given amount and returns a pair (amount, C')."""
-        secret_key = self.keyset.private_keys[amount]  # Get the correct key
-        C_ = b_dhke.step2_bob(B_, secret_key)
+        private_key_amount = self.keyset.private_keys[amount]  # Get the correct key
+        C_ = b_dhke.step2_bob(B_, private_key_amount)
         await store_promise(
             amount, B_=B_.serialize().hex(), C_=C_.serialize().hex(), db=self.db
         )
@@ -109,22 +109,24 @@ class Ledger:
             raise Exception(f"tokens already spent. Secret: {proof.secret}")
         # if no keyset id is given in proof, assume the current one
         if not proof.id:
-            secret_key = self.keyset.private_keys[proof.amount]
+            private_key_amount = self.keyset.private_keys[proof.amount]
         else:
             # use the appropriate active keyset for this proof.id
-            secret_key = self.keysets.keysets[proof.id].private_keys[proof.amount]
+            private_key_amount = self.keysets.keysets[proof.id].private_keys[
+                proof.amount
+            ]
 
         C = PublicKey(bytes.fromhex(proof.C), raw=True)
 
         # backwards compatibility with old hash_to_curve < 0.3.3
         try:
-            ret = legacy.verify_pre_0_3_3(secret_key, C, proof.secret)
+            ret = legacy.verify_pre_0_3_3(private_key_amount, C, proof.secret)
             if ret:
                 return ret
         except:
             pass
 
-        return b_dhke.verify(secret_key, C, proof.secret)
+        return b_dhke.verify(private_key_amount, C, proof.secret)
 
     def _verify_script(self, idx: int, proof: Proof):
         """
diff --git a/cashu/mint/router.py b/cashu/mint/router.py
index 2845850..d8f28f8 100644
--- a/cashu/mint/router.py
+++ b/cashu/mint/router.py
@@ -16,21 +16,21 @@ from cashu.core.base import (
     SplitRequest,
 )
 from cashu.core.errors import CashuError
-from cashu.mint import ledger
+from cashu.mint.__main__ import ledger
 
 router: APIRouter = APIRouter()
 
 
 @router.get("/keys")
-def keys() -> dict[int, str]:
+async def keys() -> dict[int, str]:
     """Get the public keys of the mint"""
-    return ledger.get_keyset()
+    return await ledger.get_keyset()
 
 
 @router.get("/keysets")
-def keysets() -> dict[str, list[str]]:
+async def keysets() -> dict[str, list[str]]:
     """Get all active keysets of the mint"""
-    return {"keysets": ledger.keysets.get_ids()}
+    return {"keysets": await ledger.keysets.get_ids()}
 
 
 @router.get("/mint")
diff --git a/cashu/mint/startup.py b/cashu/mint/startup.py
index f148e2c..852c521 100644
--- a/cashu/mint/startup.py
+++ b/cashu/mint/startup.py
@@ -7,12 +7,18 @@ from cashu.core.settings import CASHU_DIR, LIGHTNING
 from cashu.lightning import WALLET
 from cashu.mint import migrations
 
-from . import ledger
+from cashu.core.settings import MINT_PRIVATE_KEY
+from cashu.mint.ledger import Ledger
+from cashu.core.db import Database
 
 
-async def load_ledger():
+async def start_mint_init():
+    ledger = Ledger(
+        db=Database("mint", "data/mint"),
+        seed=MINT_PRIVATE_KEY,
+        derivation_path="0/0/0/0",
+    )
     await migrate_databases(ledger.db, migrations)
-    # await asyncio.wait([m001_initial(ledger.db)])
     await ledger.load_used_proofs()
     await ledger.init_keysets()