import thread, threading, time, socket, traceback, ast, sys
+from processor import timestr, random_string
-def random_string(N):
- import random, string
- return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
-def timestr():
- return time.strftime("[%d/%m/%Y-%H:%M:%S]")
+
+def new_to_old(s):
+ s = s.replace("'block_hash'", "'blk_hash'")
+ s = s.replace("'index'", "'pos'")
+ s = s.replace("'timestamp'", "'nTime'")
+ s = s.replace("'is_input'", "'is_in'")
+ s = s.replace("'raw_output_script'","'raw_scriptPubKey'")
+ return s
class NativeServer(threading.Thread):
session['last_time'] = time.time()
ret = {}
k = 0
- for addr in addresses:
+ for addr in addresses.keys():
status = self.store.get_status( addr )
- msg_id, last_status = addresses.get( addr )
+ msg_id, last_status = addresses[addr]
if last_status != status:
addresses[addr] = msg_id, status
ret[addr] = status
"""deprecated in 0.42, wad replaced by add_address_to_session"""
self.sessions[session_id]['addresses'] = {}
for a in addresses:
- self.sessions[session_id]['addresses'][a] = ''
+ self.sessions[session_id]['addresses'][a] = ('','')
self.sessions[session_id]['last_time'] = time.time()
return 'ok'
elif cmd == 'h':
address = data
out = repr( self.store.get_history( address ) )
+ out = new_to_old(out)
elif cmd =='tx':
out = self.store.send_tx(data)