mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

xmrwallet: save TX data to file even when relaying

Browse source
This commit is contained in:
The MMGen Project 2023-03-26 12:48:44 +00:00
commit 258f856128
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mmgen/xmrwallet.py
View file

@ -877,10 +877,13 @@ class MoneroWalletOps:
if uopt.tx_relay_daemon:
self.display_tx_relay_info(indent=' ')
msg('Saving TX data to file')
new_tx.write(delete_metadata=True)
if uopt.no_relay:
msg('Saving TX data to file')
new_tx.write(delete_metadata=True)
elif keypress_confirm(f'Relay {self.name} transaction?'):
return True
if keypress_confirm(f'Relay {self.name} transaction?'):
w_desc = 'source'
if uopt.tx_relay_daemon:
await h.stop_wallet('source')
@ -892,11 +895,10 @@ class MoneroWalletOps:
msg_r(f'\n Relaying {self.name} transaction...')
h.relay_tx(new_tx.data.metadata)
gmsg('\nAll done')
return True
else:
die(1,'\nExiting at user request')
return True
class transfer(sweep):
name = 'transfer'
stem = 'transferr'

9
test/test_py_d/ts_xmrwallet.py
View file

@ -438,11 +438,12 @@ class TestSuiteXMRWallet(TestSuiteBase):
if return_amt:
amt = XMRAmt(strip_ansi_escapes(t.expect_getend('Amount: ')).replace('XMR','').strip())
if no_relay:
t.expect('Save MoneroMMGenTX data? (y/N): ','y')
t.written_to_file('MoneroMMGenTX data')
else:
t.expect('Save MoneroMMGenTX data? (y/N): ','y')
t.written_to_file('MoneroMMGenTX data')
if not no_relay:
t.expect(f'Relay {op} transaction? (y/N): ','y')
get_file_with_ext(self.users[user].udir,'sigtx',delete_all=True)
t.read()