@ -307,9 +307,6 @@ class Network(util.DaemonThread):
# Resend unanswered requests
# Resend unanswered requests
requests = self . unanswered_requests . values ( )
requests = self . unanswered_requests . values ( )
self . unanswered_requests = { }
self . unanswered_requests = { }
if self . interface . ping_required ( ) :
params = [ ELECTRUM_VERSION , PROTOCOL_VERSION ]
self . queue_request ( ' server.version ' , params , self . interface )
for request in requests :
for request in requests :
message_id = self . queue_request ( request [ 0 ] , request [ 1 ] )
message_id = self . queue_request ( request [ 0 ] , request [ 1 ] )
self . unanswered_requests [ message_id ] = request
self . unanswered_requests [ message_id ] = request
@ -711,6 +708,9 @@ class Network(util.DaemonThread):
interface . mode = ' default '
interface . mode = ' default '
interface . request = None
interface . request = None
self . interfaces [ server ] = interface
self . interfaces [ server ] = interface
# server.version should be the first message
params = [ ELECTRUM_VERSION , PROTOCOL_VERSION ]
self . queue_request ( ' server.version ' , params , interface )
self . queue_request ( ' blockchain.headers.subscribe ' , [ True ] , interface )
self . queue_request ( ' blockchain.headers.subscribe ' , [ True ] , interface )
if server == self . default_server :
if server == self . default_server :
self . switch_to_interface ( server )
self . switch_to_interface ( server )
@ -734,8 +734,7 @@ class Network(util.DaemonThread):
if interface . has_timed_out ( ) :
if interface . has_timed_out ( ) :
self . connection_down ( interface . server )
self . connection_down ( interface . server )
elif interface . ping_required ( ) :
elif interface . ping_required ( ) :
params = [ ELECTRUM_VERSION , PROTOCOL_VERSION ]
self . queue_request ( ' server.ping ' , [ ] , interface )
self . queue_request ( ' server.version ' , params , interface )
now = time . time ( )
now = time . time ( )
# nodes
# nodes