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

use tokenObj in burn (#156)

Browse Source 
* use tokenObj in burn

* refactor token serialization

* add tests

* rename
This commit is contained in:
calle
2023-04-01 00:46:56 +02:00
committed by GitHub
parent 73f8c277b9
commit 2ded9c8b5c
5 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cashu/wallet/cli/cli.py
View File

@@ -18,7 +18,7 @@ import click
from click import Context
from loguru import logger
from cashu.core.base import Proof, TokenV1, TokenV2
from cashu.core.base import Proof, TokenV1, TokenV2, TokenV3
from cashu.core.helpers import sum_proofs
from cashu.core.migrations import migrate_databases
from cashu.core.settings import settings
@@ -342,8 +342,7 @@ async def receive(ctx: Context, token: str, lock: str):
# ----- receive token -----
# deserialize token
# dtoken = json.loads(base64.urlsafe_b64decode(token))
tokenObj = wallet._deserialize_token_V3(token)
tokenObj = TokenV3.deserialize(token)
# tokenObj = TokenV2.parse_obj(dtoken)
assert len(tokenObj.token), Exception("no proofs in token")
@@ -457,9 +456,8 @@ async def burn(ctx: Context, token: str, all: bool, force: bool, delete: str):
proofs = [proof for proof in reserved_proofs if proof["send_id"] == delete]
else:
# check only the specified ones
proofs = [
Proof(**p) for p in json.loads(base64.urlsafe_b64decode(token))["proofs"]
]
tokenObj = TokenV3.deserialize(token)
proofs = tokenObj.get_proofs()
if delete:
await wallet.invalidate(proofs, check_spendable=False)