From dd1300d94601fd83960fa36e6cb5fe0f1db7dcc0 Mon Sep 17 00:00:00 2001
From: MMGen <mmgen@tuta.io>
Date: Wed, 16 May 2018 10:21:28 +0000
Subject: [PATCH] addr.py,obj.py: minor changes

---
 doc/release-notes/release-notes-v0.9.8.md | 2 +-
 mmgen/addr.py                             | 8 ++++----
 mmgen/obj.py                              | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/release-notes/release-notes-v0.9.8.md b/doc/release-notes/release-notes-v0.9.8.md
index dfefa237..ca359c63 100644
--- a/doc/release-notes/release-notes-v0.9.8.md
+++ b/doc/release-notes/release-notes-v0.9.8.md
@@ -43,4 +43,4 @@ the case, you must change your wallet password to an ASCII one (or export your
 brainwallet to another MMGen wallet format) using an older version of MMGen
 before upgrading.
 
-[1]: ../../doc/README.mswin.md
+[1]: /doc/README.mswin.md
diff --git a/mmgen/addr.py b/mmgen/addr.py
index 8fa614a6..566502ed 100755
--- a/mmgen/addr.py
+++ b/mmgen/addr.py
@@ -436,12 +436,12 @@ Removed {{}} duplicate WIF key{{}} from keylist (also in {pnm} key-address file
 			e.sec = PrivKey(sha256(sha256(seed).digest()).digest(),compressed=compressed,pubkey_type=pubkey_type)
 
 			if self.gen_addrs:
-				ph = kg.to_pubhex(e.sec)
-				e.addr = ag.to_addr(ph)
+				pubhex = kg.to_pubhex(e.sec)
+				e.addr = ag.to_addr(pubhex)
 				if gen_viewkey:
-					e.viewkey = ag.to_viewkey(ph)
+					e.viewkey = ag.to_viewkey(pubhex)
 				if gen_wallet_passwd:
-					e.wallet_passwd = ag.to_wallet_passwd(ph)
+					e.wallet_passwd = ag.to_wallet_passwd(e.sec)
 
 			if type(self) == PasswordList:
 				e.passwd = unicode(self.make_passwd(e.sec)) # TODO - own type
diff --git a/mmgen/obj.py b/mmgen/obj.py
index a8700b82..c14ff297 100755
--- a/mmgen/obj.py
+++ b/mmgen/obj.py
@@ -745,12 +745,15 @@ class MMGenAddrType(str,Hilite,InitErrors,MMGenObject):
 				'compressed':False,
 				'gen_method':'zcash_z',
 				'addr_fmt':'zcash_z',
+				'extra_attrs': ('viewkey',),
 				'desc':'Zcash z-address' },
 		'M': {  'name':'monero',
 				'pubkey_type':'monero',
 				'compressed':False,
 				'gen_method':'monero',
 				'addr_fmt':'monero',
+				'wif_label':'spendkey:',
+				'extra_attrs': ('viewkey','wallet_passwd'),
 				'desc':'Monero address'}
 	}
 	def __new__(cls,s,on_fail='die',errmsg=None):
@@ -766,10 +769,8 @@ class MMGenAddrType(str,Hilite,InitErrors,MMGenObject):
 						setattr(me,k,v[k])
 					assert me in g.proto.mmtypes + ('P',), (
 						"'{}': invalid address type for {}".format(me.name,g.proto.__name__))
-					me.extra_attrs = []
-					if me.name in ('monero','zcash_z'): me.extra_attrs += ['viewkey']
-					if me.name == 'monero': me.extra_attrs += ['wallet_passwd']
-					me.wif_label = ('wif:','spendkey:')[me.name=='monero']
+					me.extra_attrs = v['extra_attrs'] if 'extra_attrs' in v else ()
+					me.wif_label   = v['wif_label'] if 'wif_label' in v else 'wif:'
 					return me
 			raise ValueError,'not found'
 		except Exception as e: