From 9eb4152ece883332979f0577183ae3eb760d5dfb Mon Sep 17 00:00:00 2001
From: philemon <mmgen-py@yandex.com>
Date: Sun, 31 Jul 2016 19:57:54 +0300
Subject: [PATCH] Fix UTF-8 ref tx label

---
 mmgen/obj.py                 |  2 +-
 test/ref/FFB367[1.234].rawtx |  4 ++--
 test/test.py                 | 30 ++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/mmgen/obj.py b/mmgen/obj.py
index e17e84ed..1e2e43b0 100755
--- a/mmgen/obj.py
+++ b/mmgen/obj.py
@@ -85,7 +85,7 @@ class MMGenObject(object):
 			if str(type(val))[:13] == "<class 'mmgen": # recurse into sub-objects
 				out.append('\n%s%s (%s):' % (indent,k,type(val)))
 				lvl += 1
-				out.append(str(getattr(self,k))+'\n')
+				out.append(unicode(getattr(self,k))+'\n')
 				lvl -= 1
 			else:
 				out.append(fs % (k, conv(val,col_w)))
diff --git a/test/ref/FFB367[1.234].rawtx b/test/ref/FFB367[1.234].rawtx
index 9c9b080c..7e70f3cf 100644
--- a/test/ref/FFB367[1.234].rawtx
+++ b/test/ref/FFB367[1.234].rawtx
@@ -1,6 +1,6 @@
-2957e0
+e7c42d
 FFB367 1.234 20150405_102927 350828
 01000000013364630b6d290a82c822facc2f7c1db4452cea459b2ce22371135530485a5d010600000000ffffffff0205d7d600010000001976a914bba3993079ccdf40c9bbbe495473f0b3d2dc5eec88ac40ef5a07000000001976a914abe58e1e45f6176910a4c1ac1ee62328d5cc4fd588ac00000000
 [{'label': u'Test Wallet', 'mmid': u'98831F3A:500', 'vout': 6, 'txid': u'015d5a483055137123e22c9b45ea2c45b41d7c2fccfa22c8820a296d0b636433', 'amt': BTCAmt('44.32452045'), 'confs': 495L, 'addr': u'1EZNuddPnaZFah9QVbGvzvTcP4KeRrRFt8', 'scriptPubKey': '76a91494b93bbe8a32f1db80b307482e83c25fa4e99b8c88ac'}]
 [{'amt': BTCAmt('43.09047045'), 'mmid': '98831F3A:3', 'addr': u'1J79LtWctedRLnMfFNRgzzSFsozQqDeoKD'}, {'amt': BTCAmt('1.23400000'), 'mmid': '98831F3A:2', 'addr': u'1GfuYaKHrhdiVybXMGCcjadSgfjvpdt2x9'}]
-3SBcsGkhcKRVB2gr98BmscU8HtWJ12HTXpJa5XmvbEUateQ3bJBEgvLd5kPGAzg1rFkzjVpZJgiKGwvnq5mJpwnbJqcHpVEAopWyALDmtjrDwEvPiTY
+TvwWgaAnrkQFpAxxjBa4PHvJ8NsJDsurtiv2HuzdnXWjQmY7LHyt6PZn5J7BNtB5VzHtBG7bUosCAMFon8yxUe2mYTZoH9e6dpoAz9E6JDZtUNYz9YnF1Z3jFND1X89RuKAk6YVBrfWseeyHR8vZDdaFzBPK5SPos
diff --git a/test/test.py b/test/test.py
index 8df9132b..5d1f8b23 100755
--- a/test/test.py
+++ b/test/test.py
@@ -71,6 +71,12 @@ ref_wallet_brainpass = 'abc'
 ref_wallet_hash_preset = '1'
 ref_wallet_incog_offset = 123
 
+from mmgen.obj import MMGenTXLabel
+ref_tx_label = ''.join([unichr(i) for i in  range(65,91) +
+											range(1040,1072) + # cyrillic
+											range(913,939) +   # greek
+											range(97,123)])[:MMGenTXLabel.max_len]
+
 ref_bw_hash_preset = '1'
 ref_bw_file        = 'wallet.mmbrain'
 ref_bw_file_spc    = 'wallet-spaced.mmbrain'
@@ -1172,7 +1178,7 @@ class MMGenTestSuite(object):
 	def txcreate(self,name,addrfile):
 		self.txcreate_common(name,sources=['1'])
 
