tool, txbump: add proxy support; proto.rune.params: network name fixes

mmgen/main_tool.py

@@ -48,6 +48,9 @@ opts_data = {
 			-- -t, --type=t           Specify address type (valid choices: 'legacy',
 			+                         'compressed', 'segwit', 'bech32', 'zcash_z')
 			-- -v, --verbose          Produce more verbose output
+			-- -x, --proxy=P          Proxy HTTP connections via SOCKS5h proxy ‘P’ (host:port).
+			+                         Use special value ‘env’ to honor *_PROXY environment
+			+                         vars instead.
 			e- -X, --cached-balances  Use cached balances
 			-- -y, --yes              Answer 'yes' to prompts, suppress non-essential output
 """,

mmgen/main_txbump.py

@@ -85,7 +85,9 @@ opts_data = {
 			e- -w, --wait             Wait for transaction confirmation
 			-- -W, --allow-non-wallet-swap Allow signing of swap transactions that send funds
 			+                         to non-wallet addresses
-			-- -x, --proxy=P          Fetch the swap quote via SOCKS5 proxy ‘P’ (host:port)
+			-- -x, --proxy=P          Fetch the swap quote via SOCKS5h proxy ‘P’ (host:port).
+			+                         Use special value ‘env’ to honor *_PROXY environment
+			+                         vars instead.
 			-- -y, --yes              Answer 'yes' to prompts, suppress non-essential output
 			-- -z, --show-hash-presets Show information on available hash presets
 """,

mmgen/proto/rune/params.py

@@ -56,8 +56,8 @@ class mainnet(CoinProtocol.Secp256k1):
 				hrp  = self.bech32_hrp,
 				data = bech32.convertbits(list(pubhash), 8, 5)))
 
-class stagenet(mainnet):
+class testnet(mainnet): # testnet is stagenet
 	bech32_hrp = 'sthor'
 
-class testnet(stagenet): # testnet is deprecated
+class regtest(testnet): # regtest is deprecated testnet
 	bech32_hrp = 'tthor'