From 30494b8aff1a6a02e0134a60ebfc948add8bc424 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sun, 7 May 2023 17:11:54 +0000 Subject: [PATCH] XMR autosign offline: check daemon socket, skip wallet refresh --- mmgen/autosign.py | 8 ++++---- mmgen/data/version | 2 +- mmgen/xmrwallet.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mmgen/autosign.py b/mmgen/autosign.py index 384f8859..fd70dc35 100755 --- a/mmgen/autosign.py +++ b/mmgen/autosign.py @@ -128,10 +128,10 @@ class Signable: class xmr_signable(transaction): # virtual class - def need_daemon_restart(self,new_idx): + def need_daemon_restart(self,m,new_idx): old_idx = self.parent.xmr_cur_wallet_idx self.parent.xmr_cur_wallet_idx = new_idx - return old_idx != new_idx + return old_idx != new_idx or m.wd.state != 'ready' def print_summary(self,signables): bmsg('\nAutosign summary:') @@ -154,7 +154,7 @@ class Signable: wallets = str(tx1.src_wallet_idx), spec = None ), ) - tx2 = await m.main( f, restart_daemon=self.need_daemon_restart(tx1.src_wallet_idx) ) + tx2 = await m.main( f, restart_daemon=self.need_daemon_restart(m,tx1.src_wallet_idx) ) tx2.write(ask_write=False) return tx2 @@ -176,7 +176,7 @@ class Signable: wallets = str(wallet_idx), spec = None ), ) - obj = await m.main( f, wallet_idx, restart_daemon=self.need_daemon_restart(wallet_idx) ) + obj = await m.main( f, wallet_idx, restart_daemon=self.need_daemon_restart(m,wallet_idx) ) obj.write() return obj diff --git a/mmgen/data/version b/mmgen/data/version index 70ee63ff..9608de6b 100644 --- a/mmgen/data/version +++ b/mmgen/data/version @@ -1 +1 @@ -13.3.dev52 +13.3.dev53 diff --git a/mmgen/xmrwallet.py b/mmgen/xmrwallet.py index cf60c951..68501f54 100755 --- a/mmgen/xmrwallet.py +++ b/mmgen/xmrwallet.py @@ -1642,7 +1642,7 @@ class MoneroWalletOps: h = self.rpc(self,self.addr_data[0]) self.head_msg(tx.src_wallet_idx,h.fn) if restart_daemon: - h.open_wallet() + h.open_wallet(refresh=False) res = self.c.call( 'sign_transfer', unsigned_txset = tx.data.unsigned_txset, @@ -1831,7 +1831,7 @@ class MoneroWalletOps: h = self.rpc(self,self.addr_data[0]) self.head_msg(wallet_idx,fn) if restart_daemon: - h.open_wallet() + h.open_wallet(refresh=False) m = MoneroWalletOutputsFile.Unsigned( parent = self, fn = fn )