m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

async wallet balance works great

Browse Source
This commit is contained in:
Thomas Farstrike
2025-05-25 21:23:26 +02:00
parent 02f68206b5
commit 4103611e88
2 changed files with 75 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/displaywallet.py
+5 -3
View File
@@ -217,12 +217,15 @@ def redraw_balance_cb(timer):
balance_label.set_text(str(wallet.last_known_balance))
def janitor_cb(timer):
global wallet
if lv.screen_active() != main_screen and lv.screen_active() != settings_screen:
print("app backgrounded, cleaning up...")
janitor.delete()
redraw_timer.delete()
wallet.destroy()
if settings_screen:
settings_screen.delete()
if main_screen:
main_screen.delete()
build_main_ui()
@@ -242,7 +245,6 @@ elif wallet_type == "nwc":
else:
print(f"No or unsupported wallet type configured: '{wallet_type}'")
wallet.start_refresh_balance()
redraw_timer = lv.timer_create(redraw_balance_cb, 1000, None)
wallet.start_refresh_balance(lambda : balance_label.set_text(str(wallet.last_known_balance)))
janitor = lv.timer_create(janitor_cb, 1000, None)
internal_filesystem/apps/com.lightningpiggy.displaywallet/assets/wallet.py
+70 -24
View File
@@ -28,9 +28,13 @@ class Wallet:
elif isinstance(self, NWCWallet):
return "NWCWallet"
def start_refresh_balance(self):
def start_refresh_balance(self, balance_updated_cb):
_thread.stack_size(mpos.apps.good_stack_size())
_thread.start_new_thread(self.fetch_balance_thread, ())
_thread.start_new_thread(self.fetch_balance_thread, (balance_updated_cb,))
def destroy(self):
# optional to inherit
pass
class LNBitsWallet(Wallet):
@@ -40,7 +44,7 @@ class LNBitsWallet(Wallet):
self.lnbits_url = lnbits_url
self.lnbits_readkey = lnbits_readkey
def fetch_balance_thread(self):
def fetch_balance_thread(self, balance_updated_cb):
print("fetch_balance_thread")
walleturl = self.lnbits_url + "/api/v1/wallet"
headers = {
@@ -61,6 +65,7 @@ class LNBitsWallet(Wallet):
balance_msat = balance_reply['balance']
self.last_known_balance = round(balance_msat / 1000)
#self.last_known_balance_timestamp = mpos.time.epoch_seconds()
balance_updated_cb()
except Exception as e:
print(f"Could not parse reponse text '{response_text}' as JSON: {e}")
@@ -74,41 +79,51 @@ class NWCWallet(Wallet):
self.private_key = PrivateKey(bytes.fromhex(self.secret))
self.relay_manager = RelayManager()
self.relay_manager.add_relay(self.relay)
print(f"DEBUG: Opening relay connections")
self.relay_manager.open_connections({"cert_reqs": ssl.CERT_NONE})
self.connected = False
def destroy(self):
self.relay_manager.close_connections()
def fetch_balance_thread(self, balance_updated_cb) :
# make sure connected to relay (otherwise connect)
if self.relay_manager.relays[self.relay].connected != True:
print(f"DEBUG: Opening relay connections")
self.relay_manager.open_connections({"cert_reqs": ssl.CERT_NONE})
self.connected = False
for _ in range(20):
time.sleep(0.5)
if self.relay_manager.relays[self.relay].connected is True:
self.connected = True
break
print("Waiting for relay connection...")
if not self.connected:
print("Failed to connect, aborting...")
return
# Set up subscription to receive response
self.subscription_id = "nwc_balance_" + str(round(time.time()))
#print(f"DEBUG: Setting up subscription with ID: {self.subscription_id}")
print(f"DEBUG: Setting up subscription with ID: {self.subscription_id}")
self.filters = Filters([Filter(
kinds=[23195], # NWC replies
authors=[self.wallet_pubkey],
pubkey_refs=[self.private_key.public_key.hex()]
)])
#print(f"DEBUG: Subscription filters: {filters.to_json_array()}")
print(f"DEBUG: Subscription filters: {self.filters.to_json_array()}")
self.relay_manager.add_subscription(self.subscription_id, self.filters)
time.sleep(5)
def start_refresh_balance(self) :
# TODO: make sure connected to relay (otherwise connect)
time.sleep(1)
# Create get_balance request
balance_request = {
"method": "get_balance",
"params": {}
}
print(f"DEBUG: Created balance request: {balance_request}")
print(f"DEBUG: Creating encrypted DM to wallet pubkey: {self.wallet_pubkey}")
dm = EncryptedDirectMessage(
recipient_pubkey=self.wallet_pubkey,
cleartext_content=json.dumps(balance_request)
)
print(f"DEBUG: Signing DM {json.dumps(dm)} with private key")
self.private_key.sign_event(dm) # sign also does encryption if it's a encrypted dm
print(f"DEBUG: DM created with ID: {dm.id}")
# Publish request
print(f"DEBUG: Publishing subscription request")
request_message = [ClientMessageType.REQUEST, self.subscription_id]
@@ -116,7 +131,45 @@ class NWCWallet(Wallet):
self.relay_manager.publish_message(json.dumps(request_message))
print(f"DEBUG: Publishing encrypted DM")
self.relay_manager.publish_event(dm)
# only accept events after the time it was published
after_time = mpos.time.epoch_seconds()
after_time -= 60 # go back a bit because server clocks might be drifting
print(f"will only consider events after {after_time}")
# Wait for response
print(f"DEBUG: Waiting for response...")
print(f"starting at {time.localtime()}")
start_time = mpos.time.epoch_seconds()
balance = None
while mpos.time.epoch_seconds() - start_time < 60 * 2:
while self.relay_manager.message_pool.has_events():
print(f"DEBUG: Event received from message pool")
event_msg = self.relay_manager.message_pool.get_event()
event_created_at = event_msg.event.created_at
print(f"Received at {time.localtime()} a message with timestamp {event_created_at}")
#if event_created_at < after_time:
# print("Skipping event because it's too old!")
# continue
#print(f"event_msg content {event_msg.event.content}")
try:
#print(f"DEBUG: Decrypting event from public_key: {event_msg.event.public_key}")
decrypted_content = self.private_key.decrypt_message(
event_msg.event.content,
event_msg.event.public_key
)
print(f"DEBUG: Decrypted content: {decrypted_content}")
response = json.loads(decrypted_content)
print(f"DEBUG: Parsed response: {response}")
self.last_known_balance = round(int(response["result"]["balance"]) / 1000)
print(f"Got balance: {self.last_known_balance}")
balance_updated_cb()
break
except Exception as e:
print(f"DEBUG: Error processing response: {e}")
if balance is not None:
break
time.sleep(1)
def parse_nwc_url(self, nwc_url):
"""Parse Nostr Wallet Connect URL to extract pubkey, relay, secret, and lud16."""
print(f"DEBUG: Starting to parse NWC URL: {nwc_url}")
@@ -131,18 +184,14 @@ class NWCWallet(Wallet):
else:
print(f"DEBUG: No recognized prefix found in URL")
raise ValueError("Invalid NWC URL: missing 'nostr+walletconnect://' or 'nwc:' prefix")
print(f"DEBUG: URL after prefix removal: {nwc_url}")
# Split into pubkey and query params
parts = nwc_url.split('?')
pubkey = parts[0]
print(f"DEBUG: Extracted pubkey: {pubkey}")
# Validate pubkey (should be 64 hex characters)
if len(pubkey) != 64 or not all(c in '0123456789abcdef' for c in pubkey):
raise ValueError("Invalid NWC URL: pubkey must be 64 hex characters")
# Extract relay, secret, and lud16 from query params
relay = None
secret = None
@@ -162,14 +211,11 @@ class NWCWallet(Wallet):
print(f"DEBUG: Extracted lud16: {lud16}")
else:
print(f"DEBUG: No query parameters found")
if not pubkey or not relay or not secret:
raise ValueError("Invalid NWC URL: missing required fields (pubkey, relay, or secret)")
# Validate secret (should be 64 hex characters)
if len(secret) != 64 or not all(c in '0123456789abcdef' for c in secret):
raise ValueError("Invalid NWC URL: secret must be 64 hex characters")
print(f"DEBUG: Parsed NWC data - Relay: {relay}, Pubkey: {pubkey}, Secret: {secret}, lud16: {lud16}")
return relay, pubkey, secret, lud16
except Exception as e: