From 83c008b6f8d73c1a3e5c3503a160958eee8623bc Mon Sep 17 00:00:00 2001 From: Eagle[TM] Date: Wed, 2 Jan 2013 14:50:52 +0100 Subject: [PATCH] revert pruning flag for default servers (too much complexity) --- RELEASE-NOTES | 1 - lib/interface.py | 22 +++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 46951b3..0ed5677 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -4,7 +4,6 @@ * (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 diff --git a/lib/interface.py b/lib/interface.py index 635afcd..d7235a0 100644 --- a/lib/interface.py +++ b/lib/interface.py @@ -26,13 +26,17 @@ from util import print_error DEFAULT_TIMEOUT = 5 DEFAULT_SERVERS = [ - 'electrum.bitcoin.cz:p:50001:t', - 'electrum.novit.ro:p:50001:t', - 'electrum.be::50001:t', - 'electrum.bysh.me::50001:t', - 'electrum.pdmc.net:p:50001:t', - 'electrum.no-ip.org::50001:t', - 'ecdsa.org:p:50001:t' + #'electrum.bitcoins.sk:50001:t', + #'uncle-enzo.info:50001:t', + #'electrum.bitfoo.org:50001:t', + #'webbtc.net:50001:t', + 'electrum.bitcoin.cz:50001:t', + 'electrum.novit.ro:50001:t', + 'electrum.be: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'] @@ -503,8 +507,8 @@ class Interface(threading.Thread): if not self.servers: servers_list = {} for x in DEFAULT_SERVERS: - h,pruning,port,protocol = x.split(':') - servers_list[h] = {'ports':[(protocol,port)], 'pruning':pruning} + h,port,protocol = x.split(':') + servers_list[h] = {'ports':[(protocol,port)]} else: servers_list = self.servers -- 1.7.1