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

lib/interface.py

@@ -28,13 +28,14 @@ DEFAULT_TIMEOUT = 5
 DEFAULT_SERVERS = [ 
     #'electrum.bitcoins.sk:50001:t',
     #'uncle-enzo.info:50001:t',
-    #'electrum.bitcoin.cz: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',
-    'webbtc.net:50001:t',
     'electrum.bysh.me:50001:t',
     'electrum.pdmc.net:50001:t',
+    'electrum.no-ip.org:50001:t',
     'ecdsa.org:50001:t'
     ]
 

lib/wallet.py

@@ -769,8 +769,8 @@ class Wallet:
             raise ValueError("Not enough funds")
 
         if not self.use_change and not change_addr:
-            change_addr = inputs[0][0]
-            print "Sending change to", change_addr
+            change_addr = inputs[-1][0]
+            print_error( "Sending change to", change_addr )
 
         outputs = self.choose_tx_outputs( to_address, amount, fee, total, change_addr )
         s_inputs = self.sign_inputs( inputs, outputs, password )

scripts/get_history

@@ -9,7 +9,7 @@ except:
     print "usage: get_history <bitcoin_address>"
     sys.exit(1)
 
-i = Interface({'server':'webbtc.com:50001:t'})
+i = Interface({'server':'electrum.be:50001:t'})
 i.start()
 h = i.synchronous_get([ ('blockchain.address.get_history',[addr]) ])[0]
 for item in h: