from version import ELECTRUM_VERSION
from util import print_error
+
DEFAULT_TIMEOUT = 5
-DEFAULT_SERVERS = [ 'ecdsa.org:50001:t',
- 'electrum.novit.ro:50001:t',
- 'uncle-enzo.info:50001:t',
+DEFAULT_SERVERS = [ 'electrum.novit.ro:50001:t',
'electrum.bytesized-hosting.com:50001:t'] # list of default servers
+proxy_modes = ['socks4', 'socks5', 'http']
+
+def pick_random_server():
+ print "using random server"
+ return random.choice( DEFAULT_SERVERS )
+
+
-def replace_keys(obj, old_key, new_key):
- if isinstance(obj, dict):
- if old_key in obj:
- obj[new_key] = obj[old_key]
- del obj[old_key]
- for elem in obj.itervalues():
- replace_keys(elem, old_key, new_key)
- elif isinstance(obj, list):
- for elem in obj:
- replace_keys(elem, old_key, new_key)
-def old_to_new(d):
- replace_keys(d, 'blk_hash', 'block_hash')
- replace_keys(d, 'pos', 'index')
- replace_keys(d, 'nTime', 'timestamp')
- replace_keys(d, 'is_in', 'is_input')
- replace_keys(d, 'raw_scriptPubKey', 'raw_output_script')
-class Interface(threading.Thread):
- def __init__(self, host, port, debug_server):
+class InterfaceAncestor(threading.Thread):
+
+ def __init__(self, host, port, proxy=None):
threading.Thread.__init__(self)
self.daemon = True
self.host = host
self.port = port
+ self.proxy = proxy
self.servers = [] # actual list from IRC
self.rtime = 0
self.responses = Queue.Queue()
self.unanswered_requests = {}
- self.debug_server = debug_server
-
- def init_socket(self):
- pass
def poke(self):
# push a fake response so that the getting thread exits its loop
def queue_json_response(self, c):
- if self.debug_server:
- print "<--",c
+ # uncomment to debug
+ # print "<--",c
msg_id = c.get('id')
error = c.get('error')
-class PollingInterface(Interface):
+
+class HttpStratumInterface(InterfaceAncestor):
""" non-persistent connection. synchronous calls"""
- def __init__(self, host, port, debug_server):
- Interface.__init__(self, host, port, debug_server)
+ def __init__(self, host, port, proxy=None):
+ InterfaceAncestor.__init__(self, host, port, proxy)
self.session_id = None
- self.debug_server = debug_server
def get_history(self, address):
self.send([('blockchain.address.get_history', [address] )])
- def poll(self):
- pass
- #if is_new or wallet.remote_url:
- # self.was_updated = True
- # is_new = wallet.synchronize()
- # wallet.update_tx_history()
- # wallet.save()
- # return is_new
- #else:
- # return False
-
def run(self):
self.is_connected = True
while self.is_connected:
self.poke()
-
-
-
-
-
-
-
-class HttpStratumInterface(PollingInterface):
-
def poll(self):
self.send([])
def send(self, messages):
import urllib2, json, time, cookielib
+
+ if self.proxy:
+ import socks
+ socks.setdefaultproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
+ socks.wrapmodule(urllib2)
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
-class TcpStratumInterface(Interface):
+class TcpStratumInterface(InterfaceAncestor):
"""json-rpc over persistent TCP connection, asynchronous"""
- def __init__(self, host, port, debug_server):
- Interface.__init__(self, host, port, debug_server)
- self.debug_server = debug_server
+ def __init__(self, host, port, proxy=None):
+ InterfaceAncestor.__init__(self, host, port, proxy)
+ self.init_socket()
def init_socket(self):
- self.s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
+ global proxy_modes
+ connection_msg = "%s:%d"%(self.host,self.port)
+ if self.proxy is None:
+ self.s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
+ else:
+ connection_msg += " using proxy %s:%s:%s"%(self.proxy.get('mode'), self.proxy.get('host'), self.proxy.get('port'))
+ import socks
+ self.s = socks.socksocket()
+ self.s.setproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
self.s.settimeout(60)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
try:
- self.s.connect(( self.host, self.port))
+ self.s.connect(( self.host.encode('ascii'), int(self.port)))
self.is_connected = True
self.send([('server.version', [ELECTRUM_VERSION])])
- print "Connected to %s:%d"%(self.host,self.port)
+ print "Connected to " + connection_msg
except:
self.is_connected = False
- print_error("Not connected")
+ print_error("Failed to connect" + connection_msg)
def run(self):
try:
request = json.dumps( { 'id':self.message_id, 'method':method, 'params':params } )
self.unanswered_requests[self.message_id] = method, params
- if self.debug_server:
- print "-->",request
+ # uncomment to debug
+ # print "-->",request
self.message_id += 1
out += request + '\n'
+class Interface(TcpStratumInterface, HttpStratumInterface):
+
+ def __init__(self, config):
-
-class WalletSynchronizer(threading.Thread):
-
- def __init__(self, wallet, loop=False):
- threading.Thread.__init__(self)
- self.daemon = True
- self.wallet = wallet
- self.loop = loop
- self.init_interface()
-
- def init_interface(self):
try:
- host, port, protocol = self.wallet.server.split(':')
+ s = config.get('server')
+ host, port, protocol = s.split(':')
port = int(port)
except:
- self.wallet.pick_random_server()
- host, port, protocol = self.wallet.server.split(':')
+ s = pick_random_server()
+ host, port, protocol = s.split(':')
port = int(port)
+ self.protocol = protocol
+ proxy = self.parse_proxy_options(config.get('proxy'))
+ self.server = host + ':%d:%s'%(port, protocol)
+
#print protocol, host, port
if protocol == 't':
- InterfaceClass = TcpStratumInterface
+ TcpStratumInterface.__init__(self, host, port, proxy)
elif protocol == 'h':
- InterfaceClass = HttpStratumInterface
+ HttpStratumInterface.__init__(self, host, port, proxy)
else:
print_error("Error: Unknown protocol")
- InterfaceClass = TcpStratumInterface
+ TcpStratumInterface.__init__(self, host, port, proxy)
+
+
+ def run(self):
+ if self.protocol == 't':
+ TcpStratumInterface.run(self)
+ else:
+ HttpStratumInterface.run(self)
+
+ def send(self, messages):
+ if self.protocol == 't':
+ TcpStratumInterface.send(self, messages)
+ else:
+ HttpStratumInterface.send(self, messages)
+
+
+ def parse_proxy_options(self, s):
+ if type(s) == type({}): return s # fixme: type should be fixed
+ if type(s) != type(""): return None
+ if s.lower() == 'none': return None
+ proxy = { "mode":"socks5", "host":"localhost" }
+ args = s.split(':')
+ n = 0
+ if proxy_modes.count(args[n]) == 1:
+ proxy["mode"] = args[n]
+ n += 1
+ if len(args) > n:
+ proxy["host"] = args[n]
+ n += 1
+ if len(args) > n:
+ proxy["port"] = args[n]
+ else:
+ proxy["port"] = "8080" if proxy["mode"] == "http" else "1080"
+ return proxy
+
+
+ def set_server(self, server, proxy=None):
+ # raise an error if the format isnt correct
+ a,b,c = server.split(':')
+ b = int(b)
+ assert c in ['t', 'h']
+ # set the server
+ if server != self.server or proxy != self.proxy:
+ print "changing server:", server, proxy
+ self.server = server
+ self.proxy = proxy
+ self.is_connected = False # this exits the polling loop
+ self.poke()
- self.interface = InterfaceClass(host, port, self.wallet.debug_server)
- self.wallet.interface = self.interface
+
+
+
+class WalletSynchronizer(threading.Thread):
+
+ def __init__(self, wallet, config, loop=False, servers_loaded_callback=None):
+ threading.Thread.__init__(self)
+ self.daemon = True
+ self.wallet = wallet
+ self.loop = loop
+ self.config = config
+ self.init_interface()
+ self.servers_loaded_callback = servers_loaded_callback
+
+ def init_interface(self):
+ self.interface = Interface(self.config)
+ self.wallet.interface = self.interface
+
def handle_response(self, r):
if r is None:
return
host = item[1]
ports = []
version = None
- if len(item)>2:
+ if len(item) > 2:
for v in item[2]:
- if re.match("[th]\d+",v):
- ports.append((v[0],v[1:]))
- if re.match("v(.?)+",v):
+ if re.match("[th]\d+", v):
+ ports.append((v[0], v[1:]))
+ if re.match("v(.?)+", v):
version = v[1:]
if ports and version:
- servers.append( (host, ports) )
+ servers.append((host, ports))
self.interface.servers = servers
+ # servers_loaded_callback is None for commands, but should
+ # NEVER be None when using the GUI.
+ if self.servers_loaded_callback is not None:
+ self.servers_loaded_callback()
elif method == 'blockchain.address.subscribe':
addr = params[0]
def start_interface(self):
- self.interface.init_socket()
self.interface.start()
if self.interface.is_connected:
self.wallet.start_session(self.interface)
self.wallet.trigger_callbacks()
if self.loop:
time.sleep(5)
+ # Server has been changed. Copy callback for new interface.
+ self.proxy = self.interface.proxy
self.init_interface()
self.start_interface()
continue
git://git.novaco.in / electrum-nvc.git / blobdiff