Browse Source
fix: network.interface can become None at any time
3.2.x
SomberNight
7 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
3 changed files with
8 additions and
4 deletions
-
gui/kivy/main_window.py
-
gui/qt/network_dialog.py
-
lib/synchronizer.py
|
@ -639,8 +639,9 @@ class ElectrumWindow(App): |
|
|
chain = self.network.blockchain() |
|
|
chain = self.network.blockchain() |
|
|
self.blockchain_checkpoint = chain.get_checkpoint() |
|
|
self.blockchain_checkpoint = chain.get_checkpoint() |
|
|
self.blockchain_name = chain.get_name() |
|
|
self.blockchain_name = chain.get_name() |
|
|
if self.network.interface: |
|
|
interface = self.network.interface |
|
|
self.server_host = self.network.interface.host |
|
|
if interface: |
|
|
|
|
|
self.server_host = interface.host |
|
|
|
|
|
|
|
|
def on_network_event(self, event, *args): |
|
|
def on_network_event(self, event, *args): |
|
|
Logger.info('network event: '+ event) |
|
|
Logger.info('network event: '+ event) |
|
|
|
@ -340,7 +340,8 @@ class NetworkChoiceLayout(object): |
|
|
self.server_port.setText(port) |
|
|
self.server_port.setText(port) |
|
|
self.autoconnect_cb.setChecked(auto_connect) |
|
|
self.autoconnect_cb.setChecked(auto_connect) |
|
|
|
|
|
|
|
|
host = self.network.interface.host if self.network.interface else _('None') |
|
|
interface = self.network.interface |
|
|
|
|
|
host = interface.host if interface else _('None') |
|
|
self.server_label.setText(host) |
|
|
self.server_label.setText(host) |
|
|
|
|
|
|
|
|
self.set_protocol(protocol) |
|
|
self.set_protocol(protocol) |
|
|
|
@ -126,7 +126,9 @@ class Synchronizer(ThreadJob): |
|
|
tx_fees = dict(filter(lambda x:x[1] is not None, tx_fees)) |
|
|
tx_fees = dict(filter(lambda x:x[1] is not None, tx_fees)) |
|
|
# Note if the server hasn't been patched to sort the items properly |
|
|
# Note if the server hasn't been patched to sort the items properly |
|
|
if hist != sorted(hist, key=lambda x:x[1]): |
|
|
if hist != sorted(hist, key=lambda x:x[1]): |
|
|
self.network.interface.print_error("serving improperly sorted address histories") |
|
|
interface = self.network.interface |
|
|
|
|
|
# note: we don't actually know which interface was used if it was *just* changed |
|
|
|
|
|
if interface: interface.print_error("serving improperly sorted address histories") |
|
|
# Check that txids are unique |
|
|
# Check that txids are unique |
|
|
if len(hashes) != len(result): |
|
|
if len(hashes) != len(result): |
|
|
self.print_error("error: server history has non-unique txids: %s"% addr) |
|
|
self.print_error("error: server history has non-unique txids: %s"% addr) |
|
|