do not pass config to storage. request height from network_proxy if connected
This commit is contained in:
@@ -907,7 +907,7 @@ class ElectrumGui:
|
||||
|
||||
contacts = util.StoreDict(config, 'contacts')
|
||||
|
||||
storage = WalletStorage(config)
|
||||
storage = WalletStorage(config.get_wallet_path())
|
||||
if not storage.file_exists:
|
||||
action = self.restore_or_create()
|
||||
if not action:
|
||||
|
||||
@@ -1290,7 +1290,7 @@ class ElectrumGui():
|
||||
|
||||
def main(self, url=None):
|
||||
|
||||
storage = WalletStorage(self.config)
|
||||
storage = WalletStorage(self.config.get_wallet_path())
|
||||
if not storage.file_exists:
|
||||
action = self.restore_or_create()
|
||||
if not action:
|
||||
|
||||
@@ -179,7 +179,7 @@ class ElectrumGui:
|
||||
if os.path.exists(last_wallet):
|
||||
self.config.read_only_options['default_wallet_path'] = last_wallet
|
||||
try:
|
||||
storage = WalletStorage(self.config)
|
||||
storage = WalletStorage(self.config.get_wallet_path())
|
||||
except BaseException as e:
|
||||
QMessageBox.warning(None, _('Warning'), str(e), _('OK'))
|
||||
self.config.set_key('gui_last_wallet', None)
|
||||
|
||||
@@ -264,7 +264,7 @@ class ElectrumWindow(QMainWindow):
|
||||
if not filename:
|
||||
return
|
||||
try:
|
||||
storage = WalletStorage({'wallet_path': filename})
|
||||
storage = WalletStorage(filename)
|
||||
except Exception as e:
|
||||
self.show_message(str(e))
|
||||
return
|
||||
|
||||
@@ -15,7 +15,7 @@ class ElectrumGui:
|
||||
def __init__(self, config, network):
|
||||
self.network = network
|
||||
self.config = config
|
||||
storage = WalletStorage(config)
|
||||
storage = WalletStorage(config.get_wallet_path())
|
||||
if not storage.file_exists:
|
||||
print "Wallet not found. try 'electrum create'"
|
||||
exit()
|
||||
|
||||
@@ -17,7 +17,7 @@ class ElectrumGui:
|
||||
|
||||
self.config = config
|
||||
self.network = network
|
||||
storage = WalletStorage(config)
|
||||
storage = WalletStorage(config.get_wallet_path())
|
||||
if not storage.file_exists:
|
||||
print "Wallet not found. try 'electrum create'"
|
||||
exit()
|
||||
|
||||
Reference in New Issue
Block a user