From edaedf01b4a7e42aa7acf1c34bd9c048a40099dc Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Wed, 21 Sep 2022 17:18:42 +0300 Subject: [PATCH] print timestamp --- core/base.py | 6 ++++++ wallet/cashu.py | 10 ++++++++-- wallet/migrations.py | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/core/base.py b/core/base.py index f1b4ebd..dbd70e7 100644 --- a/core/base.py +++ b/core/base.py @@ -10,6 +10,8 @@ class Proof(BaseModel): secret: str reserved: bool = False # whether this proof is reserved for sending send_id: str = "" # unique ID of send attempt + time_created: str = "" + time_reserved: str = "" @classmethod def from_row(cls, row: Row): @@ -19,6 +21,8 @@ class Proof(BaseModel): secret=row[2], reserved=row[3] or False, send_id=row[4] or "", + time_created=row[5] or "", + time_reserved=row[6] or "", ) @classmethod @@ -29,6 +33,8 @@ class Proof(BaseModel): secret=d["secret"], reserved=d["reserved"] or False, send_id=d["send_id"] or "", + time_created=d["time_created"] or "", + time_reserved=d["time_reserved"] or "", ) def __getitem__(self, key): diff --git a/wallet/cashu.py b/wallet/cashu.py index 4590f56..3a82531 100755 --- a/wallet/cashu.py +++ b/wallet/cashu.py @@ -4,6 +4,8 @@ import asyncio import base64 import json import math +from datetime import datetime + from functools import wraps from itertools import groupby from operator import itemgetter @@ -151,17 +153,21 @@ async def burn(ctx, token: str, all: bool): async def pending(ctx): wallet: Wallet = ctx.obj["WALLET"] await init_wallet(wallet) - wallet.status() reserved_proofs = await get_reserved_proofs(wallet.db) if len(reserved_proofs): sorted_proofs = sorted(reserved_proofs, key=itemgetter("send_id")) for key, value in groupby(sorted_proofs, key=itemgetter("send_id")): grouped_proofs = list(value) token = await wallet.serialize_proofs(grouped_proofs) + reserved_date = datetime.utcfromtimestamp( + int(grouped_proofs[0].time_reserved) + ).strftime("%Y-%m-%d %H:%M:%S") print( - f"Amount: {sum([p['amount'] for p in grouped_proofs])} sat. ID: {key}" + f"Amount: {sum([p['amount'] for p in grouped_proofs])} sat Sent: {reserved_date} ID: {key}\n" ) print(token) + print("") + wallet.status() @cli.command("pay", help="Pay lightning invoice.") diff --git a/wallet/migrations.py b/wallet/migrations.py index 269f495..8745577 100644 --- a/wallet/migrations.py +++ b/wallet/migrations.py @@ -70,7 +70,7 @@ async def m002_add_proofs_reserved(db): await db.execute("ALTER TABLE proofs ADD COLUMN reserved BOOL") -async def m003_add_proofs_sendid(db): +async def m003_add_proofs_sendid_and_timestamps(db): """ Column with unique ID for each initiated send attempt so proofs can be later grouped together for each send attempt.