tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 7601ce56e1ea4b9b8d8d234b9dfa1ae5afdcee6d
DIR parent c68bf5a1d7409d9b822fd4bc488a2e071e32dd43
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 27 Nov 2012 23:32:59 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M lib/interface.py | 5 +++--
M lib/wallet.py | 4 ++--
M scripts/get_history | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -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'
]
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -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 )
DIR diff --git a/scripts/get_history b/scripts/get_history
t@@ -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: