aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions 1

Added Blocks remaining until next difficulty adjustment

Browse source
This commit is contained in:
Black Coffee 2022-09-29 17:27:14 +01:00
parent c77a9d1747
commit 90ed8c0e0a
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lnbits/extensions/gerty/views_api.py
View file

@ -173,9 +173,9 @@ async def get_screen_text(screen_num: int, screens_list: dict, gerty):
elif screen_slug == "onchain_difficulty_epoch_progress": elif screen_slug == "onchain_difficulty_epoch_progress":
text = await get_onchain_stat(screen_slug, gerty) text = await get_onchain_stat(screen_slug, gerty)
elif screen_slug == "onchain_difficulty_retarget_date": elif screen_slug == "onchain_difficulty_retarget_date":
text = await get_onchain_stat("onchain_difficulty_retarget_date", gerty) text = await get_onchain_stat(screen_slug, gerty)
elif screen_slug == "onchain_difficulty_blocks_remaining": elif screen_slug == "onchain_difficulty_blocks_remaining":
text = await get_placeholder_text() text = await get_onchain_stat(screen_slug, gerty)
elif screen_slug == "onchain_difficulty_epoch_time_remaining": elif screen_slug == "onchain_difficulty_epoch_time_remaining":
text = await get_placeholder_text() text = await get_placeholder_text()
elif screen_slug == "mempool_recommended_fees": elif screen_slug == "mempool_recommended_fees":
@ -252,7 +252,7 @@ async def get_exchange_rate(gerty):
try: try:
amount = await satoshis_amount_as_fiat(100000000, gerty.exchange) amount = await satoshis_amount_as_fiat(100000000, gerty.exchange)
if amount: if amount:
price = ('{0} {1}').format(("{:,}".format(math.ceil(amount))), gerty.exchange) price = ('{0} {1}').format(format_number(amount), gerty.exchange)
text.append(get_text_item_dict(price, 40)) text.append(get_text_item_dict(price, 40))
text.append(get_text_item_dict("Current BTC price", 12)) text.append(get_text_item_dict("Current BTC price", 12))
except: except:
@ -294,10 +294,18 @@ async def get_onchain_stat(stat_slug: str, gerty):
dt = datetime.fromtimestamp(stat / 1000).strftime("%e %b %Y at %H:%M") dt = datetime.fromtimestamp(stat / 1000).strftime("%e %b %Y at %H:%M")
text.append(get_text_item_dict(dt, 40)) text.append(get_text_item_dict(dt, 40))
text.append(get_text_item_dict("Estimated date of next difficulty adjustment", 16)) text.append(get_text_item_dict("Estimated date of next difficulty adjustment", 16))
elif stat_slug == "onchain_difficulty_blocks_remaining":
stat = r.json()['remainingBlocks']
text.append(get_text_item_dict("{0}".format(format_number(stat)), 40))
text.append(get_text_item_dict("Blocks remaining until next difficulty adjustment", 16))
return text return text
def get_date_suffix(dayNumber): def get_date_suffix(dayNumber):
if 4 <= dayNumber <= 20 or 24 <= dayNumber <= 30: if 4 <= dayNumber <= 20 or 24 <= dayNumber <= 30:
return "th" return "th"
else: else:
return ["st", "nd", "rd"][dayNumber % 10 - 1] return ["st", "nd", "rd"][dayNumber % 10 - 1]
# format a number for nice display output
def format_number(number):
return ("{:,}".format(math.ceil(number)))