else:
- from account import BIP32_Account
- print "scanning", x_pubkeys
-
+ from account import BIP32_Account, OldAccount
for x_pubkey in x_pubkeys:
if not is_extended_pubkey(x_pubkey):
continue
- xpub, sequence = BIP32_Account.parse_xpubkey(x_pubkey)
- print "xpub", xpub
+ if x_pubkey[0:2] == 'ff':
+ xpub, sequence = BIP32_Account.parse_xpubkey(x_pubkey)
+ elif x_pubkey[0:2] == 'fe':
+ xpub, sequence = OldAccount.parse_xpubkey(x_pubkey)
# look for account that can sign
for k, account in self.accounts.items():
break
else:
continue
- print "found xpub", xpub, sequence
addr = account.get_address(*sequence)
- print addr, txin['address']
assert txin['address'] == addr
pk = self.get_private_key(addr, password)
for sec in pk:
account = self.accounts[account_id]
redeemScript = account.redeem_script(sequence)
txin['x_pubkeys'] = account.get_xpubkeys(sequence)
- txin['pubkeys'] = account.get_pubkeys(sequence)
+ txin['pubkeys'] = pubkeys = account.get_pubkeys(sequence)
+ txin['signatures'] = [None] * len(pubkeys)
+
if redeemScript:
txin['redeemScript'] = redeemScript
txin['num_sig'] = 2