AaronFiore/electrum
1
0
Fork 0
Code Activity

getmemorypool != database; use db to set address_has_mempool

Browse Source
This commit is contained in:
ThomasV
2011-12-12 13:56:36 +03:00
parent 05eeef4d94
commit aded1e35f1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/server.py
View File

@@ -75,14 +75,14 @@ class MyStore(Datastore_class):
_hash = store.binout(row[6]) _hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash) address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address): if self.tx_cache.has_key(address):
#print "cache: invalidating", address print "cache: invalidating", address
self.tx_cache.pop(address) self.tx_cache.pop(address)
outrows = self.get_tx_outputs(txid, False) outrows = self.get_tx_outputs(txid, False)
for row in outrows: for row in outrows:
_hash = store.binout(row[6]) _hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash) address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address): if self.tx_cache.has_key(address):
#print "cache: invalidating", address print "cache: invalidating", address
self.tx_cache.pop(address) self.tx_cache.pop(address)
def safe_sql(self,sql, params=(), lock=True): def safe_sql(self,sql, params=(), lock=True):
@@ -251,10 +251,14 @@ class MyStore(Datastore_class):
tx_hash = self.hashout_hex(tx_hash) tx_hash = self.hashout_hex(tx_hash)
if tx_hash in known_tx: if tx_hash in known_tx:
continue continue
# this means that pending transactions were added to the db, even if they are not returned by getmemorypool
address_has_mempool = True
# this means pending transactions are returned by getmemorypool
if tx_hash not in self.mempool_keys: if tx_hash not in self.mempool_keys:
continue continue
address_has_mempool = True
#print "mempool", tx_hash #print "mempool", tx_hash
txpoint = { txpoint = {
"nTime": 0, "nTime": 0,
@@ -351,7 +355,7 @@ def client_thread(ipaddr,conn):
try: try:
cmd, data = ast.literal_eval(msg[:-1]) cmd, data = ast.literal_eval(msg[:-1])
except: except:
print "syntax error", repr(msg) print "syntax error", repr(msg), ipaddr
conn.close() conn.close()
return return
@@ -450,7 +454,7 @@ def client_thread(ipaddr,conn):
elif cmd =='clear_cache': elif cmd =='clear_cache':
if config.get('server','password') == data: if config.get('server','password') == data:
self.tx_cache = {} store.tx_cache = {}
out = 'ok' out = 'ok'
else: else:
out = 'wrong password' out = 'wrong password'
@@ -513,10 +517,11 @@ def memorypool_update(store):
ds.write(hextx.decode('hex')) ds.write(hextx.decode('hex'))
tx = deserialize.parse_Transaction(ds) tx = deserialize.parse_Transaction(ds)
tx['hash'] = util.double_sha256(tx['tx']) tx['hash'] = util.double_sha256(tx['tx'])
store.mempool_keys.append(tx['hash'][::-1].encode('hex')) tx_hash = tx['hash'][::-1].encode('hex')
store.mempool_keys.append(tx_hash)
if store.tx_find_id_and_value(tx): if store.tx_find_id_and_value(tx):
pass pass
else: else:
store.import_tx(tx, False) store.import_tx(tx, False)
store.commit() store.commit()