AaronFiore/electrum
1
0
Fork 0
Code Activity

fix tests

Browse Source
This commit is contained in:
ThomasV
2017-09-29 17:49:29 +02:00
parent fed76bfffc
commit c73819a3d4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/bitcoin.py
View File

@@ -522,15 +522,14 @@ def is_compressed(sec):
def public_key_from_private_key(pk, compressed):
# rebuild public key from private key, compressed or uncompressed
pkey = regenerate_key(pk)
public_key = GetPubKey(pkey.pubkey, compressed)
return bh2u(public_key)
def address_from_private_key(sec):
public_key = public_key_from_private_key(sec)
address = public_key_to_p2pkh(bfh(public_key))
txin_type, privkey, compressed = deserialize_privkey(sec)
public_key = public_key_from_private_key(privkey, compressed)
address = pubkey_to_address(txin_type, public_key)
return address
def is_segwit_address(addr):
@@ -612,8 +611,8 @@ def verify_message(address, sig, message):
return False
def sign_message_with_wif_privkey(sec, message):
key = regenerate_key(sec)
compressed = is_compressed(sec)
txin_type, privkey, compressed = deserialize_privkey(sec)
key = regenerate_key(privkey)
return key.sign_message(message, compressed)
def encrypt_message(message, pubkey):