import random, socket, ast, re, ssl
import threading, traceback, sys, time, json, Queue
-from version import ELECTRUM_VERSION
+from version import ELECTRUM_VERSION, PROTOCOL_VERSION
from util import print_error
DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [
+ #'electrum.bitcoins.sk:50001:t',
+ #'uncle-enzo.info:50001:t',
+ #'electrum.bitfoo.org:50001:t',
+ #'webbtc.net:50001:t',
+ 'electrum.bitcoin.cz:50001:t',
'electrum.novit.ro:50001:t',
+ 'electrum.be:50001:t',
+ 'electrum.bysh.me:50001:t',
'electrum.pdmc.net:50001:t',
- 'ecdsa.org:50001:t',
- 'electrum.bitcoins.sk:50001:t',
- 'uncle-enzo.info:50001:t',
- 'electrum.bytesized-hosting.com:50001:t',
- 'electrum.bitcoin.cz:50001:t',
- 'electrum.bitfoo.org:50001:t'
+ 'electrum.no-ip.org:50001:t',
+ 'ecdsa.org:50001:t'
]
proxy_modes = ['socks4', 'socks5', 'http']
def queue_json_response(self, c):
# uncomment to debug
- # print "<--",c
+ # print_error( "<--",c )
msg_id = c.get('id')
error = c.get('error')
if error:
print_error("received error:", c)
+ if msg_id is not None:
+ with self.lock:
+ method, params, channel = self.unanswered_requests.pop(msg_id)
+ response_queue = self.responses[channel]
+ response_queue.put({'method':method, 'params':params, 'error':error, 'id':msg_id})
+
return
if msg_id is not None:
with self.lock:
method, params, channel = self.unanswered_requests.pop(msg_id)
result = c.get('result')
+
+ if method == 'server.version':
+ self.server_version = result
+
+ elif method == 'server.peers.subscribe':
+ servers = {}
+ for item in result:
+ s = []
+ host = item[1]
+ ports = []
+ version = None
+ pruning = False
+ if len(item) > 2:
+ for v in item[2]:
+ if re.match("[stgh]\d+", v):
+ ports.append((v[0], v[1:]))
+ elif re.match("v(.?)+", v):
+ version = v[1:]
+ elif v == 'p':
+ pruning = True
+ try:
+ is_recent = float(version)>=float(PROTOCOL_VERSION)
+ except:
+ is_recent = False
+ if ports and is_recent:
+ servers[host] = {'ports':ports, 'pruning':pruning}
+ self.servers = servers
+ self.trigger_callback('peers')
+
else:
# notification: find the channel(s)
method = c.get('method')
if self.proxy:
import socks
- socks.setdefaultproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
+ socks.setdefaultproxy(proxy_modes.index(self.proxy["mode"]) + 1, self.proxy["host"], int(self.proxy["port"]) )
socks.wrapmodule(urllib2)
cj = cookielib.CookieJar()
self.connection_msg += " using proxy %s:%s:%s"%(self.proxy.get('mode'), self.proxy.get('host'), self.proxy.get('port'))
import socks
s = socks.socksocket()
- s.setproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
+ s.setproxy(proxy_modes.index(self.proxy["mode"]) + 1, self.proxy["host"], int(self.proxy["port"]) )
if self.use_ssl:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23)
if timeout:
# ping the server with server.version, as a real ping does not exist yet
- self.send([('server.version', [ELECTRUM_VERSION])])
+ self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
continue
out += msg
def __init__(self, config=None, loop=False):
+ self.server = None
+ self.proxy = None
if config is None:
from simple_config import SimpleConfig
self.callbacks = {}
self.lock = threading.Lock()
- self.servers = [] # actual list from IRC
+ self.servers = {} # actual list from IRC
self.rtime = 0
self.bytes_received = 0
self.connect_event.set()
if self.is_connected:
- self.send([('server.version', [ELECTRUM_VERSION])])
+ self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
self.trigger_callback('connected')
else:
self.trigger_callback('notconnected')
with self.lock:
if self.subscriptions.get(channel) is None:
self.subscriptions[channel] = []
- self.subscriptions[channel] += sub
+ for message in sub:
+ if message not in self.subscriptions[channel]:
+ self.subscriptions[channel].append(message)
if self.protocol in 'st':
with self.lock:
print "changing server:", server, proxy
self.server = server
self.proxy = proxy
- if self.protocol in 'st':
+ if self.protocol in 'st' and self.s:
self.s.shutdown(socket.SHUT_RDWR)
self.s.close()
self.is_connected = False # this exits the polling loop
self.trigger_callback('disconnecting') # for actively disconnecting
+ def stop(self):
+ if self.protocol in 'st' and self.s:
+ self.s.shutdown(socket.SHUT_RDWR)
+ self.s.close()
+
+
+ def get_servers_list(self):
+ plist = {}
+ if not self.servers:
+ servers_list = {}
+ for x in DEFAULT_SERVERS:
+ h,port,protocol = x.split(':')
+ servers_list[h] = {'ports':[(protocol,port)]}
+ else:
+ servers_list = self.servers
+
+ for _host, v in servers_list.items():
+ pp = v['ports']
+ z = {}
+ for item2 in pp:
+ _protocol, _port = item2
+ z[_protocol] = _port
+ plist[_host] = z
+
+ return plist, servers_list
+
+
def is_empty(self, channel):
q = self.responses.get(channel)
if q:
git://git.novaco.in / electrum-nvc.git / blobdiff