RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: new trigger 'blockchain_updated'

Browse Source 
follow-up af63913189
needed to update history tab when new blocks come,
to refresh the number of confirmations (icons/tooltips)
This commit is contained in:
SomberNight 2018-09-19 21:56:09 +02:00
parent cbd91ba5b1
commit 855a70bc66
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/kivy/main_window.py
View File

@ -490,7 +490,8 @@ class ElectrumWindow(App):
activity.bind(on_new_intent=self.on_new_intent) activity.bind(on_new_intent=self.on_new_intent)
# connect callbacks # connect callbacks
if self.network: if self.network:
interests = ['wallet_updated', 'network_updated', 'status', 'new_transaction', 'verified'] interests = ['wallet_updated', 'network_updated', 'blockchain_updated',
'status', 'new_transaction', 'verified']
self.network.register_callback(self.on_network_event, interests) self.network.register_callback(self.on_network_event, interests)
self.network.register_callback(self.on_fee, ['fee']) self.network.register_callback(self.on_fee, ['fee'])
self.network.register_callback(self.on_fee_histogram, ['fee_histogram']) self.network.register_callback(self.on_fee_histogram, ['fee_histogram'])
@ -675,6 +676,9 @@ class ElectrumWindow(App):
elif event == 'wallet_updated': elif event == 'wallet_updated':
self._trigger_update_wallet() self._trigger_update_wallet()
self._trigger_update_status() self._trigger_update_status()
elif event == 'blockchain_updated':
# to update number of confirmations in history
self._trigger_update_wallet()
elif event == 'status': elif event == 'status':
self._trigger_update_status() self._trigger_update_status()
elif event == 'new_transaction': elif event == 'new_transaction':

6
electrum/gui/qt/main_window.py
View File

@ -189,7 +189,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
# network callbacks # network callbacks
if self.network: if self.network:
self.network_signal.connect(self.on_network_qt) self.network_signal.connect(self.on_network_qt)
interests = ['wallet_updated', 'network_updated', 'new_transaction', 'status', interests = ['wallet_updated', 'network_updated', 'blockchain_updated',
'new_transaction', 'status',
'banner', 'verified', 'fee', 'fee_histogram'] 'banner', 'verified', 'fee', 'fee_histogram']
# To avoid leaking references to "self" that prevent the # To avoid leaking references to "self" that prevent the
# window from being GC-ed when closed, callbacks should be # window from being GC-ed when closed, callbacks should be
@ -304,6 +305,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.gui_object.network_updated_signal_obj.network_updated_signal \ self.gui_object.network_updated_signal_obj.network_updated_signal \
.emit(event, args) .emit(event, args)
self.network_signal.emit('status', None) self.network_signal.emit('status', None)
elif event == 'blockchain_updated':
# to update number of confirmations in history
self.need_update.set()
elif event == 'new_transaction': elif event == 'new_transaction':
wallet, tx = args wallet, tx = args
if wallet == self.wallet: if wallet == self.wallet:

1
electrum/interface.py
View File

@ -400,6 +400,7 @@ class Interface(PrintError):
# in the simple case, height == self.tip+1 # in the simple case, height == self.tip+1
if height <= self.tip: if height <= self.tip:
await self.sync_until(height) await self.sync_until(height)
self.network.trigger_callback('blockchain_updated')
async def sync_until(self, height, next_height=None): async def sync_until(self, height, next_height=None):
if next_height is None: if next_height is None:

3
electrum/network.py
View File

@ -589,7 +589,9 @@ class Network(PrintError):
i = self.interfaces[server] i = self.interfaces[server]
if self.interface != i: if self.interface != i:
self.print_error("switching to", server) self.print_error("switching to", server)
blockchain_updated = False
if self.interface is not None: if self.interface is not None:
blockchain_updated = i.blockchain != self.interface.blockchain
# Stop any current interface in order to terminate subscriptions, # Stop any current interface in order to terminate subscriptions,
# and to cancel tasks in interface.group. # and to cancel tasks in interface.group.
# However, for headers sub, give preference to this interface # However, for headers sub, give preference to this interface
@ -605,6 +607,7 @@ class Network(PrintError):
self.trigger_callback('default_server_changed') self.trigger_callback('default_server_changed')
self.set_status('connected') self.set_status('connected')
self.trigger_callback('network_updated') self.trigger_callback('network_updated')
if blockchain_updated: self.trigger_callback('blockchain_updated')
@with_interface_lock @with_interface_lock
def close_interface(self, interface): def close_interface(self, interface):