Mint: table locks

.env.example

@@ -54,7 +54,10 @@ MINT_DERIVATION_PATH="m/0'/0'/0'"
 # In this example, we have 2 keysets for sat, 1 for msat and 1 for usd
 # MINT_DERIVATION_PATH_LIST=["m/0'/0'/0'", "m/0'/0'/1'", "m/0'/1'/0'", "m/0'/2'/0'"]
 
+# To use SQLite, choose a directory to store the database
 MINT_DATABASE=data/mint
+# To use PostgreSQL, set the connection string
+# MINT_DATABASE=postgres://cashu:cashu@localhost:5432/cashu
 
 # Funding source backends
 # Supported: FakeWallet, LndRestWallet, CLNRestWallet, BlinkWallet, LNbitsWallet, StrikeWallet, CoreLightningRestWallet (deprecated)

.github/actions/prepare/action.yml

@@ -23,5 +23,5 @@ runs:
         cache: "poetry"
     - name: Install dependencies
       run: |
-        poetry install --extras pgsql
+        poetry install
       shell: bash

.github/workflows/ci.yml

@@ -28,13 +28,14 @@ jobs:
   regtest:
     uses: ./.github/workflows/regtest.yml
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.10"]
         poetry-version: ["1.7.1"]
         backend-wallet-class:
           ["LndRestWallet", "CLNRestWallet", "CoreLightningRestWallet", "LNbitsWallet"]
-        # mint-database: ["./test_data/test_mint", "postgres://cashu:cashu@localhost:5432/cashu"]
-        mint-database: ["./test_data/test_mint"]
+        mint-database: ["./test_data/test_mint", "postgres://cashu:cashu@localhost:5432/cashu"]
+        # mint-database: ["./test_data/test_mint"]
     with:
       python-version: ${{ matrix.python-version }}
       backend-wallet-class: ${{ matrix.backend-wallet-class }}

.github/workflows/regtest.yml

@@ -23,21 +23,13 @@ jobs:
   regtest:
     runs-on: ${{ inputs.os-version }}
     timeout-minutes: 10
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: cashu
-          POSTGRES_PASSWORD: cashu
-          POSTGRES_DB: cashu
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
+      - name: Start PostgreSQL service
+        if: contains(inputs.mint-database, 'postgres')
+        run: |
+          docker run -d --name postgres -e POSTGRES_USER=cashu -e POSTGRES_PASSWORD=cashu -e POSTGRES_DB=cashu -p 5432:5432 postgres:latest
+          until docker exec postgres pg_isready; do sleep 1; done
+
       - uses: actions/checkout@v3
 
       - uses: ./.github/actions/prepare
@@ -78,7 +70,7 @@ jobs:
           MINT_CLNREST_URL: https://localhost:3010
           MINT_CLNREST_RUNE: ./regtest/data/clightning-2/rune
           MINT_CLNREST_CERT: ./regtest/data/clightning-2/regtest/ca.pem
-          MINT_CLNENABLE_MPP: false
+          MINT_CLNREST_ENABLE_MPP: false
         run: |
           sudo chmod -R 777 .
           make test

.github/workflows/tests.yml

@@ -23,21 +23,12 @@ jobs:
   poetry:
     name: Run (db ${{ inputs.mint-database }}, deprecated api ${{ inputs.mint-only-deprecated }})
     runs-on: ${{ inputs.os }}
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: cashu
-          POSTGRES_PASSWORD: cashu
-          POSTGRES_DB: cashu
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
+      - name: Start PostgreSQL service
+        if: contains(inputs.mint-database, 'postgres')
+        run: |
+          docker run -d --name postgres -e POSTGRES_USER=cashu -e POSTGRES_PASSWORD=cashu -e POSTGRES_DB=cashu -p 5432:5432 postgres:latest
+          until docker exec postgres pg_isready; do sleep 1; done
       - name: Checkout repository and submodules
         uses: actions/checkout@v2
       - uses: ./.github/actions/prepare

README.md

@@ -83,8 +83,6 @@ pyenv local 3.10.4
 poetry install
 ```
 
-If you would like to use PostgreSQL as the mint database, use the command `poetry install --extras pgsql`.
-
 #### Poetry: Update Cashu
 To update Cashu to the newest version enter
 ```bash

cashu/core/base.py

@@ -344,11 +344,13 @@ def kind(self) -> JSONRPCSubscriptionKinds:
     def __setattr__(self, name, value):
         # an unpaid quote can only be set to pending or paid
         if name == "state" and self.state == MeltQuoteState.unpaid:
-            if value != MeltQuoteState.pending and value != MeltQuoteState.paid:
-                raise Exception("Cannot change state of an unpaid quote.")
+            if value not in [MeltQuoteState.pending, MeltQuoteState.paid]:
+                raise Exception(
+                    f"Cannot change state of an unpaid melt quote to {value}."
+                )
         # a paid quote can not be changed
         if name == "state" and self.state == MeltQuoteState.paid:
-            raise Exception("Cannot change state of a paid quote.")
+            raise Exception("Cannot change state of a paid melt quote.")
         super().__setattr__(name, value)
 
 
@@ -415,18 +417,20 @@ def __setattr__(self, name, value):
         # un unpaid quote can only be set to paid
         if name == "state" and self.state == MintQuoteState.unpaid:
             if value != MintQuoteState.paid:
-                raise Exception("Cannot change state of an unpaid quote.")
+                raise Exception(
+                    f"Cannot change state of an unpaid mint quote to {value}."
+                )
         # a paid quote can only be set to pending or issued
         if name == "state" and self.state == MintQuoteState.paid:
             if value != MintQuoteState.pending and value != MintQuoteState.issued:
-                raise Exception(f"Cannot change state of a paid quote to {value}.")
+                raise Exception(f"Cannot change state of a paid mint quote to {value}.")
         # a pending quote can only be set to paid or issued
         if name == "state" and self.state == MintQuoteState.pending:
             if value not in [MintQuoteState.paid, MintQuoteState.issued]:
-                raise Exception("Cannot change state of a pending quote.")
+                raise Exception("Cannot change state of a pending mint quote.")
         # an issued quote cannot be changed
         if name == "state" and self.state == MintQuoteState.issued:
-            raise Exception("Cannot change state of an issued quote.")
+            raise Exception("Cannot change state of an issued mint quote.")
         super().__setattr__(name, value)