BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename P2PK to P2PKH to avoid confusion

This commit is contained in:
ThomasV 2017-01-02 11:02:36 +01:00
parent 7e871923f4
commit 65ee3416f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@ -52,7 +52,7 @@ from electrum.util import (block_explorer, block_explorer_info, format_time,
from electrum import Transaction, mnemonic
from electrum import util, bitcoin, commands, coinchooser
from electrum import SimpleConfig, paymentrequest
from electrum.wallet import Wallet, Multisig_Wallet, P2PK_Wallet
from electrum.wallet import Wallet, Multisig_Wallet
from amountedit import BTCAmountEdit, MyLineEdit, BTCkBEdit
from network_dialog import NetworkDialog

4
lib/wallet.py
View File

@ -1378,7 +1378,7 @@ class Imported_Wallet(Abstract_Wallet):
txin['signatures'] = [None]
class P2PK_Wallet(Abstract_Wallet):
class P2PKH_Wallet(Abstract_Wallet):
def pubkeys_to_address(self, pubkey):
return public_key_to_bc_address(pubkey.decode('hex'))
@ -1540,7 +1540,7 @@ class Deterministic_Wallet(Abstract_Wallet):
class Standard_Wallet(Deterministic_Wallet, P2PK_Wallet):
class Standard_Wallet(Deterministic_Wallet, P2PKH_Wallet):
wallet_type = 'standard'
def __init__(self, storage):