Merge branch 'main' into mint_use_embit_for_lnbits

cashubtc · Mar 12, 2024 · 85e3fb6 · 85e3fb6
2 parents 374270b + 150195d
commit 85e3fb6
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 93 deletions.
diff --git a/cashu/core/base.py b/cashu/core/base.py
@@ -487,7 +487,7 @@ class PostSplitResponse_Very_Deprecated(BaseModel):
 
 
 class PostCheckStateRequest(BaseModel):
-    secrets: List[str] = Field(..., max_items=settings.mint_max_request_length)
+    Ys: List[str] = Field(..., max_items=settings.mint_max_request_length)
 
 
 class SpentState(Enum):
@@ -500,7 +500,7 @@ def __str__(self):
 
 
 class ProofState(BaseModel):
-    secret: str
+    Y: str
     state: SpentState
     witness: Optional[str] = None
 
@@ -531,7 +531,13 @@ class CheckFeesResponse_deprecated(BaseModel):
 
 class PostRestoreResponse(BaseModel):
     outputs: List[BlindedMessage] = []
-    promises: List[BlindedSignature] = []
+    signatures: List[BlindedSignature] = []
+    promises: Optional[List[BlindedSignature]] = []  # deprecated since 0.15.1
+
+    # duplicate value of "signatures" for backwards compatibility with old clients < 0.15.1
+    def __init__(self, **data):
+        super().__init__(**data)
+        self.promises = self.signatures
 
 
 # ------- KEYSETS -------

