RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rm duplicate method getpubkey

Browse Source
This commit is contained in:
ThomasV 2014-07-06 22:24:09 +02:00
parent b5b5edbee7
commit 2e1d24939c
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/main_window.py
View File

@ -1987,7 +1987,7 @@ class ElectrumWindow(QMainWindow):
pubkey_e = QLineEdit() pubkey_e = QLineEdit()
if address: if address:
pubkey = self.wallet.getpubkeys(address)[0] pubkey = self.wallet.get_public_keys(address)[0]
pubkey_e.setText(pubkey) pubkey_e.setText(pubkey)
layout.addWidget(QLabel(_('Public key')), 2, 0) layout.addWidget(QLabel(_('Public key')), 2, 0)
layout.addWidget(pubkey_e, 2, 1) layout.addWidget(pubkey_e, 2, 1)

2
lib/commands.py
View File

@ -207,7 +207,7 @@ class Commands:
def getpubkeys(self, addr): def getpubkeys(self, addr):
out = { 'address':addr } out = { 'address':addr }
out['pubkeys'] = self.wallet.getpubkeys(addr) out['pubkeys'] = self.wallet.get_public_keys(addr)
return out return out
def getbalance(self, account= None): def getbalance(self, account= None):

7
lib/wallet.py
View File

@ -354,12 +354,6 @@ class Abstract_Wallet:
raise Exception("Address not found", address) raise Exception("Address not found", address)
def getpubkeys(self, addr):
assert is_address(addr) and self.is_mine(addr)
account, sequence = self.get_address_index(addr)
a = self.accounts[account]
return a.get_pubkeys( sequence )
def get_private_key(self, address, password): def get_private_key(self, address, password):
if self.is_watching_only(): if self.is_watching_only():
return [] return []
@ -386,7 +380,6 @@ class Abstract_Wallet:
mpk = [ self.master_public_keys[k] for k in self.master_private_keys.keys() ] mpk = [ self.master_public_keys[k] for k in self.master_private_keys.keys() ]
for xpub, sequence in xpub_list: for xpub, sequence in xpub_list:
if xpub in mpk: if xpub in mpk:
print "can sign", xpub
return True return True
return False return False