Browse Source

txbump: display outputs in raw order [bugfix]

- required when user manually chooses output to deduct the fee from
The MMGen Project 2 months ago
parent
commit
e379926042
3 changed files with 4 additions and 4 deletions
  1. 1 1
      mmgen/data/version
  2. 2 2
      mmgen/main_txbump.py
  3. 1 1
      test/cmdtest_d/main.py

+ 1 - 1
mmgen/data/version

@@ -1 +1 @@
-16.1.dev1
+16.1.dev2

+ 2 - 2
mmgen/main_txbump.py

@@ -181,7 +181,7 @@ async def main():
 
 
 	if not silent:
 	if not silent:
 		msg(green('ORIGINAL TRANSACTION'))
 		msg(green('ORIGINAL TRANSACTION'))
-		msg(orig_tx.info.format(terse=True))
+		msg(orig_tx.info.format(terse=True, sort='raw'))
 
 
 	from .tw.ctl import TwCtl
 	from .tw.ctl import TwCtl
 	tx = BumpTX(
 	tx = BumpTX(
@@ -199,7 +199,7 @@ async def main():
 
 
 	if not silent:
 	if not silent:
 		msg(green('\nREPLACEMENT TRANSACTION:'))
 		msg(green('\nREPLACEMENT TRANSACTION:'))
-		msg_r(tx.info.format(terse=True))
+		msg_r(tx.info.format(terse=True, sort='raw'))
 
 
 	if sign_and_send:
 	if sign_and_send:
 		tx2 = UnsignedTX(cfg=cfg, data=tx.__dict__)
 		tx2 = UnsignedTX(cfg=cfg, data=tx.__dict__)

+ 1 - 1
test/cmdtest_d/main.py

@@ -782,7 +782,7 @@ class CmdTestMain(CmdTestBase, CmdTestShared):
 		t = self.spawn('mmgen-txbump', args)
 		t = self.spawn('mmgen-txbump', args)
 		if seed_args:
 		if seed_args:
 			t.do_decrypt_ka_data(pw=self.cfgs['14']['kapasswd'])
 			t.do_decrypt_ka_data(pw=self.cfgs['14']['kapasswd'])
-		t.expect('deduct the fee from (Hit ENTER for the change output): ', '1\n')
+		t.expect('deduct the fee from (Hit ENTER for the change output): ', '2\n')
 		# Fee must be > tx_fee + network relay fee (currently 0.00001)
 		# Fee must be > tx_fee + network relay fee (currently 0.00001)
 		t.expect('OK? (Y/n): ', '\n')
 		t.expect('OK? (Y/n): ', '\n')
 		t.expect('Enter transaction fee: ', self.txbump_fee+'\n')
 		t.expect('Enter transaction fee: ', self.txbump_fee+'\n')