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

Merge pull request #292 from ctrlcctrlv/master

Browse source 
Fix some bugs I found in 1.9
This commit is contained in:
ThomasV 2013-09-10 14:36:10 -07:00
commit 1d0fd3784a
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/gui_classic.py
View file

@ -1944,8 +1944,10 @@ class ElectrumWindow(QMainWindow):
transaction = csv.writer(csvfile) transaction = csv.writer(csvfile)
transaction.writerow(["address", "private_key"]) transaction.writerow(["address", "private_key"])
addresses = self.wallet.addresses(True)
for addr, pk in self.wallet.get_private_keys(self.wallet.addresses(True), password).items(): for addr in addresses:
pk = "".join(self.wallet.get_private_key(addr, password))
transaction.writerow(["%34s"%addr,pk]) transaction.writerow(["%34s"%addr,pk])
self.show_message(_("Private keys exported.")) self.show_message(_("Private keys exported."))

5
lib/bitcoin.py
View file

@ -286,7 +286,10 @@ SECP256k1 = ecdsa.curves.Curve("SECP256k1", curve_secp256k1, generator_secp256k1
from ecdsa.util import string_to_number, number_to_string from ecdsa.util import string_to_number, number_to_string
def msg_magic(message): def msg_magic(message):
return "\x18Bitcoin Signed Message:\n" + chr( len(message) ) + message varint = var_int(len(message))
encoded_varint = "".join([chr(int(varint[i:i+2], 16)) for i in xrange(0, len(varint), 2)])
return "\x18Bitcoin Signed Message:\n" + encoded_varint + message
class EC_KEY(object): class EC_KEY(object):

2
lib/commands.py
View file

@ -155,7 +155,7 @@ class Commands:
def dumpprivkeys(self, addresses = None): def dumpprivkeys(self, addresses = None):
if addresses is None: if addresses is None:
addresses = self.wallet.addresses(True) addresses = self.wallet.addresses(True)
return self.wallet.get_private_keys(addresses, self.password) return [self.wallet.get_private_key(address, self.password) for address in addresses]
def validateaddress(self,addr): def validateaddress(self,addr):
isvalid = is_valid(addr) isvalid = is_valid(addr)