From 3836be8b31d22fcb2be351980b111d0baccb0051 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 5 Aug 2026 17:24:56 +0000 Subject: [PATCH] tw: display daemon name in tracking wallet views --- mmgen/daemon.py | 2 +- mmgen/tw/bal.py | 9 +++++---- mmgen/tw/view.py | 12 +++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mmgen/daemon.py b/mmgen/daemon.py index 27e1f0b2..ddda8982 100755 --- a/mmgen/daemon.py +++ b/mmgen/daemon.py @@ -376,7 +376,7 @@ class CoinDaemon(Daemon): or daemon_ids[0]) if daemon_id not in daemon_ids: - die(1, f'{daemon_id!r}: invalid daemon_id - valid choices: {fmt_list(daemon_ids)}') + die(1, f'{daemon_id!r}: invalid daemon_id for coin {coin} - valid choices: {fmt_list(daemon_ids)}') me = Daemon.__new__(cls.get_daemon(cfg, None, daemon_id, proto=proto)) diff --git a/mmgen/tw/bal.py b/mmgen/tw/bal.py index c02a80c6..e97d7064 100755 --- a/mmgen/tw/bal.py +++ b/mmgen/tw/bal.py @@ -67,10 +67,10 @@ class TwGetBalance(MMGenObject, metaclass=AsyncInit): return self.data[label][col].fmt(iwidths[col], color=color) if color: - from ..color import green, yellow + from ..color import green, yellow, pink else: from ..color import nocolor - green = yellow = nocolor + green = yellow = pink = nocolor add_w = self.proto.coin_amt.max_prec + 1 # 1 = len('.') iwidth_adj = 1 # so that min iwidth (1) + add_w + iwidth_adj >= len('Unconfirmed') @@ -79,8 +79,9 @@ class TwGetBalance(MMGenObject, metaclass=AsyncInit): iwidths = {colname: get_col_iwidth(colname) for colname in self.conf_cols} net_desc = self.proto.coin + ' ' + self.proto.network.upper() - if net_desc != 'BTC MAINNET': - yield f'Network: {green(net_desc)}' + yield f'Network: {green(net_desc)}' + if getattr(self, 'rpc', None): + yield f'Daemon: {pink(self.rpc.daemon.coind_name)}' yield '{lbl:{w}} {cols}'.format( lbl = 'Wallet', diff --git a/mmgen/tw/view.py b/mmgen/tw/view.py index b599c4f7..50f1fad3 100755 --- a/mmgen/tw/view.py +++ b/mmgen/tw/view.py @@ -26,7 +26,7 @@ from collections import namedtuple from ..cfg import gv, gc from ..objmethods import MMGenObject from ..obj import get_obj, MMGenIdx, MMGenList -from ..color import nocolor, yellow, orange, green, red, blue +from ..color import nocolor, yellow, orange, green, red, blue, pink from ..util import msg, msg_r, fmt, die, capfirst, suf, make_timestr, isAsync, is_int from ..rpc import rpc_init from ..base_obj import AsyncInit @@ -434,10 +434,10 @@ class TwView(MMGenObject, metaclass=AsyncInit): def gen_hdr(spc): if color: - Blue, Green = (blue, green) + Blue, Green, Pink = (blue, green, pink) Yes, No, Only = (green('yes'), red('no'), yellow('only')) else: - Blue, Green = (nocolor, nocolor) + Blue, Green, Pink = (nocolor, nocolor, nocolor) Yes, No, Only = ('yes', 'no', 'only') sort_info = ' '.join(self.sort_info()) @@ -458,8 +458,10 @@ class TwView(MMGenObject, metaclass=AsyncInit): ' '.join(map(fmt_filter, self.filters)), spc * len(self.filters)) - yield 'Network: {}'.format(Green( - self.proto.coin + ' ' + self.proto.chain_name.upper())) + yield ( + 'Network: {}'.format(Green(self.proto.coin + ' ' + self.proto.chain_name.upper())) + + (', Daemon: {}'.format(Pink(self.rpc.daemon.coind_name)) + if hasattr(self.rpc, 'daemon') else '')) if hasattr(self.rpc, 'blockcount'): yield 'Block {} [{}]'.format(