Skip to content

Commit d332184

Browse files
tobtohttobtoht
committed
Remove websocket
1 parent da5c09a commit d332184

30 files changed

+10
-749
lines changed

‎HACKING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ apt install git cmake build-essential ccache libssl-dev libunbound-dev libboost-
2929
```bash
3030
sudo dnf install epel-release -y
3131
sudo dnf groupinstall "Development Tools" -y
32-
sudo dnf install unbound-devel boost-devel qrencode-devel zxing-cpp-devel qt6-qtbase-devel qt6-qtsvg-devel qt6-qtwebsockets-devel qt6-qtmultimedia-devel qt6-qtwayland-devel libsodium-devel
32+
sudo dnf install unbound-devel boost-devel qrencode-devel zxing-cpp-devel qt6-qtbase-devel qt6-qtsvg-devel qt6-qtmultimedia-devel qt6-qtwayland-devel libsodium-devel
3333
```
3434

3535
#### Void Linux
3636

3737
```bash
3838
xbps-install -S base-devel cmake boost-devel openssl-devel unbound-devel libsodium-devel zlib-devel qt6-base-devel \
39-
qt6-svg-devel qt6-websockets-devel qt6-multimedia-devel qt6-wayland-devel libgcrypt-devel libzip-devel \
39+
qt6-svg-devel qt6-multimedia-devel qt6-wayland-devel libgcrypt-devel libzip-devel \
4040
hidapi-devel protobuf protobuf-devel qrencode-devel zxing-cpp-devel
4141
```
4242

‎MAINTENANCE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Goals:
3838

3939
- Make sure the project is transmissible
4040
- Make sure that setting up release infrastructure, release engineering, and maintenance are extensively documented
41-
- Make the websocket server repository public
4241

4342
### 3. Reproducibility
4443

‎RELEASE.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,3 @@
4242
- Make `depends` source files [available](https://featherwallet.org/files/sources/):
4343
- `make -C contrib/depends download`
4444
- Announce release on social media (irc/Matrix, Twitter, Lemmy)
45-
- Update websocket servers to notify clients of new release
46-
- Wait up to 7 days to allow for bug reports before major rollout

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Clarifications on scope:
3131
- The live [websites](https://github.com/feather-wallet/feather-site/blob/master/mirrors.txt) and their repositories are out of scope.
3232
- Loss of funds due to malware on the user's machine is out of scope.
3333
- Memory imaging, including cold boot attacks, is out of scope.
34-
- Social engineering against users is out of scope. This includes messages received from the [websocket server](https://docs.featherwallet.org/guides/websocket).
34+
- Social engineering against users is out of scope.
3535
- Any form of coercion, physical or psychological, is out of scope.
3636
- Vulnerabilities that are attributable to hardware are out of scope.
3737
- If the issue was fixed in the `master` branch before we receive your report, it is invalid and not eligible for a bounty from this program.

‎contrib/depends/packages/qt.mk‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ $(package)_qttools_sha256_hash=fa645589cc3f939022401a926825972a44277dead8ec8607d
3232
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
3333
$(package)_qtsvg_sha256_hash=ec359d930c95935ea48af58b100c2f5d0d275968ec8ca1e0e76629b7159215fc
3434

35-
$(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
36-
$(package)_qtwebsockets_sha256_hash=6b3add7cacf3a4e0b448d5e69d9dac42795fef63309038af1dc5a454ce514940
37-
3835
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
3936
$(package)_qtmultimedia_sha256_hash=995c3b194f3de3e1929280639642f7661d94aa57523c459dbbf2f71dbdcaa18c
4037

@@ -46,7 +43,6 @@ $(package)_qtwayland_sha256_hash=503416fcb04db503bd130e6a49c45e3e546f091e83406f7
4643

4744
$(package)_extra_sources += $($(package)_qttools_file_name)
4845
$(package)_extra_sources += $($(package)_qtsvg_file_name)
49-
$(package)_extra_sources += $($(package)_qtwebsockets_file_name)
5046
$(package)_extra_sources += $($(package)_qtmultimedia_file_name)
5147
$(package)_extra_sources += $($(package)_qtshadertools_file_name)
5248
$(package)_extra_sources += $($(package)_qtwayland_file_name)
@@ -179,7 +175,6 @@ define $(package)_fetch_cmds
179175
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
180176
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qttools_file_name),$($(package)_qttools_file_name),$($(package)_qttools_sha256_hash)) && \
181177
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtsvg_file_name),$($(package)_qtsvg_file_name),$($(package)_qtsvg_sha256_hash)) && \
182-
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtwebsockets_file_name),$($(package)_qtwebsockets_file_name),$($(package)_qtwebsockets_sha256_hash)) && \
183178
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtmultimedia_file_name),$($(package)_qtmultimedia_file_name),$($(package)_qtmultimedia_sha256_hash)) && \
184179
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtshadertools_file_name),$($(package)_qtshadertools_file_name),$($(package)_qtshadertools_sha256_hash)) && \
185180
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_qtwayland_file_name),$($(package)_qtwayland_file_name),$($(package)_qtwayland_sha256_hash))
@@ -190,7 +185,6 @@ define $(package)_extract_cmds
190185
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
191186
echo "$($(package)_qttools_sha256_hash) $($(package)_source_dir)/$($(package)_qttools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
192187
echo "$($(package)_qtsvg_sha256_hash) $($(package)_source_dir)/$($(package)_qtsvg_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
193-
echo "$($(package)_qtwebsockets_sha256_hash) $($(package)_source_dir)/$($(package)_qtwebsockets_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
194188
echo "$($(package)_qtmultimedia_sha256_hash) $($(package)_source_dir)/$($(package)_qtmultimedia_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
195189
echo "$($(package)_qtshadertools_sha256_hash) $($(package)_source_dir)/$($(package)_qtshadertools_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
196190
echo "$($(package)_qtwayland_sha256_hash) $($(package)_source_dir)/$($(package)_qtwayland_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
@@ -201,8 +195,6 @@ define $(package)_extract_cmds
201195
$(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools && \
202196
mkdir qtsvg && \
203197
$(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtsvg_file_name) -C qtsvg && \
204-
mkdir qtwebsockets && \
205-
$(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtwebsockets_file_name) -C qtwebsockets && \
206198
mkdir qtmultimedia && \
207199
$(build_TAR) --no-same-owner --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qtmultimedia_file_name) -C qtmultimedia && \
208200
mkdir qtshadertools && \

