X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=9cb8a27501849e98ddf331ceebf15418e2c77543;hb=cb0715c465de52508a3322fbc363a17218b3e89f;hp=772cac22454d816b4451dca229df997c47a13f7f;hpb=132af2254a13b0b7c39c4aa5b4c3f44b0d0b3717;p=electrum-server.git

diff --git a/server.py b/server.py
index 772cac2..9cb8a27 100755
--- a/server.py
+++ b/server.py
@@ -358,8 +358,8 @@ class Direct_Interface(Interface):
         cmds = {'session.new':new_session,
                 'session.poll':poll_session,
                 'session.update':update_session,
-                'blockchain.transaction.broadcast':send_tx,
-                'blockchain.address.get_history':store.get_history
+                'transaction.broadcast':send_tx,
+                'address.get_history':store.get_history
                 }
         func = cmds[method]
         return func( params )
@@ -446,7 +446,7 @@ def do_update_address(addr):
     # the address can be subscribed in several sessions; the cache should ensure that we don't do redundant requests
     for session_id in sessions.keys():
         session = sessions[session_id]
-        if session.get('type') != 'subscribe': continue
+        if session.get('type') != 'persistent': continue
         addresses = session['addresses'].keys()
 
         if addr in addresses:
@@ -478,7 +478,7 @@ def send_numblocks(session_id):
     output_queue.put((session_id, out))
 
 def send_status(session_id, message_id, address, status):
-    out = json.dumps( { 'id':message_id, 'status':status } )
+    out = json.dumps( { 'id':message_id, 'result':status } )
     output_queue.put((session_id, out))
 
 def subscribe_to_numblocks(session_id, message_id):
@@ -487,11 +487,16 @@ def subscribe_to_numblocks(session_id, message_id):
 
 def subscribe_to_address(session_id, message_id, address):
     status = get_address_status(address)
-    sessions[session_id]['type'] = 'subscribe'
     sessions[session_id]['addresses'][address] = (message_id, status)
     sessions[session_id]['last_time'] = time.time()
     send_status(session_id, message_id, address, status)
 
+def add_address_to_session(session_id, address):
+    status = get_address_status(address)
+    sessions[session_id]['addresses'][addr] = status
+    sessions[session_id]['last_time'] = time.time()
+    return status
+
 def new_session(version, addresses):
     session_id = random_string(10)
     sessions[session_id] = { 'addresses':{}, 'version':version }
@@ -577,6 +582,14 @@ def do_command(cmd, data, ipaddr):
         print timestr(), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
         out = new_session(version, addresses)
 
+    elif cmd=='address.subscribe':
+        try:
+            session_id, addr = ast.literal_eval(data)
+        except:
+            print "error"
+            return None
+        return add_address_to_session(session_id,addr)
+
     elif cmd=='update_session':
         try:
             session_id, addresses = ast.literal_eval(data)
@@ -695,7 +708,7 @@ def tcp_client_thread(ipaddr,conn):
     global sessions
 
     session_id = random_string(10)
-    sessions[session_id] = { 'conn':conn, 'addresses':{}, 'version':'unknown' }
+    sessions[session_id] = { 'conn':conn, 'addresses':{}, 'version':'unknown', 'type':'persistent' }
 
     ipaddr = ipaddr[0]
     msg = ''
@@ -761,9 +774,10 @@ def process_input_queue():
             address = data[0]
             out = { 'result':store.get_history( address ) } 
         elif method == 'transaction.broadcast':
-            txo = send_tx(data)
+            postdata = dumps({"method": 'importtransaction', 'params': [data], 'id':'jsonrpc'})
+            txo = urllib.urlopen(bitcoind_url, postdata).read()
             print "sent tx:", txo
-            out = { 'result':txo }
+            out = json.loads(txo)
         else:
             print "unknown command", method
         if out:
@@ -824,7 +838,7 @@ def clean_session_thread():
         time.sleep(30)
         t = time.time()
         for k,s in sessions.items():
-            if s.get('type') == 'subscribe': continue
+            if s.get('type') == 'persistent': continue
             t0 = s['last_time']
             if t - t0 > 5*60:
                 sessions.pop(k)
@@ -886,8 +900,9 @@ def http_server_thread(store):
     server.register_function(lambda : block_number, 'blocks')
     server.register_function(clear_cache, 'clear_cache')
     server.register_function(get_cache, 'get_cache')
-    server.register_function(send_tx, 'blockchain.transaction.broadcast')
-    server.register_function(store.get_history, 'blockchain.address.get_history')
+    server.register_function(send_tx, 'transaction.broadcast')
+    server.register_function(store.get_history, 'address.get_history')
+    server.register_function(add_address_to_session, 'address.subscribe')
     server.register_function(new_session, 'session.new')
     server.register_function(update_session, 'session.update')
     server.register_function(poll_session, 'session.poll')
@@ -914,9 +929,9 @@ if __name__ == '__main__':
         elif cmd == 'get_cache':
             out = server.get_cache(password,sys.argv[2])
         elif cmd == 'h':
-            out = server.blockchain.address.get_history(sys.argv[2])
+            out = server.address.get_history(sys.argv[2])
         elif cmd == 'tx':
-            out = server.blockchain.transaction.broadcast(sys.argv[2])
+            out = server.transaction.broadcast(sys.argv[2])
         elif cmd == 'b':
             out = server.blocks()
         else: