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 )
# 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:
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):
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 }
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)
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 = ''
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:
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)
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')
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: