mmgen/mmgen-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 28 Packages Wiki Activity

whitespace, cleanup

Browse source
This commit is contained in:
The MMGen Project 2024-04-06 07:09:33 +00:00
commit fe205bdda3
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
mmgen/xmrwallet.py
View file

@ -1582,36 +1582,36 @@ class MoneroWalletOps:
dest_addr = self.dest_addr
elif self.dest is None:
dest_acct = self.account
if keypress_confirm( self.cfg, f'\nCreate new address for account #{self.account}?' ):
if keypress_confirm(self.cfg, f'\nCreate new address for account #{self.account}?'):
dest_addr_chk = h.create_new_addr(self.account)
elif keypress_confirm( self.cfg, f'Sweep to last existing address of account #{self.account}?' ):
elif keypress_confirm(self.cfg, f'Sweep to last existing address of account #{self.account}?'):
dest_addr_chk = None
else:
die(1,'Exiting at user request')
dest_addr,dest_addr_idx = h.get_last_addr(self.account,display=not dest_addr_chk)
assert dest_addr_chk in (None,dest_addr), 'dest_addr_chk1'
h.print_addrs(accts_data,self.account)
dest_addr, dest_addr_idx = h.get_last_addr(self.account, display=not dest_addr_chk)
assert dest_addr_chk in (None, dest_addr), 'dest_addr_chk1'
h.print_addrs(accts_data, self.account)
else:
h.close_wallet('source')
wf = self.get_wallet_fn(self.dest)
h2 = self.rpc(self,self.dest)
h2 = self.rpc(self, self.dest)
h2.open_wallet('destination')
accts_data = h2.get_accts()[0]
if keypress_confirm( self.cfg, f'\nCreate new account for wallet {wf.name!r}?' ):
dest_acct,dest_addr = h2.create_acct(
if keypress_confirm(self.cfg, f'\nCreate new account for wallet {wf.name!r}?'):
dest_acct, dest_addr = h2.create_acct(
label = f'Sweep from {self.source.idx}:{self.account} [{make_timestr()}]')
dest_addr_idx = 0
h2.get_accts()
elif keypress_confirm( self.cfg, f'Sweep to last existing account of wallet {wf.name!r}?' ):
dest_acct,dest_addr_chk = h2.get_last_acct(accts_data)
dest_addr,dest_addr_idx = h2.get_last_addr(dest_acct,display=False)
elif keypress_confirm(self.cfg, f'Sweep to last existing account of wallet {wf.name!r}?'):
dest_acct, dest_addr_chk = h2.get_last_acct(accts_data)
dest_addr, dest_addr_idx = h2.get_last_addr(dest_acct, display=False)
assert dest_addr_chk == dest_addr, 'dest_addr_chk2'
else:
die(1,'Exiting at user request')
die(1, 'Exiting at user request')
h2.close_wallet('destination')
h.open_wallet('source',refresh=False)
h.open_wallet('source', refresh=False)
msg(f'\n Creating {self.name} transaction...')

2
scripts/exec_wrapper.py
View file

@ -39,7 +39,7 @@ def exec_wrapper_write_traceback(e,exit_val):
import sys,os
exc_line = (
f'{type(e).__name__}({e.mmcode})' if type(e).__name__ in ('MMGenError','MMGenSystemExit') else
f'{type(e).__name__}({e.mmcode}) {e}' if type(e).__name__ in ('MMGenError','MMGenSystemExit') else
f'{type(e).__name__}: {e}')
c = exec_wrapper_get_colors()