AaronFiore/electrum
1
0
Fork 0
Code Activity

allow several hardware cosigners in the same wallet

Browse Source
This commit is contained in:
ThomasV
2016-08-22 12:50:24 +02:00
parent d16fb3ee48
commit 80675121ce
4 changed files with 77 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/wallet.py
View File

@@ -990,9 +990,9 @@ class Abstract_Wallet(PrintError):
return False
if tx.is_complete():
return False
# add input info. (should be done already)
for txin in tx.inputs():
self.add_input_info(txin)
## add input info. (should be done already)
#for txin in tx.inputs():
# self.add_input_info(txin)
can_sign = any([txin['can_sign'] for txin in tx.inputs()])
return can_sign
@@ -1027,7 +1027,10 @@ class Abstract_Wallet(PrintError):
# sign
for keystore in self.get_keystores():
if not keystore.is_watching_only():
keystore.sign_transaction(tx, password)
try:
keystore.sign_transaction(tx, password)
except:
print "keystore cannot sign", keystore
def get_unused_addresses(self):
# fixme: use slots from expired requests
@@ -1519,7 +1522,7 @@ class Multisig_Wallet(Deterministic_Wallet):
def add_input_sig_info(self, txin, address):
txin['derivation'] = derivation = self.get_address_index(address)
pubkeys = self.get_pubkeys(*derivation)
x_pubkeys = self.get_xpubkeys(*derivation)
x_pubkeys = [k.get_xpubkey(*derivation) for k in self.get_keystores()]
# sort pubkeys and x_pubkeys, using the order of pubkeys
pubkeys, x_pubkeys = zip( *sorted(zip(pubkeys, x_pubkeys)))
txin['pubkeys'] = list(pubkeys)
@@ -1527,7 +1530,7 @@ class Multisig_Wallet(Deterministic_Wallet):
txin['signatures'] = [None] * len(pubkeys)
txin['redeemScript'] = self.redeem_script(*derivation)
txin['num_sig'] = self.m
txin['can_sign'] = any([x is None for x in txin['signatures']])