From a6ad36fd73f85462b052e45dfbbaa31997cbcc33 Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 6 Feb 2026 10:14:25 +0000
Subject: [PATCH] addrimport, txcreate: help screen fixes and cleanups

---
 mmgen/help/help_notes.py |  5 ++++-
 mmgen/main_addrimport.py | 11 +++++++----
 mmgen/main_txbump.py     |  4 +++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mmgen/help/help_notes.py b/mmgen/help/help_notes.py
index c4b9f867..45a13a85 100755
--- a/mmgen/help/help_notes.py
+++ b/mmgen/help/help_notes.py
@@ -21,7 +21,10 @@ class help_notes:
 	def txcreate_args(self):
 		match self.proto.base_proto:
 			case 'Bitcoin':
-				return '[ADDR,AMT ... | DATA_SPEC] ADDR [addr file ...]'
+				if self.cfg.autosign:
+					return '[ADDR,AMT ... | DATA_SPEC] ADDR'
+				else:
+					return '[ADDR,AMT ... | DATA_SPEC] ADDR [addr file ...]'
 			case 'Monero':
 				return '[ADDR,AMT]'
 			case _:
diff --git a/mmgen/main_addrimport.py b/mmgen/main_addrimport.py
index f538ad0d..d8cc170d 100755
--- a/mmgen/main_addrimport.py
+++ b/mmgen/main_addrimport.py
@@ -45,21 +45,24 @@ opts_data = {
 -t, --token-addr=ADDR Import addresses for ERC20 token with address ADDR
 """,
 	'notes': """
-
-This command can also be used to update the comment fields or balances of
-addresses already in the tracking wallet.
+                           NOTES FOR BTC, LTC AND BCH
 
 Rescanning now uses the ‘scantxoutset’ RPC call and a selective scan of
 blocks containing the relevant UTXOs for much faster performance than the
 previous implementation.  The rescan operation typically takes around two
 minutes total, independent of the number of addresses imported.
 
+It’s recommended to use ‘--rpc-backend=aio’ with ‘--rescan’.
+
 Bear in mind that the UTXO scan will not find historical transactions: to add
 them to the tracking wallet, you must perform a full or partial rescan of the
 blockchain with the ‘mmgen-tool rescan_blockchain’ utility.  A full rescan of
 the blockchain may take up to several hours.
 
-It’s recommended to use ‘--rpc-backend=aio’ with ‘--rescan’.
+A full rescan is required if you plan to use ‘mmgen-tool txhist’ or the
+automatic change address functionality of ‘mmgen-txcreate’, or wish to see
+which addresses in your tracking wallet are used.  Without it, all addresses
+without balances will be displayed as new.
 """
 	}
 }
diff --git a/mmgen/main_txbump.py b/mmgen/main_txbump.py
index a1ca49b1..11869834 100755
--- a/mmgen/main_txbump.py
+++ b/mmgen/main_txbump.py
@@ -32,11 +32,13 @@ opts_data = {
 	'text': {
 		'desc': """
                 Create, and optionally send and sign, a replacement transaction
-                on supporting networks
+                on supported networks
 		 """,
 		'usage2':   (
 			f'[opts] [{gc.proj_name} TX file] [seed source] ...',
 			f'[opts] {{u_args}} [{gc.proj_name} TX file] [seed source] ...',
+			'--autosign [opts]',
+			'--autosign [opts] {u_args}',
 		),
 		'options': """
 			-- -h, --help             Print this help message