AaronFiore/electrum
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
ThomasV
2012-11-27 23:32:59 +01:00
parent c68bf5a1d7 201a13131f
commit 7601ce56e1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/interface.py
View File

@@ -28,13 +28,14 @@ DEFAULT_TIMEOUT = 5
DEFAULT_SERVERS = [ DEFAULT_SERVERS = [
#'electrum.bitcoins.sk:50001:t', #'electrum.bitcoins.sk:50001:t',
#'uncle-enzo.info:50001:t', #'uncle-enzo.info:50001:t',
#'electrum.bitcoin.cz:50001:t',
#'electrum.bitfoo.org:50001:t', #'electrum.bitfoo.org:50001:t',
#'webbtc.net:50001:t',
'electrum.bitcoin.cz:50001:t',
'electrum.novit.ro:50001:t', 'electrum.novit.ro:50001:t',
'electrum.be:50001:t', 'electrum.be:50001:t',
'webbtc.net:50001:t',
'electrum.bysh.me:50001:t', 'electrum.bysh.me:50001:t',
'electrum.pdmc.net:50001:t', 'electrum.pdmc.net:50001:t',
'electrum.no-ip.org:50001:t',
'ecdsa.org:50001:t' 'ecdsa.org:50001:t'
] ]

4
lib/wallet.py
View File

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

2
scripts/get_history
View File

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