aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2026-02-10 03:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cashubtc:main' into breez

Browse Source
This commit is contained in:
Aljaz
2025-11-07 06:14:35 +01:00
committed by GitHub
parent 3d2643cce3 0041e3a6f2
commit 3957b790f1
11 changed files with 101 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -177,7 +177,7 @@ This command runs the mint on your local computer. Skip this step if you want to
## Docker
```
docker run -d -p 3338:3338 --name nutshell -e MINT_BACKEND_BOLT11_SAT=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.18.0 poetry run mint
docker run -d -p 3338:3338 --name nutshell -e MINT_BACKEND_BOLT11_SAT=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.18.1 poetry run mint
```
## From this repository

2
cashu/core/settings.py
View File

@@ -8,7 +8,7 @@ from pydantic import BaseSettings, Extra, Field
env = Env()
VERSION = "0.18.0"
VERSION = "0.18.1"
def find_env_file():

2
cashu/lightning/blink.py
View File

@@ -72,7 +72,7 @@ class BlinkWallet(LightningBackend):
"Content-Type": "application/json",
},
base_url=self.endpoint,
timeout=15,
timeout=None,
)
async def status(self) -> StatusResponse:

2
cashu/lightning/clnrest.py
View File

@@ -80,7 +80,7 @@ class CLNRestWallet(LightningBackend):
self.cert = settings.mint_clnrest_cert or False
self.client = httpx.AsyncClient(
base_url=self.url, verify=self.cert, headers=self.auth
base_url=self.url, verify=self.cert, headers=self.auth, timeout=None,
)
self.last_pay_index = 0

1
cashu/lightning/lnbits.py
View File

@@ -40,6 +40,7 @@ class LNbitsWallet(LightningBackend):
self.client = httpx.AsyncClient(
verify=not settings.debug,
headers={"X-Api-Key": settings.mint_lnbits_key},
timeout=None,
)
self.ws_url = f"{self.endpoint.replace('http', 'ws', 1)}/api/v1/ws/{settings.mint_lnbits_key}"
self.old_api = True

2
cashu/lightning/lndrest.py
View File

@@ -100,7 +100,7 @@ class LndRestWallet(LightningBackend):
self.auth = {"Grpc-Metadata-macaroon": self.macaroon}
self.client = httpx.AsyncClient(
base_url=self.endpoint, headers=self.auth, verify=self.cert
base_url=self.endpoint, headers=self.auth, verify=self.cert, timeout=None,
)
if self.supports_mpp:
logger.info("LNDRestWallet enabling MPP feature")

1
cashu/lightning/strike.py
View File

@@ -124,6 +124,7 @@ class StrikeWallet(LightningBackend):
self.client = httpx.AsyncClient(
verify=not settings.debug,
headers=bearer_auth,
timeout=None,
)
async def status(self) -> StatusResponse:

18
cashu/mint/migrations.py
View File

@@ -1137,3 +1137,21 @@ async def m028_promises_c_allow_null_add_melt_quote(db: Database):
# recreate the balance views
await create_balance_views(db, conn)
async def m029_remove_overlong_witness_values(db: Database):
"""
Delete any witness values longer than 1024 characters in proofs tables.
"""
async with db.connect() as conn:
# Clean proofs_used
await conn.execute(
f"UPDATE {db.table_with_schema('proofs_used')} SET witness = NULL "
"WHERE witness IS NOT NULL AND LENGTH(witness) > 1024"
)
# Clean proofs_pending (column exists in newer schemas)
await conn.execute(
f"UPDATE {db.table_with_schema('proofs_pending')} SET witness = NULL "
"WHERE witness IS NOT NULL AND LENGTH(witness) > 1024"
)

2
pyproject.toml
View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "cashu"
version = "0.18.0"
version = "0.18.1"
description = "Ecash wallet and mint"
authors = ["calle <callebtc@protonmail.com>"]
license = "MIT"

2
setup.py
View File

@@ -13,7 +13,7 @@ entry_points = {"console_scripts": ["cashu = cashu.wallet.cli.cli:cli"]}
setuptools.setup(
name="cashu",
version="0.18.0",
version="0.18.1",
description="Ecash wallet and mint",
long_description=long_description,
long_description_content_type="text/markdown",

74
tests/mint/test_mint_migrations.py Normal file
View File

@@ -0,0 +1,74 @@
import pytest
from cashu.core.db import Database
from cashu.core.migrations import migrate_databases
from cashu.mint import migrations as mint_migrations
@pytest.mark.asyncio
async def test_m029_witness_cleanup():
db = Database("mint", "./test_data/mig_witness_cleanup")
# Ensure schema is at latest so tables exist
await migrate_databases(db, mint_migrations)
long_witness = "a" * 1025
short_witness = "b" * 10
async with db.connect() as conn:
# Insert into proofs_used
await conn.execute(
f"""
INSERT INTO {db.table_with_schema('proofs_used')} (amount, id, c, secret, y, witness, created, melt_quote)
VALUES (1, 'kid', 'c_used_long', 's_used_long', 'y_used_long', :w, {db.timestamp_now}, NULL)
""",
{"w": long_witness},
)
await conn.execute(
f"""
INSERT INTO {db.table_with_schema('proofs_used')} (amount, id, c, secret, y, witness, created, melt_quote)
VALUES (1, 'kid', 'c_used_short', 's_used_short', 'y_used_short', :w, {db.timestamp_now}, NULL)
""",
{"w": short_witness},
)
# Insert into proofs_pending
await conn.execute(
f"""
INSERT INTO {db.table_with_schema('proofs_pending')} (amount, id, c, secret, y, witness, created, melt_quote)
VALUES (1, 'kid', 'c_pend_long', 's_pend_long', 'y_pend_long', :w, {db.timestamp_now}, NULL)
""",
{"w": long_witness},
)
await conn.execute(
f"""
INSERT INTO {db.table_with_schema('proofs_pending')} (amount, id, c, secret, y, witness, created, melt_quote)
VALUES (1, 'kid', 'c_pend_short', 's_pend_short', 'y_pend_short', :w, {db.timestamp_now}, NULL)
""",
{"w": short_witness},
)
# Run the migration under test directly
await mint_migrations.m029_remove_overlong_witness_values(db)
# Validate cleanup
async with db.connect() as conn:
row = await conn.fetchone(
f"SELECT witness FROM {db.table_with_schema('proofs_used')} WHERE secret = 's_used_long'"
)
assert row["witness"] is None
row = await conn.fetchone(
f"SELECT witness FROM {db.table_with_schema('proofs_used')} WHERE secret = 's_used_short'"
)
assert row["witness"] == short_witness
row = await conn.fetchone(
f"SELECT witness FROM {db.table_with_schema('proofs_pending')} WHERE secret = 's_pend_long'"
)
assert row["witness"] is None
row = await conn.fetchone(
f"SELECT witness FROM {db.table_with_schema('proofs_pending')} WHERE secret = 's_pend_short'"
)
assert row["witness"] == short_witness