‎contrib/depends/patches/qt/root_CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
3232
set(QT_NO_CREATE_TARGETS TRUE)
3333
set(QT_SUPERBUILD TRUE)
3434

35-
set(QT_BUILD_SUBMODULES "qtbase;qtsvg;qtwebsockets;qtshadertools;qtmultimedia;qtwayland" CACHE STRING "Submodules to build")
35+
set(QT_BUILD_SUBMODULES "qtbase;qtsvg;qtshadertools;qtmultimedia;qtwayland" CACHE STRING "Submodules to build")
3636

3737
foreach(module IN LISTS QT_BUILD_SUBMODULES)
3838
message(NOTICE "Configuring '${module}'")

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ if(WITH_SCANNER)
184184
target_compile_definitions(feather PRIVATE WITH_SCANNER=1)
185185
endif()
186186

187-
# TODO: PLACEHOLDER
188-
target_compile_definitions(feather PRIVATE HAS_WEBSOCKET=1)
189-
190187
if(PLATFORM_INSTALLER)
191188
target_compile_definitions(feather PRIVATE PLATFORM_INSTALLER=1)
192189
endif()

‎src/HistoryWidget.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "libwalletqt/WalletManager.h"
1414
#include "utils/config.h"
1515
#include "utils/Icons.h"
16-
#include "WebsocketNotifier.h"
16+
#include "utils/Utils.h"
1717

1818
HistoryWidget::HistoryWidget(Wallet *wallet, QWidget *parent)
1919
: QWidget(parent)
@@ -63,6 +63,7 @@ HistoryWidget::HistoryWidget(Wallet *wallet, QWidget *parent)
6363
}
6464

6565
ui->btn_options->setMenu(ui->history->getMenu());
66+
ui->history->setColumnHidden(TransactionHistoryModel::FiatAmount, true);
6667
}
6768

6869
void HistoryWidget::setSearchbarVisible(bool visible) {
@@ -74,10 +75,6 @@ void HistoryWidget::focusSearchbar() {
7475
ui->search->setFocus();
7576
}
7677

77-
void HistoryWidget::setWebsocketEnabled(bool enabled) {
78-
ui->history->setColumnHidden(TransactionHistoryModel::FiatAmount, !enabled);
79-
}
80-
8178
void HistoryWidget::showContextMenu(const QPoint &point) {
8279
QModelIndex index = ui->history->indexAt(point);
8380
if (!index.isValid()) {

‎src/HistoryWidget.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Q_OBJECT
2424

2525
void setSearchbarVisible(bool visible);
2626
void focusSearchbar();
27-
void setWebsocketEnabled(bool enabled);
2827

2928
public slots:
3029
void setSearchText(const QString &text);

‎src/MainWindow.cpp‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
#include "utils/AsyncTask.h"
3434
#include "utils/ColorScheme.h"
3535
#include "utils/Icons.h"
36-
#include "utils/WebsocketNotifier.h"
37-
3836
#include "wallet/wallet_errors.h"
3937

4038
#ifdef WITH_SCANNER
@@ -77,16 +75,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
7775

7876
this->onOfflineMode(conf()->get(Config::offlineMode).toBool());
7977
conf()->set(Config::restartRequired, false);
80-
81-
// Websocket notifier
82-
#ifdef CHECK_UPDATES
83-
connect(websocketNotifier(), &WebsocketNotifier::UpdatesReceived, m_updater.data(), &Updater::wsUpdatesReceived);
84-
#endif
85-
86-
websocketNotifier()->emitCache(); // Get cached data
87-
88-
connect(m_windowManager, &WindowManager::websocketStatusChanged, this, &MainWindow::onWebsocketStatusChanged);
89-
this->onWebsocketStatusChanged(!conf()->get(Config::disableWebsocket).toBool());
9078

9179
connect(m_windowManager, &WindowManager::proxySettingsChanged, this, &MainWindow::onProxySettingsChangedConnect);
9280
connect(m_windowManager, &WindowManager::updateBalance, m_wallet, &Wallet::updateBalance);
@@ -605,15 +593,6 @@ void MainWindow::tryStoreWallet() {
605593
m_wallet->store();
606594
}
607595

608-
void MainWindow::onWebsocketStatusChanged(bool enabled) {
609-
ui->actionShow_Home->setVisible(enabled);
610-
611-
QStringList enabledTabs = conf()->get(Config::enabledTabs).toStringList();
612-
613-
m_historyWidget->setWebsocketEnabled(enabled);
614-
m_sendWidget->setWebsocketEnabled(enabled);
615-
}
616-
617596
void MainWindow::onProxySettingsChangedConnect() {
618597
m_nodes->connectToNode();
619598
this->onProxySettingsChanged();

0 commit comments

Comments
 (0)