diff --git a/src/rpc.cpp b/src/rpc.cpp index bcdfe59..b638540 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -304,7 +304,7 @@ void RPC::getAllPrivKeys(const std::function> } -// 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) { Q_ASSERT(params.is_array()); // Get all the addresses and amounts diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 6910b63..9adb828 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -425,11 +425,7 @@ bool MainWindow::confirmTx(Tx tx) { delete confirm.sendToAddrs->findChild("labelMinerFee"); delete confirm.sendToAddrs->findChild("minerFee"); delete confirm.sendToAddrs->findChild("minerFeeUSD"); - - delete confirm.sendToAddrs->findChild("labelDevFee"); - delete confirm.sendToAddrs->findChild("devFee"); - delete confirm.sendToAddrs->findChild("devFeeUSD"); - + // For each addr/amt/memo, construct the JSON and also build the confirm dialog box for (int i=0; i < tx.toAddrs.size(); i++) { auto toAddr = tx.toAddrs[i]; diff --git a/src/settings.cpp b/src/settings.cpp index fea8c14..d50208c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -176,15 +176,6 @@ const QString Settings::getDonationAddr(bool sapling) { 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() { return 0.0001; diff --git a/src/settings.h b/src/settings.h index f75e34f..768b4c1 100644 --- a/src/settings.h +++ b/src/settings.h @@ -66,8 +66,6 @@ public: static QString getZECUSDDisplayFormat(double bal); static const QString getTokenName(); - static const QString getDevSproutAddr(); - static const QString getDevAddr(Tx tx); static const QString getDonationAddr(bool sapling); static double getMinerFee();