DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
DEFAULT_SERVERS = {
- #'the9ull.homelinux.org': {'h': '8082', 't': '50001'},
- 'electrum.coinwallet.me': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+ #'electrum.coinwallet.me': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.hachre.de': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
- #'electrum.koh.ms': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.novit.ro': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.stepkrav.pw': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
#'ecdsa.org': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
- #'electrum.mooo.com': {'h': '8081', 't': '50001'},
- #'electrum.bitcoins.sk': {'h': '8081', 's': '50002', 't': '50001', 'g': '8'},
'electrum.no-ip.org': {'h': '80', 's': '50002', 't': '50001', 'g': '443'},
- 'electrum.drollette.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+ 'electrum.drollette.com': {'h': '5000', 's': '50002', 't': '50001', 'g': '8082'},
'btc.it-zone.org': {'h': '80', 's': '110', 't': '50001', 'g': '443'},
- #'electrum.yacoin.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+ 'btc.medoix.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+ 'electrum.stupidfoot.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
+ #'electrum.pdmc.net': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.be': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'}
}
-NUM_SERVERS = 8
def filter_protocol(servers, p):
return l
-def pick_random_server():
- return random.choice( filter_protocol(DEFAULT_SERVERS,'s') )
+def pick_random_server(p='s'):
+ return random.choice( filter_protocol(DEFAULT_SERVERS,p) )
+from simple_config import SimpleConfig
class Network(threading.Thread):
- def __init__(self, config):
+ def __init__(self, config = {}):
threading.Thread.__init__(self)
self.daemon = True
- self.config = config
+ self.config = SimpleConfig(config) if type(config) == type({}) else config
self.lock = threading.Lock()
- self.blockchain = Blockchain(config, self)
+ self.num_server = 8 if not self.config.get('oneserver') else 0
+ self.blockchain = Blockchain(self.config, self)
self.interfaces = {}
self.queue = Queue.Queue()
- self.default_server = self.config.get('server')
self.callbacks = {}
+ self.protocol = self.config.get('protocol','s')
+ self.running = False
+
+ # Server for addresses and transactions
+ self.default_server = self.config.get('server')
+ if not self.default_server:
+ self.default_server = pick_random_server(self.protocol)
- self.protocol = 's'
- self.irc_servers = [] # returned by interface (list from irc)
- self.disconnected_servers = []
+ self.irc_servers = [] # returned by interface (list from irc)
+ self.pending_servers = set([])
+ self.disconnected_servers = set([])
self.recent_servers = self.config.get('recent_servers',[]) # successful connections
self.banner = ''
if message not in self.subscriptions[callback]:
self.subscriptions[callback].append(message)
- if self.interface and self.interface.is_connected:
+ if self.is_connected():
self.interface.send( messages, callback )
+ def send(self, messages, callback):
+ if self.is_connected():
+ self.interface.send( messages, callback )
+ return True
+ else:
+ return False
+
+
def register_callback(self, event, callback):
with self.lock:
if not self.callbacks.get(event):
choice_list = []
l = filter_protocol(self.get_servers(), self.protocol)
for s in l:
- if s in self.disconnected_servers or s in self.interfaces.keys():
+ if s in self.pending_servers or s in self.disconnected_servers or s in self.interfaces.keys():
continue
else:
choice_list.append(s)
if not choice_list:
if not self.interfaces:
# we are probably offline, retry later
- self.disconnected_servers = []
+ self.disconnected_servers = set([])
return
server = random.choice( choice_list )
def start_interface(self, server):
if server in self.interfaces.keys():
return
- i = interface.Interface({'server':server, 'path':self.config.path, 'proxy':self.proxy})
- self.interfaces[server] = i
+ i = interface.Interface(server, self.config)
+ self.pending_servers.add(server)
i.start(self.queue)
+ return i
def start_random_interface(self):
server = self.random_server()
self.start_interface(server)
def start_interfaces(self):
- if self.default_server:
- self.start_interface(self.default_server)
- self.interface = self.interfaces[self.default_server]
+ self.interface = self.start_interface(self.default_server)
- for i in range(NUM_SERVERS):
+ for i in range(self.num_server):
self.start_random_interface()
- if not self.interface:
- self.interface = self.interfaces.values()[0]
-
def start(self, wait=False):
self.start_interfaces()
threading.Thread.start(self)
if wait:
- self.interface.connect_event.wait()
- return self.interface.is_connected
-
+ return self.wait_until_connected()
def wait_until_connected(self):
- while not self.interface:
- time.sleep(1)
- self.interface.connect_event.wait()
+ "wait until connection status is known"
+ if self.config.get('auto_cycle'):
+ # self.random_server() returns None if all servers have been tried
+ while not self.is_connected() and self.random_server():
+ time.sleep(0.1)
+ else:
+ self.interface.connect_event.wait()
+ return self.interface.is_connected
- def set_parameters(self, server, proxy, auto_connect):
- self.config.set_key("proxy", proxy, True)
- self.proxy = proxy
+ def set_parameters(self, host, port, protocol, proxy, auto_connect):
self.config.set_key('auto_cycle', auto_connect, True)
-
+ self.config.set_key("proxy", proxy, True)
+ self.config.set_key("protocol", protocol, True)
+ server = ':'.join([ host, port, protocol ])
self.config.set_key("server", server, True)
+ if self.proxy != proxy or self.protocol != protocol:
+ self.proxy = proxy
+ self.protocol = protocol
+ for i in self.interfaces.values(): i.stop()
+ if auto_connect:
+ #self.interface = None
+ return
+
if auto_connect:
- if not self.interface:
+ if not self.interface.s_connected:
self.switch_to_random_interface()
else:
if self.server_lag > 0:
- self.interface.stop()
+ self.stop_interface()
else:
self.set_server(server)
self.switch_to_interface(random.choice(self.interfaces.values()))
def switch_to_interface(self, interface):
- print_error("switching to", interface.server)
+ assert not self.interface.is_connected
+ server = interface.server
+ print_error("switching to", server)
self.interface = interface
- self.server_lag = self.blockchain.height - self.heights[self.interface.server]
- self.config.set_key('server', self.interface.server, False)
+ h = self.heights.get(server)
+ if h:
+ self.server_lag = self.blockchain.height() - h
+ self.config.set_key('server', server, False)
+ self.default_server = server
self.send_subscriptions()
self.trigger_callback('connected')
+ def stop_interface(self):
+ self.interface.stop()
+ #self.interface = None
+
def set_server(self, server):
- if self.default_server == server and self.interface:
+ if self.default_server == server and self.interface.is_connected:
+ return
+
+ if self.protocol != server.split(':')[2]:
return
# stop the interface in order to terminate subscriptions
- if self.interface:
- self.interface.stop()
+ if self.interface.is_connected:
+ self.stop_interface()
# notify gui
self.trigger_callback('disconnecting')
if server in self.interfaces.keys():
self.switch_to_interface( self.interfaces[server] )
else:
- self.start_interface(server)
- self.interface = self.interfaces[server]
+ self.interface = self.start_interface(server)
def add_recent_server(self, i):
print_error( "Server is lagging", blockchain_height, h)
if self.config.get('auto_cycle'):
self.set_server(i.server)
+ else:
+ print_error('no height for main interface')
self.trigger_callback('updated')
while self.is_running():
try:
- i = self.queue.get(timeout = 30)
+ i = self.queue.get(timeout = 30 if self.interfaces else 3)
except Queue.Empty:
- if len(self.interfaces) < NUM_SERVERS:
+ if len(self.interfaces) < self.num_server:
self.start_random_interface()
continue
+ self.pending_servers.remove(i.server)
if i.is_connected:
+ #if i.server in self.interfaces: raise
+ self.interfaces[i.server] = i
self.add_recent_server(i)
i.send([ ('blockchain.headers.subscribe',[])], self.on_header)
if i == self.interface:
self.send_subscriptions()
self.trigger_callback('connected')
else:
- self.disconnected_servers.append(i.server)
- self.interfaces.pop(i.server)
+ self.disconnected_servers.add(i.server)
+ if i.server in self.interfaces:
+ self.interfaces.pop(i.server)
if i.server in self.heights:
self.heights.pop(i.server)
if i == self.interface:
- self.interface = None
+ #self.interface = None
self.trigger_callback('disconnected')
- if self.interface is None and self.config.get('auto_cycle'):
+ if not self.interface.is_connected and self.config.get('auto_cycle'):
self.switch_to_random_interface()
def on_header(self, i, r):
result = r.get('result')
if not result: return
- self.heights[i.server] = result.get('block_height')
+ height = result.get('block_height')
+ self.heights[i.server] = height
+ # notify blockchain about the new height
self.blockchain.queue.put((i,result))
if i == self.interface:
- self.server_lag = self.blockchain.height - self.heights[i.server]
- if self.server_lag:
- print "on_header: lag", self.server_lag
+ self.server_lag = self.blockchain.height() - height
+ if self.server_lag > 1 and self.config.get('auto_cycle'):
+ print_error( "Server lagging, stopping interface")
+ self.stop_interface()
+
self.trigger_callback('updated')
if pruning_level == '': pruning_level = '0'
try:
is_recent = float(version)>=float(PROTOCOL_VERSION)
- except:
+ except Exception:
is_recent = False
if out and is_recent:
git://git.novaco.in / electrum-nvc.git / blobdiff