-	def txcreate_common(self,name,sources=['1'],non_mmgen_input=''):
+	def txcreate_common(self,name,sources=['1'],non_mmgen_input='',do_label=False):
 		if opt.verbose or opt.exact_output:
 			sys.stderr.write(green('Generating fake tracking wallet info\n'))
 		silence()
@@ -1253,21 +1259,25 @@ class MMGenTestSuite(object):
 		if non_mmgen_input: t.expect('Accept? (y/N): ','y')
 		t.expect('OK? (Y/n): ','y') # fee OK?
 		t.expect('OK? (Y/n): ','y') # change OK?
-		t.expect('Add a comment to transaction? (y/N): ','\n')
+		if do_label:
+			t.expect('Add a comment to transaction? (y/N): ','y')
+			t.expect('Comment: ',ref_tx_label.encode('utf8')+'\n')
+		else:
+			t.expect('Add a comment to transaction? (y/N): ','\n')
 		t.tx_view()
 		t.expect('Save transaction? (y/N): ','y')
 		t.written_to_file('Transaction')
 		ok()
 
-	def txsign_end(self,t,tnum=None,has_comment=False):
+	def txsign_end(self,t,tnum=None,has_label=False):
 		t.expect('Signing transaction')
-		cprompt = ('Add a comment to transaction','Edit transaction comment')[has_comment]
+		cprompt = ('Add a comment to transaction','Edit transaction comment')[has_label]
 		t.expect('%s? (y/N): ' % cprompt,'\n')
 		t.expect('Save signed transaction.*?\? \(Y/n\): ','y',regex=True)
 		add = ' #' + tnum if tnum else ''
 		t.written_to_file('Signed transaction' + add, oo=True)
 
-	def txsign(self,name,txfile,wf,pf='',save=True,has_comment=False):
+	def txsign(self,name,txfile,wf,pf='',save=True,has_label=False):
 		add_args = ([],['-q','-P',pf])[ni]
 		if ni:
 			m = '\nAnswer the interactive prompts as follows:\n  ENTER, ENTER, ENTER'
@@ -1278,9 +1288,9 @@ class MMGenTestSuite(object):
 		t.tx_view()
 		t.passphrase('MMGen wallet',cfg['wpasswd'])
 		if save:
-			self.txsign_end(t,has_comment=has_comment)
+			self.txsign_end(t,has_label=has_label)
 		else:
-			cprompt = ('Add a comment to transaction','Edit transaction comment')[has_comment]
+			cprompt = ('Add a comment to transaction','Edit transaction comment')[has_label]
 			t.expect('%s? (y/N): ' % cprompt,'\n')
 			t.close()
 		ok()
@@ -1474,7 +1484,7 @@ class MMGenTestSuite(object):
 		self.addrgen(name,wf,pf='')
 
 	def txcreate4(self,name,f1,f2,f3,f4,f5,f6):
-		self.txcreate_common(name,sources=['1','2','3','4','14'],non_mmgen_input='4')
+		self.txcreate_common(name,sources=['1','2','3','4','14'],non_mmgen_input='4',do_label=1)
 
 	def txsign4(self,name,f1,f2,f3,f4,f5,f6):
 		non_mm_fn = os.path.join(cfg['tmpdir'],non_mmgen_fn)
@@ -1491,7 +1501,7 @@ class MMGenTestSuite(object):
 		for cnum,desc in ('1','incognito data'),('3','MMGen wallet'):
 			t.passphrase(('%s' % desc),cfgs[cnum]['wpasswd'])
 
-		self.txsign_end(t)
+		self.txsign_end(t,has_label=True)
 		ok()
 
 	def tool_encrypt(self,name,infile=''):
@@ -1722,7 +1732,7 @@ class MMGenTestSuite(object):
 		wf = os.path.join(ref_dir,cfg['ref_wallet'])
 		write_to_tmpfile(cfg,pwfile,cfg['wpasswd'])
 		pf = get_tmpfile_fn(cfg,pwfile)
-		self.txsign(name,tf,wf,pf,save=False,has_comment=True)
+		self.txsign(name,tf,wf,pf,save=False,has_label=True)
 
 	def ref_tool_decrypt(self,name):
 		f = os.path.join(ref_dir,ref_enc_fn)