diff --git a/cashu/mint/crud.py b/cashu/mint/crud.py
@@ -34,23 +34,26 @@ async def get_keyset(
         derivation_path: str = "",
         seed: str = "",
         conn: Optional[Connection] = None,
-    ) -> List[MintKeyset]: ...
+    ) -> List[MintKeyset]:
+        ...
 
     @abstractmethod
     async def get_spent_proofs(
         self,
         *,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> List[Proof]: ...
+    ) -> List[Proof]:
+        ...
 
     async def get_proof_used(
         self,
         *,
         Y: str,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> Optional[Proof]: ...
+    ) -> Optional[Proof]:
+        ...
 
     @abstractmethod
     async def invalidate_proof(
@@ -59,16 +62,18 @@ async def invalidate_proof(
         db: Database,
         proof: Proof,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def get_proofs_pending(
         self,
         *,
-        proofs: List[Proof],
+        Ys: List[str],
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> List[Proof]: ...
+    ) -> List[Proof]:
+        ...
 
     @abstractmethod
     async def set_proof_pending(
@@ -77,12 +82,14 @@ async def set_proof_pending(
         db: Database,
         proof: Proof,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def unset_proof_pending(
         self, *, proof: Proof, db: Database, conn: Optional[Connection] = None
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def store_keyset(
@@ -91,14 +98,16 @@ async def store_keyset(
         db: Database,
         keyset: MintKeyset,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def get_balance(
         self,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> int: ...
+    ) -> int:
+        ...
 
     @abstractmethod
     async def store_promise(
@@ -112,7 +121,8 @@ async def store_promise(
         e: str = "",
         s: str = "",
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def get_promise(
@@ -121,7 +131,8 @@ async def get_promise(
         db: Database,
         B_: str,
         conn: Optional[Connection] = None,
-    ) -> Optional[BlindedSignature]: ...
+    ) -> Optional[BlindedSignature]:
+        ...
 
     @abstractmethod
     async def store_mint_quote(
@@ -130,7 +141,8 @@ async def store_mint_quote(
         quote: MintQuote,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def get_mint_quote(
@@ -139,7 +151,8 @@ async def get_mint_quote(
         quote_id: str,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> Optional[MintQuote]: ...
+    ) -> Optional[MintQuote]:
+        ...
 
     @abstractmethod
     async def get_mint_quote_by_checking_id(
@@ -148,7 +161,8 @@ async def get_mint_quote_by_checking_id(
         checking_id: str,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> Optional[MintQuote]: ...
+    ) -> Optional[MintQuote]:
+        ...
 
     @abstractmethod
     async def update_mint_quote(
@@ -157,7 +171,8 @@ async def update_mint_quote(
         quote: MintQuote,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     # @abstractmethod
     # async def update_mint_quote_paid(
@@ -176,7 +191,8 @@ async def store_melt_quote(
         quote: MeltQuote,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @abstractmethod
     async def get_melt_quote(
@@ -186,7 +202,8 @@ async def get_melt_quote(
         db: Database,
         checking_id: Optional[str] = None,
         conn: Optional[Connection] = None,
-    ) -> Optional[MeltQuote]: ...
+    ) -> Optional[MeltQuote]:
+        ...
 
     @abstractmethod
     async def update_melt_quote(
@@ -195,7 +212,8 @@ async def update_melt_quote(
         quote: MeltQuote,
         db: Database,
         conn: Optional[Connection] = None,
-    ) -> None: ...
+    ) -> None:
+        ...
 
 
 class LedgerCrudSqlite(LedgerCrud):
@@ -256,9 +274,11 @@ async def get_spent_proofs(
         db: Database,
         conn: Optional[Connection] = None,
     ) -> List[Proof]:
-        rows = await (conn or db).fetchall(f"""
+        rows = await (conn or db).fetchall(
+            f"""
             SELECT * from {table_with_schema(db, 'proofs_used')}
-            """)
+            """
+        )
         return [Proof(**r) for r in rows] if rows else []
 
     async def invalidate_proof(
@@ -289,16 +309,16 @@ async def invalidate_proof(
     async def get_proofs_pending(
         self,
         *,
-        proofs: List[Proof],
+        Ys: List[str],
         db: Database,
         conn: Optional[Connection] = None,
     ) -> List[Proof]:
         rows = await (conn or db).fetchall(
             f"""
             SELECT * from {table_with_schema(db, 'proofs_pending')}
-            WHERE Y IN ({','.join(['?']*len(proofs))})
+            WHERE Y IN ({','.join(['?']*len(Ys))})
             """,
-            tuple(proof.Y for proof in proofs),
+            tuple(Ys),
         )
         return [Proof(**r) for r in rows]
 
@@ -549,9 +569,11 @@ async def get_balance(
         db: Database,
         conn: Optional[Connection] = None,
     ) -> int:
-        row = await (conn or db).fetchone(f"""
+        row = await (conn or db).fetchone(
+            f"""
             SELECT * from {table_with_schema(db, 'balance')}
-            """)
+            """
+        )
         assert row, "Balance not found"
         return int(row[0])
 

diff --git a/cashu/mint/ledger.py b/cashu/mint/ledger.py
@@ -892,7 +892,7 @@ async def load_used_proofs(self) -> None:
         logger.debug(f"Loaded {len(spent_proofs_list)} used proofs")
         self.spent_proofs = {p.Y: p for p in spent_proofs_list}
 
-    async def check_proofs_state(self, secrets: List[str]) -> List[ProofState]:
+    async def check_proofs_state(self, Ys: List[str]) -> List[ProofState]:
         """Checks if provided proofs are spend or are pending.
         Used by wallets to check if their proofs have been redeemed by a receiver or they are still in-flight in a transaction.
 
@@ -901,32 +901,26 @@ async def check_proofs_state(self, secrets: List[str]) -> List[ProofState]:
         and which isn't.
 
         Args:
-            proofs (List[Proof]): List of proofs to check.
+            Ys (List[str]): List of Y's of proofs to check
 
         Returns:
             List[bool]: List of which proof is still spendable (True if still spendable, else False)
             List[bool]: List of which proof are pending (True if pending, else False)
         """
         states: List[ProofState] = []
-        proofs_spent_idx_secret = await self._get_proofs_spent_idx_secret(secrets)
-        proofs_pending_idx_secret = await self._get_proofs_pending_idx_secret(secrets)
-        for secret in secrets:
-            if (
-                secret not in proofs_spent_idx_secret
-                and secret not in proofs_pending_idx_secret
-            ):
-                states.append(ProofState(secret=secret, state=SpentState.unspent))
-            elif (
-                secret not in proofs_spent_idx_secret
-                and secret in proofs_pending_idx_secret
-            ):
-                states.append(ProofState(secret=secret, state=SpentState.pending))
+        proofs_spent = await self._get_proofs_spent(Ys)
+        proofs_pending = await self._get_proofs_pending(Ys)
+        for Y in Ys:
+            if Y not in proofs_spent and Y not in proofs_pending:
+                states.append(ProofState(Y=Y, state=SpentState.unspent))
+            elif Y not in proofs_spent and Y in proofs_pending:
+                states.append(ProofState(Y=Y, state=SpentState.pending))
             else:
                 states.append(
                     ProofState(
-                        secret=secret,
+                        Y=Y,
                         state=SpentState.spent,
-                        witness=proofs_spent_idx_secret[secret].witness,
+                        witness=proofs_spent[Y].witness,
                     )
                 )
         return states
@@ -977,7 +971,9 @@ async def _validate_proofs_pending(
         """
         assert (
             len(
-                await self.crud.get_proofs_pending(proofs=proofs, db=self.db, conn=conn)
+                await self.crud.get_proofs_pending(
+                    Ys=[p.Y for p in proofs], db=self.db, conn=conn
+                )
             )
             == 0
         ), TransactionError("proofs are pending.")
diff --git a/cashu/mint/router.py b/cashu/mint/router.py
@@ -338,7 +338,7 @@ async def check_state(
 ) -> PostCheckStateResponse:
     """Check whether a secret has been spent already or not."""
     logger.trace(f"> POST /v1/checkstate: {payload}")
-    proof_states = await ledger.check_proofs_state(payload.secrets)
+    proof_states = await ledger.check_proofs_state(payload.Ys)
     return PostCheckStateResponse(states=proof_states)
 
 
@@ -355,4 +355,4 @@ async def check_state(
 async def restore(payload: PostMintRequest) -> PostRestoreResponse:
     assert payload.outputs, Exception("no outputs provided.")
     outputs, promises = await ledger.restore(payload.outputs)
-    return PostRestoreResponse(outputs=outputs, promises=promises)
+    return PostRestoreResponse(outputs=outputs, signatures=promises)
diff --git a/cashu/mint/router_deprecated.py b/cashu/mint/router_deprecated.py
@@ -328,7 +328,7 @@ async def check_spendable_deprecated(
 ) -> CheckSpendableResponse_deprecated:
     """Check whether a secret has been spent already or not."""
     logger.trace(f"> POST /check: {payload}")
-    proofs_state = await ledger.check_proofs_state([p.secret for p in payload.proofs])
+    proofs_state = await ledger.check_proofs_state([p.Y for p in payload.proofs])
     spendableList: List[bool] = []
     pendingList: List[bool] = []
     for proof_state in proofs_state:
@@ -360,4 +360,4 @@ async def check_spendable_deprecated(
 async def restore(payload: PostMintRequest_deprecated) -> PostRestoreResponse:
     assert payload.outputs, Exception("no outputs provided.")
     outputs, promises = await ledger.restore(payload.outputs)
-    return PostRestoreResponse(outputs=outputs, promises=promises)
+    return PostRestoreResponse(outputs=outputs, signatures=promises)