From 4f216ea9016acd5ca4a2805c3bc246d3e4fb6f60 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Wed, 10 Apr 2024 09:05:50 +0000
Subject: [PATCH] mmgen-xmrwallet sync, list, view, listview: refactor output
 code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ‘list’ and ‘listview’ operations now display truncated XMR addresses by
default.  To restore the former default behavior of displaying non-truncated
addresses, use the --full-output option.
---
 mmgen/main_xmrwallet.py |  2 ++
 mmgen/xmrwallet.py      | 68 ++++++++++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/mmgen/main_xmrwallet.py b/mmgen/main_xmrwallet.py
index a6aeff42..23d88489 100755
--- a/mmgen/main_xmrwallet.py
+++ b/mmgen/main_xmrwallet.py
@@ -66,6 +66,8 @@ opts_data = {
                                  number means higher fee).  Valid parameters:
                                  {tp}.  If option
                                  is omitted, the default priority will be used
+-F, --full-output                For ‘list’ and ‘listview’ operations, print
+                                 addresses in full instead of truncating them
 -m, --autosign-mountpoint=P      Specify the autosign mountpoint (defaults to
                                  ‘/mnt/mmgen_autosign’, implies --autosign)
 -b, --rescan-blockchain          Rescan the blockchain if wallet fails to sync
diff --git a/mmgen/xmrwallet.py b/mmgen/xmrwallet.py
index 5d453367..9956d775 100755
--- a/mmgen/xmrwallet.py
+++ b/mmgen/xmrwallet.py
@@ -1404,37 +1404,19 @@ class MoneroWalletOps:
 
 			return wallet_height >= chain_height
 
+		def gen_body(self, d):
+			for wnum, (_, wallet_data) in enumerate(d.items()):
+				yield from self.rpc(self, self.addr_data[wnum]).gen_accts_info(
+					wallet_data['accts'],
+					wallet_data['addrs'],
+					indent = '')
+				yield ''
+
 		def post_main_success(self):
 			d = self.accts_data
 
 			def gen_info():
-				for wnum,k in enumerate(d):
-					if self.name in ('sync', 'view'):
-						yield from self.rpc(self, self.addr_data[wnum]).gen_accts_info(
-							d[k]['accts'],
-							d[k]['addrs'],
-							indent = '')
-						yield ''
-					elif self.name in ('list', 'listview'):
-						fs = '  {:2} {} {} {}'
-						yield green(f'Wallet {k}:')
-						for acct_num,acct in enumerate(d[k]['addrs']):
-							yield ''
-							yield '  Account #{a} [{b} {c}]'.format(
-								a = acct_num,
-								b = self.proto.coin_amt(
-									d[k]['accts']['subaddress_accounts'][acct_num]['unlocked_balance'],
-									from_unit='atomic').hl(),
-								c = self.proto.coin_amt.hlc('XMR')
-							)
-							yield fs.format('', 'Address'.ljust(95), 'Used ', 'Label')
-							for addr in acct['addresses']:
-								yield fs.format(
-									addr['address_index'],
-									CoinAddr(self.proto, addr['address']).hl(),
-									(yellow('True ') if addr['used'] else green('False')),
-									pink(addr['label']))
-						yield ''
+				yield from self.gen_body(d)
 
 				col1_w = max(map(len, d)) + 1
 				fs = '{:%s} {} {}' % col1_w
@@ -1455,6 +1437,36 @@ class MoneroWalletOps:
 
 	class list(sync):
 		stem = 'sync'
+		opts = ('full_output',)
+
+		def gen_body(self, d):
+			addr_width = 95 if self.cfg.full_output else 17
+			for wnum, (wallet, wallet_data) in enumerate(d.items()):
+					fs = '  {I:2} {A} {U} {L}'
+					yield green(f'Wallet {wallet}:')
+					for acct_num, acct in enumerate(wallet_data['addrs']):
+						yield ''
+						yield '  Account #{a} [{b} {c}]'.format(
+							a = acct_num,
+							b = self.proto.coin_amt(
+									wallet_data['accts']['subaddress_accounts'][acct_num]['unlocked_balance'],
+									from_unit='atomic').hl(),
+							c = self.proto.coin_amt.hlc('XMR')
+						)
+						yield fs.format(
+							I = '',
+							A = 'Address'.ljust(addr_width),
+							U = 'Used'.ljust(5),
+							L = 'Label')
+						for addr in acct['addresses']:
+							ca = CoinAddr(self.proto, addr['address'])
+							yield fs.format(
+								I = addr['address_index'],
+								A = ca.hl() if self.cfg.full_output else ca.fmt(
+										color=True, width=addr_width),
+								U = (red('True ') if addr['used'] else green('False')),
+								L = pink(addr['label']))
+					yield ''
 
 	class view(sync):
 		stem = 'open'
@@ -1481,7 +1493,7 @@ class MoneroWalletOps:
 
 			return True
 
-	class listview(view):
+	class listview(view, list):
 		pass
 
 	class spec(wallet): # virtual class