self.receipts = config.get('receipts',{}) # signed URIs
self.addressbook = config.get('contacts', []) # outgoing addresses, for payments
self.imported_keys = config.get('imported_keys',{})
- self.history = config.get('history',{}) # address -> list(txid, height, timestamp)
+ self.history = config.get('addr_history',{}) # address -> list(txid, height)
self.transactions = config.get('transactions',{}) # txid -> deserialised
# not saved
def fill_addressbook(self):
for tx_hash, tx in self.transactions.items():
if self.get_tx_value(tx_hash)<0:
- for i in tx['outputs']:
- if not self.is_mine(i) and i not in self.addressbook:
- self.addressbook.append(i)
+ for o in tx['outputs']:
+ addr = o.get('address')
+ if not self.is_mine(addr) and addr not in self.addressbook:
+ self.addressbook.append(addr)
# redo labels
- self.update_tx_labels()
+ # self.update_tx_labels()
def get_address_flags(self, addr):
def get_tx_value(self, tx_hash, addresses = None):
# return the balance for that tx
if addresses is None: addresses = self.all_addresses()
- v = 0
- d = self.transactions.get(tx_hash)
- if not d: return 0
-
- for item in d.get('inputs'):
- addr = item.get('address')
- if addr in addresses:
- key = item['prevout_hash'] + ':%d'%item['prevout_n']
- value = self.prevout_values[ key ]
- v -= value
-
- for item in d.get('outputs'):
- addr = item.get('address')
- if addr in addresses:
- value = item.get('value')
- v += value
-
- return v
+ with self.lock:
+ v = 0
+ d = self.transactions.get(tx_hash)
+ if not d: return 0
+ for item in d.get('inputs'):
+ addr = item.get('address')
+ if addr in addresses:
+ key = item['prevout_hash'] + ':%d'%item['prevout_n']
+ value = self.prevout_values.get( key )
+ if value is None: continue
+ v -= value
+ for item in d.get('outputs'):
+ addr = item.get('address')
+ if addr in addresses:
+ value = item.get('value')
+ v += value
+ return v
def get_addr_balance(self, addr):
assert self.is_mine(addr)
h = self.history.get(addr,[])
+ if h == ['*']: return 0,0
c = u = 0
for tx_hash, tx_height in h:
v = self.get_tx_value(tx_hash, [addr])
for addr in domain:
h = self.history.get(addr, [])
- for tx_hash, tx_height, in h:
+ if h == ['*']: continue
+ for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash)
for output in tx.get('outputs'):
if output.get('address') != addr: continue
for addr in self.prioritized_addresses:
h = self.history.get(addr, [])
- for tx_hash, tx_height, in h:
+ if h == ['*']: continue
+ for tx_hash, tx_height in h:
for output in tx.get('outputs'):
if output.get('address') != addr: continue
key = tx_hash + ":%d" % output.get('index')
return s
- def get_status(self, address):
+ def get_history(self, address):
with self.lock:
- h = self.history.get(address)
+ return self.history.get(address)
+
+ def get_status(self, h):
if not h: return None
+ if h == ['*']: return '*'
status = ''
for tx_hash, height in h:
status += tx_hash + ':%d:' % height
- def receive_tx_callback(self, tx_hash, d):
- #print "updating history for", addr
+ def receive_tx_callback(self, tx_hash, tx):
+
+ if not self.check_new_tx(tx_hash, tx):
+ raise BaseException("error: received transaction is not consistent with history"%tx_hash)
+
with self.lock:
- self.transactions[tx_hash] = d
+ self.transactions[tx_hash] = tx
+
+ tx_height = tx.get('height')
+ if tx_height>0: self.verifier.add(tx_hash, tx_height)
- if self.verifier: self.verifier.add(tx_hash)
self.update_tx_outputs(tx_hash)
+
self.save()
def receive_history_callback(self, addr, hist):
- #print "updating history for", addr
+
+ if hist != ['*']:
+ if not self.check_new_history(addr, hist):
+ raise BaseException("error: received history for %s is not consistent with known transactions"%addr)
+
with self.lock:
self.history[addr] = hist
self.save()
+ if hist != ['*']:
+ for tx_hash, tx_height in hist:
+ if tx_height>0:
+ # add it in case it was previously unconfirmed
+ self.verifier.add(tx_hash, tx_height)
+ # set the height in case it changed
+ tx = self.transactions.get(tx_hash)
+ if tx:
+ if tx.get('height') != tx_height:
+ print_error( "changing height for tx", tx_hash )
+ tx['height'] = tx_height
def get_tx_history(self):
return out
+ def get_label(self, tx_hash):
+ label = self.labels.get(tx_hash)
+ is_default = (label == '') or (label is None)
+ if is_default: label = self.get_default_label(tx_hash)
+ return label, is_default
+
def get_default_label(self, tx_hash):
tx = self.transactions.get(tx_hash)
if tx:
'seed': self.seed,
'addresses': self.addresses,
'change_addresses': self.change_addresses,
- 'history': self.history,
+ 'addr_history': self.history,
'labels': self.labels,
'contacts': self.addressbook,
'imported_keys': self.imported_keys,
def set_verifier(self, verifier):
self.verifier = verifier
- for tx_hash in self.transactions.keys():
- self.verifier.add(tx_hash)
+ # review transactions (they might not all be in history)
+ for tx_hash, tx in self.transactions.items():
+ tx_height = tx.get('height')
+ if tx_height <1:
+ print_error( "skipping", tx_hash, tx_height )
+ continue
+
+ if tx_height>0:
+ self.verifier.add(tx_hash, tx_height)
- def set_tx_timestamp(self, tx_hash, tx_height):
- if tx_height>0:
- header = self.verifier.read_header(tx_height)
- timestamp = header.get('timestamp')
- else:
- timestamp = 1e12
+ # set the timestamp for transactions that need it
+ if tx and not tx.get('timestamp'):
+ timestamp = self.verifier.get_timestamp(tx_height)
+ if timestamp:
+ self.set_tx_timestamp(tx_hash, timestamp)
+
+
+ # review existing history
+ for addr, hist in self.history.items():
+ if hist == ['*']: continue
+ for tx_hash, tx_height in hist:
+ if tx_height>0:
+ # add it in case it was previously unconfirmed
+ self.verifier.add(tx_hash, tx_height)
+ # set the height in case it changed
+ tx = self.transactions.get(tx_hash)
+ if tx:
+ if tx.get('height') != tx_height:
+ print_error( "changing height for tx", tx_hash )
+ tx['height'] = tx_height
+
+
+ def set_tx_timestamp(self, tx_hash, timestamp):
with self.lock:
self.transactions[tx_hash]['timestamp'] = timestamp
+ def is_addr_in_tx(self, addr, tx):
+ found = False
+ for txin in tx.get('inputs'):
+ if addr == txin.get('address'):
+ found = True
+ break
+ for txout in tx.get('outputs'):
+ if addr == txout.get('address'):
+ found = True
+ break
+ return found
+
+
+ def check_new_history(self, addr, hist):
+ # - check that all tx in hist are relevant
+ for tx_hash, height in hist:
+ tx = self.transactions.get(tx_hash)
+ if not tx: continue
+ if not self.is_addr_in_tx(addr,tx):
+ return False
+
+ # todo: check that we are not "orphaning" a transaction
+ # if we are, reject tx if unconfirmed, else reject the server
+
+ return True
+
+
+
+ def check_new_tx(self, tx_hash, tx):
+ # 1 check that tx is referenced in addr_history.
+ addresses = []
+ for addr, hist in self.history.items():
+ if hist == ['*']:continue
+ for txh, height in hist:
+ if txh == tx_hash:
+ addresses.append(addr)
+
+ if not addresses:
+ return False
+
+ # 2 check that referencing addresses are in the tx
+ for addr in addresses:
+ if not self.is_addr_in_tx(addr, tx):
+ return False
+
+ return True
+
+
class WalletSynchronizer(threading.Thread):
new_addresses = self.wallet.synchronize()
if new_addresses:
self.subscribe_to_addresses(new_addresses)
+ self.wallet.up_to_date = False
+ return
- if self.interface.is_up_to_date('synchronizer'):
- if not self.wallet.up_to_date:
- self.wallet.up_to_date = True
- self.was_updated = True
- self.wallet.up_to_date_event.set()
- else:
+ if not self.interface.is_up_to_date('synchronizer'):
if self.wallet.up_to_date:
self.wallet.up_to_date = False
self.was_updated = True
+ return
+ self.wallet.up_to_date = True
+ self.was_updated = True
+ self.wallet.up_to_date_event.set()
-
+
def subscribe_to_addresses(self, addresses):
messages = []
for addr in addresses:
def run(self):
requested_tx = []
+ missing_tx = []
+ requested_histories = {}
+
+ # request any missing transactions
+ for history in self.wallet.history.values():
+ if history == ['*']: continue
+ for tx_hash, tx_height in history:
+ if self.wallet.transactions.get(tx_hash) is None and (tx_hash, tx_height) not in missing_tx:
+ missing_tx.append( (tx_hash, tx_height) )
+ print_error("missing tx", missing_tx)
# wait until we are connected, in case the user is not connected
while not self.interface.is_connected:
# 1. send new requests
self.synchronize_wallet()
+ for tx_hash, tx_height in missing_tx:
+ if (tx_hash, tx_height) not in requested_tx:
+ self.interface.send([ ('blockchain.transaction.get',[tx_hash, tx_height]) ], 'synchronizer')
+ requested_tx.append( (tx_hash, tx_height) )
+ missing_tx = []
+
if self.was_updated:
self.interface.trigger_callback('updated')
self.was_updated = False
# 2. get a response
r = self.interface.get_response('synchronizer')
- if not r: continue
+ if not r:
+ continue
# 3. handle response
method = r['method']
params = r['params']
- result = r['result']
+ result = r.get('result')
+ error = r.get('error')
+ if error:
+ print "error", r
+ continue
if method == 'blockchain.address.subscribe':
addr = params[0]
- if self.wallet.get_status(addr) != result:
+ if self.wallet.get_status(self.wallet.get_history(addr)) != result:
self.interface.send([('blockchain.address.get_history', [addr])], 'synchronizer')
-
+ requested_histories[addr] = result
+
elif method == 'blockchain.address.get_history':
addr = params[0]
- hist = []
- # in the new protocol, we will receive a list of (tx_hash, height)
- for item in result: hist.append( (item['tx_hash'], item['height']) )
- # store it
- self.wallet.receive_history_callback(addr, hist)
- # request transactions that we don't have
- for tx_hash, tx_height in hist:
- if self.wallet.transactions.get(tx_hash) is None:
- if tx_hash not in requested_tx:
- self.interface.send([ ('blockchain.transaction.get',[tx_hash, tx_height]) ], 'synchronizer')
- requested_tx.append(tx_hash)
- else:
- self.wallet.set_tx_timestamp(tx_hash, tx_height)
+ print_error("receiving history", addr, result)
+ if result == ['*']:
+ assert requested_histories.pop(addr) == '*'
+ self.wallet.receive_history_callback(addr, result)
+ else:
+ hist = []
+ # check that txids are unique
+ txids = []
+ for item in result:
+ tx_hash = item['tx_hash']
+ if tx_hash not in txids:
+ txids.append(tx_hash)
+ hist.append( (tx_hash, item['height']) )
+
+ if len(hist) != len(result):
+ raise BaseException("error: server sent history with non-unique txid", result)
+
+ # check that the status corresponds to what was announced
+ rs = requested_histories.pop(addr)
+ if self.wallet.get_status(hist) != rs:
+ raise BaseException("error: status mismatch: %s"%addr)
+
+ # store received history
+ self.wallet.receive_history_callback(addr, hist)
+
+ # request transactions that we don't have
+ for tx_hash, tx_height in hist:
+ if self.wallet.transactions.get(tx_hash) is None:
+ if (tx_hash, tx_height) not in requested_tx and (tx_hash, tx_height) not in missing_tx:
+ missing_tx.append( (tx_hash, tx_height) )
+ else:
+ timestamp = self.wallet.verifier.get_timestamp(tx_height)
+ self.wallet.set_tx_timestamp(tx_hash, timestamp)
elif method == 'blockchain.transaction.get':
tx_hash = params[0]
tx_height = params[1]
- self.receive_tx(tx_hash, tx_height, result)
- self.wallet.set_tx_timestamp(tx_hash, tx_height)
- requested_tx.remove(tx_hash)
+ d = self.deserialize_tx(tx_hash, tx_height, result)
+ self.wallet.receive_tx_callback(tx_hash, d)
self.was_updated = True
-
+ requested_tx.remove( (tx_hash, tx_height) )
+ print_error("received tx:", d)
elif method == 'blockchain.transaction.broadcast':
self.wallet.tx_result = result
else:
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
- if self.was_updated:
+ if self.was_updated and not requested_tx:
self.interface.trigger_callback('updated')
self.was_updated = False
- def receive_tx(self, tx_hash, tx_height, raw_tx):
+ def deserialize_tx(self, tx_hash, tx_height, raw_tx):
assert tx_hash == hash_encode(Hash(raw_tx.decode('hex')))
import deserialize
vds = deserialize.BCDataStream()
vds.write(raw_tx.decode('hex'))
d = deserialize.parse_Transaction(vds)
+ d['height'] = tx_height
d['tx_hash'] = tx_hash
- self.wallet.receive_tx_callback(tx_hash, d)
+ d['timestamp'] = self.wallet.verifier.get_timestamp(tx_height)
+ return d
git://git.novaco.in / electrum-nvc.git / blobdiff