from util import print_msg, print_error, user_dir, format_satoshis
from bitcoin import *
-
-# URL decode
-_ud = re.compile('%([0-9a-hA-H]{2})', re.MULTILINE)
-urldecode = lambda x: _ud.sub(lambda m: chr(int(m.group(1), 16)), x)
+from account import *
# AES encryption
EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s))
self.seed_version = config.get('seed_version', SEED_VERSION)
self.gap_limit = config.get('gap_limit', 5)
self.use_change = config.get('use_change',True)
- self.fee = int(config.get('fee',100000))
+ self.fee = int(config.get('fee_per_kb',50000))
self.num_zeros = int(config.get('num_zeros',0))
self.use_encryption = config.get('use_encryption', False)
self.seed = config.get('seed', '') # encrypted
self.labels = config.get('labels', {})
- self.aliases = config.get('aliases', {}) # aliases for addresses
- self.authorities = config.get('authorities', {}) # trusted addresses
self.frozen_addresses = config.get('frozen_addresses',[])
self.prioritized_addresses = config.get('prioritized_addresses',[])
- self.receipts = config.get('receipts',{}) # signed URIs
self.addressbook = config.get('contacts', [])
+
self.imported_keys = config.get('imported_keys',{})
self.history = config.get('addr_history',{}) # address -> list(txid, height)
- self.tx_height = config.get('tx_height',{})
- self.requested_amounts = config.get('requested_amounts',{})
- self.accounts = config.get('accounts', {}) # this should not include public keys
- self.sequences = {}
- self.sequences[0] = DeterministicSequence(self.config.get('master_public_key'))
- if self.accounts.get(0) is None:
- self.accounts[0] = { 0:[], 1:[], 'name':'Main account' }
+ self.master_public_keys = config.get('master_public_keys',{})
+ self.master_private_keys = config.get('master_private_keys', {})
+
+ self.load_accounts(config)
self.transactions = {}
tx = config.get('transactions',{})
except:
print_msg("Warning: Cannot deserialize transactions. skipping")
- # plugins
- self.plugins = []
- self.plugin_hooks = {}
-
# not saved
self.prevout_values = {} # my own transaction outputs
self.spent_outputs = []
- self.receipt = None # next receipt
- self.banner = ''
# spv
self.verifier = None
self.up_to_date = False
self.lock = threading.Lock()
+ self.transaction_lock = threading.Lock()
self.tx_event = threading.Event()
if self.seed_version != SEED_VERSION:
raise ValueError("This wallet seed is deprecated. Please run upgrade.py for a diagnostic.")
- for tx_hash in self.transactions.keys():
- self.update_tx_outputs(tx_hash)
-
-
- # plugins
- def set_hook(self, name, callback):
- h = self.plugin_hooks.get(name, [])
- h.append(callback)
- self.plugin_hooks[name] = h
-
- def unset_hook(self, name, callback):
- h = self.plugin_hooks.get(name,[])
- if callback in h: h.remove(callback)
- self.plugin_hooks[name] = h
-
- def init_plugins(self, plugins):
- self.plugins = plugins
- for p in plugins:
- try:
- p.init(self)
- except:
- import traceback
- print_msg("Error:cannot initialize plugin",p)
- traceback.print_exc(file=sys.stdout)
+ for tx_hash, tx in self.transactions.items():
+ if self.check_new_tx(tx_hash, tx):
+ self.update_tx_outputs(tx_hash)
+ else:
+ print_error("unreferenced tx", tx_hash)
+ self.transactions.pop(tx_hash)
def set_up_to_date(self,b):
def import_key(self, sec, password):
# check password
seed = self.decode_seed(password)
- address = address_from_private_key(sec)
+ try:
+ address = address_from_private_key(sec)
+ except:
+ raise BaseException('Invalid private key')
if self.is_mine(address):
raise BaseException('Address already in wallet')
# store the originally requested keypair into the imported keys table
self.imported_keys[address] = pw_encode(sec, password )
+ self.config.set_key('imported_keys', self.imported_keys, True)
return address
+ def delete_imported_key(self, addr):
+ if addr in self.imported_keys:
+ self.imported_keys.pop(addr)
+ self.config.set_key('imported_keys', self.imported_keys, True)
+
def init_seed(self, seed):
if self.seed: raise BaseException("a seed exists")
if not seed:
seed = random_seed(128)
- self.seed = seed
+ self.seed = seed
+
+
+ def save_seed(self):
self.config.set_key('seed', self.seed, True)
self.config.set_key('seed_version', self.seed_version, True)
- mpk = DeterministicSequence.mpk_from_seed(self.seed)
- self.config.set_key('master_public_key', mpk, True)
- self.sequences[0] = DeterministicSequence(mpk)
+ master_k, master_c, master_K, master_cK = bip32_init(self.seed)
+
+ # normal accounts
+ k0, c0, K0, cK0 = bip32_private_derivation(master_k, master_c, "m/", "m/0'/")
+ # p2sh 2of2
+ k1, c1, K1, cK1 = bip32_private_derivation(master_k, master_c, "m/", "m/1'/")
+ k2, c2, K2, cK2 = bip32_private_derivation(master_k, master_c, "m/", "m/2'/")
+ # p2sh 2of3
+ k3, c3, K3, cK3 = bip32_private_derivation(master_k, master_c, "m/", "m/3'/")
+ k4, c4, K4, cK4 = bip32_private_derivation(master_k, master_c, "m/", "m/4'/")
+ k5, c5, K5, cK5 = bip32_private_derivation(master_k, master_c, "m/", "m/5'/")
+
+ self.master_public_keys = {
+ "m/0'/": (c0, K0, cK0),
+ "m/1'/": (c1, K1, cK1),
+ "m/2'/": (c2, K2, cK2),
+ "m/3'/": (c3, K3, cK3),
+ "m/4'/": (c4, K4, cK4),
+ "m/5'/": (c5, K5, cK5)
+ }
+
+ self.master_private_keys = {
+ "m/0'/": k0,
+ "m/1'/": k1,
+ "m/2'/": k2,
+ "m/3'/": k3,
+ "m/4'/": k4,
+ "m/5'/": k5
+ }
+
+ self.config.set_key('master_public_keys', self.master_public_keys, True)
+ self.config.set_key('master_private_keys', self.master_private_keys, True)
+
+ # create default account
+ self.create_account('Main account')
- self.accounts[0] = { 0:[], 1:[], 'name':'Main account' }
- self.config.set_key('accounts', self.accounts, True)
+
+ def account_id(self, account_type, i):
+ if account_type is None:
+ return "m/0'/%d"%i
+ elif account_type == '2of2':
+ return "m/1'/%d & m/2'/%d"%(i,i)
+ elif account_type == '2of3':
+ return "m/3'/%d & m/4'/%d & m/5'/%d"%(i,i,i)
+ else:
+ raise BaseException('unknown account type')
+ def num_accounts(self, account_type):
+ keys = self.accounts.keys()
+ i = 0
+ while True:
+ account_id = self.account_id(account_type, i)
+ if account_id not in keys: break
+ i += 1
+ return i
+
+
+ def create_account(self, name, account_type = None):
+ i = self.num_accounts(account_type)
+ account_id = self.account_id(account_type,i)
+
+ if account_type is None:
+ master_c0, master_K0, _ = self.master_public_keys["m/0'/"]
+ c0, K0, cK0 = bip32_public_derivation(master_c0.decode('hex'), master_K0.decode('hex'), "m/0'/", "m/0'/%d"%i)
+ account = BIP32_Account({ 'c':c0, 'K':K0, 'cK':cK0 })
+
+ elif account_type == '2of2':
+ master_c1, master_K1, _ = self.master_public_keys["m/1'/"]
+ c1, K1, cK1 = bip32_public_derivation(master_c1.decode('hex'), master_K1.decode('hex'), "m/1'/", "m/1'/%d"%i)
+ master_c2, master_K2, _ = self.master_public_keys["m/2'/"]
+ c2, K2, cK2 = bip32_public_derivation(master_c2.decode('hex'), master_K2.decode('hex'), "m/2'/", "m/2'/%d"%i)
+ account = BIP32_Account_2of2({ 'c':c1, 'K':K1, 'cK':cK1, 'c2':c2, 'K2':K2, 'cK2':cK2 })
+
+ elif account_type == '2of3':
+ master_c3, master_K3, _ = self.master_public_keys["m/3'/"]
+ c3, K3, cK3 = bip32_public_derivation(master_c3.decode('hex'), master_K3.decode('hex'), "m/3'/", "m/3'/%d"%i)
+ master_c4, master_K4, _ = self.master_public_keys["m/4'/"]
+ c4, K4, cK4 = bip32_public_derivation(master_c4.decode('hex'), master_K4.decode('hex'), "m/4'/", "m/4'/%d"%i)
+ master_c5, master_K5, _ = self.master_public_keys["m/5'/"]
+ c5, K5, cK5 = bip32_public_derivation(master_c5.decode('hex'), master_K5.decode('hex'), "m/5'/", "m/5'/%d"%i)
+ account = BIP32_Account_2of3({ 'c':c3, 'K':K3, 'cK':cK3, 'c2':c4, 'K2':K4, 'cK2':cK4, 'c3':c5, 'K3':K5, 'cK3':cK5 })
+
+ self.accounts[account_id] = account
+ self.save_accounts()
+ self.labels[account_id] = name
+ self.config.set_key('labels', self.labels, True)
+
+
+ def save_accounts(self):
+ d = {}
+ for k, v in self.accounts.items():
+ d[k] = v.dump()
+ self.config.set_key('accounts', d, True)
+
+
+ def load_accounts(self, config):
+ d = config.get('accounts', {})
+ self.accounts = {}
+ for k, v in d.items():
+ if '&' in k:
+ self.accounts[k] = BIP32_Account_2of2(v)
+ else:
+ self.accounts[k] = BIP32_Account(v)
- def addresses(self, include_change = False):
- o = self.imported_keys.keys()
- for a in self.accounts.values():
- o += a[0]
- if include_change: o += a[1]
+
+
+
+ def addresses(self, include_change = True):
+ o = self.get_account_addresses(-1, include_change)
+ for a in self.accounts.keys():
+ o += self.get_account_addresses(a, include_change)
return o
return address in self.addresses(True)
def is_change(self, address):
- #return address in self.change_addresses
- return False
+ if not self.is_mine(address): return False
+ if address in self.imported_keys.keys(): return False
+ acct, s = self.get_address_index(address)
+ return s[0] == 1
def get_master_public_key(self):
- return self.sequence.master_public_key
+ raise
+ return self.config.get("master_public_key")
+
+ def get_master_private_key(self, account, password):
+ master_k = pw_decode( self.master_private_keys[account], password)
+ master_c, master_K, master_Kc = self.master_public_keys[account]
+ try:
+ K, Kc = get_pubkeys_from_secret(master_k.decode('hex'))
+ assert K.encode('hex') == master_K
+ except:
+ raise BaseException("Invalid password")
+ return master_k
+
def get_address_index(self, address):
if address in self.imported_keys.keys():
- raise BaseException("imported key")
+ return -1, None
for account in self.accounts.keys():
for for_change in [0,1]:
- addresses = self.accounts[account][for_change]
+ addresses = self.accounts[account].get_addresses(for_change)
for addr in addresses:
if address == addr:
- return account, for_change, addresses.index(addr)
+ return account, (for_change, addresses.index(addr))
raise BaseException("not found")
def get_public_key(self, address):
- account, n, for_change = self.get_address_index(address)
- return self.sequences[account].get_pubkey(n, for_change)
+ account, sequence = self.get_address_index(address)
+ return self.accounts[account].get_pubkey( *sequence )
def decode_seed(self, password):
seed = pw_decode(self.seed, password)
- self.sequences[0].check_seed(seed)
+ #todo: #self.sequences[0].check_seed(seed)
return seed
- def get_private_key(self, address, password):
- return self.get_private_keys([address], password).get(address)
- def get_private_keys(self, addresses, password):
- # decode seed in any case, in order to test the password
- seed = self.decode_seed(password)
- secexp = self.sequences[0].stretch_key(seed)
- out = {}
- for address in addresses:
- if address in self.imported_keys.keys():
- out[address] = pw_decode( self.imported_keys[address], password )
- else:
- account, for_change, n = self.get_address_index(address)
- if account == 0:
- out[address] = self.sequences[0].get_private_key_from_stretched_exponent(n, for_change, secexp)
+ def get_private_key(self, address, password):
+ out = []
+ if address in self.imported_keys.keys():
+ out.append( pw_decode( self.imported_keys[address], password ) )
+ else:
+ account, sequence = self.get_address_index(address)
+ # assert address == self.accounts[account].get_address(*sequence)
+ l = account.split("&")
+ for s in l:
+ s = s.strip()
+ m = re.match("(m/\d+'/)(\d+)", s)
+ if m:
+ root = m.group(1)
+ if root not in self.master_private_keys.keys(): continue
+ num = int(m.group(2))
+ master_k = self.get_master_private_key(root, password)
+ master_c, _, _ = self.master_public_keys[root]
+ pk = bip32_private_key( (num,) + sequence, master_k.decode('hex'), master_c.decode('hex'))
+ out.append(pk)
+
return out
+
+
def signrawtransaction(self, tx, input_info, private_keys, password):
+ import deserialize
unspent_coins = self.get_unspent_coins()
seed = self.decode_seed(password)
- # convert private_keys to dict
- pk = {}
+ # build a list of public/private keys
+ keypairs = {}
for sec in private_keys:
- address = address_from_private_key(sec)
- pk[address] = sec
- private_keys = pk
+ pubkey = public_key_from_private_key(sec)
+ keypairs[ pubkey ] = sec
+
for txin in tx.inputs:
# convert to own format
if item.get('txid') == txin['tx_hash'] and item.get('vout') == txin['index']:
txin['raw_output_script'] = item['scriptPubKey']
txin['redeemScript'] = item.get('redeemScript')
- txin['electrumKeyID'] = item.get('electrumKeyID')
+ txin['KeyID'] = item.get('KeyID')
break
else:
for item in unspent_coins:
# if neither, we might want to get it from the server..
raise
- # find the address:
- if txin.get('electrumKeyID'):
- account, for_change, n = txin.get('electrumKeyID')
- sec = self.sequences[account].get_private_key(n, for_change, seed)
- addr = self.sequences[account].get_address(n, for_change)
+ # find the address and fill private_keys
+ if txin.get('KeyID'):
+ account, name, sequence = txin.get('KeyID')
+ if name != 'BIP32': continue
+ sec = self.accounts[account].get_private_key(sequence, seed)
+ pubkey = self.accounts[account].get_pubkey(sequence)
txin['address'] = addr
- private_keys[addr] = sec
+ keypairs[pubkey] = [sec]
- elif txin.get("redeemScript"):
- txin['address'] = hash_160_to_bc_address(hash_160(txin.get("redeemScript").decode('hex')), 5)
+ redeem_script = txin.get("redeemScript")
+ if redeem_script:
+ num, redeem_pubkeys = deserialize.parse_redeemScript(redeem_script)
+ addr = hash_160_to_bc_address(hash_160(redeem_script.decode('hex')), 5)
+ txin['address'] = addr
elif txin.get("raw_output_script"):
- import deserialize
addr = deserialize.get_address_from_output_script(txin.get("raw_output_script").decode('hex'))
sec = self.get_private_key(addr, password)
+ pubkey = public_key_from_private_key(sec)
if sec:
- private_keys[addr] = sec
+ keypairs[pubkey] = [sec]
txin['address'] = addr
- tx.sign( private_keys )
+ tx.sign( keypairs )
def sign_message(self, address, message, password):
sec = self.get_private_key(address, password)
compressed = is_compressed(sec)
return key.sign_message(message, compressed, address)
+ def verify_message(self, address, signature, message):
+ try:
+ EC_KEY.verify_message(address, signature, message)
+ return True
+ except BaseException as e:
+ print_error("Verification error: {0}".format(e))
+ return False
- def create_new_address(self, account, for_change):
- addresses = self.accounts[account][for_change]
- n = len(addresses)
- address = self.get_new_address( account, for_change, n)
- self.accounts[account][for_change].append(address)
- self.history[address] = []
- return address
-
-
- def get_new_address(self, account, for_change, n):
- return self.sequences[account].get_address(for_change, n)
- print address
- return address
def change_gap_limit(self, value):
if value >= self.gap_limit:
self.gap_limit = value
- self.save()
+ self.config.set_key('gap_limit', self.gap_limit, True)
self.interface.poke('synchronizer')
return True
self.accounts[key][0] = addresses
self.gap_limit = value
- self.save()
+ self.config.set_key('gap_limit', self.gap_limit, True)
+ self.save_accounts()
return True
else:
return False
nmax = 0
for account in self.accounts.values():
- addresses = account[0]
+ addresses = account.get_addresses(0)
k = self.num_unused_trailing_addresses(addresses)
for a in addresses[0:-k]:
if self.history.get(a):
def synchronize_sequence(self, account, for_change):
limit = self.gap_limit_for_change if for_change else self.gap_limit
- addresses = self.accounts[account][for_change]
new_addresses = []
while True:
+ addresses = account.get_addresses(for_change)
if len(addresses) < limit:
- new_addresses.append( self.create_new_address(account, for_change) )
+ address = account.create_new_address(for_change)
+ self.history[address] = []
+ new_addresses.append( address )
continue
+
if map( lambda a: self.address_is_old(a), addresses[-limit:] ) == limit*[False]:
break
else:
- new_addresses.append( self.create_new_address(account, for_change) )
+ address = account.create_new_address(for_change)
+ self.history[address] = []
+ new_addresses.append( address )
+
return new_addresses
def synchronize(self):
new = []
- for account in self.accounts.keys():
+ for account in self.accounts.values():
new += self.synchronize_account(account)
+ if new:
+ self.save_accounts()
+ self.config.set_key('addr_history', self.history, True)
return new
return self.history.values() != [[]] * len(self.history)
+ def add_contact(self, address, label=None):
+ self.addressbook.append(address)
+ self.config.set_key('contacts', self.addressbook, True)
+ if label:
+ self.labels[address] = label
+ self.config.set_key('labels', self.labels, True)
+
+ def delete_contact(self, addr):
+ if addr in self.addressbook:
+ self.addressbook.remove(addr)
+ self.config.set_key('addressbook', self.addressbook, True)
+
+
def fill_addressbook(self):
for tx_hash, tx in self.transactions.items():
- is_send, _, _ = self.get_tx_value(tx)
+ is_relevant, is_send, _, _ = self.get_tx_value(tx)
if is_send:
for addr, v in tx.outputs:
if not self.is_mine(addr) and addr not in self.addressbook:
# redo labels
# self.update_tx_labels()
+ def get_num_tx(self, address):
+ n = 0
+ for tx in self.transactions.values():
+ if address in map(lambda x:x[0], tx.outputs): n += 1
+ return n
+
def get_address_flags(self, addr):
flags = "C" if self.is_change(addr) else "I" if addr in self.imported_keys.keys() else "-"
return flags
- def get_tx_value(self, tx, addresses=None):
- if addresses is None: addresses = self.addresses(True)
- return tx.get_value(addresses, self.prevout_values)
-
-
- def get_tx_details(self, tx_hash):
- import datetime
- if not tx_hash: return ''
- tx = self.transactions.get(tx_hash)
- is_mine, v, fee = self.get_tx_value(tx)
- conf, timestamp = self.verifier.get_confirmations(tx_hash)
-
- if timestamp:
- time_str = datetime.datetime.fromtimestamp(timestamp).isoformat(' ')[:-3]
- else:
- time_str = 'pending'
-
- inputs = map(lambda x: x.get('address'), tx.inputs)
- outputs = map(lambda x: x.get('address'), tx.d['outputs'])
- tx_details = "Transaction Details" +"\n\n" \
- + "Transaction ID:\n" + tx_hash + "\n\n" \
- + "Status: %d confirmations\n"%conf
- if is_mine:
- if fee:
- tx_details += "Amount sent: %s\n"% format_satoshis(v-fee, False) \
- + "Transaction fee: %s\n"% format_satoshis(fee, False)
- else:
- tx_details += "Amount sent: %s\n"% format_satoshis(v, False) \
- + "Transaction fee: unknown\n"
- else:
- tx_details += "Amount received: %s\n"% format_satoshis(v, False) \
-
- tx_details += "Date: %s\n\n"%time_str \
- + "Inputs:\n-"+ '\n-'.join(inputs) + "\n\n" \
- + "Outputs:\n-"+ '\n-'.join(outputs)
-
- r = self.receipts.get(tx_hash)
- if r:
- tx_details += "\n_______________________________________" \
- + '\n\nSigned URI: ' + r[2] \
- + "\n\nSigned by: " + r[0] \
- + '\n\nSignature: ' + r[1]
-
- return tx_details
+ def get_tx_value(self, tx, account=None):
+ domain = self.get_account_addresses(account)
+ return tx.get_value(domain, self.prevout_values)
def update_tx_outputs(self, tx_hash):
tx = self.transactions.get(tx_hash)
- i = 0
- for item in tx.outputs:
- addr, value = item
+
+ for i, (addr, value) in enumerate(tx.outputs):
key = tx_hash+ ':%d'%i
- with self.lock:
- self.prevout_values[key] = value
- i += 1
+ self.prevout_values[key] = value
for item in tx.inputs:
if self.is_mine(item.get('address')):
for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash)
if not tx: continue
- i = 0
- for item in tx.outputs:
- addr, value = item
+
+ for i, (addr, value) in enumerate(tx.outputs):
if addr == address:
key = tx_hash + ':%d'%i
received_coins.append(key)
- i +=1
for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash)
if key in received_coins:
v -= value
- i = 0
- for item in tx.outputs:
- addr, value = item
+ for i, (addr, value) in enumerate(tx.outputs):
key = tx_hash + ':%d'%i
if addr == address:
v += value
- i += 1
if tx_height:
c += v
u += v
return c, u
- def get_account_addresses(self, a):
- ac = self.accounts[a]
- return ac[0] + ac[1]
+
+ def get_accounts(self):
+ accounts = {}
+ for k, account in self.accounts.items():
+ accounts[k] = self.labels.get(k, 'unnamed')
+ if self.imported_keys:
+ accounts[-1] = 'Imported keys'
+ return accounts
+
+ def get_account_addresses(self, a, include_change=True):
+ if a is None:
+ o = self.addresses(True)
+ elif a == -1:
+ o = self.imported_keys.keys()
+ else:
+ ac = self.accounts[a]
+ o = ac.get_addresses(0)
+ if include_change: o += ac.get_addresses(1)
+ return o
def get_imported_balance(self):
cc = uu = 0
return cc, uu
def get_account_balance(self, account):
+ if account is None:
+ return self.get_balance()
+ elif account == -1:
+ return self.get_imported_balance()
+
conf = unconf = 0
for addr in self.get_account_addresses(account):
c, u = self.get_addr_balance(addr)
unconf += u
return conf, unconf
+ def get_frozen_balance(self):
+ conf = unconf = 0
+ for addr in self.frozen_addresses:
+ c, u = self.get_addr_balance(addr)
+ conf += c
+ unconf += u
+ return conf, unconf
+
+
def get_balance(self):
cc = uu = 0
for a in self.accounts.keys():
if h == ['*']: continue
for tx_hash, tx_height in h:
tx = self.transactions.get(tx_hash)
+ if tx is None: raise BaseException("Wallet not synchronized")
for output in tx.d.get('outputs'):
if output.get('address') != addr: continue
key = tx_hash + ":%d" % output.get('index')
- def choose_tx_inputs( self, amount, fixed_fee, from_addr = None ):
+ def choose_tx_inputs( self, amount, fixed_fee, account = None ):
""" todo: minimize tx size """
total = 0
fee = self.fee if fixed_fee is None else fixed_fee
-
+ domain = self.get_account_addresses(account)
coins = []
prioritized_coins = []
- domain = [from_addr] if from_addr else self.addresses(True)
for i in self.frozen_addresses:
if i in domain: domain.remove(i)
addr = item.get('address')
v = item.get('value')
total += v
-
inputs.append( item )
- fee = self.fee*len(inputs) if fixed_fee is None else fixed_fee
+ fee = self.estimated_fee(inputs) if fixed_fee is None else fixed_fee
if total >= amount + fee: break
else:
- #print "not enough funds: %s %s"%(format_satoshis(total), format_satoshis(fee))
inputs = []
+
return inputs, total, fee
- def add_tx_change( self, outputs, amount, fee, total, change_addr=None ):
+
+ def estimated_fee(self, inputs):
+ estimated_size = len(inputs) * 180 + 80 # this assumes non-compressed keys
+ fee = self.fee * int(round(estimated_size/1024.))
+ if fee == 0: fee = self.fee
+ return fee
+
+
+ def add_tx_change( self, inputs, outputs, amount, fee, total, change_addr=None, account=0 ):
+ "add change to a transaction"
change_amount = total - ( amount + fee )
if change_amount != 0:
- # normally, the update thread should ensure that the last change address is unused
if not change_addr:
- change_addresses = self.accounts[0][1]
- change_addr = change_addresses[-self.gap_limit_for_change]
+ if account is None:
+ # send change to one of the accounts involved in the tx
+ address = inputs[0].get('address')
+ account, _ = self.get_address_index(address)
+
+ if not self.use_change or account == -1:
+ change_addr = inputs[-1]['address']
+ else:
+ change_addr = self.accounts[account].get_addresses(1)[-self.gap_limit_for_change]
+
# Insert the change output at a random position in the outputs
posn = random.randint(0, len(outputs))
outputs[posn:posn] = [( change_addr, change_amount)]
with self.lock:
return self.history.get(address)
+
def get_status(self, h):
if not h: return None
if h == ['*']: return '*'
return hashlib.sha256( status ).digest().encode('hex')
-
def receive_tx_callback(self, tx_hash, tx, tx_height):
-
if not self.check_new_tx(tx_hash, tx):
- raise BaseException("error: received transaction is not consistent with history"%tx_hash)
+ # may happen due to pruning
+ print_error("received transaction that is no longer referenced in history", tx_hash)
+ return
- with self.lock:
+ with self.transaction_lock:
self.transactions[tx_hash] = tx
- self.tx_height[tx_hash] = tx_height
- #tx_height = tx.get('height')
- if self.verifier and tx_height>0:
- self.verifier.add(tx_hash, tx_height)
+ self.interface.pending_transactions_for_notifications.append(tx)
- self.update_tx_outputs(tx_hash)
+ self.save_transactions()
+ if self.verifier and tx_height>0:
+ self.verifier.add(tx_hash, tx_height)
+ self.update_tx_outputs(tx_hash)
- self.save()
+ def save_transactions(self):
+ tx = {}
+ for k,v in self.transactions.items():
+ tx[k] = str(v)
+ self.config.set_key('transactions', tx, True)
def receive_history_callback(self, addr, hist):
with self.lock:
self.history[addr] = hist
- self.save()
+ self.config.set_key('addr_history', self.history, True)
if hist != ['*']:
for tx_hash, tx_height in hist:
if tx_height>0:
# add it in case it was previously unconfirmed
if self.verifier: self.verifier.add(tx_hash, tx_height)
- # set the height in case it changed
- txh = self.tx_height.get(tx_hash)
- if txh is not None and txh != tx_height:
- print_error( "changing height for tx", tx_hash )
- self.tx_height[tx_hash] = tx_height
- def get_tx_history(self):
- with self.lock:
+ def get_tx_history(self, account=None):
+ with self.transaction_lock:
history = self.transactions.items()
- history.sort(key = lambda x: self.tx_height.get(x[0]) if self.tx_height.get(x[0]) else 1e12)
- result = []
+ history.sort(key = lambda x: self.verifier.get_txpos(x[0]))
+ result = []
- balance = 0
- for tx_hash, tx in history:
- is_mine, v, fee = self.get_tx_value(tx)
- if v is not None: balance += v
- c, u = self.get_balance()
+ balance = 0
+ for tx_hash, tx in history:
+ is_relevant, is_mine, v, fee = self.get_tx_value(tx, account)
+ if v is not None: balance += v
+
+ c, u = self.get_account_balance(account)
- if balance != c+u:
- v_str = format_satoshis( c+u - balance, True, self.num_zeros)
- result.append( ('', 1000, 0, c+u-balance, None, c+u-balance, None ) )
+ if balance != c+u:
+ result.append( ('', 1000, 0, c+u-balance, None, c+u-balance, None ) )
- balance = c + u - balance
- for tx_hash, tx in history:
- conf, timestamp = self.verifier.get_confirmations(tx_hash) if self.verifier else (None, None)
- is_mine, value, fee = self.get_tx_value(tx)
- if value is not None:
- balance += value
+ balance = c + u - balance
+ for tx_hash, tx in history:
+ is_relevant, is_mine, value, fee = self.get_tx_value(tx, account)
+ if not is_relevant:
+ continue
+ if value is not None:
+ balance += value
- result.append( (tx_hash, conf, is_mine, value, fee, balance, timestamp) )
+ conf, timestamp = self.verifier.get_confirmations(tx_hash) if self.verifier else (None, None)
+ result.append( (tx_hash, conf, is_mine, value, fee, balance, timestamp) )
return result
tx = self.transactions.get(tx_hash)
default_label = ''
if tx:
- is_mine, _, _ = self.get_tx_value(tx)
+ is_relevant, is_mine, _, _ = self.get_tx_value(tx)
if is_mine:
for o in tx.outputs:
o_addr, _ = o
default_label = self.labels[o_addr]
except KeyError:
default_label = o_addr
+ break
+ else:
+ default_label = '(internal)'
else:
for o in tx.outputs:
o_addr, _ = o
return default_label
- def mktx(self, outputs, password, fee=None, change_addr=None, from_addr= None):
-
+ def mktx(self, outputs, password, fee=None, change_addr=None, account=None ):
+ """
+ create a transaction
+ account parameter:
+ None means use all accounts
+ -1 means imported keys
+ 0, 1, etc are seed accounts
+ """
+
for address, x in outputs:
assert is_valid(address)
amount = sum( map(lambda x:x[1], outputs) )
- inputs, total, fee = self.choose_tx_inputs( amount, fee, from_addr )
+
+ inputs, total, fee = self.choose_tx_inputs( amount, fee, account )
if not inputs:
raise ValueError("Not enough funds")
- if not self.use_change and not change_addr:
- change_addr = inputs[-1]['address']
- print_error( "Sending change to", change_addr )
- outputs = self.add_tx_change(outputs, amount, fee, total, change_addr)
+ outputs = self.add_tx_change(inputs, outputs, amount, fee, total, change_addr, account)
tx = Transaction.from_io(inputs, outputs)
- pk_addresses = []
- for i in range(len(tx.inputs)):
- txin = tx.inputs[i]
+
+ keypairs = {}
+ for i, txin in enumerate(tx.inputs):
address = txin['address']
- if address in self.imported_keys.keys():
+ if address in self.imported_keys.keys():
pk_addresses.append(address)
continue
- account, is_change, n = self.get_address_index(address)
- txin['electrumKeyID'] = (account, is_change, n) # used by the server to find the key
- pk_addr, redeemScript = self.sequences[account].get_input_info(is_change, n)
- if redeemScript: txin['redeemScript'] = redeemScript
- pk_addresses.append(pk_addr)
+ account, sequence = self.get_address_index(address)
+ txin['KeyID'] = (account, 'BIP32', sequence) # used by the server to find the key
+
+ redeemScript = self.accounts[account].redeem_script(sequence)
+ if redeemScript:
+ txin['redeemScript'] = redeemScript
+ assert address == self.accounts[account].get_address(*sequence)
+ else:
+ txin['redeemPubkey'] = self.accounts[account].get_pubkey(*sequence)
+
+ private_keys = self.get_private_key(address, password)
+ for sec in private_keys:
+ pubkey = public_key_from_private_key(sec)
+ keypairs[ pubkey ] = sec
- # get all private keys at once.
- private_keys = self.get_private_keys(pk_addresses, password)
- tx.sign(private_keys)
+ tx.sign(keypairs)
for address, x in outputs:
if address not in self.addressbook and not self.is_mine(address):
out = self.tx_result
if out != tx_hash:
return False, "error: " + out
- if self.receipt:
- self.receipts[tx_hash] = self.receipt
- self.receipt = None
return True, out
- def read_alias(self, alias):
- # this might not be the right place for this function.
- import urllib
-
- m1 = re.match('([\w\-\.]+)@((\w[\w\-]+\.)+[\w\-]+)', alias)
- m2 = re.match('((\w[\w\-]+\.)+[\w\-]+)', alias)
- if m1:
- url = 'https://' + m1.group(2) + '/bitcoin.id/' + m1.group(1)
- elif m2:
- url = 'https://' + alias + '/bitcoin.id'
- else:
- return ''
- try:
- lines = urllib.urlopen(url).readlines()
- except:
- return ''
-
- # line 0
- line = lines[0].strip().split(':')
- if len(line) == 1:
- auth_name = None
- target = signing_addr = line[0]
- else:
- target, auth_name, signing_addr, signature = line
- msg = "alias:%s:%s:%s"%(alias,target,auth_name)
- print msg, signature
- EC_KEY.verify_message(signing_addr, signature, msg)
-
- # other lines are signed updates
- for line in lines[1:]:
- line = line.strip()
- if not line: continue
- line = line.split(':')
- previous = target
- print repr(line)
- target, signature = line
- EC_KEY.verify_message(previous, signature, "alias:%s:%s"%(alias,target))
-
- if not is_valid(target):
- raise ValueError("Invalid bitcoin address")
-
- return target, signing_addr, auth_name
def update_password(self, seed, old_password, new_password):
if new_password == '': new_password = None
- self.use_encryption = (new_password != None)
+ # this will throw an exception if unicode cannot be converted
self.seed = pw_encode( seed, new_password)
self.config.set_key('seed', self.seed, True)
+ self.use_encryption = (new_password != None)
+ self.config.set_key('use_encryption', self.use_encryption,True)
for k in self.imported_keys.keys():
a = self.imported_keys[k]
b = pw_decode(a, old_password)
c = pw_encode(b, new_password)
self.imported_keys[k] = c
- self.save()
-
- def get_alias(self, alias, interactive = False, show_message=None, question = None):
- try:
- target, signing_address, auth_name = self.read_alias(alias)
- except BaseException, e:
- # raise exception if verify fails (verify the chain)
- if interactive:
- show_message("Alias error: " + str(e))
- return
-
- print target, signing_address, auth_name
-
- if auth_name is None:
- a = self.aliases.get(alias)
- if not a:
- msg = "Warning: the alias '%s' is self-signed.\nThe signing address is %s.\n\nDo you want to add this alias to your list of contacts?"%(alias,signing_address)
- if interactive and question( msg ):
- self.aliases[alias] = (signing_address, target)
- else:
- target = None
- else:
- if signing_address != a[0]:
- msg = "Warning: the key of alias '%s' has changed since your last visit! It is possible that someone is trying to do something nasty!!!\nDo you accept to change your trusted key?"%alias
- if interactive and question( msg ):
- self.aliases[alias] = (signing_address, target)
- else:
- target = None
- else:
- if signing_address not in self.authorities.keys():
- msg = "The alias: '%s' links to %s\n\nWarning: this alias was signed by an unknown key.\nSigning authority: %s\nSigning address: %s\n\nDo you want to add this key to your list of trusted keys?"%(alias,target,auth_name,signing_address)
- if interactive and question( msg ):
- self.authorities[signing_address] = auth_name
- else:
- target = None
-
- if target:
- self.aliases[alias] = (signing_address, target)
-
- return target
-
-
- def parse_url(self, url, show_message, question):
- o = url[8:].split('?')
- address = o[0]
- if len(o)>1:
- params = o[1].split('&')
- else:
- params = []
-
- amount = label = message = signature = identity = ''
- for p in params:
- k,v = p.split('=')
- uv = urldecode(v)
- if k == 'amount': amount = uv
- elif k == 'message': message = uv
- elif k == 'label': label = uv
- elif k == 'signature':
- identity, signature = uv.split(':')
- url = url.replace('&%s=%s'%(k,v),'')
- else:
- print k,v
-
- if label and self.labels.get(address) != label:
- if question('Give label "%s" to address %s ?'%(label,address)):
- if address not in self.addressbook and not self.is_mine(address):
- self.addressbook.append(address)
- self.labels[address] = label
-
- if signature:
- if re.match('^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$', identity):
- signing_address = self.get_alias(identity, True, show_message, question)
- elif is_valid(identity):
- signing_address = identity
- else:
- signing_address = None
- if not signing_address:
- return
- try:
- EC_KEY.verify_message(signing_address, signature, url )
- self.receipt = (signing_address, signature, url)
- except:
- show_message('Warning: the URI contains a bad signature.\nThe identity of the recipient cannot be verified.')
- address = amount = label = identity = message = ''
-
- if re.match('^(|([\w\-\.]+)@)((\w[\w\-]+\.)+[\w\-]+)$', address):
- payto_address = self.get_alias(address, True, show_message, question)
- if payto_address:
- address = address + ' <' + payto_address + '>'
-
- return address, amount, label, message, signature, identity, url
+ self.config.set_key('imported_keys', self.imported_keys, True)
+ for k, v in self.master_private_keys.items():
+ b = pw_decode(v, old_password)
+ c = pw_encode(b, new_password)
+ self.master_private_keys[k] = c
+ self.config.set_key('master_private_keys', self.master_private_keys, True)
def freeze(self,addr):
return False
def prioritize(self,addr):
- if is_mine(addr) and addr not in self.prioritized_addresses:
+ if self.is_mine(addr) and addr not in self.prioritized_addresses:
self.unfreeze(addr)
self.prioritized_addresses.append(addr)
self.config.set_key('prioritized_addresses', self.prioritized_addresses, True)
return False
def unprioritize(self,addr):
- if is_mine(addr) and addr in self.prioritized_addresses:
+ if self.is_mine(addr) and addr in self.prioritized_addresses:
self.prioritized_addresses.remove(addr)
self.config.set_key('prioritized_addresses', self.prioritized_addresses, True)
return True
else:
return False
+ def set_fee(self, fee):
+ if self.fee != fee:
+ self.fee = fee
+ self.config.set_key('fee_per_kb', self.fee, True)
+
+
def save(self):
+ print_error("Warning: wallet.save() is deprecated")
tx = {}
for k,v in self.transactions.items():
tx[k] = str(v)
s = {
- 'use_encryption': self.use_encryption,
'use_change': self.use_change,
- 'fee': self.fee,
- 'accounts': self.accounts,
+ 'fee_per_kb': self.fee,
'addr_history': self.history,
'labels': self.labels,
'contacts': self.addressbook,
- 'imported_keys': self.imported_keys,
- 'aliases': self.aliases,
- 'authorities': self.authorities,
- 'receipts': self.receipts,
'num_zeros': self.num_zeros,
'frozen_addresses': self.frozen_addresses,
'prioritized_addresses': self.prioritized_addresses,
'gap_limit': self.gap_limit,
'transactions': tx,
- 'tx_height': self.tx_height,
- 'requested_amounts': self.requested_amounts,
}
for k, v in s.items():
self.config.set_key(k,v)
def set_verifier(self, verifier):
self.verifier = verifier
- # review stored transactions and send them to the verifier
- # (they are not necessarily in the history, because history items might have have been pruned)
- for tx_hash, tx in self.transactions.items():
- tx_height = self.tx_height[tx_hash]
- if tx_height <1:
- print_error( "skipping", tx_hash, tx_height )
- continue
-
- if tx_height>0:
- self.verifier.add(tx_hash, tx_height)
-
# review transactions that are in the history
for addr, hist in self.history.items():
if hist == ['*']: continue
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
- txh = self.tx_height.get(tx_hash)
- if txh is not None and txh != tx_height:
- print_error( "changing height for tx", tx_hash )
- self.tx_height[tx_hash] = tx_height
+ # if we are on a pruning server, remove unverified transactions
+ vr = self.verifier.transactions.keys() + self.verifier.verified_tx.keys()
+ for tx_hash in self.transactions.keys():
+ if tx_hash not in vr:
+ self.transactions.pop(tx_hash)
+
def check_new_history(self, addr, hist):
if not tx: continue
# already verified?
- if self.tx_height.get(tx_hash):
+ if self.verifier.get_height(tx_hash):
continue
# unconfirmed tx
print_error("new history is orphaning transaction:", tx_hash)
# check that all outputs are not mine, request histories
ext_requests = []
- for o in tx.get('outputs'):
- _addr = o.get('address')
+ for _addr, _v in tx.outputs:
# assert not self.is_mine(_addr)
ext_requests.append( ('blockchain.address.get_history', [_addr]) )
ext_h = self.interface.synchronous_get(ext_requests)
+ print_error("sync:", ext_requests, ext_h)
height = None
for h in ext_h:
if h == ['*']: continue
for item in h:
if item.get('tx_hash') == tx_hash:
height = item.get('height')
- self.tx_height[tx_hash] = height
if height:
print_error("found height for", tx_hash, height)
self.verifier.add(tx_hash, height)
threading.Thread.__init__(self)
self.daemon = True
self.wallet = wallet
+ wallet.synchronizer = self
self.interface = self.wallet.interface
self.interface.register_channel('synchronizer')
self.wallet.interface.register_callback('connected', lambda: self.wallet.set_up_to_date(False))
- self.wallet.interface.register_callback('connected', lambda: self.interface.send([('server.banner',[])],'synchronizer') )
self.was_updated = True
self.running = False
self.lock = threading.Lock()
def is_running(self):
with self.lock: return self.running
- def synchronize_wallet(self):
- new_addresses = self.wallet.synchronize()
- if new_addresses:
- self.subscribe_to_addresses(new_addresses)
- self.wallet.up_to_date = False
- return
-
- if not self.interface.is_up_to_date('synchronizer'):
- if self.wallet.is_up_to_date():
- self.wallet.set_up_to_date(False)
- self.was_updated = True
- return
-
- self.wallet.set_up_to_date(True)
- self.was_updated = True
-
def subscribe_to_addresses(self, addresses):
messages = []
while not self.interface.is_connected:
time.sleep(1)
- # request banner, because 'connected' event happens before this thread is started
- self.interface.send([('server.banner',[])],'synchronizer')
-
# subscriptions
self.subscribe_to_addresses(self.wallet.addresses(True))
while self.is_running():
- # 1. send new requests
- self.synchronize_wallet()
+ # 1. create new addresses
+ new_addresses = self.wallet.synchronize()
+
+ # request missing addresses
+ if new_addresses:
+ self.subscribe_to_addresses(new_addresses)
+ # request missing transactions
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 = []
+ # detect if situation has changed
+ if not self.interface.is_up_to_date('synchronizer'):
+ if self.wallet.is_up_to_date():
+ self.wallet.set_up_to_date(False)
+ self.was_updated = True
+ else:
+ if not self.wallet.is_up_to_date():
+ self.wallet.set_up_to_date(True)
+ self.was_updated = True
+
if self.was_updated:
self.interface.trigger_callback('updated')
self.was_updated = False
self.wallet.receive_tx_callback(tx_hash, tx, tx_height)
self.was_updated = True
requested_tx.remove( (tx_hash, tx_height) )
- print_error("received tx:", tx)
+ print_error("received tx:", tx_hash, len(tx.raw))
elif method == 'blockchain.transaction.broadcast':
self.wallet.tx_result = result
self.wallet.tx_event.set()
- elif method == 'server.banner':
- self.wallet.banner = result
- self.interface.trigger_callback('banner')
else:
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
if self.was_updated and not requested_tx:
self.interface.trigger_callback('updated')
- self.was_updated = False
-
+ self.interface.trigger_callback("new_transaction") # Updated gets called too many times from other places as well; if we use that signal we get the notification three times
+
+ self.was_updated = False
git://git.novaco.in / electrum-nvc.git / blobdiff