fixes
This commit is contained in:
parent
462e7f3d0d
commit
479b71b690
|
@ -333,7 +333,7 @@ class Wallet:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
s = repr( (self.version, self.use_encryption, self.fee, self.host, self.blocks,
|
s = repr( (self.version, self.use_encryption, self.fee, self.host, self.port, self.blocks,
|
||||||
self.seed, self.addresses, self.private_keys,
|
self.seed, self.addresses, self.private_keys,
|
||||||
self.change_addresses, self.status, self.history,
|
self.change_addresses, self.status, self.history,
|
||||||
self.labels, self.addressbook) )
|
self.labels, self.addressbook) )
|
||||||
|
@ -350,14 +350,12 @@ class Wallet:
|
||||||
return False
|
return False
|
||||||
try:
|
try:
|
||||||
sequence = ast.literal_eval( data )
|
sequence = ast.literal_eval( data )
|
||||||
(self.version, self.use_encryption, self.fee, self.host, self.blocks,
|
(self.version, self.use_encryption, self.fee, self.host, self.port, self.blocks,
|
||||||
self.seed, self.addresses, self.private_keys,
|
self.seed, self.addresses, self.private_keys,
|
||||||
self.change_addresses, self.status, self.history,
|
self.change_addresses, self.status, self.history,
|
||||||
self.labels, self.addressbook) = sequence
|
self.labels, self.addressbook) = sequence
|
||||||
except:
|
except:
|
||||||
if len(sequence) == 12:
|
raise BaseException("version error.")
|
||||||
raise BaseException("version error.")
|
|
||||||
return False
|
|
||||||
self.update_tx_history()
|
self.update_tx_history()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -397,8 +395,9 @@ class Wallet:
|
||||||
|
|
||||||
def request(self, request ):
|
def request(self, request ):
|
||||||
import urllib
|
import urllib
|
||||||
|
use_http = self.port in [80,81]
|
||||||
|
|
||||||
if self.port == 80:
|
if use_http:
|
||||||
request2 = urllib.urlencode({'q':request})
|
request2 = urllib.urlencode({'q':request})
|
||||||
request = "GET /electrum.php?" + request2 + " HTTP/1.0\r\n\r\n"
|
request = "GET /electrum.php?" + request2 + " HTTP/1.0\r\n\r\n"
|
||||||
else:
|
else:
|
||||||
|
@ -414,7 +413,7 @@ class Wallet:
|
||||||
else: break
|
else: break
|
||||||
s.close()
|
s.close()
|
||||||
|
|
||||||
if self.port == 80:
|
if use_http:
|
||||||
out = out.split('\r\n')[-1]
|
out = out.split('\r\n')[-1]
|
||||||
|
|
||||||
return out
|
return out
|
||||||
|
@ -617,6 +616,7 @@ if __name__ == '__main__':
|
||||||
gui.init_wallet(wallet)
|
gui.init_wallet(wallet)
|
||||||
gui = gui.BitcoinGUI(wallet)
|
gui = gui.BitcoinGUI(wallet)
|
||||||
gui.main()
|
gui.main()
|
||||||
|
wallet.save()
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
if not wallet.read():
|
if not wallet.read():
|
||||||
|
|
Loading…
Reference in New Issue