electrum

commit eafc5c74922164b32f05874a73895c9955bfc04e
parent e80ce35a1d1d623295735a0075110e36304fa44f
Author: ThomasV <thomasv@electrum.org>
Date:   Mon, 20 Mar 2017 06:34:48 +0100

Merge branch 'master' of git://github.com/spesmilo/electrum

Diffstat:
M
lib/network.py
 | 
40
+++++++++++++++++++++++++---------------

1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/lib/network.py b/lib/network.py
@@ -45,22 +45,32 @@ from version import ELECTRUM_VERSION, PROTOCOL_VERSION
 
 DEFAULT_PORTS = {'t':'50001', 's':'50002'}
 
+#There is a schedule to move the default list to e-x (electrumx) by Jan 2018
+#Schedule is as follows:
+#move ~3/4 to e-x by 1.4.17
+#then gradually switch remaining nodes to e-x nodes
+
 DEFAULT_SERVERS = {
-    'erbium1.sytes.net':DEFAULT_PORTS,
-    'ecdsa.net':{'t':'50001', 's':'110'},
-    'gh05.geekhosters.com':DEFAULT_PORTS,
-    'VPS.hsmiths.com':DEFAULT_PORTS,
-    'electrum.anduck.net':DEFAULT_PORTS,
-    'electrum.no-ip.org':DEFAULT_PORTS,
-    'us.electrum.be':DEFAULT_PORTS,
-    'electrum.villocq.com':DEFAULT_PORTS,
-    'us11.einfachmalnettsein.de':DEFAULT_PORTS,
-    'electrum.trouth.net':DEFAULT_PORTS,
-    'Electrum.hsmiths.com':{'t':'8080', 's':'995'},
-    'electrum3.hachre.de':DEFAULT_PORTS,
-    'elec.luggs.co':{'t':'80', 's':'443'},
-    'btc.smsys.me':{'t':'110', 's':'995'},
-    'btc.mustyoshi.com':DEFAULT_PORTS,
+    'erbium1.sytes.net':DEFAULT_PORTS,                  # core, e-x
+    'ecdsa.net':{'t':'50001', 's':'110'},               # core, e-x
+    'gh05.geekhosters.com':DEFAULT_PORTS,               # core, e-s
+    'VPS.hsmiths.com':DEFAULT_PORTS,                    # core, e-x
+    'electrum.anduck.net':DEFAULT_PORTS,                # core, e-s; banner with version pending
+    'electrum.no-ip.org':DEFAULT_PORTS,                 # core, e-s
+    'electrum.be':DEFAULT_PORTS,                        # core, e-x
+    'helicarrier.bauerj.eu':DEFAULT_PORTS,              # core, e-x
+    'elex01.blackpole.online':DEFAULT_PORTS,            # core, e-x
+    'electrumx.not.fyi':DEFAULT_PORTS,                  # core, e-x
+    'node.xbt.eu':DEFAULT_PORTS,                        # core, e-x
+    'kirsche.emzy.de':DEFAULT_PORTS,                    # core, e-x
+    'electrum.villocq.com':DEFAULT_PORTS,               # core?, e-s; banner with version recommended
+    'us11.einfachmalnettsein.de':DEFAULT_PORTS,         # core, e-x
+    'electrum.trouth.net':DEFAULT_PORTS,                # BU, e-s
+    'Electrum.hsmiths.com':{'t':'8080', 's':'995'},     # core, e-x
+    'electrum3.hachre.de':DEFAULT_PORTS,                # core, e-x
+    'b.1209k.com':DEFAULT_PORTS,                        # XT, jelectrum
+    'elec.luggs.co':{ 's':'443'},                       # core, e-x
+    'btc.smsys.me':{'t':'110', 's':'995'},              # BU, e-x
 }
 
 def set_testnet():