BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Maran 2014-03-13 18:26:19 +01:00
parent bae36d658b e2c749cdab
commit f56fbb509f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/network.py
View File

@ -7,18 +7,18 @@ from blockchain import Blockchain
DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
DEFAULT_SERVERS = {
#'electrum.coinwallet.me': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.hachre.de': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.novit.ro': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.stepkrav.pw': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
#'ecdsa.org': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.no-ip.org': {'h': '80', 's': '50002', 't': '50001', 'g': '443'},
'electrum.drollette.com': {'h': '5000', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.random.re': {'h': '80', 's': '110', 't': '50001', 'g': '443'},
'btc.medoix.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.stupidfoot.com': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
#'electrum.pdmc.net': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'},
'electrum.be': {'h': '8081', 's': '50002', 't': '50001', 'g': '8082'}
'ecdsa.org': DEFAULT_PORTS,
'ecdsa.net': DEFAULT_PORTS,
'electrum.hachre.de': DEFAULT_PORTS,
'electrum.novit.ro': DEFAULT_PORTS,
'electrum.coinwallet.me': DEFAULT_PORTS,
'cube.l0g.in': DEFAULT_PORTS,
'bitcoin.epicinet.net': DEFAULT_PORTS,
'h.1209k.com': DEFAULT_PORTS,
'electrum.electricnewyear.net': DEFAULT_PORTS,
'erbium.sytes.net': DEFAULT_PORTS,
'e2.pdmc.net':DEFAULT_PORTS,
'electrum.thwg.org':DEFAULT_PORTS,
}

4
lib/wallet.py
View File

@ -639,9 +639,9 @@ class NewWallet:
rs = self.rebase_sequence(account, sequence)
dd = []
for root, public_sequence in rs:
c, K, _ = self.master_public_keys[root]
c, K, cK = self.master_public_keys[root]
s = '/' + '/'.join( map(lambda x:str(x), public_sequence) )
dd.append( 'bip32(%s,%s,%s)'%(c,K, s) )
dd.append( 'bip32(%s,%s,%s)'%(c, cK, s) )
return '&'.join(dd)