move wallet classes from seed.py to new module wallet.py

mmgen/common.py

@@ -29,7 +29,7 @@ from mmgen.util import *
 
 def help_notes(k):
 	from mmgen.obj import SubSeedIdxRange,SeedShareIdx,SeedShareCount,MasterShareIdx
-	from mmgen.seed import Wallet
+	from .wallet import Wallet
 	from mmgen.tx import MMGenTX
 	def fee_spec_letters(use_quotes=False):
 		cu = g.proto.coin_amt.units

mmgen/filename.py

@@ -39,7 +39,7 @@ class Filename(MMGenObject):
 		self.ctime    = None
 		self.atime    = None
 
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		from mmgen.tx import MMGenTX
 		if ftype:
 			if isinstance(ftype,type):
@@ -99,7 +99,7 @@ def find_files_in_dir(ftype,fdir,no_dups=False):
 	if not isinstance(ftype,type):
 		die(3,"'{}': is of type {} (not a subclass of type 'type')".format(ftype,type(ftype)))
 
-	from mmgen.seed import Wallet
+	from .wallet import Wallet
 	if not issubclass(ftype,Wallet):
 		die(3,"'{}': not a recognized file type".format(ftype))
 

mmgen/main_addrgen.py

@@ -24,7 +24,7 @@ mmgen-addrgen: Generate a series or range of addresses from an MMGen
 from mmgen.common import *
 from mmgen.crypto import *
 from mmgen.addr import *
-from mmgen.seed import Wallet
+from .wallet import Wallet
 
 if g.prog_name == 'mmgen-keygen':
 	gen_what = 'keys'

mmgen/main_autosign.py

@@ -249,7 +249,7 @@ def decrypt_wallets():
 	opt.set_by_user = ['hash_preset']
 	opt.passwd_file = os.path.join(tx_dir,key_fn)
 #	opt.passwd_file = '/tmp/key'
-	from mmgen.seed import Wallet
+	from .wallet import Wallet
 	msg("Unlocking wallet{} with key from '{}'".format(suf(wfs),opt.passwd_file))
 	fails = 0
 	for wf in wfs:
@@ -352,7 +352,7 @@ def create_wallet_dir():
 def setup():
 	remove_wallet_dir()
 	gen_key(no_unmount=True)
-	from mmgen.seed import Wallet
+	from .wallet import Wallet
 	opt.hidden_incog_input_params = None
 	opt.quiet = True
 	opt.in_fmt = 'words'

mmgen/main_passgen.py

@@ -24,7 +24,7 @@ mmgen-passgen: Generate a series or range of passwords from an MMGen
 from mmgen.common import *
 from mmgen.crypto import *
 from mmgen.addr import PasswordList,AddrIdxList
-from mmgen.seed import Wallet
+from .wallet import Wallet
 from mmgen.obj import MMGenPWIDString
 
 pwi = PasswordList.pw_info

mmgen/main_seedjoin.py

@@ -23,7 +23,8 @@ mmgen/main_seedjoin: Regenerate an MMGen deterministic wallet from seed shares
 
 from mmgen.common import *
 from mmgen.obj import MasterShareIdx,SeedSplitIDString,MMGenWalletLabel
