tfix typos - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f937472928a641cba55e8e9767802086374e58c2
DIR parent 030d61f987c59fe472ac97b8224d398c28a959be
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 26 Jan 2017 19:23:17 +0100
fix typos
Diffstat:
M lib/bitcoin.py | 4 ++--
M lib/wallet.py | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -745,7 +745,7 @@ def xprv_header(xtype):
def xpub_header(xtype):
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
return EncodeBase58Check(xprv)
t@@ -802,7 +802,7 @@ def bip32_root(seed, xtype):
master_c = I[32:]
K, cK = get_pubkeys_from_secret(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
def xpub_from_pubkey(xtype, cK):
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1631,15 +1631,15 @@ class P2SH:
class Standard_Wallet(Simple_Deterministic_Wallet):
wallet_type = 'standard'
- def pubkeys_to_redeem_script(self, pubkeys):
+ def pubkeys_to_redeem_script(self, pubkey):
if self.xpub_type == 1:
return transaction.segwit_script(pubkey)
def pubkeys_to_address(self, pubkey):
if self.xpub_type == 0:
return bitcoin.public_key_to_p2pkh(pubkey.decode('hex'))
- elif self.xpub_type == 1 and TESTNET:
- redeem_script = self.pubkeys_to_redeem_script(pubkeys)
+ elif self.xpub_type == 1 and bitcoin.TESTNET:
+ redeem_script = self.pubkeys_to_redeem_script(pubkey)
return bitcoin.hash160_to_p2sh(hash_160(redeem_script.decode('hex')))
else:
raise NotImplementedError()