diff --git a/.gitignore b/.gitignore index 0a00d97..a7a3ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ build/* CMakeCache.txt CMakeFiles cmake_install.cmake -feather_autogen/ -feather.cbp +wowlet_autogen/ +wowlet.cbp src/tor/* !src/tor/.gitkeep -src/config-feather.h +src/config-wowlet.h diff --git a/BUILDING.md b/BUILDING.md index c2f519f..57c2b75 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -13,7 +13,7 @@ Static builds via Docker are done in 3 steps: ### Linux (reproducible) The docker image for reproducible Linux static builds uses Ubuntu 16.04 and compiles the required libraries statically -so that the resulting Feather binary is static. For more information, check the Dockerfile: `Dockerfile`. +so that the resulting `wowlet` binary is static. For more information, check the Dockerfile: `Dockerfile`. #### 1. Clone @@ -99,7 +99,7 @@ git clone --recursive https://git.wownero.com/wowlet/wowlet.git Get the latest LTS from here: https://www.qt.io/offline-installers and install. -Build Feather. +Build WOWlet. ```bash CMAKE_PREFIX_PATH=~/Qt5.15.1/5.15.1/clang_64 make mac-release diff --git a/CMakeLists.txt b/CMakeLists.txt index 77ce1b2..b81ff8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.13) -project(feather) +project(wowlet) message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}") @@ -11,7 +11,7 @@ set(VERSION "beta-1") option(FETCH_DEPS "Download dependencies if they are not found" ON) option(XMRIG "Include XMRig module" ON) -option(TOR_BIN "Path to Tor binary to embed inside Feather" OFF) +option(TOR_BIN "Path to Tor binary to embed inside WOWlet" OFF) option(STATIC "Link libraries statically, requires static Qt") option(USE_DEVICE_TREZOR "Trezor support compilation" OFF) option(DONATE_BEG "Prompt donation window every once in a while" ON) @@ -98,7 +98,7 @@ get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIB include(CMakePackageConfigHelpers) include(VersionMonero) -include(VersionFeather) +include(VersionWowlet) include_directories(${EASYLOGGING_INCLUDE}) link_directories(${EASYLOGGING_LIBRARY_DIRS}) @@ -127,7 +127,7 @@ find_package(monero-seed CONFIG) if(NOT monero-seed_FOUND) if(FETCH_DEPS) FetchContent_Declare(monero-seed - GIT_REPOSITORY https://git.wownero.com/feather/monero-seed.git) + GIT_REPOSITORY https://git.wownero.com/wowlet/monero-seed.git) FetchContent_GetProperties(monero-seed) if(NOT monero-seed_POPULATED) message(STATUS "Fetching monero-seed") @@ -183,7 +183,7 @@ if("$ENV{DRONE}" STREQUAL "true") message(STATUS "We are inside a static compile with Drone CI") endif() -# To build Feather with embedded (and static) Tor, pass CMake -DTOR_BIN=/path/to/tor +# To build WOWlet with embedded (and static) Tor, pass CMake -DTOR_BIN=/path/to/tor if(TOR_BIN) if(APPLE) execute_process(COMMAND bash -c "touch ${CMAKE_CURRENT_SOURCE_DIR}/src/tor/libevent-2.1.7.dylib") @@ -194,7 +194,7 @@ if(TOR_BIN) set(TOR_VERSION "${out}") endif() message(STATUS "${TOR_VERSION}") - configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h") + configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h") # on the buildbot Tor is baked into the image # - linux: See `Dockerfile` diff --git a/Dockerfile b/Dockerfile index aa07f03..a2af185 100644 --- a/Dockerfile +++ b/Dockerfile @@ -392,7 +392,7 @@ RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && make -j$THREADS install && \ rm -rf $(pwd) -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ +RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ cd monero-seed && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ diff --git a/Dockerfile.windows b/Dockerfile.windows index e4d8928..7c65ee0 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -172,7 +172,7 @@ RUN git clone -b tor-0.4.5.5-rc --depth 1 https://git.torproject.org/tor.git && rm -rf $(pwd) && \ strip -s -D /usr/local/tor/bin/tor.exe -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ +RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ cd monero-seed && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \ diff --git a/Dockerfile.windows_mxe b/Dockerfile.windows_mxe index e81fa5e..7361268 100644 --- a/Dockerfile.windows_mxe +++ b/Dockerfile.windows_mxe @@ -48,7 +48,7 @@ RUN apt install -y \ wget \ xz-utils -RUN git clone -b feather-patch --depth 1 https://git.wownero.com/feather/mxe.git && \ +RUN git clone -b wowlet-patch --depth 1 https://git.wownero.com/wowlet/mxe.git && \ cd mxe && \ make -j$THREADS MXE_TARGETS='x86_64-w64-mingw32.static' gcc libqrencode pkgconf libgpg_error libgcrypt cmake libsodium lzma readline libzmq boost qtbase qtsvg qtwebsockets qtimageformats qtmultimedia @@ -67,7 +67,7 @@ RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuin.a /mxe/usr/x86_64-w64 ENV PATH="/mxe/usr/bin/:$PATH" -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ +RUN git clone https://git.wownero.com/wowlet/monero-seed.git && \ cd monero-seed && \ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ make -Cbuild -j$THREADS && \ diff --git a/SECURITY.md b/SECURITY.md index 7b608ba..f034c0e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -11,6 +11,5 @@ The following keys may be used to communicate sensitive information to developer | Name | Fingerprint | |------|-------------| | dsc | 1BFD 40F9 B0E2 B40D C8C7 FD4A 521F 1E79 91AA 42DC | -| tobtoht | C5AB E5C0 E50F A2B3 F14A B92D 1CAD D27F 41F4 5C3C | Public keys can be found in `utils/pubkeys`. diff --git a/cmake/VersionMonero.cmake b/cmake/VersionMonero.cmake index 4600c7c..2ce459c 100644 --- a/cmake/VersionMonero.cmake +++ b/cmake/VersionMonero.cmake @@ -46,4 +46,4 @@ else () set(MONERO_VERSION "${TAG}") endif() -configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h") \ No newline at end of file +configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h") \ No newline at end of file diff --git a/cmake/VersionFeather.cmake b/cmake/VersionWowlet.cmake similarity index 78% rename from cmake/VersionFeather.cmake rename to cmake/VersionWowlet.cmake index fc12faf..2c15345 100644 --- a/cmake/VersionFeather.cmake +++ b/cmake/VersionWowlet.cmake @@ -10,8 +10,8 @@ if(RET) # Something went wrong, set the version tag to -unknown message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.") - set(FEATHER_BRANCH "unknown") - configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h") + set(WOWLET_BRANCH "unknown") + configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h") else() string(SUBSTRING ${COMMIT} 0 9 COMMIT) message(STATUS "You are currently on commit ${COMMIT}") @@ -21,19 +21,19 @@ else() if(NOT TAGGEDCOMMIT) message(STATUS "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") - set(FEATHER_BRANCH "${COMMIT}") + set(WOWLET_BRANCH "${COMMIT}") else() message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}") # Check if we're building that tagged commit or a different one if(COMMIT STREQUAL TAGGEDCOMMIT) message(STATUS "You are building a tagged release") - set(FEATHER_BRANCH "release") + set(WOWLET_BRANCH "release") else() message(STATUS "You are ahead of or behind a tagged release") - set(FEATHER_BRANCH "${COMMIT}") + set(WOWLET_BRANCH "${COMMIT}") endif() endif() - configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h") + configure_file("cmake/config-wowlet.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-wowlet.h") endif() diff --git a/cmake/config-feather.h.cmake b/cmake/config-feather.h.cmake deleted file mode 100644 index 4c565a5..0000000 --- a/cmake/config-feather.h.cmake +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FEATHER_VERSION_H -#define FEATHER_VERSION_H - -#define FEATHER_VERSION "@VERSION@" -#define FEATHER_BRANCH "@FEATHER_BRANCH@" - -#define MONERO_VERSION "@MONERO_VERSION@" -#define MONERO_BRANCH "@MONERO_BRANCH@" - -#define TOR_VERSION "@TOR_VERSION@" - -#endif //FEATHER_VERSION_H diff --git a/cmake/config-wowlet.h.cmake b/cmake/config-wowlet.h.cmake new file mode 100644 index 0000000..1790145 --- /dev/null +++ b/cmake/config-wowlet.h.cmake @@ -0,0 +1,12 @@ +#ifndef WOWLET_VERSION_H +#define WOWLET_VERSION_H + +#define WOWLET_VERSION "@VERSION@" +#define WOWLET_BRANCH "@WOWLET_BRANCH@" + +#define MONERO_VERSION "@MONERO_VERSION@" +#define MONERO_BRANCH "@MONERO_BRANCH@" + +#define TOR_VERSION "@TOR_VERSION@" + +#endif //WOWLET_VERSION_H diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 426c81a..6f882f5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,7 +93,7 @@ file(GLOB_RECURSE SRC_SOURCES *.cpp) file(GLOB_RECURSE SRC_HEADERS *.h) target_include_directories(wowlet PUBLIC - ${CMAKE_BINARY_DIR}/src/feather_autogen/include + ${CMAKE_BINARY_DIR}/src/wowlet_autogen/include ${CMAKE_SOURCE_DIR}/monero/include ${CMAKE_SOURCE_DIR}/monero/src ${CMAKE_SOURCE_DIR}/monero/external/easylogging++ diff --git a/src/appcontext.cpp b/src/appcontext.cpp index eaf3f3a..1b0640c 100644 --- a/src/appcontext.cpp +++ b/src/appcontext.cpp @@ -142,7 +142,7 @@ AppContext::AppContext(QCommandLineParser *cmdargs) { this->walletManager = WalletManager::instance(); QString logPath = QString("%1/daemon.log").arg(configDirectory); Monero::Utils::onStartup(); - Monero::Wallet::init("", "feather", logPath.toStdString(), true); + Monero::Wallet::init("", "wowlet", logPath.toStdString(), true); bool logLevelFromEnv; int logLevel = qEnvironmentVariableIntValue("MONERO_LOG_LEVEL", &logLevelFromEnv); @@ -444,7 +444,7 @@ void AppContext::onWSMessage(const QJsonObject &msg) { } void AppContext::onWSNodes(const QJsonArray &nodes) { - QList> l; + QList> l; for (auto &&entry: nodes) { auto obj = entry.toObject(); auto nettype = obj.value("nettype"); @@ -463,12 +463,12 @@ void AppContext::onWSNodes(const QJsonArray &nodes) { if(type == "tor" && (!(this->isTails || this->isWhonix || this->isTorSocks))) continue; - auto node = new FeatherNode( + auto node = new WowletNode( obj.value("address").toString(), obj.value("height").toInt(), obj.value("target_height").toInt(), obj.value("online").toBool()); - QSharedPointer r = QSharedPointer(node); + QSharedPointer r = QSharedPointer(node); l.append(r); } this->nodes->onWSNodesReceived(l); @@ -536,7 +536,7 @@ void AppContext::createConfigDirectory(const QString &dir) { } } -void AppContext::createWallet(FeatherSeed seed, const QString &path, const QString &password) { +void AppContext::createWallet(WowletSeed seed, const QString &path, const QString &password) { if(Utils::fileExists(path)) { auto err = QString("Failed to write wallet to path: \"%1\"; file already exists.").arg(path); qCritical() << err; @@ -552,7 +552,7 @@ void AppContext::createWallet(FeatherSeed seed, const QString &path, const QStri Wallet *wallet = nullptr; if (seed.seedType == SeedType::TEVADOR) { wallet = this->walletManager->createDeterministicWalletFromSpendKey(path, password, seed.language, this->networkType, seed.spendKey, seed.restoreHeight, this->kdfRounds); - wallet->setCacheAttribute("feather.seed", seed.mnemonic.join(" ")); + wallet->setCacheAttribute("wowlet.seed", seed.mnemonic.join(" ")); } if (seed.seedType == SeedType::MONERO) { wallet = this->walletManager->recoveryWallet(path, password, seed.mnemonic.join(" "), "", this->networkType, seed.restoreHeight, this->kdfRounds); @@ -614,7 +614,7 @@ void AppContext::initRestoreHeights() { } void AppContext::onSetRestoreHeight(quint64 height){ - auto seed = this->currentWallet->getCacheAttribute("feather.seed"); + auto seed = this->currentWallet->getCacheAttribute("wowlet.seed"); if(!seed.isEmpty()) { const auto msg = "This wallet has a 14 word mnemonic seed which has the restore height embedded."; emit setRestoreHeightError(msg); @@ -811,7 +811,7 @@ void AppContext::onTransactionCommitted(bool status, PendingTransaction *tx, con emit transactionCommitted(status, tx, txid); - // this tx was a donation to Feather, stop our nagging + // this tx was a donation to WOWlet, stop our nagging if(this->donationSending) { this->donationSending = false; config()->set(Config::donateBeg, -1); diff --git a/src/appcontext.h b/src/appcontext.h index cc69167..4748878 100644 --- a/src/appcontext.h +++ b/src/appcontext.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_APPCONTEXT_H -#define FEATHER_APPCONTEXT_H +#ifndef WOWLET_APPCONTEXT_H +#define WOWLET_APPCONTEXT_H #include #include @@ -17,7 +17,7 @@ #include "utils/xmrig.h" #include "utils/wsclient.h" #include "utils/txfiathistory.h" -#include "utils/FeatherSeed.h" +#include "utils/WowletSeed.h" #include "widgets/RedditPost.h" #include "widgets/CCSEntry.h" #include "utils/RestoreHeightLookup.h" @@ -99,7 +99,7 @@ public: bool refreshed = false; WalletManager *walletManager; Wallet *currentWallet = nullptr; - void createWallet(FeatherSeed seed, const QString &path, const QString &password); + void createWallet(WowletSeed seed, const QString &path, const QString &password); void createWalletViewOnly(const QString &path, const QString &password, const QString &address, const QString &viewkey, const QString &spendkey, quint64 restoreHeight); void createWalletFinish(const QString &password); void syncStatusUpdated(quint64 height, quint64 target); @@ -166,12 +166,12 @@ signals: void createTransactionCancelled(const QVector &address, double amount); void createTransactionSuccess(PendingTransaction *tx, const QVector &address); void redditUpdated(QList> &posts); - void nodesUpdated(QList> &nodes); + void nodesUpdated(QList> &nodes); void ccsUpdated(QList> &entries); void suchWowUpdated(const QJsonArray &such_data); void nodeSourceChanged(NodeSource nodeSource); void XMRigDownloads(const QJsonObject &data); - void setCustomNodes(QList nodes); + void setCustomNodes(QList nodes); void openAliasResolveError(const QString &msg); void openAliasResolved(const QString &address, const QString &openAlias); void setRestoreHeightError(const QString &msg); @@ -186,7 +186,8 @@ private: WalletKeysFilesModel *m_walletKeysFilesModel; const int m_donationBoundary = 15; QTimer m_storeTimer; + // @TODO: Replace url QUrl m_wsUrl = QUrl(QStringLiteral("ws://feathercitimllbmdktu6cmjo3fizgmyfrntntqzu6xguqa2rlq5cgid.onion/ws")); }; -#endif //FEATHER_APPCONTEXT_H +#endif //WOWLET_APPCONTEXT_H diff --git a/src/assets/about.txt b/src/assets/about.txt index 32f4e21..13a4dec 100644 --- a/src/assets/about.txt +++ b/src/assets/about.txt @@ -1,4 +1,4 @@ -WOWlet () +WOWlet () Website: https://wownero.org E-mail: dev@wownero.org diff --git a/src/cli.h b/src/cli.h index c946381..2b18722 100644 --- a/src/cli.h +++ b/src/cli.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CLI_H -#define FEATHER_CLI_H +#ifndef WOWLET_CLI_H +#define WOWLET_CLI_H #include #include "appcontext.h" @@ -46,4 +46,4 @@ signals: void closeApplication(); }; -#endif //FEATHER_CLI_H +#endif //WOWLET_CLI_H diff --git a/src/coinswidget.h b/src/coinswidget.h index 4ee451f..7464300 100644 --- a/src/coinswidget.h +++ b/src/coinswidget.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_COINSWIDGET_H -#define FEATHER_COINSWIDGET_H +#ifndef WOWLET_COINSWIDGET_H +#define WOWLET_COINSWIDGET_H #include "appcontext.h" #include "model/CoinsModel.h" @@ -76,4 +76,4 @@ private: }; -#endif //FEATHER_COINSWIDGET_H +#endif //WOWLET_COINSWIDGET_H diff --git a/src/config-feather.h b/src/config-feather.h new file mode 100644 index 0000000..8e6fd31 --- /dev/null +++ b/src/config-feather.h @@ -0,0 +1,12 @@ +#ifndef WOWLET_VERSION_H +#define WOWLET_VERSION_H + +#define WOWLET_VERSION "beta-1" +#define WOWLET_BRANCH "fd09b8875" + +#define MONERO_VERSION "v0.9.0.2" +#define MONERO_BRANCH "f611d5c9e" + +#define TOR_VERSION "" + +#endif //WOWLET_VERSION_H diff --git a/src/dialog/WalletCacheDebugDialog.h b/src/dialog/WalletCacheDebugDialog.h index 54a5f67..bd22a84 100644 --- a/src/dialog/WalletCacheDebugDialog.h +++ b/src/dialog/WalletCacheDebugDialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WALLETCACHEDEBUGDIALOG_H -#define FEATHER_WALLETCACHEDEBUGDIALOG_H +#ifndef WOWLET_WALLETCACHEDEBUGDIALOG_H +#define WOWLET_WALLETCACHEDEBUGDIALOG_H #include #include "appcontext.h" @@ -27,4 +27,4 @@ private: -#endif //FEATHER_WALLETCACHEDEBUGDIALOG_H +#endif //WOWLET_WALLETCACHEDEBUGDIALOG_H diff --git a/src/dialog/aboutdialog.cpp b/src/dialog/aboutdialog.cpp index 0d443c1..93f1dfc 100644 --- a/src/dialog/aboutdialog.cpp +++ b/src/dialog/aboutdialog.cpp @@ -4,7 +4,7 @@ #include "aboutdialog.h" #include "ui_aboutdialog.h" #include "utils/utils.h" -#include "config-feather.h" +#include "config-wowlet.h" AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) @@ -17,8 +17,8 @@ AboutDialog::AboutDialog(QWidget *parent) ui->aboutImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)); auto about = Utils::fileOpenQRC(":assets/about.txt"); auto about_text = Utils::barrayToString(about); - about_text = about_text.replace("", FEATHER_VERSION); - about_text = about_text.replace("", FEATHER_BRANCH); + about_text = about_text.replace("", WOWLET_VERSION); + about_text = about_text.replace("", WOWLET_BRANCH); about_text = about_text.replace("", QString::number(QDate::currentDate().year())); ui->copyrightText->setPlainText(about_text); diff --git a/src/dialog/aboutdialog.ui b/src/dialog/aboutdialog.ui index 9025c44..f928be0 100644 --- a/src/dialog/aboutdialog.ui +++ b/src/dialog/aboutdialog.ui @@ -25,7 +25,7 @@ 0 - + WOWlet diff --git a/src/dialog/balancedialog.h b/src/dialog/balancedialog.h index 3812be0..ee11724 100644 --- a/src/dialog/balancedialog.h +++ b/src/dialog/balancedialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_BALANCEDIALOG_H -#define FEATHER_BALANCEDIALOG_H +#ifndef WOWLET_BALANCEDIALOG_H +#define WOWLET_BALANCEDIALOG_H #include "libwalletqt/Wallet.h" @@ -24,4 +24,4 @@ private: Ui::BalanceDialog *ui; }; -#endif //FEATHER_BALANCEDIALOG_H +#endif //WOWLET_BALANCEDIALOG_H diff --git a/src/dialog/broadcasttxdialog.h b/src/dialog/broadcasttxdialog.h index bc2f5e3..a7553ae 100644 --- a/src/dialog/broadcasttxdialog.h +++ b/src/dialog/broadcasttxdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_BROADCASTTXDIALOG_H -#define FEATHER_BROADCASTTXDIALOG_H +#ifndef WOWLET_BROADCASTTXDIALOG_H +#define WOWLET_BROADCASTTXDIALOG_H #include #include "appcontext.h" @@ -32,4 +32,4 @@ private: }; -#endif //FEATHER_BROADCASTTXDIALOG_H +#endif //WOWLET_BROADCASTTXDIALOG_H diff --git a/src/dialog/contactsdialog.h b/src/dialog/contactsdialog.h index f94bf34..6c89b74 100644 --- a/src/dialog/contactsdialog.h +++ b/src/dialog/contactsdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CONTACTSDIALOG_H -#define FEATHER_CONTACTSDIALOG_H +#ifndef WOWLET_CONTACTSDIALOG_H +#define WOWLET_CONTACTSDIALOG_H #include @@ -28,4 +28,4 @@ private: QString m_name; }; -#endif //FEATHER_CONTACTSDIALOG_H +#endif //WOWLET_CONTACTSDIALOG_H diff --git a/src/dialog/debuginfodialog.cpp b/src/dialog/debuginfodialog.cpp index 4d99032..f1aeed0 100644 --- a/src/dialog/debuginfodialog.cpp +++ b/src/dialog/debuginfodialog.cpp @@ -3,7 +3,7 @@ #include "debuginfodialog.h" #include "ui_debuginfodialog.h" -#include "config-feather.h" +#include "config-wowlet.h" DebugInfoDialog::DebugInfoDialog(AppContext *ctx, QWidget *parent) : QDialog(parent) @@ -40,7 +40,7 @@ void DebugInfoDialog::updateInfo() { else torStatus = "Unknown"; - ui->label_featherVersion->setText(QString("%1-%2").arg(FEATHER_VERSION, FEATHER_BRANCH)); + ui->label_wowletVersion->setText(QString("%1-%2").arg(WOWLET_VERSION, WOWLET_BRANCH)); ui->label_moneroVersion->setText(QString("%1-%2").arg(MONERO_VERSION, MONERO_BRANCH)); ui->label_walletHeight->setText(QString::number(m_ctx->currentWallet->blockChainHeight())); @@ -56,7 +56,7 @@ void DebugInfoDialog::updateInfo() { ui->label_websocketStatus->setText(Utils::QtEnumToString(m_ctx->ws->webSocket.state()).remove("State")); ui->label_netType->setText(Utils::QtEnumToString(m_ctx->currentWallet->nettype())); - ui->label_seedType->setText(m_ctx->currentWallet->getCacheAttribute("feather.seed").isEmpty() ? "25 word" : "14 word"); + ui->label_seedType->setText(m_ctx->currentWallet->getCacheAttribute("wowlet.seed").isEmpty() ? "25 word" : "14 word"); ui->label_viewOnly->setText(m_ctx->currentWallet->viewOnly() ? "True" : "False"); ui->label_primaryOnly->setText(m_ctx->currentWallet->balance(0) == m_ctx->currentWallet->balanceAll() ? "True" : "False"); @@ -89,7 +89,7 @@ QString DebugInfoDialog::statusToString(Wallet::ConnectionStatus status) { void DebugInfoDialog::copyToClipboad() { // Two spaces at the end of each line are for newlines in Markdown QString text = ""; - text += QString("WOWlet version: %1 \n").arg(ui->label_featherVersion->text()); + text += QString("WOWlet version: %1 \n").arg(ui->label_wowletVersion->text()); text += QString("Wownero version: %1 \n").arg(ui->label_moneroVersion->text()); text += QString("Wallet height: %1 \n").arg(ui->label_walletHeight->text()); diff --git a/src/dialog/debuginfodialog.h b/src/dialog/debuginfodialog.h index 1f9821b..899fde3 100644 --- a/src/dialog/debuginfodialog.h +++ b/src/dialog/debuginfodialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_DEBUGINFODIALOG_H -#define FEATHER_DEBUGINFODIALOG_H +#ifndef WOWLET_DEBUGINFODIALOG_H +#define WOWLET_DEBUGINFODIALOG_H #include #include "appcontext.h" @@ -31,4 +31,4 @@ private: Ui::DebugInfoDialog *ui; }; -#endif //FEATHER_DEBUGINFODIALOG_H +#endif //WOWLET_DEBUGINFODIALOG_H diff --git a/src/dialog/debuginfodialog.ui b/src/dialog/debuginfodialog.ui index 6d312af..73f7352 100644 --- a/src/dialog/debuginfodialog.ui +++ b/src/dialog/debuginfodialog.ui @@ -24,7 +24,7 @@ - + TextLabel diff --git a/src/dialog/keysdialog.h b/src/dialog/keysdialog.h index e0fe0c0..5bc7453 100644 --- a/src/dialog/keysdialog.h +++ b/src/dialog/keysdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_KEYSDIALOG_H -#define FEATHER_KEYSDIALOG_H +#ifndef WOWLET_KEYSDIALOG_H +#define WOWLET_KEYSDIALOG_H #include #include "appcontext.h" @@ -24,4 +24,4 @@ private: }; -#endif //FEATHER_KEYSDIALOG_H +#endif //WOWLET_KEYSDIALOG_H diff --git a/src/dialog/outputinfodialog.h b/src/dialog/outputinfodialog.h index a691ab6..6d983bb 100644 --- a/src/dialog/outputinfodialog.h +++ b/src/dialog/outputinfodialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_OUTPUTINFODIALOG_H -#define FEATHER_OUTPUTINFODIALOG_H +#ifndef WOWLET_OUTPUTINFODIALOG_H +#define WOWLET_OUTPUTINFODIALOG_H #include #include "libwalletqt/Coins.h" @@ -25,4 +25,4 @@ private: }; -#endif //FEATHER_OUTPUTINFODIALOG_H +#endif //WOWLET_OUTPUTINFODIALOG_H diff --git a/src/dialog/outputsweepdialog.h b/src/dialog/outputsweepdialog.h index ebbffce..f3185e6 100644 --- a/src/dialog/outputsweepdialog.h +++ b/src/dialog/outputsweepdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_OUTPUTSWEEPDIALOG_H -#define FEATHER_OUTPUTSWEEPDIALOG_H +#ifndef WOWLET_OUTPUTSWEEPDIALOG_H +#define WOWLET_OUTPUTSWEEPDIALOG_H #include @@ -31,4 +31,4 @@ private: }; -#endif //FEATHER_OUTPUTSWEEPDIALOG_H +#endif //WOWLET_OUTPUTSWEEPDIALOG_H diff --git a/src/dialog/passwordchangedialog.h b/src/dialog/passwordchangedialog.h index 43debbb..c3a418a 100644 --- a/src/dialog/passwordchangedialog.h +++ b/src/dialog/passwordchangedialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_PASSWORDCHANGEDIALOG_H -#define FEATHER_PASSWORDCHANGEDIALOG_H +#ifndef WOWLET_PASSWORDCHANGEDIALOG_H +#define WOWLET_PASSWORDCHANGEDIALOG_H #include #include "libwalletqt/Wallet.h" @@ -27,4 +27,4 @@ private: void setPassword(); }; -#endif //FEATHER_PASSWORDCHANGEDIALOG_H +#endif //WOWLET_PASSWORDCHANGEDIALOG_H diff --git a/src/dialog/passworddialog.h b/src/dialog/passworddialog.h index 060de72..6b6bdf2 100644 --- a/src/dialog/passworddialog.h +++ b/src/dialog/passworddialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_PASSWORDDIALOG_H -#define FEATHER_PASSWORDDIALOG_H +#ifndef WOWLET_PASSWORDDIALOG_H +#define WOWLET_PASSWORDDIALOG_H #include @@ -24,4 +24,4 @@ private: Ui::PasswordDialog *ui; }; -#endif //FEATHER_PASSWORDDIALOG_H +#endif //WOWLET_PASSWORDDIALOG_H diff --git a/src/dialog/qrcodedialog.h b/src/dialog/qrcodedialog.h index 83c9715..b2cc300 100644 --- a/src/dialog/qrcodedialog.h +++ b/src/dialog/qrcodedialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_QRCODEDIALOG_H -#define FEATHER_QRCODEDIALOG_H +#ifndef WOWLET_QRCODEDIALOG_H +#define WOWLET_QRCODEDIALOG_H #include #include "qrcode/QrCode.h" @@ -29,4 +29,4 @@ private: }; -#endif //FEATHER_QRCODEDIALOG_H +#endif //WOWLET_QRCODEDIALOG_H diff --git a/src/dialog/seeddialog.cpp b/src/dialog/seeddialog.cpp index 9232981..f481c62 100644 --- a/src/dialog/seeddialog.cpp +++ b/src/dialog/seeddialog.cpp @@ -13,7 +13,7 @@ SeedDialog::SeedDialog(Wallet *wallet, QWidget *parent) ui->label_restoreHeight->setText(QString::number(wallet->getWalletCreationHeight())); - QString seed_14_words = wallet->getCacheAttribute("feather.seed"); + QString seed_14_words = wallet->getCacheAttribute("wowlet.seed"); QString seed_25_words = wallet->getSeed(); if (seed_14_words.isEmpty()) { diff --git a/src/dialog/seeddialog.h b/src/dialog/seeddialog.h index 52793e4..45c8179 100644 --- a/src/dialog/seeddialog.h +++ b/src/dialog/seeddialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_SEEDDIALOG_H -#define FEATHER_SEEDDIALOG_H +#ifndef WOWLET_SEEDDIALOG_H +#define WOWLET_SEEDDIALOG_H #include #include "libwalletqt/Wallet.h" @@ -26,4 +26,4 @@ private: }; -#endif //FEATHER_SEEDDIALOG_H +#endif //WOWLET_SEEDDIALOG_H diff --git a/src/dialog/signverifydialog.h b/src/dialog/signverifydialog.h index 0436cea..b53b40f 100644 --- a/src/dialog/signverifydialog.h +++ b/src/dialog/signverifydialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_SIGNVERIFYDIALOG_H -#define FEATHER_SIGNVERIFYDIALOG_H +#ifndef WOWLET_SIGNVERIFYDIALOG_H +#define WOWLET_SIGNVERIFYDIALOG_H #include #include "libwalletqt/Wallet.h" @@ -30,4 +30,4 @@ private slots: }; -#endif //FEATHER_SIGNVERIFYDIALOG_H +#endif //WOWLET_SIGNVERIFYDIALOG_H diff --git a/src/dialog/torinfodialog.h b/src/dialog/torinfodialog.h index 64c7e61..be71712 100644 --- a/src/dialog/torinfodialog.h +++ b/src/dialog/torinfodialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TORINFODIALOG_H -#define FEATHER_TORINFODIALOG_H +#ifndef WOWLET_TORINFODIALOG_H +#define WOWLET_TORINFODIALOG_H #include @@ -29,4 +29,4 @@ private: }; -#endif //FEATHER_TORINFODIALOG_H +#endif //WOWLET_TORINFODIALOG_H diff --git a/src/dialog/transactioninfodialog.h b/src/dialog/transactioninfodialog.h index 67ddad8..f5d93ca 100644 --- a/src/dialog/transactioninfodialog.h +++ b/src/dialog/transactioninfodialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TRANSACTIONINFODIALOG_H -#define FEATHER_TRANSACTIONINFODIALOG_H +#ifndef WOWLET_TRANSACTIONINFODIALOG_H +#define WOWLET_TRANSACTIONINFODIALOG_H #include #include @@ -35,4 +35,4 @@ private: QString m_txKey; }; -#endif //FEATHER_TRANSACTIONINFODIALOG_H +#endif //WOWLET_TRANSACTIONINFODIALOG_H diff --git a/src/dialog/txconfadvdialog.h b/src/dialog/txconfadvdialog.h index bd68797..08380d8 100644 --- a/src/dialog/txconfadvdialog.h +++ b/src/dialog/txconfadvdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TXCONFADVDIALOG_H -#define FEATHER_TXCONFADVDIALOG_H +#ifndef WOWLET_TXCONFADVDIALOG_H +#define WOWLET_TXCONFADVDIALOG_H #include #include @@ -50,4 +50,4 @@ private: QMenu *m_exportSignedMenu; }; -#endif //FEATHER_TXCONFADVDIALOG_H +#endif //WOWLET_TXCONFADVDIALOG_H diff --git a/src/dialog/txconfdialog.h b/src/dialog/txconfdialog.h index 0fdd95a..c13eef0 100644 --- a/src/dialog/txconfdialog.h +++ b/src/dialog/txconfdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TXCONFDIALOG_H -#define FEATHER_TXCONFDIALOG_H +#ifndef WOWLET_TXCONFDIALOG_H +#define WOWLET_TXCONFDIALOG_H #include #include "libwalletqt/PendingTransaction.h" @@ -33,4 +33,4 @@ private: QString m_description; }; -#endif //FEATHER_TXCONFDIALOG_H +#endif //WOWLET_TXCONFDIALOG_H diff --git a/src/dialog/tximportdialog.h b/src/dialog/tximportdialog.h index 13294f4..93ca797 100644 --- a/src/dialog/tximportdialog.h +++ b/src/dialog/tximportdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TXIMPORTDIALOG_H -#define FEATHER_TXIMPORTDIALOG_H +#ifndef WOWLET_TXIMPORTDIALOG_H +#define WOWLET_TXIMPORTDIALOG_H #include #include "appcontext.h" @@ -36,4 +36,4 @@ private: }; -#endif //FEATHER_TXIMPORTDIALOG_H +#endif //WOWLET_TXIMPORTDIALOG_H diff --git a/src/dialog/verifyproofdialog.h b/src/dialog/verifyproofdialog.h index cf8bde7..08eca19 100644 --- a/src/dialog/verifyproofdialog.h +++ b/src/dialog/verifyproofdialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_VERIFYPROOFDIALOG_H -#define FEATHER_VERIFYPROOFDIALOG_H +#ifndef WOWLET_VERIFYPROOFDIALOG_H +#define WOWLET_VERIFYPROOFDIALOG_H #include #include "libwalletqt/Wallet.h" @@ -32,4 +32,4 @@ private: Wallet *m_wallet; }; -#endif //FEATHER_VERIFYPROOFDIALOG_H +#endif //WOWLET_VERIFYPROOFDIALOG_H diff --git a/src/dialog/viewonlydialog.h b/src/dialog/viewonlydialog.h index ccc9c2e..2930750 100644 --- a/src/dialog/viewonlydialog.h +++ b/src/dialog/viewonlydialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_VIEWONLYDIALOG_H -#define FEATHER_VIEWONLYDIALOG_H +#ifndef WOWLET_VIEWONLYDIALOG_H +#define WOWLET_VIEWONLYDIALOG_H #include #include "appcontext.h" @@ -29,4 +29,4 @@ private: }; -#endif //FEATHER_KEYSDIALOG_H +#endif //WOWLET_KEYSDIALOG_H diff --git a/src/dialog/walletinfodialog.cpp b/src/dialog/walletinfodialog.cpp index 991cce7..d46909f 100644 --- a/src/dialog/walletinfodialog.cpp +++ b/src/dialog/walletinfodialog.cpp @@ -18,7 +18,7 @@ WalletInfoDialog::WalletInfoDialog(AppContext *ctx, QWidget *parent) ui->label_walletName->setText(keys.fileName().replace(".keys", "")); ui->label_netType->setText(Utils::QtEnumToString(ctx->currentWallet->nettype())); - ui->label_seedType->setText(ctx->currentWallet->getCacheAttribute("feather.seed").isEmpty() ? "25 word" : "14 word"); + ui->label_seedType->setText(ctx->currentWallet->getCacheAttribute("wowlet.seed").isEmpty() ? "25 word" : "14 word"); ui->label_viewOnly->setText(ctx->currentWallet->viewOnly() ? "True" : "False"); ui->label_path->setText(ctx->walletPath); ui->label_cacheSize->setText(QString("%1 MB").arg(QString::number(cache.size() / 1e6, 'f', 2))); diff --git a/src/dialog/walletinfodialog.h b/src/dialog/walletinfodialog.h index 9697475..81794f0 100644 --- a/src/dialog/walletinfodialog.h +++ b/src/dialog/walletinfodialog.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WALLETINFODIALOG_H -#define FEATHER_WALLETINFODIALOG_H +#ifndef WOWLET_WALLETINFODIALOG_H +#define WOWLET_WALLETINFODIALOG_H #include @@ -27,4 +27,4 @@ private: AppContext *m_ctx; }; -#endif //FEATHER_WALLETINFODIALOG_H +#endif //WOWLET_WALLETINFODIALOG_H diff --git a/src/globals.h b/src/globals.h index 03ef6b0..909f838 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_GLOBALS_H -#define FEATHER_GLOBALS_H +#ifndef WOWLET_GLOBALS_H +#define WOWLET_GLOBALS_H #include @@ -11,4 +11,4 @@ namespace globals const qreal cdiv = 1e11; } -#endif //FEATHER_GLOBALS_H +#endif //WOWLET_GLOBALS_H diff --git a/src/historywidget.h b/src/historywidget.h index 35c1df1..e898f8a 100644 --- a/src/historywidget.h +++ b/src/historywidget.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_HISTORYWIDGET_H -#define FEATHER_HISTORYWIDGET_H +#ifndef WOWLET_HISTORYWIDGET_H +#define WOWLET_HISTORYWIDGET_H #include "model/TransactionHistoryModel.h" #include "model/TransactionHistoryProxyModel.h" @@ -60,4 +60,4 @@ private: Wallet *m_wallet = nullptr; }; -#endif //FEATHER_HISTORYWIDGET_H +#endif //WOWLET_HISTORYWIDGET_H diff --git a/src/libwalletqt/AddressBookInfo.h b/src/libwalletqt/AddressBookInfo.h index c6e10f7..f969b9f 100644 --- a/src/libwalletqt/AddressBookInfo.h +++ b/src/libwalletqt/AddressBookInfo.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2014-2021, The Monero Project. -#ifndef FEATHER_ADDRESSBOOKINFO_H -#define FEATHER_ADDRESSBOOKINFO_H +#ifndef WOWLET_ADDRESSBOOKINFO_H +#define WOWLET_ADDRESSBOOKINFO_H #include #include @@ -25,4 +25,4 @@ private: }; -#endif //FEATHER_ADDRESSBOOKINFO_H +#endif //WOWLET_ADDRESSBOOKINFO_H diff --git a/src/libwalletqt/Coins.h b/src/libwalletqt/Coins.h index e92f458..d493d65 100644 --- a/src/libwalletqt/Coins.h +++ b/src/libwalletqt/Coins.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_COINS_H -#define FEATHER_COINS_H +#ifndef WOWLET_COINS_H +#define WOWLET_COINS_H #include @@ -49,4 +49,4 @@ private: mutable QList m_tinfo; }; -#endif //FEATHER_COINS_H +#endif //WOWLET_COINS_H diff --git a/src/libwalletqt/CoinsInfo.h b/src/libwalletqt/CoinsInfo.h index 05c71e7..a9155a4 100644 --- a/src/libwalletqt/CoinsInfo.h +++ b/src/libwalletqt/CoinsInfo.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_COINSINFO_H -#define FEATHER_COINSINFO_H +#ifndef WOWLET_COINSINFO_H +#define WOWLET_COINSINFO_H #include #include @@ -88,4 +88,4 @@ private: bool m_coinbase; }; -#endif //FEATHER_COINSINFO_H +#endif //WOWLET_COINSINFO_H diff --git a/src/libwalletqt/ConstructionInfo.h b/src/libwalletqt/ConstructionInfo.h index 5e70df7..3d46567 100644 --- a/src/libwalletqt/ConstructionInfo.h +++ b/src/libwalletqt/ConstructionInfo.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2014-2021, The Monero Project. -#ifndef FEATHER_CONSTRUCTIONINFO_H -#define FEATHER_CONSTRUCTIONINFO_H +#ifndef WOWLET_CONSTRUCTIONINFO_H +#define WOWLET_CONSTRUCTIONINFO_H #include #include @@ -43,4 +43,4 @@ private: }; -#endif //FEATHER_CONSTRUCTIONINFO_H +#endif //WOWLET_CONSTRUCTIONINFO_H diff --git a/src/libwalletqt/Input.h b/src/libwalletqt/Input.h index 1b3973a..5978f81 100644 --- a/src/libwalletqt/Input.h +++ b/src/libwalletqt/Input.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2014-2021, The Monero Project. -#ifndef FEATHER_INPUT_H -#define FEATHER_INPUT_H +#ifndef WOWLET_INPUT_H +#define WOWLET_INPUT_H #include #include @@ -26,4 +26,4 @@ public: }; -#endif //FEATHER_INPUT_H +#endif //WOWLET_INPUT_H diff --git a/src/libwalletqt/PendingTransactionInfo.h b/src/libwalletqt/PendingTransactionInfo.h index 85c7f22..63a4907 100644 --- a/src/libwalletqt/PendingTransactionInfo.h +++ b/src/libwalletqt/PendingTransactionInfo.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2014-2021, The Monero Project. -#ifndef FEATHER_PENDINGTRANSACTIONINFO_H -#define FEATHER_PENDINGTRANSACTIONINFO_H +#ifndef WOWLET_PENDINGTRANSACTIONINFO_H +#define WOWLET_PENDINGTRANSACTIONINFO_H #include #include "ConstructionInfo.h" @@ -43,4 +43,4 @@ private: }; -#endif //FEATHER_PENDINGTRANSACTIONINFO_H +#endif //WOWLET_PENDINGTRANSACTIONINFO_H diff --git a/src/libwalletqt/Ring.h b/src/libwalletqt/Ring.h index b09a964..5faca5c 100644 --- a/src/libwalletqt/Ring.h +++ b/src/libwalletqt/Ring.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_RINGS_H -#define FEATHER_RINGS_H +#ifndef WOWLET_RINGS_H +#define WOWLET_RINGS_H #include #include @@ -25,4 +25,4 @@ public: std::vector ringMembers() const { return m_ringMembers; } }; -#endif //FEATHER_RINGS_H +#endif //WOWLET_RINGS_H diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 8c94c48..d5ea6ad 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -22,7 +22,7 @@ namespace { static const int DAEMON_BLOCKCHAIN_TARGET_HEIGHT_CACHE_TTL_SECONDS = 30; static const int WALLET_CONNECTION_STATUS_CACHE_TTL_SECONDS = 5; - static constexpr char ATTRIBUTE_SUBADDRESS_ACCOUNT[] = "feather.subaddress_account"; + static constexpr char ATTRIBUTE_SUBADDRESS_ACCOUNT[] = "wowlet.subaddress_account"; } Wallet::Wallet(QObject * parent) diff --git a/src/main.cpp b/src/main.cpp index 04bbec9..fd8e65b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include #include -#include "config-feather.h" +#include "config-wowlet.h" #include "mainwindow.h" #include "cli.h" @@ -155,7 +155,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); QApplication::setDesktopSettingsAware(true); // use system font - QApplication::setApplicationVersion(FEATHER_VERSION); + QApplication::setApplicationVersion(WOWLET_VERSION); QApplication app(argc, argv); @@ -168,7 +168,7 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { if(!quiet) { QMap info; info["Qt"] = QT_VERSION_STR; - info["WOWlet"] = FEATHER_VERSION; + info["WOWlet"] = WOWLET_VERSION; if (stagenet) info["Mode"] = "Stagenet"; else if (testnet) info["Mode"] = "Testnet"; else info["Mode"] = "Mainnet"; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 256ff27..46d027e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -328,7 +328,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) : #ifdef Q_OS_MAC m_touchbar = new KDMacTouchBar(this); m_touchbarActionWelcome = new QAction(QIcon(":/assets/images/wowlet.png"), "Welcome to WOWlet!"); - m_touchbarWalletItems = {ui->actionSettings, ui->actionCalculator, ui->actionKeys, ui->actionDonate_to_Feather}; + m_touchbarWalletItems = {ui->actionSettings, ui->actionCalculator, ui->actionKeys, ui->actionDonate_to_Wowlet}; m_touchbarWizardItems = {m_touchbarActionWelcome}; #endif @@ -480,7 +480,7 @@ void MainWindow::initMenu() { // About screen connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::menuAboutClicked); - connect(ui->actionDonate_to_Feather, &QAction::triggered, this, &MainWindow::donateButtonClicked); + connect(ui->actionDonate_to_Wowlet, &QAction::triggered, this, &MainWindow::donateButtonClicked); // Close wallet connect(ui->actionClose, &QAction::triggered, this, &MainWindow::menuWalletCloseClicked); @@ -876,7 +876,7 @@ void MainWindow::updatePasswordIcon() { void MainWindow::showRestoreHeightDialog() { // settings custom restore height is only available for 25 word seeds - auto seed = m_ctx->currentWallet->getCacheAttribute("feather.seed"); + auto seed = m_ctx->currentWallet->getCacheAttribute("wowlet.seed"); if(!seed.isEmpty()) { const auto msg = "This wallet has a 14 word mnemonic seed which has the restore height embedded."; QMessageBox::warning(this, "Cannot set custom restore height", msg); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 884b712..4e4d905 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -429,7 +429,7 @@ - + @@ -504,7 +504,7 @@ Report bug - + Donate to WOWlet diff --git a/src/model/AddressBookProxyModel.h b/src/model/AddressBookProxyModel.h index 3b24e9e..20d7b20 100644 --- a/src/model/AddressBookProxyModel.h +++ b/src/model/AddressBookProxyModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_ADDRESSBOOKPROXYMODEL_H -#define FEATHER_ADDRESSBOOKPROXYMODEL_H +#ifndef WOWLET_ADDRESSBOOKPROXYMODEL_H +#define WOWLET_ADDRESSBOOKPROXYMODEL_H #include @@ -25,4 +25,4 @@ private: QRegExp m_searchRegExp; }; -#endif //FEATHER_ADDRESSBOOKPROXYMODEL_H +#endif //WOWLET_ADDRESSBOOKPROXYMODEL_H diff --git a/src/model/CCSModel.h b/src/model/CCSModel.h index 15c744f..871401c 100644 --- a/src/model/CCSModel.h +++ b/src/model/CCSModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CCSMODEL_H -#define FEATHER_CCSMODEL_H +#ifndef WOWLET_CCSMODEL_H +#define WOWLET_CCSMODEL_H #include #include @@ -39,4 +39,4 @@ private: }; -#endif //FEATHER_CCSMODEL_H +#endif //WOWLET_CCSMODEL_H diff --git a/src/model/CoinsModel.h b/src/model/CoinsModel.h index 062ff9d..7d7f0c3 100644 --- a/src/model/CoinsModel.h +++ b/src/model/CoinsModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_COINSMODEL_H -#define FEATHER_COINSMODEL_H +#ifndef WOWLET_COINSMODEL_H +#define WOWLET_COINSMODEL_H #include @@ -55,4 +55,4 @@ private: QIcon m_eyeBlind; }; -#endif //FEATHER_COINSMODEL_H +#endif //WOWLET_COINSMODEL_H diff --git a/src/model/CoinsProxyModel.h b/src/model/CoinsProxyModel.h index 43bff13..2e327f6 100644 --- a/src/model/CoinsProxyModel.h +++ b/src/model/CoinsProxyModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_COINSPROXYMODEL_H -#define FEATHER_COINSPROXYMODEL_H +#ifndef WOWLET_COINSPROXYMODEL_H +#define WOWLET_COINSPROXYMODEL_H #include #include "libwalletqt/Coins.h" @@ -25,4 +25,4 @@ private: Coins *m_coins; }; -#endif //FEATHER_COINSPROXYMODEL_H +#endif //WOWLET_COINSPROXYMODEL_H diff --git a/src/model/ModelUtils.h b/src/model/ModelUtils.h index b6b539e..15452d7 100644 --- a/src/model/ModelUtils.h +++ b/src/model/ModelUtils.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_MODELUTILS_H -#define FEATHER_MODELUTILS_H +#ifndef WOWLET_MODELUTILS_H +#define WOWLET_MODELUTILS_H #include #include @@ -15,4 +15,4 @@ public: }; -#endif //FEATHER_MODELUTILS_H +#endif //WOWLET_MODELUTILS_H diff --git a/src/model/NodeModel.cpp b/src/model/NodeModel.cpp index fabbbc1..47a83e0 100644 --- a/src/model/NodeModel.cpp +++ b/src/model/NodeModel.cpp @@ -19,7 +19,7 @@ void NodeModel::clear() { endResetModel(); } -void NodeModel::updateNodes(const QList nodes) { +void NodeModel::updateNodes(const QList nodes) { beginResetModel(); m_nodes.clear(); m_nodes = nodes; @@ -42,7 +42,7 @@ QVariant NodeModel::data(const QModelIndex &index, int role) const { if (!index.isValid() || index.row() < 0 || index.row() >= m_nodes.count()) return QVariant(); - FeatherNode node = m_nodes.at(index.row()); + WowletNode node = m_nodes.at(index.row()); if(role == Qt::DisplayRole) { switch(index.column()) { @@ -94,10 +94,10 @@ QVariant NodeModel::headerData(int section, Qt::Orientation orientation, int rol return QVariant(); } -FeatherNode NodeModel::node(int row) { +WowletNode NodeModel::node(int row) { if (row < 0 || row >= m_nodes.size()) { qCritical("%s: no reddit post for index %d", __FUNCTION__, row); - return FeatherNode(); + return WowletNode(); } return m_nodes.at(row); } diff --git a/src/model/NodeModel.h b/src/model/NodeModel.h index 5b79a5e..54d6c43 100644 --- a/src/model/NodeModel.h +++ b/src/model/NodeModel.h @@ -1,13 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_NODEMODEL_H -#define FEATHER_NODEMODEL_H +#ifndef WOWLET_NODEMODEL_H +#define WOWLET_NODEMODEL_H #include #include -class FeatherNode; +class WowletNode; class NodeModel : public QAbstractTableModel { Q_OBJECT @@ -25,16 +25,16 @@ public: int columnCount(const QModelIndex &parent) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - FeatherNode node(int row); + WowletNode node(int row); void clear(); - void updateNodes(QList nodes); + void updateNodes(QList nodes); private: - QList m_nodes; + QList m_nodes; QIcon m_offline; QIcon m_online; int m_nodeSource; }; -#endif //FEATHER_NODEMODEL_H +#endif //WOWLET_NODEMODEL_H diff --git a/src/model/RedditModel.h b/src/model/RedditModel.h index 2bd497e..73b14df 100644 --- a/src/model/RedditModel.h +++ b/src/model/RedditModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_REDDITMODEL_H -#define FEATHER_REDDITMODEL_H +#ifndef WOWLET_REDDITMODEL_H +#define WOWLET_REDDITMODEL_H #include #include @@ -38,4 +38,4 @@ private: QList> m_posts; }; -#endif //FEATHER_REDDITMODEL_H +#endif //WOWLET_REDDITMODEL_H diff --git a/src/model/SubaddressProxyModel.h b/src/model/SubaddressProxyModel.h index 7a51335..3c94de2 100644 --- a/src/model/SubaddressProxyModel.h +++ b/src/model/SubaddressProxyModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_SUBADDRESSPROXYMODEL_H -#define FEATHER_SUBADDRESSPROXYMODEL_H +#ifndef WOWLET_SUBADDRESSPROXYMODEL_H +#define WOWLET_SUBADDRESSPROXYMODEL_H #include "libwalletqt/Subaddress.h" @@ -35,4 +35,4 @@ private: bool m_hidePrimary; }; -#endif //FEATHER_SUBADDRESSPROXYMODEL_H +#endif //WOWLET_SUBADDRESSPROXYMODEL_H diff --git a/src/model/SubaddressView.h b/src/model/SubaddressView.h index ba98424..626cac7 100644 --- a/src/model/SubaddressView.h +++ b/src/model/SubaddressView.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_SUBADDRESSVIEW_H -#define FEATHER_SUBADDRESSVIEW_H +#ifndef WOWLET_SUBADDRESSVIEW_H +#define WOWLET_SUBADDRESSVIEW_H #include #include @@ -19,4 +19,4 @@ protected: void keyPressEvent(QKeyEvent *event); }; -#endif //FEATHER_SUBADDRESSVIEW_H +#endif //WOWLET_SUBADDRESSVIEW_H diff --git a/src/model/TransactionHistoryProxyModel.h b/src/model/TransactionHistoryProxyModel.h index 019976a..f7c0349 100644 --- a/src/model/TransactionHistoryProxyModel.h +++ b/src/model/TransactionHistoryProxyModel.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TRANSACTIONHISTORYPROXYMODEL_H -#define FEATHER_TRANSACTIONHISTORYPROXYMODEL_H +#ifndef WOWLET_TRANSACTIONHISTORYPROXYMODEL_H +#define WOWLET_TRANSACTIONHISTORYPROXYMODEL_H #include "libwalletqt/TransactionHistory.h" #include "libwalletqt/Wallet.h" @@ -30,4 +30,4 @@ private: QRegExp m_searchRegExp; }; -#endif //FEATHER_TRANSACTIONHISTORYPROXYMODEL_H +#endif //WOWLET_TRANSACTIONHISTORYPROXYMODEL_H diff --git a/src/receivewidget.h b/src/receivewidget.h index 035eb2c..8890f64 100644 --- a/src/receivewidget.h +++ b/src/receivewidget.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_RECEIVEWIDGET_H -#define FEATHER_RECEIVEWIDGET_H +#ifndef WOWLET_RECEIVEWIDGET_H +#define WOWLET_RECEIVEWIDGET_H #include "appcontext.h" #include "qrcode/QrCode.h" @@ -59,4 +59,4 @@ private: void showQrCodeDialog(); }; -#endif //FEATHER_RECEIVEWIDGET_H +#endif //WOWLET_RECEIVEWIDGET_H diff --git a/src/settings.cpp b/src/settings.cpp index af314e5..333770d 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -31,7 +31,7 @@ Settings::Settings(QWidget *parent) : // nodes ui->nodeWidget->setupUI(m_ctx); connect(ui->nodeWidget, &NodeWidget::nodeSourceChanged, m_ctx->nodes, &Nodes::onNodeSourceChanged); - connect(ui->nodeWidget, &NodeWidget::connectToNode, m_ctx->nodes, QOverload::of(&Nodes::connectToNode)); + connect(ui->nodeWidget, &NodeWidget::connectToNode, m_ctx->nodes, QOverload::of(&Nodes::connectToNode)); // setup checkboxes ui->checkBox_externalLink->setChecked(config()->get(Config::warnOnExternalLink).toBool()); diff --git a/src/utils/ColorScheme.h b/src/utils/ColorScheme.h index 9037271..31697ec 100644 --- a/src/utils/ColorScheme.h +++ b/src/utils/ColorScheme.h @@ -2,8 +2,8 @@ // Copyright (c) 2020-2021, The Monero Project. // Copyright (c) 2012 thomasv@gitorious -#ifndef FEATHER_COLORSCHEME_H -#define FEATHER_COLORSCHEME_H +#ifndef WOWLET_COLORSCHEME_H +#define WOWLET_COLORSCHEME_H #include #include @@ -41,4 +41,4 @@ public: }; -#endif //FEATHER_COLORSCHEME_H +#endif //WOWLET_COLORSCHEME_H diff --git a/src/utils/RestoreHeightLookup.h b/src/utils/RestoreHeightLookup.h index 882914b..5018a39 100644 --- a/src/utils/RestoreHeightLookup.h +++ b/src/utils/RestoreHeightLookup.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_RESTOREHEIGHTLOOKUP_H -#define FEATHER_RESTOREHEIGHTLOOKUP_H +#ifndef WOWLET_RESTOREHEIGHTLOOKUP_H +#define WOWLET_RESTOREHEIGHTLOOKUP_H #include #include @@ -73,4 +73,4 @@ struct RestoreHeightLookup { } }; -#endif //FEATHER_RESTOREHEIGHTLOOKUP_H +#endif //WOWLET_RESTOREHEIGHTLOOKUP_H diff --git a/src/utils/FeatherSeed.h b/src/utils/WowletSeed.h similarity index 95% rename from src/utils/FeatherSeed.h rename to src/utils/WowletSeed.h index b7dfbef..856230e 100644 --- a/src/utils/FeatherSeed.h +++ b/src/utils/WowletSeed.h @@ -1,5 +1,5 @@ -#ifndef FEATHER_FEATHERSEED_H -#define FEATHER_FEATHERSEED_H +#ifndef WOWLET_WOWLETSEED_H +#define WOWLET_WOWLETSEED_H #include "libwalletqt/WalletManager.h" #include "libwalletqt/Wallet.h" @@ -12,7 +12,7 @@ enum SeedType { TEVADOR // 14 word seeds }; -struct FeatherSeed { +struct WowletSeed { QString coin; QString language; SeedType seedType; @@ -27,7 +27,7 @@ struct FeatherSeed { QString errorString; - explicit FeatherSeed(RestoreHeightLookup *lookup, + explicit WowletSeed(RestoreHeightLookup *lookup, const QString &coin = "monero", const QString &language = "English", const QStringList &mnemonic = {}) @@ -111,4 +111,4 @@ struct FeatherSeed { } }; -#endif //FEATHER_FEATHERSEED_H +#endif //WOWLET_WOWLETSEED_H diff --git a/src/utils/childproc.h b/src/utils/childproc.h index 00afda7..f3c1dc0 100644 --- a/src/utils/childproc.h +++ b/src/utils/childproc.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_FPROCESS_H -#define FEATHER_FPROCESS_H +#ifndef WOWLET_FPROCESS_H +#define WOWLET_FPROCESS_H #include @@ -21,4 +21,4 @@ protected: }; -#endif //FEATHER_FPROCESS_H +#endif //WOWLET_FPROCESS_H diff --git a/src/utils/config.h b/src/utils/config.h index bf87a88..abc408d 100644 --- a/src/utils/config.h +++ b/src/utils/config.h @@ -3,8 +3,8 @@ // Copyright (C) 2011 Felix Geyer // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_SETTINGS_H -#define FEATHER_SETTINGS_H +#ifndef WOWLET_SETTINGS_H +#define WOWLET_SETTINGS_H #include #include @@ -78,4 +78,4 @@ inline Config* config() return Config::instance(); } -#endif //FEATHER_SETTINGS_H +#endif //WOWLET_SETTINGS_H diff --git a/src/utils/daemonrpc.h b/src/utils/daemonrpc.h index c2d6692..408a387 100644 --- a/src/utils/daemonrpc.h +++ b/src/utils/daemonrpc.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_DAEMON_RPC_H -#define FEATHER_DAEMON_RPC_H +#ifndef WOWLET_DAEMON_RPC_H +#define WOWLET_DAEMON_RPC_H #include @@ -48,4 +48,4 @@ private: }; -#endif //FEATHER_DAEMON_RPC_H +#endif //WOWLET_DAEMON_RPC_H diff --git a/src/utils/networking.h b/src/utils/networking.h index 2d163e3..a9fa984 100644 --- a/src/utils/networking.h +++ b/src/utils/networking.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_NETWORKING_H -#define FEATHER_NETWORKING_H +#ifndef WOWLET_NETWORKING_H +#define WOWLET_NETWORKING_H #include #include @@ -38,4 +38,4 @@ private: QNetworkAccessManager *m_networkAccessManager; }; -#endif //FEATHER_NETWORKING_H +#endif //WOWLET_NETWORKING_H diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp index f75c520..246dbf5 100644 --- a/src/utils/nodes.cpp +++ b/src/utils/nodes.cpp @@ -12,7 +12,7 @@ Nodes::Nodes(AppContext *ctx, QNetworkAccessManager *networkAccessManager, QObje QObject(parent), m_ctx(ctx), m_networkAccessManager(networkAccessManager), - m_connection(FeatherNode()), + m_connection(WowletNode()), modelWebsocket(new NodeModel(NodeSource::websocket, this)), modelCustom(new NodeModel(NodeSource::custom, this)) { this->loadConfig(); @@ -41,7 +41,7 @@ void Nodes::loadConfig() { // load custom nodes auto nodes = obj.value("custom").toArray(); for (auto value: nodes) { - auto customNode = FeatherNode(value.toString()); + auto customNode = WowletNode(value.toString()); customNode.custom = true; if(m_connection == customNode) { @@ -57,7 +57,7 @@ void Nodes::loadConfig() { // load cached websocket nodes auto ws = obj.value("ws").toArray(); for (auto value: ws) { - auto wsNode = FeatherNode(value.toString()); + auto wsNode = WowletNode(value.toString()); wsNode.custom = false; wsNode.online = true; // assume online @@ -104,7 +104,7 @@ void Nodes::loadConfig() { nodes_list = nodes_json[netKey].toObject()["clearnet"].toArray(); } for (auto node: nodes_list) { - auto wsNode = FeatherNode(node.toString()); + auto wsNode = WowletNode(node.toString()); wsNode.custom = false; wsNode.online = true; m_websocketNodes.append(wsNode); @@ -134,7 +134,7 @@ void Nodes::connectToNode() { this->autoConnect(true); } -void Nodes::connectToNode(const FeatherNode &node) { +void Nodes::connectToNode(const WowletNode &node) { if (node.address.isEmpty()) return; @@ -169,7 +169,7 @@ void Nodes::autoConnect(bool forceReconnect) { if (wsMode && !m_wsNodesReceived && m_websocketNodes.count() == 0) { // this situation should rarely occur due to the usage of the websocket node cache on startup. - qInfo() << "Feather is in websocket connection mode but was not able to receive any nodes (yet)."; + qInfo() << "WOWlet is in websocket connection mode but was not able to receive any nodes (yet)."; return; } @@ -200,9 +200,9 @@ void Nodes::autoConnect(bool forceReconnect) { this->updateModels(); } -FeatherNode Nodes::pickEligibleNode() { +WowletNode Nodes::pickEligibleNode() { // Pick a node at random to connect to - auto rtn = FeatherNode(); + auto rtn = WowletNode(); auto wsMode = (this->source() == NodeSource::websocket); auto nodes = wsMode ? m_websocketNodes : m_customNodes; @@ -224,7 +224,7 @@ FeatherNode Nodes::pickEligibleNode() { // Pick random eligible node int mode_height = this->modeHeight(nodes); for (int index : node_indeces) { - const FeatherNode &node = nodes.at(index); + const WowletNode &node = nodes.at(index); // This may fail to detect bad nodes if cached nodes are used // Todo: wait on websocket before connecting, only use cache if websocket is unavailable @@ -258,7 +258,7 @@ FeatherNode Nodes::pickEligibleNode() { return rtn; } -void Nodes::onWSNodesReceived(const QList> &nodes) { +void Nodes::onWSNodesReceived(const QList> &nodes) { m_websocketNodes.clear(); m_wsNodesReceived = true; @@ -303,7 +303,7 @@ void Nodes::onNodeSourceChanged(NodeSource nodeSource) { this->autoConnect(true); } -void Nodes::setCustomNodes(const QList &nodes) { +void Nodes::setCustomNodes(const QList &nodes) { m_customNodes.clear(); auto key = QString::number(m_ctx->networkType); auto obj = m_configJson.value(key).toObject(); @@ -329,7 +329,7 @@ void Nodes::updateModels() { } void Nodes::resetLocalState() { - auto resetState = [this](QList *model){ + auto resetState = [this](QList *model){ for (auto&& node: *model) { node.isConnecting = false; node.isActive = false; @@ -372,11 +372,11 @@ void Nodes::WSNodeExhaustedWarning() { m_wsExhaustedWarningEmitted = true; } -QList Nodes::customNodes() { +QList Nodes::customNodes() { return m_customNodes; } -FeatherNode Nodes::connection() { +WowletNode Nodes::connection() { return m_connection; } @@ -384,7 +384,7 @@ NodeSource Nodes::source() { return m_source; } -int Nodes::modeHeight(const QList &nodes) { +int Nodes::modeHeight(const QList &nodes) { QVector heights; for (const auto &node: nodes) { heights.push_back(node.height); diff --git a/src/utils/nodes.h b/src/utils/nodes.h index 97c8ccb..083c309 100644 --- a/src/utils/nodes.h +++ b/src/utils/nodes.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_NODES_H -#define FEATHER_NODES_H +#ifndef WOWLET_NODES_H +#define WOWLET_NODES_H #include #include @@ -20,8 +20,8 @@ enum NodeSource { custom }; -struct FeatherNode { - explicit FeatherNode(QString _address = "", int height = 0, int target_height = 0, bool online = false) +struct WowletNode { + explicit WowletNode(QString _address = "", int height = 0, int target_height = 0, bool online = false) : height(height), target_height(target_height), online(online){ // wonky ipv4/host parsing, should be fine(tm)(c). if(_address.isEmpty()) return; @@ -73,7 +73,7 @@ struct FeatherNode { return QString("%1://%2/get_info").arg(this->isHttps ? "https": "http",this->full); } - bool operator == (const FeatherNode &other) const { + bool operator == (const WowletNode &other) const { return this->full == other.full; } }; @@ -87,18 +87,18 @@ public: void writeConfig(); NodeSource source(); - FeatherNode connection(); - QList customNodes(); + WowletNode connection(); + QList customNodes(); NodeModel *modelWebsocket; NodeModel *modelCustom; public slots: void connectToNode(); - void connectToNode(const FeatherNode &node); - void onWSNodesReceived(const QList>& nodes); + void connectToNode(const WowletNode &node); + void onWSNodesReceived(const QList>& nodes); void onNodeSourceChanged(NodeSource nodeSource); - void setCustomNodes(const QList& nodes); + void setCustomNodes(const QList& nodes); void autoConnect(bool forceReconnect = false); signals: @@ -114,24 +114,24 @@ private: QStringList m_recentFailures; - QList m_customNodes; - QList m_websocketNodes; + QList m_customNodes; + QList m_websocketNodes; - FeatherNode m_connection; // current active connection, if any + WowletNode m_connection; // current active connection, if any bool m_wsNodesReceived = false; bool m_wsExhaustedWarningEmitted = true; bool m_customExhaustedWarningEmitted = true; bool m_enableAutoconnect = true; - FeatherNode pickEligibleNode(); + WowletNode pickEligibleNode(); void updateModels(); void resetLocalState(); void exhausted(); void WSNodeExhaustedWarning(); void nodeExhaustedWarning(); - int modeHeight(const QList &nodes); + int modeHeight(const QList &nodes); }; -#endif //FEATHER_NODES_H +#endif //WOWLET_NODES_H diff --git a/src/utils/prices.h b/src/utils/prices.h index 3f0df18..4749e0c 100644 --- a/src/utils/prices.h +++ b/src/utils/prices.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_PRICES_H -#define FEATHER_PRICES_H +#ifndef WOWLET_PRICES_H +#define WOWLET_PRICES_H #include #include @@ -39,4 +39,4 @@ signals: void cryptoPricesUpdated(); }; -#endif //FEATHER_PRICES_H +#endif //WOWLET_PRICES_H diff --git a/src/utils/tor.cpp b/src/utils/tor.cpp index df52380..a4e0996 100644 --- a/src/utils/tor.cpp +++ b/src/utils/tor.cpp @@ -8,7 +8,7 @@ #include "utils/utils.h" #include "utils/tor.h" #include "appcontext.h" -#include "config-feather.h" +#include "config-wowlet.h" QString Tor::torHost = "127.0.0.1"; quint16 Tor::torPort = 9050; @@ -116,7 +116,7 @@ void Tor::start() { } void Tor::checkConnection() { - // We might not be able to connect to localhost if torsocks is used to start feather + // We might not be able to connect to localhost if torsocks is used to start wowlet if (m_ctx->isTorSocks) this->setConnectionState(true); diff --git a/src/utils/tor.h b/src/utils/tor.h index 22ab243..2bdf02b 100644 --- a/src/utils/tor.h +++ b/src/utils/tor.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TOR_H -#define FEATHER_TOR_H +#ifndef WOWLET_TOR_H +#define WOWLET_TOR_H #include #include @@ -112,4 +112,4 @@ private: class AppContext; // forward declaration -#endif //FEATHER_TOR_H \ No newline at end of file +#endif //WOWLET_TOR_H \ No newline at end of file diff --git a/src/utils/txfiathistory.h b/src/utils/txfiathistory.h index 5587b7f..d3eca70 100644 --- a/src/utils/txfiathistory.h +++ b/src/utils/txfiathistory.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TXFIATHISTORY_H -#define FEATHER_TXFIATHISTORY_H +#ifndef WOWLET_TXFIATHISTORY_H +#define WOWLET_TXFIATHISTORY_H class TxFiatHistory : public QObject { Q_OBJECT @@ -30,4 +30,4 @@ private: int m_genesis_timestamp; }; -#endif //FEATHER_TXFIATHISTORY_H +#endif //WOWLET_TXFIATHISTORY_H diff --git a/src/utils/utils.h b/src/utils/utils.h index d38ceb0..962e000 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_UTILS_H -#define FEATHER_UTILS_H +#ifndef WOWLET_UTILS_H +#define WOWLET_UTILS_H #include #include @@ -86,4 +86,4 @@ public: class AppContext; // forward declaration -#endif //FEATHER_UTILS_H +#endif //WOWLET_UTILS_H diff --git a/src/utils/whonix.h b/src/utils/whonix.h index 538332b..8d923f5 100644 --- a/src/utils/whonix.h +++ b/src/utils/whonix.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WHONIX_H -#define FEATHER_WHONIX_H +#ifndef WOWLET_WHONIX_H +#define WOWLET_WHONIX_H #include @@ -12,4 +12,4 @@ struct WhonixOS { }; -#endif //FEATHER_WHONIX_H +#endif //WOWLET_WHONIX_H diff --git a/src/utils/xmrig.h b/src/utils/xmrig.h index 7d6afc2..c25c52a 100644 --- a/src/utils/xmrig.h +++ b/src/utils/xmrig.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_XMRIG_H -#define FEATHER_XMRIG_H +#ifndef WOWLET_XMRIG_H +#define WOWLET_XMRIG_H #include #include @@ -42,4 +42,4 @@ private: ChildProcess m_process; }; -#endif //FEATHER_XMRIG_H +#endif //WOWLET_XMRIG_H diff --git a/src/widgets/CCSEntry.h b/src/widgets/CCSEntry.h index 6ec48dd..8c68364 100644 --- a/src/widgets/CCSEntry.h +++ b/src/widgets/CCSEntry.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CCSENTRY_H -#define FEATHER_CCSENTRY_H +#ifndef WOWLET_CCSENTRY_H +#define WOWLET_CCSENTRY_H #include @@ -21,4 +21,4 @@ struct CCSEntry { int contributions = 0; }; -#endif //FEATHER_CCSENTRY_H +#endif //WOWLET_CCSENTRY_H diff --git a/src/widgets/PayToEdit.h b/src/widgets/PayToEdit.h index 78ffd23..74d66cc 100644 --- a/src/widgets/PayToEdit.h +++ b/src/widgets/PayToEdit.h @@ -2,8 +2,8 @@ // Copyright (c) 2020-2021, The Monero Project. // Copyright (c) 2012 thomasv@gitorious -#ifndef FEATHER_PAYTOEDIT_H -#define FEATHER_PAYTOEDIT_H +#ifndef WOWLET_PAYTOEDIT_H +#define WOWLET_PAYTOEDIT_H #include #include @@ -67,4 +67,4 @@ private: QVector m_outputs; }; -#endif //FEATHER_PAYTOEDIT_H +#endif //WOWLET_PAYTOEDIT_H diff --git a/src/widgets/RedditPost.h b/src/widgets/RedditPost.h index 221db91..05bf06e 100644 --- a/src/widgets/RedditPost.h +++ b/src/widgets/RedditPost.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_REDDITPOST_H -#define FEATHER_REDDITPOST_H +#ifndef WOWLET_REDDITPOST_H +#define WOWLET_REDDITPOST_H #include @@ -16,4 +16,4 @@ struct RedditPost { int comments; }; -#endif //FEATHER_REDDITPOST_H +#endif //WOWLET_REDDITPOST_H diff --git a/src/widgets/ccsprogressdelegate.h b/src/widgets/ccsprogressdelegate.h index c2fd13e..cb20047 100644 --- a/src/widgets/ccsprogressdelegate.h +++ b/src/widgets/ccsprogressdelegate.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CSSPROGRESSDELEGATE_H -#define FEATHER_CSSPROGRESSDELEGATE_H +#ifndef WOWLET_CSSPROGRESSDELEGATE_H +#define WOWLET_CSSPROGRESSDELEGATE_H #include #include "model/CCSModel.h" @@ -20,4 +20,4 @@ private: }; -#endif //FEATHER_CSSPROGRESSDELEGATE_H +#endif //WOWLET_CSSPROGRESSDELEGATE_H diff --git a/src/widgets/nodewidget.cpp b/src/widgets/nodewidget.cpp index 4fe5056..f8b08d0 100644 --- a/src/widgets/nodewidget.cpp +++ b/src/widgets/nodewidget.cpp @@ -49,7 +49,7 @@ NodeWidget::NodeWidget(QWidget *parent) void NodeWidget::onShowWSContextMenu(const QPoint &pos) { m_activeView = ui->wsView; - FeatherNode node = this->selectedNode(); + WowletNode node = this->selectedNode(); if (node.full.isEmpty()) return; this->showContextMenu(pos, node); @@ -57,13 +57,13 @@ void NodeWidget::onShowWSContextMenu(const QPoint &pos) { void NodeWidget::onShowCustomContextMenu(const QPoint &pos) { m_activeView = ui->customView; - FeatherNode node = this->selectedNode(); + WowletNode node = this->selectedNode(); if (node.full.isEmpty()) return; this->showContextMenu(pos, node); } -void NodeWidget::showContextMenu(const QPoint &pos, const FeatherNode &node) { +void NodeWidget::showContextMenu(const QPoint &pos, const WowletNode &node) { QMenu menu(this); if (!node.isActive) { @@ -86,27 +86,27 @@ void NodeWidget::onContextConnect() { else m_activeView = ui->wsView; - FeatherNode node = this->selectedNode(); + WowletNode node = this->selectedNode(); if (!node.full.isEmpty()) emit connectToNode(node); } void NodeWidget::onContextStatusURL() { - FeatherNode node = this->selectedNode(); + WowletNode node = this->selectedNode(); if (!node.full.isEmpty()) Utils::externalLinkWarning(this, node.as_url()); } void NodeWidget::onContextNodeCopy() { - FeatherNode node = this->selectedNode(); + WowletNode node = this->selectedNode(); Utils::copyToClipboard(node.full); } -FeatherNode NodeWidget::selectedNode() { +WowletNode NodeWidget::selectedNode() { QModelIndex index = m_activeView->currentIndex(); - if (!index.isValid()) return FeatherNode(); + if (!index.isValid()) return WowletNode(); - FeatherNode node; + WowletNode node; if (m_activeView == ui->customView) { node = m_customModel->node(index.row()); } else { @@ -118,10 +118,10 @@ FeatherNode NodeWidget::selectedNode() { void NodeWidget::onContextCustomNodeRemove() { QModelIndex index = ui->customView->currentIndex(); if (!index.isValid()) return; - FeatherNode node = m_customModel->node(index.row()); + WowletNode node = m_customModel->node(index.row()); auto nodes = m_ctx->nodes->customNodes(); - QMutableListIterator i(nodes); + QMutableListIterator i(nodes); while (i.hasNext()) if (i.next() == node) i.remove(); @@ -141,14 +141,14 @@ void NodeWidget::onCustomAddClicked(){ if (!ok || text.isEmpty()) return; - QList nodesList; + QList nodesList; auto newNodesList = text.split("\n"); for(auto &newNodeText: newNodesList) { newNodeText = newNodeText.replace("\r", "").trimmed(); if(newNodeText.isEmpty()) continue; - auto node = FeatherNode(newNodeText); + auto node = WowletNode(newNodeText); node.custom = true; nodesList.append(node); } diff --git a/src/widgets/nodewidget.h b/src/widgets/nodewidget.h index be987f4..e21e387 100644 --- a/src/widgets/nodewidget.h +++ b/src/widgets/nodewidget.h @@ -40,7 +40,7 @@ private slots: void onContextNodeCopy(); signals: - void connectToNode(FeatherNode node); + void connectToNode(WowletNode node); void nodeSourceChanged(NodeSource nodeSource); private: @@ -56,8 +56,8 @@ private: QAction *m_contextActionOpenStatusURL; QAction *m_contextActionCopy; - void showContextMenu(const QPoint &pos, const FeatherNode &node); - FeatherNode selectedNode(); + void showContextMenu(const QPoint &pos, const WowletNode &node); + WowletNode selectedNode(); }; #endif // NODEWIDGET_H diff --git a/src/widgets/suchwowwidget.h b/src/widgets/suchwowwidget.h index bd1519f..802a845 100644 --- a/src/widgets/suchwowwidget.h +++ b/src/widgets/suchwowwidget.h @@ -57,6 +57,7 @@ signals: void thumbReceived(SuchWowPost *test); private: + // @TODO: Replace url QString m_weburl = "http://feathercitimllbmdktu6cmjo3fizgmyfrntntqzu6xguqa2rlq5cgid.onion/suchwow"; AppContext *m_ctx = nullptr; UtilsNetworking *m_networkThumb = nullptr; diff --git a/src/widgets/txproofwidget.h b/src/widgets/txproofwidget.h index f142627..0be3146 100644 --- a/src/widgets/txproofwidget.h +++ b/src/widgets/txproofwidget.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_TXPROOFWIDGET_H -#define FEATHER_TXPROOFWIDGET_H +#ifndef WOWLET_TXPROOFWIDGET_H +#define WOWLET_TXPROOFWIDGET_H #include @@ -30,4 +30,4 @@ private: Wallet *m_wallet; }; -#endif //FEATHER_TXPROOFWIDGET_H +#endif //WOWLET_TXPROOFWIDGET_H diff --git a/src/widgets/xmrigwidget.cpp b/src/widgets/xmrigwidget.cpp index 3574fbe..c683c9e 100644 --- a/src/widgets/xmrigwidget.cpp +++ b/src/widgets/xmrigwidget.cpp @@ -83,11 +83,11 @@ XMRigWidget::XMRigWidget(AppContext *ctx, QWidget *parent) : // username/password connect(ui->lineEdit_password, &QLineEdit::editingFinished, [=]() { - m_ctx->currentWallet->setCacheAttribute("feather.xmrig_password", ui->lineEdit_password->text()); + m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_password", ui->lineEdit_password->text()); m_ctx->storeWallet(); }); connect(ui->lineEdit_address, &QLineEdit::editingFinished, [=]() { - m_ctx->currentWallet->setCacheAttribute("feather.xmrig_username", ui->lineEdit_address->text()); + m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_username", ui->lineEdit_address->text()); m_ctx->storeWallet(); }); @@ -104,17 +104,17 @@ void XMRigWidget::onWalletClosed() { void XMRigWidget::onWalletOpened(Wallet *wallet){ // Xmrig username - auto username = m_ctx->currentWallet->getCacheAttribute("feather.xmrig_username"); + auto username = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_username"); if(!username.isEmpty()) ui->lineEdit_address->setText(username); // Xmrig passwd - auto password = m_ctx->currentWallet->getCacheAttribute("feather.xmrig_password"); + auto password = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_password"); if(!password.isEmpty()) { ui->lineEdit_password->setText(password); } else { - ui->lineEdit_password->setText("featherwallet"); - m_ctx->currentWallet->setCacheAttribute("feather.xmrig_password", ui->lineEdit_password->text()); + ui->lineEdit_password->setText("wowlet"); + m_ctx->currentWallet->setCacheAttribute("wowlet.xmrig_password", ui->lineEdit_password->text()); } } @@ -145,8 +145,8 @@ void XMRigWidget::onStartClicked() { xmrigPath = config()->get(Config::xmrigPath).toString(); // username is receiving address usually - auto username = m_ctx->currentWallet->getCacheAttribute("feather.xmrig_username"); - auto password = m_ctx->currentWallet->getCacheAttribute("feather.xmrig_password"); + auto username = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_username"); + auto password = m_ctx->currentWallet->getCacheAttribute("wowlet.xmrig_password"); if(username.isEmpty()) { QString err = "Please specify a receiving address on the Settings screen"; diff --git a/src/wizard/createwallet.h b/src/wizard/createwallet.h index 28a4675..a51d68b 100644 --- a/src/wizard/createwallet.h +++ b/src/wizard/createwallet.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CREATEWALLET_H -#define FEATHER_CREATEWALLET_H +#ifndef WOWLET_CREATEWALLET_H +#define WOWLET_CREATEWALLET_H #include #include @@ -35,4 +35,4 @@ private: bool validateWidgets(); }; -#endif //FEATHER_CREATEWALLET_H +#endif //WOWLET_CREATEWALLET_H diff --git a/src/wizard/createwalletseed.cpp b/src/wizard/createwalletseed.cpp index 1e538b5..65da829 100644 --- a/src/wizard/createwalletseed.cpp +++ b/src/wizard/createwalletseed.cpp @@ -51,7 +51,7 @@ void CreateWalletSeedPage::seedRoulette(int count) { } void CreateWalletSeedPage::generateSeed() { - 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_mnemonic = seed.mnemonic.join(" "); m_restoreHeight = seed.restoreHeight; this->displaySeed(m_mnemonic); diff --git a/src/wizard/createwalletseed.h b/src/wizard/createwalletseed.h index 986068d..b021891 100644 --- a/src/wizard/createwalletseed.h +++ b/src/wizard/createwalletseed.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_CREATEWALLETSEED_H -#define FEATHER_CREATEWALLETSEED_H +#ifndef WOWLET_CREATEWALLETSEED_H +#define WOWLET_CREATEWALLETSEED_H #include #include @@ -47,4 +47,4 @@ private: int m_rouletteSpin = 15; }; -#endif //FEATHER_CREATEWALLETSEED_H +#endif //WOWLET_CREATEWALLETSEED_H diff --git a/src/wizard/menu.h b/src/wizard/menu.h index d62c999..8d03d64 100644 --- a/src/wizard/menu.h +++ b/src/wizard/menu.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WIZARDMENU_H -#define FEATHER_WIZARDMENU_H +#ifndef WOWLET_WIZARDMENU_H +#define WOWLET_WIZARDMENU_H #include #include @@ -30,4 +30,4 @@ private: Ui::MenuPage *ui; }; -#endif //FEATHER_WIZARDMENU_H +#endif //WOWLET_WIZARDMENU_H diff --git a/src/wizard/network.cpp b/src/wizard/network.cpp index 8921ac2..ea3aed1 100644 --- a/src/wizard/network.cpp +++ b/src/wizard/network.cpp @@ -16,8 +16,8 @@ NetworkPage::NetworkPage(AppContext *ctx, QWidget *parent) : ui->customFrame->hide(); QPixmap p(":assets/images/wowlet.png"); - ui->featherImage->setText(""); - ui->featherImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + ui->wowletImage->setText(""); + ui->wowletImage->setPixmap(p.scaled(128, 128, Qt::KeepAspectRatio, Qt::SmoothTransformation)); ui->label_eg->setText("Examples:\n- http://127.0.0.1:34568\n- my.node.com\n- my.node.com:34568\n- user:pass@my.node.com:34568"); auto nodeSourceUInt = config()->get(Config::nodeSource).toUInt(); @@ -59,7 +59,7 @@ bool NetworkPage::validatePage() { auto nodeText = ui->lineEdit_customNode->text().trimmed(); if(!nodeText.isEmpty()) { auto customNodes = m_ctx->nodes->customNodes(); - auto node = FeatherNode(nodeText); + auto node = WowletNode(nodeText); customNodes.append(node); m_ctx->setCustomNodes(customNodes); } diff --git a/src/wizard/network.h b/src/wizard/network.h index 61b276c..d58d606 100644 --- a/src/wizard/network.h +++ b/src/wizard/network.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WIZARDNETWORK_H -#define FEATHER_WIZARDNETWORK_H +#ifndef WOWLET_WIZARDNETWORK_H +#define WOWLET_WIZARDNETWORK_H #include #include @@ -30,4 +30,4 @@ private: Ui::NetworkPage *ui; }; -#endif //FEATHER_WIZARDNETWORK_H +#endif //WOWLET_WIZARDNETWORK_H diff --git a/src/wizard/network.ui b/src/wizard/network.ui index 9ad92f8..6066b02 100644 --- a/src/wizard/network.ui +++ b/src/wizard/network.ui @@ -29,7 +29,7 @@ - + 128 @@ -204,7 +204,7 @@ - Automatically connect to a remote node, hosted by the feather team and various trusted Wownero community members. These nodes are provided as "best effort". + Automatically connect to a remote node, hosted by the wowlet team and various trusted Wownero community members. These nodes are provided as "best effort". true diff --git a/src/wizard/openwallet.h b/src/wizard/openwallet.h index d3efa7e..7c4a0ad 100644 --- a/src/wizard/openwallet.h +++ b/src/wizard/openwallet.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_OPENWALLET_H -#define FEATHER_OPENWALLET_H +#ifndef WOWLET_OPENWALLET_H +#define WOWLET_OPENWALLET_H #include #include @@ -38,4 +38,4 @@ private: QStandardItemModel *m_model; }; -#endif //FEATHER_OPENWALLET_H +#endif //WOWLET_OPENWALLET_H diff --git a/src/wizard/restorewallet.cpp b/src/wizard/restorewallet.cpp index 866517f..83738dd 100644 --- a/src/wizard/restorewallet.cpp +++ b/src/wizard/restorewallet.cpp @@ -10,7 +10,7 @@ #include #include // tevador 14 word -#include "utils/FeatherSeed.h" +#include "utils/WowletSeed.h" RestorePage::RestorePage(AppContext *ctx, QWidget *parent) : QWizardPage(parent), @@ -21,7 +21,7 @@ RestorePage::RestorePage(AppContext *ctx, QWidget *parent) : ui->restoreFrame->hide(); ui->label_errorString->hide(); - QFont f("feather"); + QFont f("wowlet"); f.setStyleHint(QFont::Monospace); auto data = Utils::fileOpen(":/assets/mnemonic_25_english.txt"); @@ -150,7 +150,7 @@ bool RestorePage::validatePage() { } } - auto _seed = FeatherSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage, seedSplit); + auto _seed = WowletSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage, seedSplit); if (!_seed.errorString.isEmpty()) { QMessageBox::warning(this, "Invalid seed", QString("Invalid seed:\n\n%1").arg(_seed.errorString)); ui->seedEdit->setStyleSheet(errStyle); diff --git a/src/wizard/restorewallet.h b/src/wizard/restorewallet.h index 4774f0a..0b61d4e 100644 --- a/src/wizard/restorewallet.h +++ b/src/wizard/restorewallet.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WIZARDRESTORE_H -#define FEATHER_WIZARDRESTORE_H +#ifndef WOWLET_WIZARDRESTORE_H +#define WOWLET_WIZARDRESTORE_H #include #include diff --git a/src/wizard/viewonlywallet.cpp b/src/wizard/viewonlywallet.cpp index 01c610b..2488991 100644 --- a/src/wizard/viewonlywallet.cpp +++ b/src/wizard/viewonlywallet.cpp @@ -15,7 +15,7 @@ ViewOnlyPage::ViewOnlyPage(AppContext *ctx, QWidget *parent) : this->setTitle("Import view only wallet"); ui->label_errorString->hide(); - QFont f("feather"); + QFont f("wowlet"); f.setStyleHint(QFont::Monospace); auto *viewOnlyViewKeyDummy = new QLineEdit(this); diff --git a/src/wizard/viewonlywallet.h b/src/wizard/viewonlywallet.h index 32f4836..127cfd2 100644 --- a/src/wizard/viewonlywallet.h +++ b/src/wizard/viewonlywallet.h @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#ifndef FEATHER_WIZARDVIEWONLY_H -#define FEATHER_WIZARDVIEWONLY_H +#ifndef WOWLET_WIZARDVIEWONLY_H +#define WOWLET_WIZARDVIEWONLY_H #include #include diff --git a/src/wizard/walletwizard.cpp b/src/wizard/walletwizard.cpp index dd0f103..7613bcc 100644 --- a/src/wizard/walletwizard.cpp +++ b/src/wizard/walletwizard.cpp @@ -81,7 +81,7 @@ void WalletWizard::createWallet() { return; } - auto seed = FeatherSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage, mnemonicSeed.split(" ")); + auto seed = WowletSeed(m_ctx->restoreHeights[m_ctx->networkType], m_ctx->coinName, m_ctx->seedLanguage, mnemonicSeed.split(" ")); if(restoreHeight > 0) seed.setRestoreHeight(restoreHeight); diff --git a/utils/build_macos.sh b/utils/build_macos.sh index 9864fc4..c1948df 100644 --- a/utils/build_macos.sh +++ b/utils/build_macos.sh @@ -17,7 +17,7 @@ cp "/Users/administrator/tor/libevent-2.1.7.dylib" "/Users/administrator/wowlet/ CMAKE_PREFIX_PATH="~/Qt/5.15.1/clang_64" TOR_BIN="/Users/administrator/tor/tor" make -j3 mac-release if [[ $? -eq 0 ]]; then - echo "[+] Feather built OK" + echo "[+] WOWlet built OK" cd ~/wowlet/build/bin zip -qr ~/wowlet.zip wowlet.app else diff --git a/utils/images/feather-home.png b/utils/images/feather-home.png deleted file mode 100644 index 85dcc67..0000000 Binary files a/utils/images/feather-home.png and /dev/null differ diff --git a/utils/images/wowlet-home.png b/utils/images/wowlet-home.png new file mode 100644 index 0000000..4a39f10 Binary files /dev/null and b/utils/images/wowlet-home.png differ diff --git a/utils/pubkeys/featherwallet.asc b/utils/pubkeys/featherwallet.asc deleted file mode 100644 index c047b2f..0000000 --- a/utils/pubkeys/featherwallet.asc +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -Ig== -=2rq8 ------END PGP PUBLIC KEY BLOCK----- diff --git a/utils/pubkeys/tobtoht.asc b/utils/pubkeys/tobtoht.asc deleted file mode 100644 index 8fa20f4..0000000 --- a/utils/pubkeys/tobtoht.asc +++ /dev/null @@ -1,59 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBF2zfmoBEACrlG7MvTd0QpmSelCDHjO/speQpS34Up+PlJmtRqKXaTKap4ex -RmG0rEfJtaybkckrxJvl+niphLZeQfuxukyUGiqhRsjQLpSD2y3CXqfHkAQYY8Kl -ZGPRhRWCjGG9kbz+yoXz27/anszObHZwlK/JoBdn2u+O9tw8el+zaS5uewYCwEOn -ixrUdRhPLCLqz9rpO8YAwdEOk83ENr6U4xAwKBo2rhWPNBlNtG2KJAz+mS/Yarpz -vr/KFV09sDIgypJkkD+h6YpZ6xIRHa4mlDk6UvK2sGupMh6LU/LRMywaDurNMqOt -F4ja1abmyR5zZclLtx8fNqgRM9/EdKFL4+N1fp5CbJqIbI5kEYeyHtrGZCNQYP1m -yz8AcFIqd0BF9R0Fr0SYmnePqJWdIszE9JC+G0VccGzssHc30JUbvV4YyqlRq2m/ -ypb24Wr52ttHWVi+I+/LvRsfrRKpIG4VjQKAQ3FZF/MoY9YbPuZusVgx2X9RwtuO -AxgsTCNnkqXg2FC/NkeYluHRwSFMSMX2lFQcMK0+qo7xQCZ6Wx+GXTPSk6NLmnqt -l0J6fDUXLdKEr/wdVmeiyMcxjZGYOHLJOJ39QwxBiq11Y4BboYz4WUKtFDZJCkLJ -YoMkFNgoiDqPher9TZ3xcPRdvfuoDcn9GCcAjs0RRFNGskjdx4ujfbxHgQARAQAB -tEx0aG90Ym90ICgvdS9UaG90Ym90IG9uIERyZWFkLCAvdS90b2J0b2h0IG9uIFJl -ZGRpdCkgPHRob3Rib3RAcHJvdG9ubWFpbC5jb20+iQJOBBMBCAA4FiEExavlwOUP -orPxSrktHK3Sf0H0XDwFAl2zfmoCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA -CgkQHK3Sf0H0XDxtXQ//Uw7SAH2tlwTTE/ehJbg2fZG4Jfn91XKtpEE8yMtqIHQc -QiGAp7pe/c851TTJ2aug6y0/9/usp4qMPhx4l/vNOHwe5sk+a2jm/Wxh+lfJqv6Q -+En7JmKRE7ZFCaTirEY5u4Qxepg/tSqD29ZN2uHeAVx3RTHSO05R6RMe6PPjEvsB -4xTOK7pKXI1Oxy0RJwRZSum8wwBUvmfeE78colyBekbl1A2TuIfEmfzPY+UjaxQj -28DUYsZ6RqFGBRnf6cMWm2iZx9FaLEZhqZUFL746vxIGwADgJmanI+f25UMPQfTP -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 -RR9alvpX5jGtupg5+1E= -=hD7u ------END PGP PUBLIC KEY BLOCK-----