AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #72 from EagleTM/master

Browse Source 
other stuff for 1.5.8.
This commit is contained in:
EagleTM
2013-01-02 02:33:02 -08:00
parent 4978eff7f6 c3b3ecb016
commit 864aebff7e
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RELEASE-NOTES
View File

@@ -1,4 +1,12 @@
# Release 1.5.8 (Not released) # Release 1.5.8 (02-01-2013)
== Core
* (Bug) Fix pending address balance on received coins for pruning servers
* (Bug) Fix history command line option to show output again (regression by SPV)
* (Chore) Restore timer for deseeded wallets
* (Chore) Update built-in default server with pruning flag
* (Chore) Add timeout to blockchain headers file download by HTTP
== Lite GUI == Lite GUI
* (Bug) Sending to auto-completed contacts works again * (Bug) Sending to auto-completed contacts works again
* (Chore) Added version number to title bar * (Chore) Added version number to title bar

22
lib/interface.py
View File

@@ -26,17 +26,13 @@ from util import print_error
DEFAULT_TIMEOUT = 5 DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [ DEFAULT_SERVERS = [
#'electrum.bitcoins.sk:50001:t', 'electrum.bitcoin.cz:p:50001:t',
#'uncle-enzo.info:50001:t', 'electrum.novit.ro:p:50001:t',
#'electrum.bitfoo.org:50001:t', 'electrum.be::50001:t',
#'webbtc.net:50001:t', 'electrum.bysh.me::50001:t',
'electrum.bitcoin.cz:50001:t', 'electrum.pdmc.net:p:50001:t',
'electrum.novit.ro:50001:t', 'electrum.no-ip.org::50001:t',
'electrum.be:50001:t', 'ecdsa.org:p:50001:t'
'electrum.bysh.me:50001:t',
'electrum.pdmc.net:50001:t',
'electrum.no-ip.org:50001:t',
'ecdsa.org:50001:t'
] ]
proxy_modes = ['socks4', 'socks5', 'http'] proxy_modes = ['socks4', 'socks5', 'http']
@@ -507,8 +503,8 @@ class Interface(threading.Thread):
if not self.servers: if not self.servers:
servers_list = {} servers_list = {}
for x in DEFAULT_SERVERS: for x in DEFAULT_SERVERS:
h,port,protocol = x.split(':') h,pruning,port,protocol = x.split(':')
servers_list[h] = {'ports':[(protocol,port)]} servers_list[h] = {'ports':[(protocol,port)], 'pruning':pruning}
else: else:
servers_list = self.servers servers_list = self.servers