From 39e71b20d822d24570559dc79142da8b0f9e7179 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Sun, 5 Mar 2023 11:13:55 +0100 Subject: [PATCH] Mint database setting (#126) * mint: new .env variable MINT_DATABASE * make format --- .env.example | 2 ++ cashu/core/settings.py | 2 ++ cashu/lightning/lnbits.py | 3 ++- cashu/mint/startup.py | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index e8f8e87..bae7b89 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,8 @@ CASHU_DIR=~/.cashu MINT_HOST=127.0.0.1 MINT_PORT=3338 +MINT_DATABASE=data/mint + # use builtin tor, this overrides SOCKS_HOST and SOCKS_PORT TOR=TRUE diff --git a/cashu/core/settings.py b/cashu/core/settings.py index 5d76efb..94f8c17 100644 --- a/cashu/core/settings.py +++ b/cashu/core/settings.py @@ -44,6 +44,8 @@ MINT_URL = env.str("MINT_URL", default=None) MINT_HOST = env.str("MINT_HOST", default="8333.space") MINT_PORT = env.int("MINT_PORT", default=3338) +MINT_DATABASE = env.str("MINT_DATABASE", default="data/mint") + if not MINT_URL: if MINT_HOST in ["localhost", "127.0.0.1"]: MINT_URL = f"http://{MINT_HOST}:{MINT_PORT}" diff --git a/cashu/lightning/lnbits.py b/cashu/lightning/lnbits.py index c0f6ada..1dce0f8 100644 --- a/cashu/lightning/lnbits.py +++ b/cashu/lightning/lnbits.py @@ -4,7 +4,7 @@ from typing import Dict, Optional import requests -from cashu.core.settings import LNBITS_ENDPOINT, LNBITS_KEY +from cashu.core.settings import DEBUG, LNBITS_ENDPOINT, LNBITS_KEY from .base import ( InvoiceResponse, @@ -26,6 +26,7 @@ class LNbitsWallet(Wallet): self.s = requests.Session() self.s.auth = ("user", "pass") self.s.headers.update({"X-Api-Key": key}) + self.s.verify = not DEBUG async def status(self) -> StatusResponse: try: diff --git a/cashu/mint/startup.py b/cashu/mint/startup.py index 7032b7d..f7ee27f 100644 --- a/cashu/mint/startup.py +++ b/cashu/mint/startup.py @@ -7,13 +7,13 @@ from loguru import logger from cashu.core.db import Database from cashu.core.migrations import migrate_databases -from cashu.core.settings import CASHU_DIR, LIGHTNING, MINT_PRIVATE_KEY +from cashu.core.settings import CASHU_DIR, LIGHTNING, MINT_DATABASE, MINT_PRIVATE_KEY from cashu.lightning.lnbits import LNbitsWallet # type: ignore from cashu.mint import migrations from cashu.mint.ledger import Ledger ledger = Ledger( - db=Database("mint", "data/mint"), + db=Database("mint", MINT_DATABASE), seed=MINT_PRIVATE_KEY, derivation_path="0/0/0/0", lightning=LNbitsWallet(),