From 92ab29a138a269a4929b64af0cb5a2011234aef3 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Tue, 12 Mar 2024 13:21:57 +0000
Subject: [PATCH] support use of alternate tracking wallet with --tw-name

---
 mmgen/data/version          |  2 +-
 mmgen/help/__init__.py      |  4 ++++
 mmgen/opts.py               |  5 ++++-
 mmgen/proto/btc/rpc.py      |  2 +-
 test/unit_tests_d/ut_rpc.py | 11 ++++++++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/mmgen/data/version b/mmgen/data/version
index 247246e0..56012dfa 100644
--- a/mmgen/data/version
+++ b/mmgen/data/version
@@ -1 +1 @@
-14.1.dev22
+14.1.dev23
diff --git a/mmgen/help/__init__.py b/mmgen/help/__init__.py
index c724b92a..28ccc116 100755
--- a/mmgen/help/__init__.py
+++ b/mmgen/help/__init__.py
@@ -40,6 +40,10 @@ def help_notes_func(proto,cfg,k):
 
 	class help_notes:
 
+		def dfl_twname():
+			from ..proto.btc.rpc import BitcoinRPCClient
+			return BitcoinRPCClient.dfl_twname
+
 		def MasterShareIdx():
 			from ..seedsplit import MasterShareIdx
 			return MasterShareIdx
diff --git a/mmgen/opts.py b/mmgen/opts.py
index f9c1da87..318a9d2f 100755
--- a/mmgen/opts.py
+++ b/mmgen/opts.py
@@ -62,15 +62,18 @@ long_opts_data = {
 --, --aiohttp-rpc-queue-len=N Use N simultaneous RPC connections with aiohttp
 --, --regtest=0|1          Disable or enable regtest mode
 --, --testnet=0|1          Disable or enable testnet
+--, --tw-name=NAME         Specify alternate name for the BTC/LTC/BCH tracking
+                         wallet (default: ‘{tw_name}’)
 --, --skip-cfg-file        Skip reading the configuration file
 --, --version              Print version information and exit
 --, --bob                  Specify user “Bob” in MMGen regtest mode
 --, --alice                Specify user “Alice” in MMGen regtest mode
 --, --carol                Specify user “Carol” in MMGen regtest mode
 	""",
-	'code': lambda proto,s: s.format(
+	'code': lambda proto,help_notes,s: s.format(
 			pnm    = gc.proj_name,
 			cu_dfl = proto.coin,
+			tw_name = help_notes('dfl_twname')
 		)
 }
 
diff --git a/mmgen/proto/btc/rpc.py b/mmgen/proto/btc/rpc.py
index 0f6fa322..9b87841a 100755
--- a/mmgen/proto/btc/rpc.py
+++ b/mmgen/proto/btc/rpc.py
@@ -127,7 +127,7 @@ class BitcoinRPCClient(RPCClient,metaclass=AsyncInit):
 		self.proto = proto
 		self.daemon = daemon
 		self.call_sigs = getattr(CallSigs,daemon.id)(cfg)
-		self.twname = cfg.regtest_user or self.dfl_twname
+		self.twname = cfg.regtest_user or cfg.tw_name or self.dfl_twname
 
 		super().__init__(
 			cfg  = cfg,
diff --git a/test/unit_tests_d/ut_rpc.py b/test/unit_tests_d/ut_rpc.py
index d03fa4f8..9f65de51 100755
--- a/test/unit_tests_d/ut_rpc.py
+++ b/test/unit_tests_d/ut_rpc.py
@@ -6,6 +6,7 @@ test.unit_tests_d.ut_rpc: RPC unit test for the MMGen suite
 
 import sys,os,time
 
+from mmgen.cfg import Config
 from mmgen.color import yellow,cyan
 from mmgen.util import msg,gmsg,make_timestr,pp_fmt,die
 from mmgen.protocol import init_proto
@@ -70,6 +71,7 @@ async def print_daemon_info(rpc):
     NETWORKINFO:    {fmt_dict(rpc.cached["networkinfo"])}
     BLOCKCHAININFO: {fmt_dict(rpc.cached["blockchaininfo"])}
     DEPLOYMENTINFO: {fmt_dict(rpc.cached["deploymentinfo"])}
+    WALLETINFO:     {fmt_dict(await rpc.walletinfo)}
 		""".rstrip())
 
 	msg('')
@@ -85,6 +87,10 @@ class init_test:
 		rpc = await rpc_init(cfg, daemon.proto, backend, daemon)
 		do_msg(rpc,backend)
 
+		if cfg.tw_name:
+			wi = await rpc.walletinfo
+			assert wi['walletname'] == rpc.cfg.tw_name, f'{wi["walletname"]!r} != {rpc.cfg.tw_name!r}'
+
 		bh = (await rpc.call('getblockchaininfo',timeout=300))['bestblockhash']
 		await rpc.gathered_call('getblock',((bh,),(bh,1)),timeout=300)
 		await rpc.gathered_call(None,(('getblock',(bh,)),('getblock',(bh,1))),timeout=300)
@@ -150,7 +156,10 @@ class unit_tests:
 	arm_skip = ('parity',) # no prebuilt binaries for ARM
 
 	async def btc(self, name, ut):
-		return await run_test(['btc','btc_tn'], test_cf_auth=True)
+		return await run_test(
+			['btc','btc_tn'],
+			test_cf_auth = True,
+			cfg_in = Config({'_clone': cfg, 'tw_name': 'alternate-tracking-wallet'}))
 
 	async def ltc(self, name, ut):
 		return await run_test(['ltc','ltc_tn'], test_cf_auth=True)