Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cashu/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ class GetInfoResponse_deprecated(BaseModel):
class KeysResponseKeyset(BaseModel):
id: str
unit: str
active: bool
input_fee_ppk: Optional[int] = None
keys: Dict[int, str]


Expand Down
2 changes: 2 additions & 0 deletions cashu/mint/auth/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ async def keys():
KeysResponseKeyset(
id=keyset.id,
unit=keyset.unit.name,
active=keyset.active,
keys={k: v for k, v in keyset.public_keys_hex.items()},
)
)
Expand Down Expand Up @@ -64,6 +65,7 @@ async def keyset_keys(keyset_id: str) -> KeysResponse:
keyset_for_response = KeysResponseKeyset(
id=keyset.id,
unit=keyset.unit.name,
active=keyset.active,
keys={k: v for k, v in keyset.public_keys_hex.items()},
)
return KeysResponse(keysets=[keyset_for_response])
Expand Down
4 changes: 4 additions & 0 deletions cashu/mint/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ async def keys():
KeysResponseKeyset(
id=keyset.id,
unit=keyset.unit.name,
active=keyset.active,
input_fee_ppk=keyset.input_fee_ppk,
keys={k: v for k, v in keyset.public_keys_hex.items()},
)
)
Expand Down Expand Up @@ -116,6 +118,8 @@ async def keyset_keys(keyset_id: str) -> KeysResponse:
keyset_for_response = KeysResponseKeyset(
id=keyset.id,
unit=keyset.unit.name,
active=keyset.active,
input_fee_ppk=keyset.input_fee_ppk,
keys={k: v for k, v in keyset.public_keys_hex.items()},
)
return KeysResponse(keysets=[keyset_for_response])
Expand Down
6 changes: 6 additions & 0 deletions tests/mint/test_mint_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ async def test_api_keys(ledger: Ledger):
{
"id": keyset.id,
"unit": keyset.unit.name,
"active": keyset.active,
"input_fee_ppk": keyset.input_fee_ppk,
"keys": {
str(k): v.format().hex()
for k, v in keyset.public_keys.items() # type: ignore
Expand Down Expand Up @@ -122,6 +124,8 @@ async def test_api_keyset_keys(ledger: Ledger):
{
"id": "009a1f293253e41e",
"unit": "sat",
"active": True,
"input_fee_ppk": 0,
"keys": {
str(k): v.format().hex()
for k, v in ledger.keysets["009a1f293253e41e"].public_keys.items() # type: ignore
Expand All @@ -146,6 +150,8 @@ async def test_api_keyset_keys_old_keyset_id(ledger: Ledger):
{
"id": "009a1f293253e41e",
"unit": "sat",
"active": True,
"input_fee_ppk": 0,
"keys": {
str(k): v.format().hex()
for k, v in ledger.keysets["009a1f293253e41e"].public_keys.items() # type: ignore
Expand Down