Nutshell cleanup wishlist (#332)

* fix keys

* fix tests

* backwards compatible api upgrade

* upgrade seems to work

* fix tests

* add deprecated api functions

* add more tests of backwards compat

* add test serialization for nut00

* remove a redundant test

* move mint and melt to new api

* mypy works

* CI: mypy --check-untyped-defs

* add deprecated router

* add hints and remove logs

* fix tests

* cleanup

* use new mint and melt endpoints

* tests passing?

* fix mypy

* make format

* make format

* make format

* commit

* errors gone

* save

* adjust the API

* store quotes in db

* make mypy happy

* add fakewallet settings

* remove LIGHTNING=True and pass quote id for melt

* format

* tests passing

* add CoreLightningRestWallet

* add macaroon loader

* add correct config

* preimage -> proof

* move wallet.status() to cli.helpers.print_status()

* remove statuses from tests

* remove

* make format

* Use httpx in deprecated wallet

* fix cln interface

* create invoice before quote

* internal transactions and deprecated api testing

* fix tests

* add deprecated API tests

* fastapi type hints break things

* fix duplicate wallet error

* make format

* update poetry in CI to 1.7.1

* precommit restore

* remove bolt11

* oops

* default poetry

* store fee reserve for melt quotes and refactor melt()

* works?

* make format

* test

* finally

* fix deprecated models

* rename v1 endpoints to bolt11

* raise restore and check to v1, bump version to 0.15.0

* add version byte to keyset id

* remove redundant fields in json

* checks

* generate bip32 keyset wip

* migrate old keysets

* load duplicate keys

* duplicate old keysets

* revert router changes

* add deprecated /check and /restore endpoints

* try except invalidate

* parse unit from derivation path, adjust keyset id calculation with bytes

* remove keyest id from functions again and rely on self.keyset_id

* mosts tests work

* mint loads multiple derivation paths

* make format

* properly print units

* fix tests

* wallet works with multiple units

* add strike wallet and choose backend dynamically

* fix mypy

* add get_payment_quote to lightning backends

* make format

* fix startup

* fix lnbitswallet

* fix tests

* LightningWallet -> LightningBackend

* remove comments

* make format

* remove msat conversion

* add Amount type

* fix regtest

* use melt_quote as argument for pay_invoice

* test old api

* fees in sats

* fix deprecated fees

* fixes

* print balance correctly

* internally index keyset response by int

* add pydantic validation to input models

* add timestamps to mint db

* store timestamps for invoices, promises, proofs_used

* fix wallet migration

* rotate keys correctly for testing

* remove print

* update latest keyset

* fix tests

* fix test

* make format

* make format with correct black version

* remove nsat and cheese

* test against deprecated mint

* fix tests?

* actually use env var

* mint run with env vars

* moar test

* cleanup

* simplify tests, load all keys

* try out testing with internal invoices

* fix internal melt test

* fix test

* deprecated checkfees expects appropriate fees

* adjust comment

* drop lightning table

* split migration for testing for now, remove it later

* remove unused lightning table

* skip_private_key -> skip_db_read

* throw error on migration error

* reorder

* fix migrations

* fix lnbits fee return value negative

* fix typo

* comments

* add type

* make format

* split must use correct amount

* fix tests

* test deprecated api with internal/external melts

* do not split if not necessary

* refactor

* fix test

* make format with new black

* cleanup and add comments

* add quote state check endpoints

* fix deprecated wallet response

* split -> swap endpoint

* make format

* add expiry to quotes, get quote endpoints, and adjust to nut review comments

* allow overpayment of melt

* add lightning wallet tests

* commiting to save

* fix tests a bit

* make format

* remove comments

* get mint info

* check_spendable default False, and return payment quote checking id

* make format

* bump version in pyproject

* update to /v1/checkstate

* make format

* fix mint api checks

* return witness on /v1/checkstate

* no failfast

* try fail-fast: false in ci.yaml

* fix db lookup

* clean up literals

.github/actions/prepare/action.yml

@@ -7,7 +7,7 @@ inputs:
     default: "3.10"
   poetry-version:
     description: "Poetry Version"
-    default: "1.5.1"
+    default: "1.7.1"
 
 runs:
   using: "composite"

.github/workflows/checks.yml

@@ -7,7 +7,7 @@ on:
         default: "3.10.4"
         type: string
       poetry-version:
-        default: "1.5.1"
+        default: "1.7.1"
         type: string
 
 jobs:
@@ -46,7 +46,7 @@ jobs:
       - name: Setup mypy
         run: yes | poetry run mypy cashu --install-types || true
       - name: Run mypy
-        run: poetry run mypy cashu --ignore-missing
+        run: poetry run mypy cashu --ignore-missing --check-untyped-defs
   ruff:
     runs-on: ubuntu-latest
     steps:

.github/workflows/ci.yml

@@ -10,25 +10,29 @@ jobs:
     uses: ./.github/workflows/checks.yml
   tests:
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest]
         python-version: ["3.10"]
