Skip to content

Commit 68b75ab

Browse files
committed
Remove multibroadcast
1 parent d332184 commit 68b75ab

File tree

6 files changed

+1
-34
lines changed

6 files changed

+1
-34
lines changed

src/MainWindow.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,6 @@ void MainWindow::initWalletContext() {
443443
connect(m_wallet, &Wallet::donationSent, this, []{
444444
conf()->set(Config::donateBeg, -1);
445445
});
446-
447-
connect(m_wallet, &Wallet::multiBroadcast, this, &MainWindow::onMultiBroadcast);
448446
}
449447

450448
void MainWindow::menuToggleTabVisible(const QString &key){
@@ -642,19 +640,6 @@ void MainWindow::onSubtractFeeFromAmountEnabled(bool enabled) {
642640
m_sendWidget->setSubtractFeeFromAmountEnabled(enabled);
643641
}
644642

645-
void MainWindow::onMultiBroadcast(const QMap<QString, QString> &txHexMap) {
646-
QMapIterator<QString, QString> i(txHexMap);
647-
while (i.hasNext()) {
648-
i.next();
649-
for (const auto& node: m_nodes->nodes()) {
650-
QString address = node.toURL();
651-
qDebug() << QString("Relaying %1 to: %2").arg(i.key(), address);
652-
m_rpc->setDaemonAddress(address);
653-
m_rpc->sendRawTransaction(i.value());
654-
}
655-
}
656-
}
657-
658643
void MainWindow::onSyncStatus(quint64 height, quint64 target, bool daemonSync) {
659644
if (height >= (target - 1)) {
660645
this->updateNetStats();

src/MainWindow.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ private slots:
171171
void onOfflineMode(bool offline);
172172
void onManualFeeSelectionEnabled(bool enabled);
173173
void onSubtractFeeFromAmountEnabled(bool enabled);
174-
void onMultiBroadcast(const QMap<QString, QString> &txHexMap);
175174

176175
private:
177176
friend WindowManager;

src/SettingsDialog.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,15 +318,6 @@ void Settings::setupMemoryTab() {
318318
}
319319

320320
void Settings::setupTransactionsTab() {
321-
// [Multibroadcast outgoing transactions]
322-
ui->checkBox_multibroadcast->setChecked(conf()->get(Config::multiBroadcast).toBool());
323-
connect(ui->checkBox_multibroadcast, &QCheckBox::toggled, [](bool toggled){
324-
conf()->set(Config::multiBroadcast, toggled);
325-
});
326-
connect(ui->btn_multibroadcast, &QPushButton::clicked, [this]{
327-
Utils::showInfo(this, "Multibroadcasting", "Multibroadcasting relays outgoing transactions to all nodes in your node list. This may improve transaction relay speed and reduces the chance of your transaction failing.");
328-
});
329-
330321
// Hide unimplemented settings
331322
ui->checkBox_alwaysOpenAdvancedTxDialog->hide();
332323
ui->checkBox_requirePasswordToSpend->hide();

src/libwalletqt/Wallet.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,13 +1008,6 @@ void Wallet::onTransactionCommitted(bool success, PendingTransaction *tx, const
10081008
return;
10091009
}
10101010

1011-
// Nodes - even well-connected, properly configured ones - consistently fail to relay transactions
1012-
// To mitigate transactions failing we just send the transaction to every node we know about over Tor
1013-
if (conf()->get(Config::multiBroadcast).toBool()) {
1014-
// Let MainWindow handle this
1015-
emit multiBroadcast(txHexMap);
1016-
}
1017-
10181011
// this tx was a donation to Feather, stop our nagging
10191012
if (this->donationSending) {
10201013
this->donationSending = false;

src/libwalletqt/Wallet.h

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

471471
void selectedInputsChanged(const QStringList &selectedInputs);
472472

473-
void multiBroadcast(const QMap<QString, QString> &txHexMap);
474473
void heightsRefreshed(bool success, quint64 daemonHeight, quint64 targetHeight);
475474

476475
private:

src/utils/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
7979
{Config::offlineMode, {QS("offlineMode"), false}},
8080

8181
// Transactions
82-
{Config::multiBroadcast, {QS("multiBroadcast"), true}},
82+
{Config::multiBroadcast, {QS("multiBroadcast"), false}},
8383
{Config::offlineTxSigningMethod, {QS("offlineTxSigningMethod"), Config::OTSMethod::UnifiedResources}},
8484
{Config::offlineTxSigningForceKISync, {QS("offlineTxSigningForceKISync"), false}},
8585
{Config::manualFeeTierSelection, {QS("manualFeeTierSelection"), false}},

0 commit comments

Comments
 (0)