AaronFiore/electrum
1
0
Fork 0
Code Activity

simplify: public_key_from_private_key

Browse Source
This commit is contained in:
ThomasV
2013-08-17 11:09:19 +02:00
parent 4869d05841
commit 799c6571f5
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/wallet.py
View File

@@ -363,10 +363,8 @@ class Wallet:
# build a list of public/private keys
keypairs = {}
for sec in private_keys:
compressed = is_compressed(sec)
pkey = regenerate_key(sec)
pubkey = GetPubKey(pkey.pubkey, compressed)
keypairs[ pubkey.encode('hex') ] = sec
pubkey = public_key_from_private_key(sec)
keypairs[ pubkey ] = sec
for txin in tx.inputs:
@@ -404,10 +402,10 @@ class Wallet:
addr = hash_160_to_bc_address(hash_160(redeem_script.decode('hex')), 5)
txin['address'] = addr
elif txin.get("raw_output_script"):
addr = deserialize.get_address_from_output_script(txin.get("raw_output_script").decode('hex'))
sec = self.get_private_key(addr, password)
pubkey = public_key_from_private_key(sec)
if sec:
keypairs[pubkey] = [sec]
txin['address'] = addr