Merge pull request 'defeather files' (#38) from wowario/wowlet:feather1 into master

Reviewed-on: #38
pull/40/head
wowario 3 years ago
commit ca72462125

@ -78,7 +78,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) {
QCommandLineOption exportTxHistoryOption(QStringList() << "export-txhistory", "Output wallet transaction history as CSV to specified path.", "file"); QCommandLineOption exportTxHistoryOption(QStringList() << "export-txhistory", "Output wallet transaction history as CSV to specified path.", "file");
parser.addOption(exportTxHistoryOption); parser.addOption(exportTxHistoryOption);
QCommandLineOption backgroundOption(QStringList() << "daemon", "Start Feather in the background and start a websocket server (IPv4:port)", "backgroundAddress"); QCommandLineOption backgroundOption(QStringList() << "daemon", "Start WOWlet in the background and start a websocket server (IPv4:port)", "backgroundAddress");
parser.addOption(backgroundOption); parser.addOption(backgroundOption);
QCommandLineOption backgroundPasswordOption(QStringList() << "daemon-password", "Password for connecting to the wowlet websocket service", "backgroundPassword"); QCommandLineOption backgroundPasswordOption(QStringList() << "daemon-password", "Password for connecting to the wowlet websocket service", "backgroundPassword");

@ -33,7 +33,7 @@ WSServer::WSServer(AppContext *ctx, const QHostAddress &host, const quint16 port
m_ctx(ctx), m_ctx(ctx),
m_password(password), m_password(password),
m_pWebSocketServer( m_pWebSocketServer(
new QWebSocketServer(QStringLiteral("Feather Daemon WS"), new QWebSocketServer(QStringLiteral("WOWlet Daemon WS"),
QWebSocketServer::NonSecureMode, this)) { QWebSocketServer::NonSecureMode, this)) {
if (!m_pWebSocketServer->listen(QHostAddress::Any, port)) if (!m_pWebSocketServer->listen(QHostAddress::Any, port))
return; return;
@ -201,7 +201,7 @@ void WSServer::processBinaryMessage(QByteArray buffer) {
} }
} }
FeatherSeed seed = FeatherSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage); WowletSeed seed = WowletSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage);
m_ctx->createWallet(seed, walletPath, password); m_ctx->createWallet(seed, walletPath, password);
} else if(cmd == "transactionHistory") { } else if(cmd == "transactionHistory") {
m_ctx->currentWallet->history()->refresh(m_ctx->currentWallet->currentSubaddressAccount()); m_ctx->currentWallet->history()->refresh(m_ctx->currentWallet->currentSubaddressAccount());

@ -1,8 +1,8 @@
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
// Copyright (c) 2020-2021, The Monero Project. // Copyright (c) 2020-2021, The Monero Project.
#ifndef FEATHER_WSSERVER_H #ifndef WOWLET_WSSERVER_H
#define FEATHER_WSSERVER_H #define WOWLET_WSSERVER_H
#include <QObject> #include <QObject>
@ -71,4 +71,4 @@ private:
void sendAll(const QString &cmd, const QString &val); void sendAll(const QString &cmd, const QString &val);
}; };
#endif //FEATHER_WSSERVER_H #endif //WOWLET_WSSERVER_H

Loading…
Cancel
Save