# we need to import electrum
sys.path.append('../client/')
-import electrum
+from wallet import Wallet
+from interface import Interface
config = ConfigParser.ConfigParser()
-class Direct_Interface(electrum.Interface):
+class Direct_Interface(Interface):
def __init__(self):
pass
def do_command(cmd, data, ipaddr):
+ timestr = time.strftime("[%d/%m/%Y-%H:%M:%S]")
+
if cmd=='b':
out = "%d"%block_number
except:
print "error", data
return None
- print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
+ print timestr, "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
out = new_session(version, addresses)
elif cmd=='update_session':
except:
print "error"
return None
- print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
+ print timestr, "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
out = update_session(session_id,addresses)
elif cmd == 'bccapi_login':
master_public_key = k.decode('hex') # todo: sanitize. no need to decode twice...
print master_public_key
wallet_id = random_string(10)
- w = electrum.Wallet( Direct_Interface() )
+ w = Wallet( Direct_Interface() )
w.master_public_key = master_public_key.decode('hex')
w.synchronize()
wallets[wallet_id] = w
print "wallets", wallets
elif cmd == 'bccapi_getAccountInfo':
- from electrum import int_to_hex
+ from wallet import int_to_hex
v, wallet_id = ast.literal_eval(data)
w = wallets.get(wallet_id)
if w is not None:
out = "error"
elif cmd == 'bccapi_getAccountStatement':
- from electrum import int_to_hex
+ from wallet import int_to_hex
v, wallet_id = ast.literal_eval(data)
w = wallets.get(wallet_id)
if w is not None:
elif cmd =='tx':
out = send_tx(data)
- print "sent tx:", out
+ print timestr, "sent tx:", ipaddr, out
elif cmd == 'stop':
out = cmd_stop(data)
store.catch_up()
memorypool_update(store)
block_number = store.get_block_number(1)
- dblock.release()
except:
traceback.print_exc(file=sys.stdout)
+ finally:
+ dblock.release()
time.sleep(10)
print "server stopped"