Remove all dev fee references
This commit is contained in:
@@ -304,7 +304,7 @@ void RPC::getAllPrivKeys(const std::function<void(QList<QPair<QString, QString>>
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Build the RPC JSON Parameters for this tx (with the dev fee included if applicable)
|
// Build the RPC JSON Parameters for this tx
|
||||||
void RPC::fillTxJsonParams(json& params, Tx tx) {
|
void RPC::fillTxJsonParams(json& params, Tx tx) {
|
||||||
Q_ASSERT(params.is_array());
|
Q_ASSERT(params.is_array());
|
||||||
// Get all the addresses and amounts
|
// Get all the addresses and amounts
|
||||||
|
|||||||
@@ -425,11 +425,7 @@ bool MainWindow::confirmTx(Tx tx) {
|
|||||||
delete confirm.sendToAddrs->findChild<QLabel*>("labelMinerFee");
|
delete confirm.sendToAddrs->findChild<QLabel*>("labelMinerFee");
|
||||||
delete confirm.sendToAddrs->findChild<QLabel*>("minerFee");
|
delete confirm.sendToAddrs->findChild<QLabel*>("minerFee");
|
||||||
delete confirm.sendToAddrs->findChild<QLabel*>("minerFeeUSD");
|
delete confirm.sendToAddrs->findChild<QLabel*>("minerFeeUSD");
|
||||||
|
|
||||||
delete confirm.sendToAddrs->findChild<QLabel*>("labelDevFee");
|
|
||||||
delete confirm.sendToAddrs->findChild<QLabel*>("devFee");
|
|
||||||
delete confirm.sendToAddrs->findChild<QLabel*>("devFeeUSD");
|
|
||||||
|
|
||||||
// For each addr/amt/memo, construct the JSON and also build the confirm dialog box
|
// For each addr/amt/memo, construct the JSON and also build the confirm dialog box
|
||||||
for (int i=0; i < tx.toAddrs.size(); i++) {
|
for (int i=0; i < tx.toAddrs.size(); i++) {
|
||||||
auto toAddr = tx.toAddrs[i];
|
auto toAddr = tx.toAddrs[i];
|
||||||
|
|||||||
@@ -176,15 +176,6 @@ const QString Settings::getDonationAddr(bool sapling) {
|
|||||||
return "zcEgrceTwvoiFdEvPWcsJHAMrpLsprMF6aRJiQa3fan5ZphyXLPuHghnEPrEPRoEVzUy65GnMVyCTRdkT6BYBepnXh6NBYs";
|
return "zcEgrceTwvoiFdEvPWcsJHAMrpLsprMF6aRJiQa3fan5ZphyXLPuHghnEPrEPRoEVzUy65GnMVyCTRdkT6BYBepnXh6NBYs";
|
||||||
}
|
}
|
||||||
|
|
||||||
const QString Settings::getDevSproutAddr() {
|
|
||||||
return "ztbGDqgkmXQjheivgeirwEvJLD4SUNqsWCGwxwVg4YpGz1ARR8P2rXaptkT14z3NDKamcxNmQuvmvktyokMs7HkutRNSx1D";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the dev fee address based on the transaction
|
|
||||||
const QString Settings::getDevAddr(Tx) {
|
|
||||||
return QString();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
double Settings::getMinerFee() {
|
double Settings::getMinerFee() {
|
||||||
return 0.0001;
|
return 0.0001;
|
||||||
|
|||||||
@@ -66,8 +66,6 @@ public:
|
|||||||
static QString getZECUSDDisplayFormat(double bal);
|
static QString getZECUSDDisplayFormat(double bal);
|
||||||
|
|
||||||
static const QString getTokenName();
|
static const QString getTokenName();
|
||||||
static const QString getDevSproutAddr();
|
|
||||||
static const QString getDevAddr(Tx tx);
|
|
||||||
static const QString getDonationAddr(bool sapling);
|
static const QString getDonationAddr(bool sapling);
|
||||||
|
|
||||||
static double getMinerFee();
|
static double getMinerFee();
|
||||||
|
|||||||
Reference in New Issue
Block a user