COINBASE_MATURITY = 100
DUST_THRESHOLD = 5430
-# AES encryption
-EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s))
-DecodeAES = lambda secret, e: aes.decryptData(secret, base64.b64decode(e))
-
-def pw_encode(s, password):
- if password:
- secret = Hash(password)
- return EncodeAES(secret, s)
- else:
- return s
-
-def pw_decode(s, password):
- if password is not None:
- secret = Hash(password)
- try:
- d = DecodeAES(secret, s)
- except Exception:
- raise Exception('Invalid password')
- return d
- else:
- return s
-
-
+# internal ID for imported account
+IMPORTED_ACCOUNT = '/x'
with self.lock:
if value is not None:
self.data[key] = value
- else:
+ elif key in self.data:
self.data.pop(key)
if save:
self.write()
self.frozen_addresses = storage.get('frozen_addresses',[])
self.addressbook = storage.get('contacts', [])
- self.imported_keys = storage.get('imported_keys',{})
self.history = storage.get('addr_history',{}) # address -> list(txid, height)
self.fee = int(storage.get('fee_per_kb', 10000))
def get_action(self):
pass
-
+
+ def convert_imported_keys(self, password):
+ for k, v in self.imported_keys.items():
+ sec = pw_decode(v, password)
+ pubkey = public_key_from_private_key(sec)
+ address = public_key_to_bc_address(pubkey.decode('hex'))
+ assert address == k
+ self.import_key(sec, password)
+ self.imported_keys.pop(k)
+ self.storage.put('imported_keys', self.imported_keys)
+
+
+ def load_accounts(self):
+ self.accounts = {}
+ self.imported_keys = self.storage.get('imported_keys',{})
+
+ d = self.storage.get('accounts', {})
+ for k, v in d.items():
+ if k == 0:
+ v['mpk'] = self.storage.get('master_public_key')
+ self.accounts[k] = OldAccount(v)
+ elif v.get('imported'):
+ self.accounts[k] = ImportedAccount(v)
+ elif v.get('xpub3'):
+ self.accounts[k] = BIP32_Account_2of3(v)
+ elif v.get('xpub2'):
+ self.accounts[k] = BIP32_Account_2of2(v)
+ elif v.get('xpub'):
+ self.accounts[k] = BIP32_Account(v)
+ elif v.get('pending'):
+ self.accounts[k] = PendingAccount(v)
+ else:
+ print_error("cannot load account", v)
+
+
+ def synchronize(self):
+ pass
+
def can_create_accounts(self):
return False
-
def set_up_to_date(self,b):
with self.lock: self.up_to_date = b
-
def is_up_to_date(self):
with self.lock: return self.up_to_date
while not self.is_up_to_date():
time.sleep(0.1)
+ def is_imported(self, addr):
+ account = self.accounts.get(IMPORTED_ACCOUNT)
+ if account:
+ return addr in account.get_addresses(0)
+ else:
+ return False
+
+ def has_imported_keys(self):
+ account = self.accounts.get(IMPORTED_ACCOUNT)
+ return account is not None
def import_key(self, sec, password):
- # check password
- seed = self.get_seed(password)
try:
- address = address_from_private_key(sec)
+ pubkey = public_key_from_private_key(sec)
+ address = public_key_to_bc_address(pubkey.decode('hex'))
except Exception:
raise Exception('Invalid private key')
if self.is_mine(address):
raise Exception('Address already in wallet')
- # store the originally requested keypair into the imported keys table
- self.imported_keys[address] = pw_encode(sec, password )
- self.storage.put('imported_keys', self.imported_keys, True)
+ if self.accounts.get(IMPORTED_ACCOUNT) is None:
+ self.accounts[IMPORTED_ACCOUNT] = ImportedAccount({'imported':{}})
+ self.accounts[IMPORTED_ACCOUNT].add(address, pubkey, sec, password)
+ self.save_accounts()
+
if self.synchronizer:
self.synchronizer.subscribe_to_addresses([address])
return address
def delete_imported_key(self, addr):
- if addr in self.imported_keys:
- self.imported_keys.pop(addr)
- self.storage.put('imported_keys', self.imported_keys, True)
-
-
- def add_seed(self, seed, password):
- if self.seed:
- raise Exception("a seed exists")
-
- self.seed_version, self.seed = self.prepare_seed(seed)
- if password:
- self.seed = pw_encode( self.seed, password)
- self.use_encryption = True
- else:
- self.use_encryption = False
-
- self.storage.put('seed', self.seed, True)
- self.storage.put('seed_version', self.seed_version, True)
- self.storage.put('use_encryption', self.use_encryption,True)
- self.create_master_keys(password)
-
-
- def create_watching_only_wallet(self, xpub):
- self.storage.put('seed_version', self.seed_version, True)
- self.add_master_public_key("m/", xpub)
- account = BIP32_Account({'xpub':xpub})
- self.add_account("m/", account)
-
-
-
-
- def create_accounts(self, password):
- seed = pw_decode(self.seed, password)
- self.create_account('Main account', password)
-
-
- def add_master_public_key(self, name, mpk):
- self.master_public_keys[name] = mpk
- self.storage.put('master_public_keys', self.master_public_keys, True)
-
-
- def add_master_private_key(self, name, xpriv, password):
- self.master_private_keys[name] = pw_encode(xpriv, password)
- self.storage.put('master_private_keys', self.master_private_keys, True)
-
-
- def add_master_keys(self, root, account_id, password):
- x = self.master_private_keys.get(root)
- if x:
- master_xpriv = pw_decode(x, password )
- xpriv, xpub = bip32_private_derivation(master_xpriv, root, account_id)
- self.add_master_public_key(account_id, xpub)
- self.add_master_private_key(account_id, xpriv, password)
- else:
- master_xpub = self.master_public_keys[root]
- xpub = bip32_public_derivation(master_xpub, root, account_id)
- self.add_master_public_key(account_id, xpub)
- return xpub
-
-
- def create_master_keys(self, password):
- xpriv, xpub = bip32_root(self.get_seed(password))
- self.add_master_public_key("m/", xpub)
- self.add_master_private_key("m/", xpriv, password)
-
-
- def find_root_by_master_key(self, xpub):
- for key, xpub2 in self.master_public_keys.items():
- if key == "m/":continue
- if xpub == xpub2:
- return key
-
- def is_watching_only(self):
- return (self.seed == '') and (self.master_private_keys == {})
-
-
- def num_accounts(self):
- keys = self.accounts.keys()
- i = 0
- while True:
- account_id = self.account_id(i)
- if account_id not in keys: break
- i += 1
- return i
-
-
- def next_account_address(self, password):
- i = self.num_accounts()
- account_id = self.account_id(i)
-
- addr = self.next_addresses.get(account_id)
- if not addr:
- account = self.make_account(account_id, password)
- addr = account.first_address()
- self.next_addresses[account_id] = addr
- self.storage.put('next_addresses', self.next_addresses)
-
- return account_id, addr
-
- def account_id(self, i):
- return "m/%d'"%i
-
- def make_account(self, account_id, password):
- """Creates and saves the master keys, but does not save the account"""
- xpub = self.add_master_keys("m/", account_id, password)
- account = BIP32_Account({'xpub':xpub})
- return account
+ account = self.accounts[IMPORTED_ACCOUNT]
+ account.remove(addr)
+ if not account.get_addresses(0):
+ self.accounts.pop(IMPORTED_ACCOUNT)
+ self.save_accounts()
def set_label(self, name, text = None):
return changed
- def create_account(self, name, password):
- i = self.num_accounts()
- account_id = self.account_id(i)
- account = self.make_account(account_id, password)
- self.add_account(account_id, account)
- if name:
- self.set_label(account_id, name)
-
- # add address of the next account
- _, _ = self.next_account_address(password)
-
-
- def add_account(self, account_id, account):
- self.accounts[account_id] = account
- if account_id in self.pending_accounts:
- self.pending_accounts.pop(account_id)
- self.storage.put('pending_accounts', self.pending_accounts)
- self.save_accounts()
-
-
- def save_accounts(self):
- d = {}
- for k, v in self.accounts.items():
- d[k] = v.dump()
- self.storage.put('accounts', d, True)
-
-
-
- def load_accounts(self):
- d = self.storage.get('accounts', {})
- self.accounts = {}
- for k, v in d.items():
- if k == 0:
- v['mpk'] = self.storage.get('master_public_key')
- self.accounts[k] = OldAccount(v)
- elif v.get('xpub3'):
- self.accounts[k] = BIP32_Account_2of3(v)
- elif v.get('xpub2'):
- self.accounts[k] = BIP32_Account_2of2(v)
- elif v.get('xpub'):
- self.accounts[k] = BIP32_Account(v)
- else:
- raise
-
- self.pending_accounts = self.storage.get('pending_accounts',{})
-
-
- def delete_pending_account(self, k):
- self.pending_accounts.pop(k)
- self.storage.put('pending_accounts', self.pending_accounts)
-
- def account_is_pending(self, k):
- return k in self.pending_accounts
-
- def create_pending_account(self, name, password):
- account_id, addr = self.next_account_address(password)
- self.set_label(account_id, name)
- self.pending_accounts[account_id] = addr
- self.storage.put('pending_accounts', self.pending_accounts)
-
- def get_pending_accounts(self):
- return self.pending_accounts.items()
def addresses(self, include_change = True, _next=True):
- o = self.get_account_addresses(-1, include_change)
+ o = []
for a in self.accounts.keys():
o += self.get_account_addresses(a, include_change)
def is_mine(self, address):
- return address in self.addresses(True)
+ return address in self.addresses(True)
def is_change(self, address):
if not self.is_mine(address): return False
- if address in self.imported_keys.keys(): return False
acct, s = self.get_address_index(address)
if s is None: return False
return s[0] == 1
- def get_master_public_key(self):
- return self.master_public_keys["m/"]
-
- def get_master_public_keys(self):
- out = {}
- for k, account in self.accounts.items():
- name = self.get_account_name(k)
- mpk_text = '\n\n'.join( account.get_master_pubkeys() )
- out[name] = mpk_text
- return out
-
- def get_master_private_key(self, account, password):
- k = self.master_private_keys.get(account)
- if not k: return
- xpriv = pw_decode( k, password)
- return xpriv
-
def get_address_index(self, address):
- if address in self.imported_keys.keys():
- return -1, None
for account in self.accounts.keys():
for for_change in [0,1]:
def getpubkeys(self, addr):
assert is_valid(addr) and self.is_mine(addr)
account, sequence = self.get_address_index(addr)
- if account != -1:
- a = self.accounts[account]
- return a.get_pubkeys( sequence )
-
-
- def get_roots(self, account):
- roots = []
- for a in account.split('&'):
- s = a.strip()
- m = re.match("m/(\d+')", s)
- roots.append( m.group(1) )
- return roots
-
-
- def is_seeded(self, account):
- return True
-
-
- for root in self.get_roots(account):
- if root not in self.master_private_keys.keys():
- return False
- return True
-
- def rebase_sequence(self, account, sequence):
- # account has one or more xpub
- # sequence is a sequence of public derivations
- c, i = sequence
- dd = []
- for a in account.split('&'):
- s = a.strip()
- m = re.match("m/(\d+)'", s)
- root = "m/"
- num = int(m.group(1))
- dd.append( (root, [num,c,i] ) )
- return dd
-
+ a = self.accounts[account]
+ return a.get_pubkeys( sequence )
-
-
- def get_seed(self, password):
- s = pw_decode(self.seed, password)
- seed = mnemonic_to_seed(s,'').encode('hex')
- return seed
-
-
- def get_mnemonic(self, password):
- return pw_decode(self.seed, password)
-
-
def get_private_key(self, address, password):
if self.is_watching_only():
return []
-
- # first check the provided password
- seed = self.get_seed(password)
-
- out = []
- if address in self.imported_keys.keys():
- out.append( pw_decode( self.imported_keys[address], password ) )
- else:
- account_id, sequence = self.get_address_index(address)
- account = self.accounts[account_id]
- xpubs = account.get_master_pubkeys()
- roots = [k for k, v in self.master_public_keys.iteritems() if v in xpubs]
- for root in roots:
- xpriv = self.get_master_private_key(root, password)
- if not xpriv:
- continue
- _, _, _, c, k = deserialize_xkey(xpriv)
- pk = bip32_private_key( sequence, k, c )
- out.append(pk)
-
- return out
+ account_id, sequence = self.get_address_index(address)
+ return self.accounts[account_id].get_private_key(sequence, self, password)
def get_public_keys(self, address):
for sec in private_keys:
pubkey = public_key_from_private_key(sec)
keypairs[ pubkey ] = sec
- if address in self.imported_keys.keys():
- txin['redeemPubkey'] = pubkey
+
def add_keypairs_from_KeyID(self, tx, keypairs, password):
secret = keys[0]
ec = regenerate_key(secret)
decrypted = ec.decrypt_message(message)
- return decrypted[0]
-
-
- def change_gap_limit(self, value):
- if value >= self.gap_limit:
- self.gap_limit = value
- self.storage.put('gap_limit', self.gap_limit, True)
- #self.interface.poke('synchronizer')
- return True
+ return decrypted
- elif value >= self.min_acceptable_gap():
- for key, account in self.accounts.items():
- addresses = account[0]
- k = self.num_unused_trailing_addresses(addresses)
- n = len(addresses) - k + value
- addresses = addresses[0:n]
- self.accounts[key][0] = addresses
-
- self.gap_limit = value
- self.storage.put('gap_limit', self.gap_limit, True)
- self.save_accounts()
- return True
- else:
- return False
-
- def num_unused_trailing_addresses(self, addresses):
- k = 0
- for a in addresses[::-1]:
- if self.history.get(a):break
- k = k + 1
- return k
-
- def min_acceptable_gap(self):
- # fixme: this assumes wallet is synchronized
- n = 0
- nmax = 0
-
- for account in self.accounts.values():
- addresses = account.get_addresses(0)
- k = self.num_unused_trailing_addresses(addresses)
- for a in addresses[0:-k]:
- if self.history.get(a):
- n = 0
- else:
- n += 1
- if n > nmax: nmax = n
- return nmax + 1
-
-
- def address_is_old(self, address):
- age = -1
- h = self.history.get(address, [])
- if h == ['*']:
- return True
- for tx_hash, tx_height in h:
- if tx_height == 0:
- tx_age = 0
- else:
- tx_age = self.network.get_local_height() - tx_height + 1
- if tx_age > age:
- age = tx_age
- return age > 2
-
-
- def synchronize_sequence(self, account, for_change):
- limit = self.gap_limit_for_change if for_change else self.gap_limit
- new_addresses = []
- while True:
- addresses = account.get_addresses(for_change)
- if len(addresses) < limit:
- 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:
- address = account.create_new_address(for_change)
- self.history[address] = []
- new_addresses.append( address )
-
- return new_addresses
-
-
- def check_pending_accounts(self):
- for account_id, addr in self.next_addresses.items():
- if self.address_is_old(addr):
- print_error( "creating account", account_id )
- xpub = self.master_public_keys[account_id]
- account = BIP32_Account({'xpub':xpub})
- self.add_account(account_id, account)
- self.next_addresses.pop(account_id)
-
-
- def synchronize_account(self, account):
- new = []
- new += self.synchronize_sequence(account, 0)
- new += self.synchronize_sequence(account, 1)
- return new
-
-
- def synchronize(self):
- self.check_pending_accounts()
- new = []
- for account in self.accounts.values():
- new += self.synchronize_account(account)
- if new:
- self.save_accounts()
- self.storage.put('addr_history', self.history, True)
- return new
def is_found(self):
def get_addr_balance(self, address):
- assert self.is_mine(address)
+ #assert self.is_mine(address)
h = self.history.get(address,[])
if h == ['*']: return 0,0
c = u = 0
def get_account_name(self, k):
- default = "Unnamed account"
- m = re.match("m/0'/(\d+)", k)
- if m:
- num = m.group(1)
- if num == '0':
- default = "Main account"
- else:
- default = "Account %s"%num
-
- m = re.match("m/1'/(\d+) & m/2'/(\d+)", k)
- if m:
- num = m.group(1)
- default = "2of2 account %s"%num
- name = self.labels.get(k, default)
- return name
+ return self.labels.get(k, self.accounts[k].get_name(k))
def get_account_names(self):
- accounts = {}
- for k, account in self.accounts.items():
- accounts[k] = self.get_account_name(k)
- if self.imported_keys:
- accounts[-1] = 'Imported keys'
- return accounts
+ account_names = {}
+ for k in self.accounts.keys():
+ account_names[k] = self.get_account_name(k)
+ return account_names
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:
+ elif a in self.accounts:
ac = self.accounts[a]
o = ac.get_addresses(0)
if include_change: o += ac.get_addresses(1)
return o
- def get_imported_balance(self):
- return self.get_balance(self.imported_keys.keys())
def get_account_balance(self, account):
return self.get_balance(self.get_account_addresses(account))
return [x[1] for x in coins]
- def choose_tx_inputs( self, amount, fixed_fee, num_outputs, domain = None ):
+ def choose_tx_inputs( self, amount, fixed_fee, num_outputs, domain = None, coins = None ):
""" todo: minimize tx size """
total = 0
fee = self.fee if fixed_fee is None else fixed_fee
- if domain is None:
- domain = self.addresses(True)
- for i in self.frozen_addresses:
- if i in domain: domain.remove(i)
+ if not coins:
+ if domain is None:
+ domain = self.addresses(True)
+ for i in self.frozen_addresses:
+ if i in domain: domain.remove(i)
+ coins = self.get_unspent_coins(domain)
- coins = self.get_unspent_coins(domain)
inputs = []
for item in coins:
address = inputs[0].get('address')
account, _ = self.get_address_index(address)
- if not self.use_change or account == -1:
+ if not self.use_change or account == IMPORTED_ACCOUNT:
change_addr = inputs[-1]['address']
else:
change_addr = self.accounts[account].get_addresses(1)[-self.gap_limit_for_change]
return default_label
- def make_unsigned_transaction(self, outputs, fee=None, change_addr=None, domain=None ):
+ def make_unsigned_transaction(self, outputs, fee=None, change_addr=None, domain=None, coins=None ):
for address, x in outputs:
assert is_valid(address), "Address " + address + " is invalid!"
amount = sum( map(lambda x:x[1], outputs) )
- inputs, total, fee = self.choose_tx_inputs( amount, fee, len(outputs), domain )
+ inputs, total, fee = self.choose_tx_inputs( amount, fee, len(outputs), domain, coins )
if not inputs:
raise ValueError("Not enough funds")
for txin in inputs:
return Transaction.from_io(inputs, outputs)
- def mktx(self, outputs, password, fee=None, change_addr=None, domain= None ):
- tx = self.make_unsigned_transaction(outputs, fee, change_addr, domain)
+ def mktx(self, outputs, password, fee=None, change_addr=None, domain= None, coins = None ):
+ tx = self.make_unsigned_transaction(outputs, fee, change_addr, domain, coins)
keypairs = {}
self.add_keypairs_from_wallet(tx, keypairs, password)
if keypairs:
def add_input_info(self, txin):
address = txin['address']
- if address in self.imported_keys.keys():
- return
account_id, sequence = self.get_address_index(address)
account = self.accounts[account_id]
txin['KeyID'] = account.get_keyID(sequence)
return True, out
-
def update_password(self, old_password, new_password):
- if new_password == '': new_password = None
- decoded = self.get_seed(old_password)
- self.seed = pw_encode( decoded, new_password)
- self.storage.put('seed', self.seed, True)
- self.use_encryption = (new_password != None)
- self.storage.put('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.storage.put('imported_keys', self.imported_keys, True)
+ if new_password == '':
+ new_password = None
+
+ if self.has_seed():
+ decoded = self.get_seed(old_password)
+ self.seed = pw_encode( decoded, new_password)
+ self.storage.put('seed', self.seed, True)
+
+ imported_account = self.accounts.get(IMPORTED_ACCOUNT)
+ if imported_account:
+ imported_account.update_password(old_password, new_password)
+ self.save_accounts()
for k, v in self.master_private_keys.items():
b = pw_decode(v, old_password)
self.master_private_keys[k] = c
self.storage.put('master_private_keys', self.master_private_keys, True)
+ self.use_encryption = (new_password != None)
+ self.storage.put('use_encryption', self.use_encryption,True)
+
def freeze(self,addr):
if self.is_mine(addr) and addr not in self.frozen_addresses:
else:
return False
+
def unfreeze(self,addr):
if self.is_mine(addr) and addr in self.frozen_addresses:
self.frozen_addresses.remove(addr)
# add it in case it was previously unconfirmed
self.verifier.add(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():
self.transactions.pop(tx_hash)
-
def check_new_history(self, addr, hist):
# check that all tx in hist are relevant
return True
-
def check_new_tx(self, tx_hash, tx):
# 1 check that tx is referenced in addr_history.
addresses = []
self.verifier.stop()
self.synchronizer.stop()
+ def restore(self, cb):
+ pass
+
+ def get_accounts(self):
+ return self.accounts
+
+ def save_accounts(self):
+ d = {}
+ for k, v in self.accounts.items():
+ d[k] = v.dump()
+ self.storage.put('accounts', d, True)
+
+ def can_import(self):
+ return not self.is_watching_only()
+
+ def is_used(self, address):
+ h = self.history.get(address,[])
+ c, u = self.get_addr_balance(address)
+ return len(h), len(h) > 0 and c == -u
+
+
+class Imported_Wallet(Abstract_Wallet):
+
+ def __init__(self, storage):
+ Abstract_Wallet.__init__(self, storage)
+ a = self.accounts.get(IMPORTED_ACCOUNT)
+ if not a:
+ self.accounts[IMPORTED_ACCOUNT] = ImportedAccount({'imported':{}})
+ self.storage.put('wallet_type', 'imported', True)
+
+
+ def is_watching_only(self):
+ acc = self.accounts[IMPORTED_ACCOUNT]
+ n = acc.keypairs.values()
+ return n == [(None, None)] * len(n)
+
+ def has_seed(self):
+ return False
+
+ def is_deterministic(self):
+ return False
+
+ def check_password(self, password):
+ self.accounts[IMPORTED_ACCOUNT].get_private_key((0,0), self, password)
+
+ def is_used(self, address):
+ h = self.history.get(address,[])
+ return len(h), False
+
+
+class Deterministic_Wallet(Abstract_Wallet):
+
+ def __init__(self, storage):
+ Abstract_Wallet.__init__(self, storage)
+
+ def has_seed(self):
+ return self.seed != ''
+
+ def is_deterministic(self):
+ return True
+
+ def is_watching_only(self):
+ return not self.has_seed()
+
+ def add_seed(self, seed, password):
+ if self.seed:
+ raise Exception("a seed exists")
+
+ self.seed_version, self.seed = self.prepare_seed(seed)
+ if password:
+ self.seed = pw_encode( self.seed, password)
+ self.use_encryption = True
+ else:
+ self.use_encryption = False
+
+ self.storage.put('seed', self.seed, True)
+ self.storage.put('seed_version', self.seed_version, True)
+ self.storage.put('use_encryption', self.use_encryption,True)
+ self.create_master_keys(password)
+
+ def get_seed(self, password):
+ return pw_decode(self.seed, password)
+
+ def get_mnemonic(self, password):
+ return self.get_seed(password)
+
+ def change_gap_limit(self, value):
+ if value >= self.gap_limit:
+ self.gap_limit = value
+ self.storage.put('gap_limit', self.gap_limit, True)
+ #self.interface.poke('synchronizer')
+ return True
+
+ elif value >= self.min_acceptable_gap():
+ for key, account in self.accounts.items():
+ addresses = account[0]
+ k = self.num_unused_trailing_addresses(addresses)
+ n = len(addresses) - k + value
+ addresses = addresses[0:n]
+ self.accounts[key][0] = addresses
+
+ self.gap_limit = value
+ self.storage.put('gap_limit', self.gap_limit, True)
+ self.save_accounts()
+ return True
+ else:
+ return False
+
+ def num_unused_trailing_addresses(self, addresses):
+ k = 0
+ for a in addresses[::-1]:
+ if self.history.get(a):break
+ k = k + 1
+ return k
+
+ def min_acceptable_gap(self):
+ # fixme: this assumes wallet is synchronized
+ n = 0
+ nmax = 0
+
+ for account in self.accounts.values():
+ addresses = account.get_addresses(0)
+ k = self.num_unused_trailing_addresses(addresses)
+ for a in addresses[0:-k]:
+ if self.history.get(a):
+ n = 0
+ else:
+ n += 1
+ if n > nmax: nmax = n
+ return nmax + 1
+
+
+ def address_is_old(self, address):
+ age = -1
+ h = self.history.get(address, [])
+ if h == ['*']:
+ return True
+ for tx_hash, tx_height in h:
+ if tx_height == 0:
+ tx_age = 0
+ else:
+ tx_age = self.network.get_local_height() - tx_height + 1
+ if tx_age > age:
+ age = tx_age
+ return age > 2
+
+
+ def synchronize_sequence(self, account, for_change):
+ limit = self.gap_limit_for_change if for_change else self.gap_limit
+ new_addresses = []
+ while True:
+ addresses = account.get_addresses(for_change)
+ if len(addresses) < limit:
+ 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:
+ address = account.create_new_address(for_change)
+ self.history[address] = []
+ new_addresses.append( address )
+
+ return new_addresses
+
+
+ def check_pending_accounts(self):
+ for account_id, addr in self.next_addresses.items():
+ if self.address_is_old(addr):
+ print_error( "creating account", account_id )
+ xpub = self.master_public_keys[account_id]
+ account = BIP32_Account({'xpub':xpub})
+ self.add_account(account_id, account)
+ self.next_addresses.pop(account_id)
+
+
+ def synchronize_account(self, account):
+ new = []
+ new += self.synchronize_sequence(account, 0)
+ new += self.synchronize_sequence(account, 1)
+ return new
+
+
+ def synchronize(self):
+ self.check_pending_accounts()
+ new = []
+ for account in self.accounts.values():
+ if type(account) in [ImportedAccount, PendingAccount]:
+ continue
+ new += self.synchronize_account(account)
+ if new:
+ self.save_accounts()
+ self.storage.put('addr_history', self.history, True)
+ return new
+
def restore(self, callback):
from i18n import _
self.fill_addressbook()
+ def create_account(self, name, password):
+ i = self.num_accounts()
+ account_id = self.account_id(i)
+ account = self.make_account(account_id, password)
+ self.add_account(account_id, account)
+ if name:
+ self.set_label(account_id, name)
-class Imported_Wallet(Abstract_Wallet):
+ # add address of the next account
+ _, _ = self.next_account_address(password)
- def __init__(self, storage):
- Abstract_Wallet.__init__(self, storage)
- def is_watching_only(self):
- n = self.imported_keys.values()
- return n == [''] * len(n)
+ def add_account(self, account_id, account):
+ self.accounts[account_id] = account
+ self.save_accounts()
+
+
+
+ def account_is_pending(self, k):
+ return type(self.accounts.get(k)) == PendingAccount
+
+ def delete_pending_account(self, k):
+ assert self.account_is_pending(k)
+ self.accounts.pop(k)
+ self.save_accounts()
+
+ def create_pending_account(self, name, password):
+ account_id, addr = self.next_account_address(password)
+ self.set_label(account_id, name)
+ self.accounts[account_id] = PendingAccount({'pending':addr})
+ self.save_accounts()
-class NewWallet(Abstract_Wallet):
- """class for BIP32 wallet"""
+
+class NewWallet(Deterministic_Wallet):
def __init__(self, storage):
- Abstract_Wallet.__init__(self, storage)
+ Deterministic_Wallet.__init__(self, storage)
def can_create_accounts(self):
return not self.is_watching_only()
+ def get_master_public_key(self):
+ return self.master_public_keys["m/"]
+
+ def get_master_public_keys(self):
+ out = {}
+ for k, account in self.accounts.items():
+ name = self.get_account_name(k)
+ mpk_text = '\n\n'.join( account.get_master_pubkeys() )
+ out[name] = mpk_text
+ return out
+
+ def get_master_private_key(self, account, password):
+ k = self.master_private_keys.get(account)
+ if not k: return
+ xpriv = pw_decode( k, password)
+ return xpriv
+
+ def check_password(self, password):
+ xpriv = self.get_master_private_key( "m/", password )
+ xpub = self.master_public_keys["m/"]
+ assert deserialize_xkey(xpriv)[3] == deserialize_xkey(xpub)[3]
+
+ def create_watching_only_wallet(self, xpub):
+ self.storage.put('seed_version', self.seed_version, True)
+ self.add_master_public_key("m/", xpub)
+ account = BIP32_Account({'xpub':xpub})
+ self.add_account("m/", account)
+
+
+ def create_accounts(self, password):
+ seed = pw_decode(self.seed, password)
+ self.create_account('Main account', password)
+
+
+ def add_master_public_key(self, name, mpk):
+ self.master_public_keys[name] = mpk
+ self.storage.put('master_public_keys', self.master_public_keys, True)
+
+
+ def add_master_private_key(self, name, xpriv, password):
+ self.master_private_keys[name] = pw_encode(xpriv, password)
+ self.storage.put('master_private_keys', self.master_private_keys, True)
+
+
+ def add_master_keys(self, root, account_id, password):
+ x = self.master_private_keys.get(root)
+ if x:
+ master_xpriv = pw_decode(x, password )
+ xpriv, xpub = bip32_private_derivation(master_xpriv, root, account_id)
+ self.add_master_public_key(account_id, xpub)
+ self.add_master_private_key(account_id, xpriv, password)
+ else:
+ master_xpub = self.master_public_keys[root]
+ xpub = bip32_public_derivation(master_xpub, root, account_id)
+ self.add_master_public_key(account_id, xpub)
+ return xpub
+
+
+ def create_master_keys(self, password):
+ xpriv, xpub = bip32_root(mnemonic_to_seed(self.get_seed(password),'').encode('hex'))
+ self.add_master_public_key("m/", xpub)
+ self.add_master_private_key("m/", xpriv, password)
+
+
+ def find_root_by_master_key(self, xpub):
+ for key, xpub2 in self.master_public_keys.items():
+ if key == "m/":continue
+ if xpub == xpub2:
+ return key
+
+
+ def num_accounts(self):
+ keys = []
+ for k, v in self.accounts.items():
+ if type(v) != BIP32_Account:
+ continue
+ keys.append(k)
+
+ i = 0
+ while True:
+ account_id = self.account_id(i)
+ if account_id not in keys: break
+ i += 1
+ return i
+
+
+ def next_account_address(self, password):
+ i = self.num_accounts()
+ account_id = self.account_id(i)
+
+ addr = self.next_addresses.get(account_id)
+ if not addr:
+ account = self.make_account(account_id, password)
+ addr = account.first_address()
+ self.next_addresses[account_id] = addr
+ self.storage.put('next_addresses', self.next_addresses)
+
+ return account_id, addr
+
+ def account_id(self, i):
+ return "m/%d'"%i
+
+ def make_account(self, account_id, password):
+ """Creates and saves the master keys, but does not save the account"""
+ xpub = self.add_master_keys("m/", account_id, password)
+ account = BIP32_Account({'xpub':xpub})
+ return account
+
+
def make_seed(self):
import mnemonic, ecdsa
entropy = ecdsa.util.randrange( pow(2,160) )
NewWallet.__init__(self, storage)
self.storage.put('wallet_type', '2of2', True)
+ def can_create_accounts(self):
+ return False
+
+ def can_import(self):
+ return False
+
def create_account(self):
xpub1 = self.master_public_keys.get("m/")
xpub2 = self.master_public_keys.get("cold/")
xpub1 = self.master_public_keys.get("m/")
xpub2 = self.master_public_keys.get("cold/")
xpub3 = self.master_public_keys.get("remote/")
- if xpub2 is None:
- return 'create_2of3_1'
+ # fixme: we use order of creation
+ if xpub2 and xpub1 is None:
+ return 'create_2fa_2'
if xpub1 is None:
+ return 'create_2of3_1'
+ if xpub2 is None or xpub3 is None:
return 'create_2of3_2'
- if xpub3 is None:
- return 'create_2of3_3'
-class OldWallet(Abstract_Wallet):
+class OldWallet(Deterministic_Wallet):
def make_seed(self):
import mnemonic
def create_master_keys(self, password):
- seed = pw_decode(self.seed, password)
+ seed = self.get_seed(password)
mpk = OldAccount.mpk_from_seed(seed)
self.storage.put('master_public_key', mpk, True)
self.create_account(mpk)
def get_seed(self, password):
- seed = pw_decode(self.seed, password)
- self.accounts[0].check_seed(seed)
+ seed = pw_decode(self.seed, password).encode('utf8')
return seed
+ def check_password(self, password):
+ seed = self.get_seed(password)
+ self.accounts[0].check_seed(seed)
+
def get_mnemonic(self, password):
import mnemonic
- s = pw_decode(self.seed, password)
+ s = self.get_seed(password)
return ' '.join(mnemonic.mn_encode(s))
def add_keypairs_from_KeyID(self, tx, keypairs, password):
# first check the provided password
- seed = self.get_seed(password)
for txin in tx.inputs:
keyid = txin.get('KeyID')
if keyid:
account = self.accounts[0]
addr = account.get_address(for_change, num)
txin['address'] = addr # fixme: side effect
- pk = account.get_private_key(seed, (for_change, num))
- pubkey = public_key_from_private_key(pk)
- keypairs[pubkey] = pk
-
+ pk = account.get_private_key((for_change, num), self, password)
+ for sec in pk:
+ pubkey = public_key_from_private_key(sec)
+ keypairs[pubkey] = sec
- def get_account_name(self, k):
- assert k == 0
- return 'Main account'
- def is_seeded(self, account):
- return self.seed is not None
-
- def get_private_key(self, address, password):
- if self.is_watching_only():
- return []
-
- # first check the provided password
- seed = self.get_seed(password)
-
- out = []
- if address in self.imported_keys.keys():
- out.append( pw_decode( self.imported_keys[address], password ) )
- else:
- account_id, sequence = self.get_address_index(address)
- pk = self.accounts[0].get_private_key(seed, sequence)
- out.append(pk)
- return out
def check_pending_accounts(self):
pass
if storage.get('wallet_type') == '2of3':
return Wallet_2of3(storage)
- if storage.file_exists and not storage.get('seed'):
- # wallet made of imported keys
+ if storage.get('wallet_type') == 'imported':
return Imported_Wallet(storage)
@classmethod
def is_address(self, text):
+ if not text:
+ return False
for x in text.split():
if not bitcoin.is_address(x):
return False
@classmethod
def is_private_key(self, text):
+ if not text:
+ return False
for x in text.split():
if not bitcoin.is_private_key(x):
return False
def from_address(self, text, storage):
w = Imported_Wallet(storage)
for x in text.split():
- w.imported_keys[x] = ''
- w.storage.put('imported_keys', w.imported_keys, True)
+ w.accounts[IMPORTED_ACCOUNT].add(x, None, None, None)
+ w.save_accounts()
return w
@classmethod
git://git.novaco.in / electrum-nvc.git / blobdiff