From 92fdfc047e213aed42fdb7a71c29aef32707404f Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Sun, 29 Sep 2024 14:29:10 +0000
Subject: [PATCH] Support BCH cashaddr format

---
 mmgen_node_tools/data/version    | 2 +-
 mmgen_node_tools/main_addrbal.py | 6 +++---
 setup.cfg                        | 2 +-
 test/cmdtest_py_d/ct_regtest.py  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version
index 1809198..3f8a888 100644
--- a/mmgen_node_tools/data/version
+++ b/mmgen_node_tools/data/version
@@ -1 +1 @@
-3.4.0
+3.5.dev1
diff --git a/mmgen_node_tools/main_addrbal.py b/mmgen_node_tools/main_addrbal.py
index 7af2b77..e78a53e 100755
--- a/mmgen_node_tools/main_addrbal.py
+++ b/mmgen_node_tools/main_addrbal.py
@@ -38,7 +38,7 @@ def do_output(proto,addr_data,blk_hdrs):
 	indent = ' ' * (col1w + 2)
 
 	for n,(addr,unspents) in enumerate(addr_data.items(),1):
-		Msg(f'\n{n:{col1w}}) Address: {addr.hl()}')
+		Msg(f'\n{n:{col1w}}) Address: {addr.hl(addr.view_pref)}')
 
 		if unspents:
 			heights = { u['height'] for u in unspents }
@@ -93,7 +93,7 @@ def do_output_tabular(proto,addr_data,blk_hdrs):
 		if unspents:
 			Msg(fs.format(
 				n = str(n) + ')',
-				a = addr.fmt(width=max_addrw,color=True),
+				a = addr.fmt(addr.view_pref, width=max_addrw, color=True),
 				u = red(str(len(unspents)).rjust(5)),
 				b = unspents[0]['height'],
 				t = make_timestr( blk_hdrs[unspents[0]['height']]['time'] ),
@@ -104,7 +104,7 @@ def do_output_tabular(proto,addr_data,blk_hdrs):
 		else:
 			Msg(fs.format(
 				n = str(n) + ')',
-				a = addr.fmt(width=max_addrw,color=True),
+				a = addr.fmt(addr.view_pref, width=max_addrw, color=True),
 				u = '    -',
 				b = '-',
 				t = '',
diff --git a/setup.cfg b/setup.cfg
index 9a0ab04..875bb01 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ python_requires = >=3.9
 include_package_data = True
 
 install_requires =
-	mmgen-wallet==15.0.0
+	mmgen-wallet>=15.1.dev1
 	pyyaml
 	yahooquery
 
diff --git a/test/cmdtest_py_d/ct_regtest.py b/test/cmdtest_py_d/ct_regtest.py
index c89f8fa..ee59b31 100755
--- a/test/cmdtest_py_d/ct_regtest.py
+++ b/test/cmdtest_py_d/ct_regtest.py
@@ -112,7 +112,7 @@ class CmdTestRegtest(CmdTestBase):
 		if cfg._proto.testnet:
 			die(2,'--testnet and --regtest options incompatible with regtest test suite')
 		self.proto = init_proto( cfg, self.proto.coin, network='regtest', need_amt=True )
-		self.addrs = gen_addrs(self.proto,'regtest',[1,2,3,4,5])
+		self.addrs = [a.views[a.view_pref] for a in gen_addrs(self.proto,'regtest',[1,2,3,4,5])]
 
 		self.use_bdb_wallet = self.bdb_wallet or self.proto.coin != 'BTC'
 		self.regtest = MMGenRegtest(cfg, self.proto.coin, bdb_wallet=self.use_bdb_wallet)