LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: replace remaining occurences of public_key_to_bc_address

Browse source
This commit is contained in:
ThomasV 2017-01-29 06:34:35 +01:00
parent f937472928
commit 6bfbc9a718
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/bitcoin.py
View file

@ -404,7 +404,7 @@ def public_key_from_private_key(sec):
def address_from_private_key(sec): def address_from_private_key(sec):
public_key = public_key_from_private_key(sec) public_key = public_key_from_private_key(sec)
address = public_key_to_bc_address(public_key.decode('hex')) address = public_key_to_p2pkh(public_key.decode('hex'))
return address return address
@ -470,7 +470,7 @@ def verify_message(address, sig, message):
public_key, compressed = pubkey_from_signature(sig, message) public_key, compressed = pubkey_from_signature(sig, message)
# check public key using the address # check public key using the address
pubkey = point_to_ser(public_key.pubkey.point, compressed) pubkey = point_to_ser(public_key.pubkey.point, compressed)
addr = public_key_to_bc_address(pubkey) addr = public_key_to_p2pkh(pubkey)
if address != addr: if address != addr:
raise Exception("Bad signature") raise Exception("Bad signature")
# check message # check message

2
lib/transaction.py
View file

@ -820,7 +820,7 @@ class Transaction:
if type == TYPE_ADDRESS: if type == TYPE_ADDRESS:
addr = x addr = x
elif type == TYPE_PUBKEY: elif type == TYPE_PUBKEY:
addr = public_key_to_bc_address(x.decode('hex')) addr = bitcoin.public_key_to_p2pkh(x.decode('hex'))
else: else:
addr = 'SCRIPT ' + x.encode('hex') addr = 'SCRIPT ' + x.encode('hex')
o.append((addr,v)) # consider using yield (addr, v) o.append((addr,v)) # consider using yield (addr, v)

2
lib/wallet.py
View file

@ -619,7 +619,7 @@ class Abstract_Wallet(PrintError):
if _type == TYPE_ADDRESS: if _type == TYPE_ADDRESS:
addr = x addr = x
elif _type == TYPE_PUBKEY: elif _type == TYPE_PUBKEY:
addr = public_key_to_bc_address(x.decode('hex')) addr = bitcoin.public_key_to_p2pkh(x.decode('hex'))
else: else:
addr = None addr = None
if addr and self.is_mine(addr): if addr and self.is_mine(addr):

4
plugins/trezor/plugin.py
View file

@ -6,7 +6,7 @@ from binascii import hexlify, unhexlify
from functools import partial from functools import partial
from electrum.bitcoin import (bc_address_to_hash_160, xpub_from_pubkey, from electrum.bitcoin import (bc_address_to_hash_160, xpub_from_pubkey,
public_key_to_bc_address, EncodeBase58Check, public_key_to_p2pkh, EncodeBase58Check,
TYPE_ADDRESS, TYPE_SCRIPT) TYPE_ADDRESS, TYPE_SCRIPT)
from electrum.i18n import _ from electrum.i18n import _
from electrum.plugins import BasePlugin, hook from electrum.plugins import BasePlugin, hook
@ -29,7 +29,7 @@ class TrezorCompatibleKeyStore(Hardware_KeyStore):
def decrypt_message(self, pubkey, message, password): def decrypt_message(self, pubkey, message, password):
raise RuntimeError(_('Electrum and %s encryption and decryption are currently incompatible') % self.device) raise RuntimeError(_('Electrum and %s encryption and decryption are currently incompatible') % self.device)
address = public_key_to_bc_address(pubkey.decode('hex')) address = public_key_to_p2pkh(pubkey.decode('hex'))
client = self.get_client() client = self.get_client()
address_path = self.address_id(address) address_path = self.address_id(address)
address_n = client.expand_path(address_path) address_n = client.expand_path(address_path)