-from mmgen.seed import Seed,Wallet,SeedShareMasterJoining
+from .seed import Seed,SeedShareMasterJoining
+from .wallet import Wallet
 
 opts_data = {
 	'text': {

mmgen/main_txbump.py

@@ -22,7 +22,7 @@ mmgen-txbump: Increase the fee on a replaceable (replace-by-fee) MMGen
 """
 
 from mmgen.common import *
-from mmgen.seed import Wallet
+from .wallet import Wallet
 
 opts_data = {
 	'sets': [('yes', True, 'quiet', True)],

mmgen/main_txdo.py

@@ -21,7 +21,7 @@ mmgen-txdo: Create, sign and broadcast an online MMGen transaction
 """
 
 from mmgen.common import *
-from mmgen.seed import Wallet
+from .wallet import Wallet
 from mmgen.obj import SubSeedIdxRange
 
 opts_data = {

mmgen/main_txsign.py

@@ -22,7 +22,7 @@ mmgen-txsign: Sign a transaction generated by 'mmgen-txcreate'
 
 from mmgen.common import *
 from mmgen.obj import SubSeedIdxRange
-from mmgen.seed import Wallet
+from .wallet import Wallet
 
 # -w, --use-wallet-dat (keys from running coin daemon) removed: use walletdump rpc instead
 opts_data = {

mmgen/main_wallet.py

@@ -22,7 +22,7 @@ mmgen/main_wallet:  Entry point for MMGen wallet-related scripts
 
 import os
 from mmgen.common import *
-from mmgen.seed import Wallet,MMGenWallet
+from .wallet import Wallet,MMGenWallet
 from mmgen.filename import find_file_in_dir
 from mmgen.obj import MMGenWalletLabel,MasterShareIdx
 

mmgen/opts.py

@@ -392,7 +392,7 @@ def check_usr_opts(usr_opts): # Raises an exception if any check fails
 		msg_r('{} option {!r}{}'.format(beg,s,end))
 
 	def chk_in_fmt(key,val,desc):
-		from mmgen.seed import Wallet,IncogWallet,Brainwallet,IncogWalletHidden
+		from .wallet import Wallet,IncogWallet,Brainwallet,IncogWalletHidden
 		sstype = Wallet.fmt_code_to_type(val)
 		if not sstype:
 			opt_unrecognized(key,val)
@@ -434,7 +434,7 @@ def check_usr_opts(usr_opts): # Raises an exception if any check fails
 
 		if hasattr(opt,key2):
 			val2 = getattr(opt,key2)
-			from mmgen.seed import IncogWalletHidden
+			from .wallet import IncogWalletHidden
 			if val2 and val2 not in IncogWalletHidden.fmt_codes:
 				fs = 'Option conflict:\n  {}, with\n  {}={}'
 				raise UserOptError(fs.format(fmt_opt(key),fmt_opt(key2),val2))

mmgen/tool.py

@@ -786,14 +786,14 @@ class MMGenToolCmdWallet(MMGenToolCmds):
 		"get the Seed ID of a single subseed by Subseed Index for default or specified wallet"
 		opt.quiet = True
 		sf = get_seed_file([wallet] if wallet else [],1)
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		return Wallet(sf).seed.subseed(subseed_idx).sid
 
 	def get_subseed_by_seed_id(self,seed_id:str,wallet='',last_idx=g.subseeds):
 		"get the Subseed Index of a single subseed by Seed ID for default or specified wallet"
 		opt.quiet = True
 		sf = get_seed_file([wallet] if wallet else [],1)
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		ret = Wallet(sf).seed.subseed_by_seed_id(seed_id,last_idx)
 		return ret.ss_idx if ret else None
 
@@ -801,7 +801,7 @@ class MMGenToolCmdWallet(MMGenToolCmds):
 		"list a range of subseed Seed IDs for default or specified wallet"
 		opt.quiet = True
 		sf = get_seed_file([wallet] if wallet else [],1)
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		return Wallet(sf).seed.subseeds.format(*SubSeedIdxRange(subseed_idx_range))
 
 	def list_shares(self,
@@ -812,7 +812,7 @@ class MMGenToolCmdWallet(MMGenToolCmds):
 		"list the Seed IDs of the shares resulting from a split of default or specified wallet"
 		opt.quiet = True
 		sf = get_seed_file([wallet] if wallet else [],1)
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		return Wallet(sf).seed.split(share_count,id_str,master_share).format()
 
 	def gen_key(self,mmgen_addr:str,wallet=''):
@@ -824,7 +824,7 @@ class MMGenToolCmdWallet(MMGenToolCmds):
 		addr = MMGenID(mmgen_addr)
 		opt.quiet = True
 		sf = get_seed_file([wallet] if wallet else [],1)
-		from mmgen.seed import Wallet
+		from .wallet import Wallet
 		ss = Wallet(sf)
 		if ss.seed.sid != addr.sid:
 			m = 'Seed ID of requested address ({}) does not match wallet ({})'

mmgen/txsign.py

@@ -21,7 +21,7 @@ txsign: Sign a transaction generated by 'mmgen-txcreate'
 """
 
 from mmgen.common import *
-from mmgen.seed import *
+from .wallet import *
 from mmgen.tx import *
 from mmgen.addr import *
 

mmgen/util.py

@@ -470,7 +470,7 @@ def check_outfile(f,blkdev_ok=False):
 def check_outdir(f):
 	return check_file_type_and_access(f,'output directory')
 def check_wallet_extension(fn):
-	from mmgen.seed import Wallet
+	from .wallet import Wallet
 	if not Wallet.ext_to_type(get_extension(fn)):
 		raise BadFileExtension("'{}': unrecognized seed source file extension".format(fn))
 def make_full_path(outdir,outfile):
@@ -478,7 +478,7 @@ def make_full_path(outdir,outfile):
 
 def get_seed_file(cmd_args,nargs,invoked_as=None):
 	from mmgen.filename import find_file_in_dir
-	from mmgen.seed import MMGenWallet
+	from .wallet import MMGenWallet
 
 	wf = find_file_in_dir(MMGenWallet,g.data_dir)
 

setup.py

@@ -106,6 +106,7 @@ setup(
 			'mmgen.color',
 			'mmgen.common',
 			'mmgen.crypto',
+			'mmgen.daemon',
 			'mmgen.devtools',
 			'mmgen.ed25519',
 			'mmgen.ed25519ll_djbec',
@@ -114,8 +115,8 @@ setup(
 			'mmgen.globalvars',
 			'mmgen.keccak',
 			'mmgen.license',
-			'mmgen.mn_entry',
 			'mmgen.mn_electrum',
+			'mmgen.mn_entry',
 			'mmgen.mn_monero',
 			'mmgen.mn_tirosh',
 			'mmgen.obj',
@@ -126,12 +127,12 @@ setup(
 			'mmgen.seed',
 			'mmgen.sha2',
 			'mmgen.term',
-			'mmgen.daemon',
 			'mmgen.tool',
 			'mmgen.tw',
 			'mmgen.tx',
 			'mmgen.txsign',
 			'mmgen.util',
+			'mmgen.wallet',
 
 			'mmgen.altcoins.__init__',
 

test/test_py_d/ts_input.py

@@ -13,7 +13,7 @@ ts_input.py: user input tests for the MMGen test.py test suite
 from ..include.common import *
 from .ts_base import *
 from .input import *
-from mmgen.seed import Wallet
+from mmgen.wallet import Wallet
 
 class TestSuiteInput(TestSuiteBase):
 	'user input'

test/test_py_d/ts_main.py

@@ -22,7 +22,7 @@ ts_main.py: Basic operations tests for the test.py test suite
 
 from mmgen.globalvars import g
 from mmgen.opts import opt
-from mmgen.seed import Wallet,MMGenWallet,MMGenMnemonic,IncogWallet,MMGenSeedFile
+from mmgen.wallet import Wallet,MMGenWallet,MMGenMnemonic,IncogWallet,MMGenSeedFile
 from ..include.common import *
 from .common import *
 from .ts_base import *

test/test_py_d/ts_ref.py

@@ -23,7 +23,7 @@ ts_ref.py: Reference file tests for the test.py test suite
 import os
 from mmgen.globalvars import g
 from mmgen.opts import opt
-from mmgen.seed import MMGenMnemonic
+from mmgen.wallet import MMGenMnemonic
 from ..include.common import *
 from .common import *
 

test/test_py_d/ts_ref_3seed.py

@@ -23,7 +23,7 @@ ts_ref_3seed.py: Saved and generated reference file tests for 128, 192 and
 
 from mmgen.globalvars import g
 from mmgen.opts import opt
-from mmgen.seed import Wallet
+from mmgen.wallet import *
 from ..include.common import *
 from .common import *
 from .ts_base import *
@@ -89,27 +89,21 @@ class TestSuiteRef3Seed(TestSuiteBase,TestSuiteShared):
 		return self.walletchk(wf,pf=None,wcls=ss,sid=self.seed_id)
 
 	def ref_seed_chk(self):
-		from mmgen.seed import MMGenSeedFile
 		return self.ref_ss_chk(ss=MMGenSeedFile)
 
 	def ref_hex_chk(self):
-		from mmgen.seed import MMGenHexSeedFile
 		return self.ref_ss_chk(ss=MMGenHexSeedFile)
 
 	def ref_plainhex_chk(self):
-		from mmgen.seed import PlainHexSeedFile
 		return self.ref_ss_chk(ss=PlainHexSeedFile)
 
 	def ref_dieroll_chk(self):
-		from mmgen.seed import DieRollSeedFile
 		return self.ref_ss_chk(ss=DieRollSeedFile)
 
 	def ref_mn_chk(self):
-		from mmgen.seed import MMGenMnemonic
 		return self.ref_ss_chk(ss=MMGenMnemonic)
 
 	def ref_bip39_chk(self):
-		from mmgen.seed import BIP39Mnemonic
 		return self.ref_ss_chk(ss=BIP39Mnemonic)
 
 	def ref_hincog_chk(self,desc='hidden incognito data'):

test/test_py_d/ts_regtest.py

@@ -27,7 +27,7 @@ from mmgen.opts import opt
 from mmgen.util import die,gmsg,write_data_to_file
 from mmgen.protocol import CoinProtocol
 from mmgen.addr import AddrList
-from mmgen.seed import MMGenWallet
+from mmgen.wallet import MMGenWallet
 from ..include.common import *
 from .common import *
 

test/test_py_d/ts_seedsplit.py

@@ -22,7 +22,7 @@ ts_seedsplit.py: Seed split/join tests for the test.py test suite
 
 from mmgen.globalvars import g
 from mmgen.opts import opt
-from mmgen.seed import Wallet,MMGenWallet,IncogWallet,IncogWalletHex,IncogWalletHidden,WalletEnc
+from mmgen.wallet import Wallet,MMGenWallet,IncogWallet,IncogWalletHex,IncogWalletHidden,WalletEnc
 
 from .ts_base import *
 

test/test_py_d/ts_shared.py

@@ -24,7 +24,7 @@ import os
 from mmgen.globalvars import g
 from mmgen.opts import opt
 from mmgen.util import ymsg
-from mmgen.seed import Wallet,WalletEnc,Brainwallet,MMGenWallet,IncogWalletHidden
+from mmgen.wallet import Wallet,WalletEnc,Brainwallet,MMGenWallet,IncogWalletHidden
 from ..include.common import *
 from .common import *
 

test/test_py_d/ts_wallet.py

@@ -22,7 +22,7 @@ ts_wallet.py: Wallet conversion tests for the test.py test suite
 
 import os
 from mmgen.opts import opt
-from mmgen.seed import *
+from mmgen.wallet import *
 from .common import *
 from .ts_base import *
 from .ts_shared import *

test/tooltest2.py

@@ -31,7 +31,7 @@ from include.tests_header import repo_root
 from mmgen.common import *
 from test.include.common import *
 from mmgen.obj import is_wif,is_coin_addr
-from mmgen.seed import is_bip39_mnemonic,is_mmgen_mnemonic
+from mmgen.wallet import is_bip39_mnemonic,is_mmgen_mnemonic
 from mmgen.addr import is_xmrseed
 from mmgen.baseconv import *