IMPORTED_ACCOUNT = '/x'
-
-class WalletStorage:
+class WalletStorage(object):
def __init__(self, config):
- self.lock = threading.Lock()
+ self.lock = threading.RLock()
self.config = config
self.data = {}
self.file_exists = False
if self.path:
self.read(self.path)
-
def init_path(self, config):
"""Set the path of the wallet."""
return new_path
-
def read(self, path):
"""Read the contents of the wallet file."""
try:
self.data = d
self.file_exists = True
-
def get(self, key, default=None):
- v = self.data.get(key)
- if v is None:
- v = default
- return v
+
+ with self.lock:
+ v = self.data.get(key)
+ if v is None:
+ v = default
+ return v
def put(self, key, value, save = True):
os.chmod(self.path,stat.S_IREAD | stat.S_IWRITE)
-class Abstract_Wallet:
+class Abstract_Wallet(object):
"""
Wallet classes are created to handle various address generation methods.
Completion states (watching-only, single account, no seed, etc) are handled inside classes.
"""
-
def __init__(self, storage):
self.storage = storage
self.electrum_version = ELECTRUM_VERSION
self.fee = int(storage.get('fee_per_kb', 10000))
- self.master_public_keys = storage.get('master_public_keys',{})
- self.master_private_keys = storage.get('master_private_keys', {})
-
self.next_addresses = storage.get('next_addresses',{})
-
# This attribute is set when wallet.start_threads is called.
self.synchronizer = None
self.transactions = {}
tx_list = self.storage.get('transactions',{})
- for k,v in tx_list.items():
+ for k, raw in tx_list.items():
try:
- tx = Transaction(v)
+ tx = Transaction.deserialize(raw)
except Exception:
print_msg("Warning: Cannot deserialize transactions. skipping")
continue
- self.add_extra_addresses(tx)
+ self.add_pubkey_addresses(tx)
self.transactions[k] = tx
for h,tx in self.transactions.items():
print_error("removing unreferenced tx", h)
self.transactions.pop(h)
-
# not saved
self.prevout_values = {} # my own transaction outputs
self.spent_outputs = []
for tx_hash, tx in self.transactions.items():
self.update_tx_outputs(tx_hash)
- def add_extra_addresses(self, tx):
- h = tx.hash()
+ def add_pubkey_addresses(self, tx):
# find the address corresponding to pay-to-pubkey inputs
- tx.add_extra_addresses(self.transactions)
- for o in tx.d.get('outputs'):
- if o.get('is_pubkey'):
+ h = tx.hash()
+
+ # inputs
+ tx.add_pubkey_addresses(self.transactions)
+
+ # outputs of tx: inputs of tx2
+ for type, x, v in tx.outputs:
+ if type == 'pubkey':
for tx2 in self.transactions.values():
- tx2.add_extra_addresses({h:tx})
+ tx2.add_pubkey_addresses({h:tx})
def get_action(self):
pass
return s[0] == 1
def get_address_index(self, address):
-
for account in self.accounts.keys():
for for_change in [0,1]:
addresses = self.accounts[account].get_addresses(for_change)
raise Exception("Address not found", address)
- def getpubkeys(self, addr):
- assert is_address(addr) and self.is_mine(addr)
- account, sequence = self.get_address_index(addr)
- a = self.accounts[account]
- return a.get_pubkeys( sequence )
-
def get_private_key(self, address, password):
if self.is_watching_only():
return []
account_id, sequence = self.get_address_index(address)
return self.accounts[account_id].get_pubkeys(sequence)
- def can_sign(self, tx):
-
- if self.is_watching_only():
- return False
-
- if tx.is_complete():
- return False
-
- addr_list, xpub_list = tx.inputs_to_sign()
- for addr in addr_list:
- if self.is_mine(addr):
- return True
-
- mpk = [ self.master_public_keys[k] for k in self.master_private_keys.keys() ]
- for xpub, sequence in xpub_list:
- if xpub in mpk:
- return True
-
- return False
-
def add_keypairs(self, tx, keypairs, password):
# first check the provided password. This will raise if invalid.
self.check_password(password)
break
else:
continue
-
- addr = account.get_address(*sequence)
- pk = self.get_private_key(addr, password)
+ pk = account.get_private_key(sequence, self, password)
for sec in pk:
pubkey = public_key_from_private_key(sec)
keypairs[pubkey] = sec
for tx_hash, tx in self.transactions.items():
is_relevant, is_send, _, _ = self.get_tx_value(tx)
if is_send:
- for addr, v in tx.outputs:
+ for addr in tx.get_output_addresses():
if not self.is_mine(addr) and addr not in self.addressbook:
self.addressbook.append(addr)
# redo 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
+ if address in tx.get_output_addresses(): n += 1
return n
def get_address_flags(self, addr):
def update_tx_outputs(self, tx_hash):
tx = self.transactions.get(tx_hash)
- for i, (addr, value) in enumerate(tx.outputs):
+ for i, (addr, value) in enumerate(tx.get_outputs()):
key = tx_hash+ ':%d'%i
self.prevout_values[key] = value
tx = self.transactions.get(tx_hash)
if not tx: continue
- for i, (addr, value) in enumerate(tx.outputs):
+ for i, (addr, value) in enumerate(tx.get_outputs()):
if addr == address:
key = tx_hash + ':%d'%i
received_coins.append(key)
if key in received_coins:
v -= value
- for i, (addr, value) in enumerate(tx.outputs):
+ for i, (addr, value) in enumerate(tx.get_outputs()):
key = tx_hash + ':%d'%i
if addr == address:
v += value
tx = self.transactions.get(tx_hash)
if tx is None: raise Exception("Wallet not synchronized")
is_coinbase = tx.inputs[0].get('prevout_hash') == '0'*64
- for o in tx.d.get('outputs'):
- output = o.copy()
- if output.get('address') != addr: continue
- key = tx_hash + ":%d" % output.get('prevout_n')
+ for i, (address, value) in enumerate(tx.get_outputs()):
+ output = {'address':address, 'value':value, 'prevout_n':i}
+ if address != addr: continue
+ key = tx_hash + ":%d"%i
if key in self.spent_outputs: continue
output['prevout_hash'] = tx_hash
output['height'] = tx_height
# Insert the change output at a random position in the outputs
posn = random.randint(0, len(outputs))
- outputs[posn:posn] = [( change_addr, change_amount)]
+ outputs[posn:posn] = [( 'address', change_addr, change_amount)]
return outputs
def get_history(self, address):
def receive_tx_callback(self, tx_hash, tx, tx_height):
with self.transaction_lock:
- self.add_extra_addresses(tx)
+ self.add_pubkey_addresses(tx)
if not self.check_new_tx(tx_hash, tx):
# may happen due to pruning
print_error("received transaction that is no longer referenced in history", tx_hash)
if tx:
is_relevant, is_mine, _, _ = self.get_tx_value(tx)
if is_mine:
- for o in tx.outputs:
- o_addr, _ = o
+ for o_addr in tx.get_output_addresses():
if not self.is_mine(o_addr):
try:
default_label = self.labels[o_addr]
else:
default_label = '(internal)'
else:
- for o in tx.outputs:
- o_addr, _ = o
+ for o_addr in tx.get_output_addresses():
if self.is_mine(o_addr) and not self.is_change(o_addr):
break
else:
- for o in tx.outputs:
- o_addr, _ = o
+ for o_addr in tx.get_output_addresses():
if self.is_mine(o_addr):
break
else:
return default_label
def make_unsigned_transaction(self, outputs, fee=None, change_addr=None, domain=None, coins=None ):
- for address, x in outputs:
- if address.startswith('OP_RETURN:'):
+ for type, address, x in outputs:
+ if type == 'op_return':
continue
- assert is_address(address), "Address " + address + " is invalid!"
- amount = sum( map(lambda x:x[1], outputs) )
+ if type == 'address':
+ assert is_address(address), "Address " + address + " is invalid!"
+ amount = sum( map(lambda x:x[2], outputs) )
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:
self.add_input_info(txin)
outputs = self.add_tx_change(inputs, outputs, amount, fee, total, change_addr)
- return Transaction.from_io(inputs, outputs)
+ return Transaction(inputs, outputs)
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)
address = txin['address']
account_id, sequence = self.get_address_index(address)
account = self.accounts[account_id]
- redeemScript = account.redeem_script(sequence)
- txin['x_pubkeys'] = account.get_xpubkeys(sequence)
- txin['pubkeys'] = pubkeys = account.get_pubkeys(sequence)
+ redeemScript = account.redeem_script(*sequence)
+ pubkeys = account.get_pubkeys(*sequence)
+ x_pubkeys = account.get_xpubkeys(*sequence)
+ # sort pubkeys and x_pubkeys, using the order of pubkeys
+ pubkeys, x_pubkeys = zip( *sorted(zip(pubkeys, x_pubkeys)))
+ txin['pubkeys'] = list(pubkeys)
+ txin['x_pubkeys'] = list(x_pubkeys)
txin['signatures'] = [None] * len(pubkeys)
if redeemScript:
print_error("new history is orphaning transaction:", tx_hash)
# check that all outputs are not mine, request histories
ext_requests = []
- for _addr, _v in tx.outputs:
+ for _addr in tx.get_output_addresses():
# assert not self.is_mine(_addr)
ext_requests.append( ('blockchain.address.get_history', [_addr]) )
def is_beyond_limit(self, address, account, is_change):
return False
+
class Deterministic_Wallet(Abstract_Wallet):
def __init__(self, storage):
return False
prev_addresses = prev_addresses[max(0, i - limit):]
for addr in prev_addresses:
- if self.address_is_old(addr):
+ if self.history.get(addr):
return False
return True
def __init__(self, storage):
Deterministic_Wallet.__init__(self, storage)
+ self.master_public_keys = storage.get('master_public_keys', {})
+ self.master_private_keys = storage.get('master_private_keys', {})
def default_account(self):
return self.accounts["m/0'"]
return 'm/' in self.master_private_keys.keys()
def get_master_public_key(self):
- return self.master_public_keys["m/"]
+ """xpub of the main account"""
+ return self.master_public_keys.get("m/0'")
def get_master_public_keys(self):
out = {}
self.add_master_public_key("m/", xpub)
self.add_master_private_key("m/", xpriv, password)
+ def can_sign(self, tx):
+ if self.is_watching_only():
+ return False
+ if tx.is_complete():
+ return False
+ addr_list, xpub_list = tx.inputs_to_sign()
+ for addr in addr_list:
+ if self.is_mine(addr):
+ return True
+ mpk = [ self.master_public_keys[k] for k in self.master_private_keys.keys() ]
+ for xpub, sequence in xpub_list:
+ if xpub in mpk:
+ return True
+ return False
+
def find_root_by_master_key(self, xpub):
for key, xpub2 in self.master_public_keys.items():
if key == "m/":continue
def check_pending_accounts(self):
pass
+ def can_sign(self, tx):
+ if self.is_watching_only():
+ return False
+ if tx.is_complete():
+ return False
+ addr_list, xpub_list = tx.inputs_to_sign()
+ for addr in addr_list:
+ if self.is_mine(addr):
+ return True
+ for xpub, sequence in xpub_list:
+ if xpub == self.master_public_key:
+ return True
+ return False
# former WalletFactory
class Wallet(object):
config = storage.config
self.wallet_types = [
- ('standard', ("Standard wallet"), OldWallet),
- ('imported', ("Imported wallet"), Imported_Wallet),
+ ('standard', ("Standard wallet"), NewWallet if config.get('bip32') else OldWallet),
+ ('imported', ("Imported wallet"), Imported_Wallet),
('2of2', ("Multisig wallet (2 of 2)"), Wallet_2of2),
('2of3', ("Multisig wallet (2 of 3)"), Wallet_2of3)
]
git://git.novaco.in / electrum-nvc.git / blobdiff