BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

account:simplification

This commit is contained in:
ThomasV 2014-04-03 14:32:03 +02:00
parent 4fb5296a92
commit a194edbefb
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/account.py
View File

@ -157,7 +157,7 @@ class BIP32_Account(Account):
return None
def get_pubkeys(self, sequence):
return [self.get_pubkey(self.xpub, *sequence)]
return sorted(map(lambda x: self.get_pubkey(x, *sequence ), self.get_master_pubkeys()))
def get_master_pubkeys(self):
return [self.xpub]
@ -189,9 +189,6 @@ class BIP32_Account_2of2(BIP32_Account):
address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
return address
def get_pubkeys(self, sequence):
return sorted(map(lambda x: self.get_pubkey(x, *sequence ), self.get_master_pubkeys()))
def get_master_pubkeys(self):
return [self.xpub, self.xpub2]