-        poetry-version: ["1.5.1"]
-        mint-cache-secrets: ["true", "false"]
+        poetry-version: ["1.7.1"]
+        mint-cache-secrets: ["false", "true"]
+        mint-only-deprecated: ["false", "true"]
         # db-url: ["", "postgres://cashu:cashu@localhost:5432/test"] # TODO: Postgres test not working
         db-url: [""]
         backend-wallet-class: ["FakeWallet"]
     uses: ./.github/workflows/tests.yml
     with:
+      os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
       poetry-version: ${{ matrix.poetry-version }}
       mint-cache-secrets: ${{ matrix.mint-cache-secrets }}
+      mint-only-deprecated: ${{ matrix.mint-only-deprecated }}
   regtest:
     uses: ./.github/workflows/regtest.yml
     strategy:
       matrix:
         python-version: ["3.10"]
-        poetry-version: ["1.5.1"]
+        poetry-version: ["1.7.1"]
         backend-wallet-class:
           ["LndRestWallet", "CoreLightningRestWallet", "LNbitsWallet"]
     with:

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
         default: "3.10.4"
         type: string
       poetry-version:
-        default: "1.5.1"
+        default: "1.7.1"
         type: string
       db-url:
         default: ""
@@ -18,9 +18,13 @@ on:
       mint-cache-secrets:
         default: "false"
         type: string
+      mint-only-deprecated:
+        default: "false"
+        type: string
 
 jobs:
   poetry:
+    name: Run (mint-cache-secrets ${{ inputs.mint-cache-secrets }}, mint-only-deprecated ${{ inputs.mint-only-deprecated }})
     runs-on: ${{ inputs.os }}
     services:
       postgres:
@@ -51,6 +55,7 @@ jobs:
           MINT_PORT: 3337
           MINT_DATABASE: ${{ inputs.db-url }}
           MINT_CACHE_SECRETS: ${{ inputs.mint-cache-secrets }}
+          DEBUG_MINT_ONLY_DEPRECATED: ${{ inputs.mint-only-deprecated }}
           TOR: false
         run: |
           make test

.pre-commit-config.yaml

@@ -12,17 +12,18 @@ repos:
       - id: debug-statements
       - id: mixed-line-ending
       - id: check-case-conflict
-  - repo: https://github.com/psf/black
-    rev: 23.7.0
-    hooks:
-      - id: black
+  # - repo: https://github.com/psf/black
+  #   rev: 23.11.0
+  #   hooks:
+  #     - id: black
+  #       args: [--line-length=150]
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.0.283
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  # - repo: https://github.com/pre-commit/mirrors-mypy
-  #   rev: v1.6.0
-  #   hooks:
-  #     - id: mypy
-  #       args: [--ignore-missing]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.6.0
+    hooks:
+      - id: mypy
+        args: [--ignore-missing, --check-untyped-defs]

Makefile

@@ -11,7 +11,7 @@ black-check:
 	poetry run black . --check
 
 mypy:
-	poetry run mypy cashu --ignore-missing --check-untyped-defs
+	poetry run mypy cashu --check-untyped-defs
 
 format: black ruff
 

README.md

@@ -182,9 +182,9 @@ To run the tests in this repository, first install the dev dependencies with
 poetry install --with dev
 ```
 
-Then, make sure to set up your `.env` file to use your local mint and disable Lightning and Tor:
+Then, make sure to set up your mint's `.env` file to use a fake Lightning backend and disable Tor:
 ```bash
-LIGHTNING=FALSE
+MINT_LIGHTNING_BACKEND=FakeWallet
 TOR=FALSE
 ```
 You can run the tests with