AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/electrum/electrum

Browse Source
This commit is contained in:
thomasv
2011-12-16 09:37:43 +01:00
parent 878cf6fb06 33f0c661da
commit 16d7f793b8
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/README
View File

@@ -18,7 +18,7 @@ be possible to write clients capable of using several servers.
INSTALL INSTALL
1. patch and recompile the bitcoin daemon - bitcoinrpc.diff 1. patch and recompile the bitcoin daemon: see bitcoinrpc.cpp.diff and main.cpp.diff
2. install bitcoin-abe : https://github.com/jtobey/bitcoin-abe 2. install bitcoin-abe : https://github.com/jtobey/bitcoin-abe

25
server/server.py
View File

@@ -196,7 +196,7 @@ class MyStore(Datastore_class):
JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id) JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
WHERE pubkey.pubkey_hash = ? """, (dbhash,)) WHERE pubkey.pubkey_hash = ? """, (dbhash,))
def get_txpoints(self, addr): def get_history(self, addr):
if config.get('server','cache') == 'yes': if config.get('server','cache') == 'yes':
cached_version = self.tx_cache.get( addr ) cached_version = self.tx_cache.get( addr )
@@ -205,7 +205,8 @@ class MyStore(Datastore_class):
version, binaddr = decode_check_address(addr) version, binaddr = decode_check_address(addr)
if binaddr is None: if binaddr is None:
return "err" return None
dbhash = self.binin(binaddr) dbhash = self.binin(binaddr)
rows = [] rows = []
rows += self.get_address_out_rows( dbhash ) rows += self.get_address_out_rows( dbhash )
@@ -313,7 +314,6 @@ class MyStore(Datastore_class):
def send_tx(tx): def send_tx(tx):
import bitcoinrpc import bitcoinrpc
conn = bitcoinrpc.connect_to_local() conn = bitcoinrpc.connect_to_local()
@@ -370,7 +370,7 @@ def client_thread(ipaddr,conn):
version = "old" version = "old"
else: else:
version, addresses = ast.literal_eval(data) version, addresses = ast.literal_eval(data)
version = "v"+version if version[0]=="0": version = "v" + version
except: except:
print "error", data print "error", data
conn.close() conn.close()
@@ -416,7 +416,7 @@ def client_thread(ipaddr,conn):
if store.tx_cache.get( addr ) is not None: k += 1 if store.tx_cache.get( addr ) is not None: k += 1
# get addtess status, i.e. the last block for that address. # get addtess status, i.e. the last block for that address.
tx_points = store.get_txpoints(addr) tx_points = store.get_history(addr)
if not tx_points: if not tx_points:
status = None status = None
else: else:
@@ -424,7 +424,7 @@ def client_thread(ipaddr,conn):
status = lastpoint['blk_hash'] status = lastpoint['blk_hash']
# this is a temporary hack; move it up once old clients have disappeared # this is a temporary hack; move it up once old clients have disappeared
if status == 'mempool' and session['version'] != "old": if status == 'mempool' and session['version'] != "old":
status = status + ':%s'% lastpoint['tx_hash'] status = status + ':%d'% len(tx_points)
last_status = addresses.get( addr ) last_status = addresses.get( addr )
if last_status != status: if last_status != status:
@@ -440,7 +440,7 @@ def client_thread(ipaddr,conn):
elif cmd == 'h': elif cmd == 'h':
# history # history
address = data address = data
out = repr( store.get_txpoints( address ) ) out = repr( store.get_history( address ) )
elif cmd == 'load': elif cmd == 'load':
if config.get('server','password') == data: if config.get('server','password') == data:
@@ -498,12 +498,12 @@ def client_thread(ipaddr,conn):
conn.close() conn.close()
ds = BCDataStream.BCDataStream()
def memorypool_update(store): def memorypool_update(store):
ds = BCDataStream.BCDataStream()
store.mempool_keys = [] store.mempool_keys = []
conn = bitcoinrpc.connect_to_local() conn = bitcoinrpc.connect_to_local()
try: try:
@@ -588,16 +588,17 @@ if __name__ == '__main__':
if len(sys.argv)>1: if len(sys.argv)>1:
cmd = sys.argv[1] cmd = sys.argv[1]
pw = config.get('server','password')
if cmd == 'load': if cmd == 'load':
request = "('load','%s')#"%config.get('server','password') request = "('load','%s')#"%pw
elif cmd == 'peers': elif cmd == 'peers':
request = "('peers','')#" request = "('peers','')#"
elif cmd == 'stop': elif cmd == 'stop':
request = "('stop','%s')#"%config.get('server','password') request = "('stop','%s')#"%pw
elif cmd == 'clear_cache': elif cmd == 'clear_cache':
request = "('clear_cache','%s')#"%config.get('server','password') request = "('clear_cache','%s')#"%pw
elif cmd == 'get_cache': elif cmd == 'get_cache':
request = "('get_cache',('%s','%s'))#"%(config.get('server','password'),sys.argv[2]) request = "('get_cache',('%s','%s'))#"%(pw,sys.argv[2])
elif cmd == 'h': elif cmd == 'h':
request = "('h','%s')#"%sys.argv[2] request = "('h','%s')#"%sys.argv[2]
elif cmd == 'b': elif cmd == 'b':