AaronFiore/electrum
1
0
Fork 0
Code Activity

move get_keyID to accounts

Browse Source
This commit is contained in:
ThomasV
2014-04-01 23:53:07 +02:00
parent 5c31263848
commit df540cb241
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/account.py
View File

@@ -122,6 +122,10 @@ class OldAccount(Account):
def get_type(self):
return _('Old Electrum format')
def get_keyID(self, sequence):
a, b = sequence
return 'old(%s,%d,%d)'%(self.mpk,a,b)
class BIP32_Account(Account):
@@ -160,7 +164,10 @@ class BIP32_Account(Account):
def get_type(self):
return _('Standard 1 of 1')
#acctype = 'multisig 2 of 2' if len(roots) == 2 else 'multisig 2 of 3' if len(roots) == 3 else 'standard 1 of 1'
def get_keyID(self, sequence):
s = '/' + '/'.join( map(lambda x:str(x), sequence) )
return '&'.join( map(lambda x: 'bip32(%s,%s)'%(x, s), self.get_master_pubkeys() ) )
class BIP32_Account_2of2(BIP32_Account):
@@ -182,7 +189,7 @@ class BIP32_Account_2of2(BIP32_Account):
def redeem_script(self, sequence):
pubkeys = self.get_pubkeys(sequence)
return Transaction.multisig_script(pubkeys, len(pubkeys))
return Transaction.multisig_script(pubkeys, 2)
def get_address(self, for_change, n):
address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
@@ -226,3 +233,4 @@ class BIP32_Account_2of3(BIP32_Account_2of2):