AaronFiore/electrum
1
0
Fork 0
Code Activity

fix typos

Browse Source
This commit is contained in:
ThomasV
2017-01-26 19:23:17 +01:00
parent 030d61f987
commit f937472928
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bitcoin.py
View File

@@ -745,7 +745,7 @@ def xprv_header(xtype):
def xpub_header(xtype): def xpub_header(xtype):
return ("%08x"%(XPUB_HEADER + xtype)).decode('hex') return ("%08x"%(XPUB_HEADER + xtype)).decode('hex')
def serialize_xpub(xtype, c, k): def serialize_xprv(xtype, c, k):
xprv = xprv_header(xtype) + chr(0)*9 + c + chr(0) + k xprv = xprv_header(xtype) + chr(0)*9 + c + chr(0) + k
return EncodeBase58Check(xprv) return EncodeBase58Check(xprv)
@@ -802,7 +802,7 @@ def bip32_root(seed, xtype):
master_c = I[32:] master_c = I[32:]
K, cK = get_pubkeys_from_secret(master_k) K, cK = get_pubkeys_from_secret(master_k)
xprv = serialize_xprv(xtype, master_c, master_k) xprv = serialize_xprv(xtype, master_c, master_k)
xpub = serialize_xpub(xtype, master_c + cK) xpub = serialize_xpub(xtype, master_c, cK)
return xprv, xpub return xprv, xpub
def xpub_from_pubkey(xtype, cK): def xpub_from_pubkey(xtype, cK):

6
lib/wallet.py
View File

@@ -1631,15 +1631,15 @@ class P2SH:
class Standard_Wallet(Simple_Deterministic_Wallet): class Standard_Wallet(Simple_Deterministic_Wallet):
wallet_type = 'standard' wallet_type = 'standard'
def pubkeys_to_redeem_script(self, pubkeys): def pubkeys_to_redeem_script(self, pubkey):
if self.xpub_type == 1: if self.xpub_type == 1:
return transaction.segwit_script(pubkey) return transaction.segwit_script(pubkey)
def pubkeys_to_address(self, pubkey): def pubkeys_to_address(self, pubkey):
if self.xpub_type == 0: if self.xpub_type == 0:
return bitcoin.public_key_to_p2pkh(pubkey.decode('hex')) return bitcoin.public_key_to_p2pkh(pubkey.decode('hex'))
elif self.xpub_type == 1 and TESTNET: elif self.xpub_type == 1 and bitcoin.TESTNET:
redeem_script = self.pubkeys_to_redeem_script(pubkeys) redeem_script = self.pubkeys_to_redeem_script(pubkey)
return bitcoin.hash160_to_p2sh(hash_160(redeem_script.decode('hex'))) return bitcoin.hash160_to_p2sh(hash_160(redeem_script.decode('hex')))
else: else:
raise NotImplementedError() raise NotImplementedError()