diff --git a/monero b/monero index 30e1cfec..1ed9d64c 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 30e1cfecf522fa3e0f74dd1d523430f0cad314dc +Subproject commit 1ed9d64c3350655b2082156fafec96e3c89fb513 diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index dc55a4f2..60e2fef6 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1719,7 +1719,7 @@ void MainWindow::onTxPoolBacklog(const QVector &backlog, quint64 origin QString("There is a backlog of %1 blocks (≈ %2 minutes) in the transaction pool " "at the maximum automatic fee level.\n\n" "Do you want to increase the fee for this transaction?") - .arg(QString::number(backlog[1]), QString::number(backlog[1] * 2))); + .arg(QString::number(backlog[1]), QString::number(backlog[1] * 5))); if (button == QMessageBox::Yes) { feeLevel = 3; } diff --git a/src/SendWidget.cpp b/src/SendWidget.cpp index 0549d412..dff189e6 100644 --- a/src/SendWidget.cpp +++ b/src/SendWidget.cpp @@ -222,7 +222,7 @@ void SendWidget::sendClicked() { } if (unlocked_balance == 0) { - Utils::showError(this, "Unable to create transaction", QString("No spendable balance.\n\n%1 WOW becomes spendable within 10 blocks (~20 minutes).").arg(WalletManager::displayAmount(total_balance - unlocked_balance)), {"Wait for more balance to unlock.", "Click 'Help' to learn more about how balance works."}, "balance"); + Utils::showError(this, "Unable to create transaction", QString("No spendable balance.\n\n%1 WOW becomes spendable within 4 blocks (~20 minutes).").arg(WalletManager::displayAmount(total_balance - unlocked_balance)), {"Wait for more balance to unlock.", "Click 'Help' to learn more about how balance works."}, "balance"); return; } diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 982fef24..65bed8b5 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -86,7 +86,7 @@ void Settings::setupAppearanceTab() { }); // [Amount precision] - for (int i = 0; i <= 12; i++) { + for (int i = 0; i <= 11; i++) { ui->comboBox_amountPrecision->addItem(QString::number(i)); } ui->comboBox_amountPrecision->setCurrentIndex(conf()->get(Config::amountPrecision).toInt()); diff --git a/src/dialog/BalanceDialog.cpp b/src/dialog/BalanceDialog.cpp index 451833bd..03a88c56 100644 --- a/src/dialog/BalanceDialog.cpp +++ b/src/dialog/BalanceDialog.cpp @@ -19,7 +19,7 @@ BalanceDialog::BalanceDialog(QWidget *parent, Wallet *wallet) connect(m_wallet, &Wallet::balanceUpdated, this, &BalanceDialog::updateBalance); - ui->label_unconfirmed_help->setHelpText("Unconfirmed balance", "Outputs require 10 confirmations before they become spendable. " + ui->label_unconfirmed_help->setHelpText("Unconfirmed balance", "Outputs require 4 confirmations before they become spendable. " "This will take 20 minutes on average.", "balance"); ui->label_unconfirmed->setFont(Utils::getMonospaceFont()); diff --git a/src/dialog/TxInfoDialog.cpp b/src/dialog/TxInfoDialog.cpp index 0ecb3f1a..46c3090a 100644 --- a/src/dialog/TxInfoDialog.cpp +++ b/src/dialog/TxInfoDialog.cpp @@ -139,7 +139,7 @@ void TxInfoDialog::setData(const TransactionRow &tx) { if (tx.confirmationsRequired() > tx.confirmations) { - bool mandatoryLock = tx.confirmationsRequired() == 10; + bool mandatoryLock = tx.confirmationsRequired() == 4; QString confsRequired = QString::number(tx.confirmationsRequired() - tx.confirmations); ui->label_lock->setText(QString("Lock: Outputs become spendable in %1 blocks (%2)").arg(confsRequired, mandatoryLock ? "consensus rule" : "specified by sender")); } else { diff --git a/src/libwalletqt/rows/TransactionRow.cpp b/src/libwalletqt/rows/TransactionRow.cpp index cabd0047..4c8c6c0d 100644 --- a/src/libwalletqt/rows/TransactionRow.cpp +++ b/src/libwalletqt/rows/TransactionRow.cpp @@ -39,7 +39,7 @@ QString TransactionRow::displayFee() const quint64 TransactionRow::confirmationsRequired() const { - return (blockHeight < unlockTime) ? unlockTime - blockHeight : 10; + return (blockHeight < unlockTime) ? unlockTime - blockHeight : 4; } QString TransactionRow::date() const diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp index 801204a7..cb5ea729 100644 --- a/src/utils/Utils.cpp +++ b/src/utils/Utils.cpp @@ -372,13 +372,13 @@ bool portOpen(const QString &hostname, quint16 port) { // TODO: this call should quint16 getDefaultRpcPort(NetworkType::Type type) { switch (type) { case NetworkType::Type::MAINNET: - return 18081; + return 34568; case NetworkType::Type::TESTNET: return 28081; case NetworkType::Type::STAGENET: return 38081; } - return 18081; + return 34568; } bool isTorsocks() { diff --git a/src/utils/config.cpp b/src/utils/config.cpp index 09910f90..442a315d 100644 --- a/src/utils/config.cpp +++ b/src/utils/config.cpp @@ -69,7 +69,7 @@ static const QHash configStrings = { {Config::pruneBlockchain,{QS("pruneBlockchain"), false}}, // full archival by default {Config::wownerodPath,{QS("wownerodPath"), ""}}, // optional override; bundled by default {Config::broadcastOverTor,{QS("broadcastOverTor"), true}},// wowlet: --tx-proxy our txs through Tor (hide originating IP) - {Config::amountPrecision, {QS("amountPrecision"), 12}}, + {Config::amountPrecision, {QS("amountPrecision"), 11}}, {Config::dateFormat, {QS("dateFormat"), "yyyy-MM-dd"}}, {Config::timeFormat, {QS("timeFormat"), "HH:mm"}}, {Config::balanceDisplay, {QS("balanceDisplay"), Config::BalanceDisplay::spendablePlusUnconfirmed}}, @@ -124,7 +124,7 @@ static const QHash configStrings = { {Config::useLocalTor, {QS("useLocalTor"), false}}, {Config::initSyncThreshold, {QS("initSyncThreshold"), 360}}, - {Config::enabledPlugins, {QS("enabledPlugins"), QStringList{"tickers", "crowdfunding", "revuo", "calc"}}}, + {Config::enabledPlugins, {QS("enabledPlugins"), QStringList{"tickers", "calc"}}}, {Config::restartRequired, {QS("restartRequired"), false}}, {Config::tickers, {QS("tickers"), QStringList{"WOW", "BTC", "WOW/BTC"}}}, diff --git a/src/utils/nodes.h b/src/utils/nodes.h index 8bbf8b3a..7d01d41d 100644 --- a/src/utils/nodes.h +++ b/src/utils/nodes.h @@ -60,7 +60,7 @@ struct FeatherNode { return; if (url.port() == -1) - url.setPort(18081); + url.setPort(34568); }; int height; diff --git a/src/widgets/NodeWidget.cpp b/src/widgets/NodeWidget.cpp index b2c94e77..8a776516 100644 --- a/src/widgets/NodeWidget.cpp +++ b/src/widgets/NodeWidget.cpp @@ -153,7 +153,7 @@ void NodeWidget::onCustomAddClicked(){ } bool ok; - QString text = QInputDialog::getMultiLineText(this, "Add custom node(s).", "One node per line\nE.g: user:password@127.0.0.1:18081", currentNodesText, &ok); + QString text = QInputDialog::getMultiLineText(this, "Add custom node(s).", "One node per line\nE.g: user:password@127.0.0.1:34568", currentNodesText, &ok); if (!ok || text.isEmpty()) { return; } diff --git a/src/wizard/PageNetwork.ui b/src/wizard/PageNetwork.ui index 8e26fb2c..20d11a36 100644 --- a/src/wizard/PageNetwork.ui +++ b/src/wizard/PageNetwork.ui @@ -111,7 +111,7 @@ - wowlet detected a local node on port 18081. + wowlet detected a local node on port 34568. @@ -178,10 +178,10 @@ - 127.0.0.1:18081 + 127.0.0.1:34568 - 127.0.0.1:18081 + 127.0.0.1:34568