electrum

commit 65ee3416f6b0c8f8491cb4d9b9fef73540f48431
parent 7e871923f4454eb6c7e149bf1252bcba4a80994c
Author: ThomasV <thomasv@electrum.org>
Date:   Mon,  2 Jan 2017 11:02:36 +0100

rename P2PK to P2PKH to avoid confusion

Diffstat:
M
gui/qt/main_window.py
 | 
2
+-
M
lib/wallet.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -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
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -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):