account:simplification
This commit is contained in:
parent
4fb5296a92
commit
a194edbefb
|
@ -157,7 +157,7 @@ class BIP32_Account(Account):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_pubkeys(self, sequence):
|
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):
|
def get_master_pubkeys(self):
|
||||||
return [self.xpub]
|
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)
|
address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
|
||||||
return address
|
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):
|
def get_master_pubkeys(self):
|
||||||
return [self.xpub, self.xpub2]
|
return [self.xpub, self.xpub2]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue