From 44e788f87dd32e700b3ba2a3ff7494342844d83a Mon Sep 17 00:00:00 2001 From: Deniod Date: Tue, 28 Nov 2023 09:48:25 +0100 Subject: [PATCH] set fee for hushchat to 0 --- src/chatmodel.cpp | 4 ++-- src/mainwindow.cpp | 4 ++-- src/settings.cpp | 4 ++++ src/settings.h | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index 306b1ba..e2d44af 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -509,7 +509,7 @@ Tx MainWindow::createTxFromChatPage() { } } - tx.fee = Settings::getMinerFee(); + tx.fee = Settings::getMinerFeeChat(); return tx; @@ -803,7 +803,7 @@ Tx MainWindow::createTxForSafeContactRequest() tx.toAddrs.push_back(ToFields{addr, amt, hmemo}); tx.toAddrs.push_back(ToFields{addr, amt, memo}); - tx.fee = Settings::getMinerFee(); + tx.fee = Settings::getMinerFeeChat(); } return tx; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6562979..2360984 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1950,7 +1950,7 @@ Tx MainWindow::createTxFromSendChatPage() { } } - tx.fee = Settings::getMinerFee(); + tx.fee = Settings::getMinerFeeChat(); return tx; @@ -2240,7 +2240,7 @@ Tx MainWindow::createTxFromSendRequestChatPage() { } } - tx.fee = Settings::getMinerFee(); + tx.fee = Settings::getMinerFeeChat(); return tx; diff --git a/src/settings.cpp b/src/settings.cpp index d6243b6..87cfd8b 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -358,6 +358,10 @@ CAmount Settings::getMinerFee() { return CAmount::fromqint64(10000); } +CAmount Settings::getMinerFeeChat() { + return CAmount::fromqint64(0); +} + bool Settings::isValidSaplingPrivateKey(QString pk) { if (isTestnet()) { QRegExp zspkey("^secret-extended-key-test[0-9a-z]{278}$", Qt::CaseInsensitive); diff --git a/src/settings.h b/src/settings.h index f65e4cd..82e31c5 100644 --- a/src/settings.h +++ b/src/settings.h @@ -164,6 +164,7 @@ public: static QString getDefaultServer(); static QString getRandomServer(); static CAmount getMinerFee(); + static CAmount getMinerFeeChat(); static int getMaxMobileAppTxns() { return 30; }