Merge pull request #4061 from Yuki-Inoue/feature/current_wallet_path

daemon status shows current wallet path
This commit is contained in:
ThomasV 2018-03-27 11:04:46 +02:00 committed by GitHub
commit 2886bf8a05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -186,6 +186,9 @@ class Daemon(DaemonThread):
elif sub == 'status':
if self.network:
p = self.network.get_parameters()
current_wallet = self.cmd_runner.wallet
current_wallet_path = current_wallet.storage.path \
if current_wallet else None
response = {
'path': self.network.config.path,
'server': p[0],
@ -197,6 +200,7 @@ class Daemon(DaemonThread):
'version': ELECTRUM_VERSION,
'wallets': {k: w.is_up_to_date()
for k, w in self.wallets.items()},
'current_wallet': current_wallet_path,
'fee_per_kb': self.config.fee_per_kb(),
}
else: