provide the full server list on wallet creation
This commit is contained in:
parent
ce16fe224d
commit
9c4fa26e31
|
@ -259,6 +259,7 @@ class Interface:
|
||||||
else: break
|
else: break
|
||||||
s.close()
|
s.close()
|
||||||
self.rtime = time.time() - t1
|
self.rtime = time.time() - t1
|
||||||
|
self.is_connected = True
|
||||||
if cmd in[ 'peers','h']:
|
if cmd in[ 'peers','h']:
|
||||||
out = ast.literal_eval( out )
|
out = ast.literal_eval( out )
|
||||||
return out
|
return out
|
||||||
|
@ -277,6 +278,7 @@ class Interface:
|
||||||
if not out:
|
if not out:
|
||||||
print response
|
print response
|
||||||
self.rtime = time.time() - t1
|
self.rtime = time.time() - t1
|
||||||
|
self.is_connected = True
|
||||||
return out
|
return out
|
||||||
|
|
||||||
def send_tx(self, data):
|
def send_tx(self, data):
|
||||||
|
|
|
@ -110,6 +110,7 @@ def init_wallet(wallet):
|
||||||
wallet.new_seed(None)
|
wallet.new_seed(None)
|
||||||
|
|
||||||
# ask for the server.
|
# ask for the server.
|
||||||
|
wallet.interface.get_servers()
|
||||||
run_network_dialog( wallet, parent=None )
|
run_network_dialog( wallet, parent=None )
|
||||||
|
|
||||||
# generate first key
|
# generate first key
|
||||||
|
@ -215,6 +216,9 @@ def run_recovery_dialog(wallet):
|
||||||
import mnemonic
|
import mnemonic
|
||||||
print "not hex, trying decode"
|
print "not hex, trying decode"
|
||||||
seed = mnemonic.mn_decode( seed.split(' ') )
|
seed = mnemonic.mn_decode( seed.split(' ') )
|
||||||
|
if not seed:
|
||||||
|
show_message("no seed")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
wallet.seed = seed
|
wallet.seed = seed
|
||||||
wallet.gap_limit = gap
|
wallet.gap_limit = gap
|
||||||
|
@ -277,10 +281,14 @@ def run_settings_dialog(wallet, parent):
|
||||||
def run_network_dialog( wallet, parent ):
|
def run_network_dialog( wallet, parent ):
|
||||||
image = gtk.Image()
|
image = gtk.Image()
|
||||||
image.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_DIALOG)
|
image.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_DIALOG)
|
||||||
|
|
||||||
|
if parent:
|
||||||
if wallet.interface.is_connected:
|
if wallet.interface.is_connected:
|
||||||
status = "Connected to %s.\n%d blocks\nresponse time: %f"%(wallet.interface.host, wallet.interface.blocks, wallet.interface.rtime)
|
status = "Connected to %s.\n%d blocks\nresponse time: %f"%(wallet.interface.host, wallet.interface.blocks, wallet.interface.rtime)
|
||||||
else:
|
else:
|
||||||
status = "Not connected"
|
status = "Not connected"
|
||||||
|
else:
|
||||||
|
status = "Please choose a server."
|
||||||
|
|
||||||
dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
|
dialog = gtk.MessageDialog( parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
|
||||||
gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, status)
|
gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, status)
|
||||||
|
@ -333,9 +341,13 @@ def run_network_dialog( wallet, parent ):
|
||||||
r = dialog.run()
|
r = dialog.run()
|
||||||
hh = host_entry.get_text()
|
hh = host_entry.get_text()
|
||||||
dialog.destroy()
|
dialog.destroy()
|
||||||
|
|
||||||
if r==gtk.RESPONSE_CANCEL:
|
if r==gtk.RESPONSE_CANCEL:
|
||||||
|
if parent == None:
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
return
|
return
|
||||||
print hh
|
|
||||||
try:
|
try:
|
||||||
if ':' in hh:
|
if ':' in hh:
|
||||||
host, port = hh.split(':')
|
host, port = hh.split(':')
|
||||||
|
@ -344,7 +356,10 @@ def run_network_dialog( wallet, parent ):
|
||||||
host = hh
|
host = hh
|
||||||
port = 50000
|
port = 50000
|
||||||
except:
|
except:
|
||||||
self.show_message("error")
|
show_message("error")
|
||||||
|
if parent == None:
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
return
|
return
|
||||||
|
|
||||||
if host!= wallet.interface.host or port!=wallet.interface.port:
|
if host!= wallet.interface.host or port!=wallet.interface.port:
|
||||||
|
@ -563,7 +578,6 @@ class BitcoinGUI:
|
||||||
try:
|
try:
|
||||||
self.wallet.interface.is_connected = False
|
self.wallet.interface.is_connected = False
|
||||||
self.wallet.interface.new_session(self.wallet.all_addresses(), self.wallet.electrum_version)
|
self.wallet.interface.new_session(self.wallet.all_addresses(), self.wallet.electrum_version)
|
||||||
self.wallet.interface.is_connected = True
|
|
||||||
self.update_session = False
|
self.update_session = False
|
||||||
self.info.set_text( self.wallet.interface.message)
|
self.info.set_text( self.wallet.interface.message)
|
||||||
except:
|
except:
|
||||||
|
|
Loading…
Reference in New Issue