From 9de994988b57b6f6c1cd0f6efdc8a221df4e39a3 Mon Sep 17 00:00:00 2001 From: strophy <32928115+strophy@users.noreply.github.com> Date: Thu, 21 Nov 2019 21:49:35 +0100 Subject: [PATCH] Compliance changes to terminology (#3211) Replace inaccurate user-facing descriptions of PS as anonymous to mixed or private, since Dash is a transparent blockchain. --- README.md | 2 +- contrib/debian/control | 6 +++--- doc/man/dash-qt.1 | 2 +- doc/man/dashd.1 | 2 +- src/init.cpp | 2 +- src/privatesend/privatesend-client.cpp | 8 ++++---- src/qt/coincontroldialog.cpp | 2 +- src/qt/dashstrings.cpp | 6 +++--- src/qt/forms/optionsdialog.ui | 4 ++-- src/qt/sendcoinsdialog.cpp | 6 +++--- src/qt/utilitydialog.cpp | 2 +- src/rpc/masternode.cpp | 2 +- src/rpc/misc.cpp | 2 +- src/wallet/rpcwallet.cpp | 6 +++--- src/wallet/wallet.cpp | 16 ++++++++-------- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 5168ae6e5c..64dbf2f430 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ https://www.dash.org What is Dash? ------------- -Dash is an experimental digital currency that enables anonymous, instant +Dash is an experimental digital currency that enables instant, private payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Dash Core is the name of the open diff --git a/contrib/debian/control b/contrib/debian/control index 2f9caa8457..98e3c358af 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -34,7 +34,7 @@ Package: dashd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - Dash is an experimental new digital currency that enables anonymous, instant + Dash is an experimental new digital currency that enables instant, private payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Dash Core @@ -47,7 +47,7 @@ Package: dash-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - Dash is an experimental new digital currency that enables anonymous, instant + Dash is an experimental new digital currency that enables instant, private payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Dash Core @@ -59,7 +59,7 @@ Package: dash-tx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer digital currency - standalone transaction tool - Dash is an experimental new digital currency that enables anonymous, instant + Dash is an experimental new digital currency that enables instant, private payments to anyone, anywhere in the world. Dash uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Dash Core diff --git a/doc/man/dash-qt.1 b/doc/man/dash-qt.1 index 648ae0a3ae..d11551a96d 100644 --- a/doc/man/dash-qt.1 +++ b/doc/man/dash-qt.1 @@ -550,7 +550,7 @@ Use N separate masternodes for each denominated input to mix funds .HP \fB\-privatesendamount=\fR .IP -Keep N DASH anonymized (2\-21000000, default: 1000) +Keep N DASH mixed (2\-21000000, default: 1000) .HP \fB\-privatesenddenoms=\fR .IP diff --git a/doc/man/dashd.1 b/doc/man/dashd.1 index 1f2d9b8fcb..3c2b4236b3 100644 --- a/doc/man/dashd.1 +++ b/doc/man/dashd.1 @@ -551,7 +551,7 @@ Use N separate masternodes for each denominated input to mix funds .HP \fB\-privatesendamount=\fR .IP -Keep N DASH anonymized (2\-21000000, default: 1000) +Keep N DASH mixed (2\-21000000, default: 1000) .HP \fB\-privatesenddenoms=\fR .IP diff --git a/src/init.cpp b/src/init.cpp index 8bbeeb7226..df18401b60 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -609,7 +609,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-privatesendmultisession", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), DEFAULT_PRIVATESEND_MULTISESSION)); strUsage += HelpMessageOpt("-privatesendsessions=", strprintf(_("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_SESSIONS, MAX_PRIVATESEND_SESSIONS, DEFAULT_PRIVATESEND_SESSIONS)); strUsage += HelpMessageOpt("-privatesendrounds=", strprintf(_("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_ROUNDS, MAX_PRIVATESEND_ROUNDS, DEFAULT_PRIVATESEND_ROUNDS)); - strUsage += HelpMessageOpt("-privatesendamount=", strprintf(_("Keep N DASH anonymized (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT)); + strUsage += HelpMessageOpt("-privatesendamount=", strprintf(_("Keep N DASH mixed (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT)); strUsage += HelpMessageOpt("-privatesenddenoms=", strprintf(_("Create up to N inputs of each denominated amount (%u-%u, default: %u)"), MIN_PRIVATESEND_DENOMS, MAX_PRIVATESEND_DENOMS, DEFAULT_PRIVATESEND_DENOMS)); #endif // ENABLE_WALLET diff --git a/src/privatesend/privatesend-client.cpp b/src/privatesend/privatesend-client.cpp index 5bd398abf6..d128ead692 100644 --- a/src/privatesend/privatesend-client.cpp +++ b/src/privatesend/privatesend-client.cpp @@ -753,7 +753,7 @@ bool CPrivateSendClientManager::CheckAutomaticBackup() } // -// Passively run mixing in the background to anonymize funds based on the given configuration. +// Passively run mixing in the background to mix funds based on the given configuration. // bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool fDryRun) { @@ -815,10 +815,10 @@ bool CPrivateSendClientSession::DoAutomaticDenominating(CConnman& connman, bool // including denoms but applying some restrictions CAmount nBalanceAnonymizable = vpwallets[0]->GetAnonymizableBalance(); - // anonymizable balance is way too small + // mixable balance is way too small if (nBalanceAnonymizable < nValueMin) { - LogPrint(BCLog::PRIVATESEND, "CPrivateSendClientSession::DoAutomaticDenominating -- Not enough funds to anonymize\n"); - strAutoDenomResult = _("Not enough funds to anonymize."); + LogPrint(BCLog::PRIVATESEND, "CPrivateSendClientSession::DoAutomaticDenominating -- Not enough funds to mix\n"); + strAutoDenomResult = _("Not enough funds to mix."); return false; } diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 87b1f13115..fc47977bf3 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -432,7 +432,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) int nRounds = vpwallets[0]->GetRealOutpointPrivateSendRounds(outpt); if (coinControl->IsUsingPrivateSend() && nRounds < privateSendClient.nPrivateSendRounds) { QMessageBox::warning(this, windowTitle(), - tr("Non-anonymized input selected. PrivateSend will be disabled.

If you still want to use PrivateSend, please deselect all non-anonymized inputs first and then check the PrivateSend checkbox again."), + tr("Non-mixed input selected. PrivateSend will be disabled.

If you still want to use PrivateSend, please deselect all non-mixed inputs first and then check the PrivateSend checkbox again."), QMessageBox::Ok, QMessageBox::Ok); coinControl->UsePrivateSend(false); } diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp index 3f3eb900b3..5aeefd17f6 100644 --- a/src/qt/dashstrings.cpp +++ b/src/qt/dashstrings.cpp @@ -186,7 +186,7 @@ QT_TRANSLATE_NOOP("dash-core", "" "about the software."), QT_TRANSLATE_NOOP("dash-core", "" "PrivateSend uses exact denominated amounts to send funds, you might simply " -"need to anonymize some more coins."), +"need to mix some more coins."), QT_TRANSLATE_NOOP("dash-core", "" "Prune configured below the minimum of %d MiB. Please use a higher number."), QT_TRANSLATE_NOOP("dash-core", "" @@ -444,7 +444,7 @@ QT_TRANSLATE_NOOP("dash-core", "Invalid script detected."), QT_TRANSLATE_NOOP("dash-core", "Invalid spork address specified with -sporkaddr"), QT_TRANSLATE_NOOP("dash-core", "KeePassHttp id for the established association"), QT_TRANSLATE_NOOP("dash-core", "KeePassHttp key for AES encrypted communication with KeePass"), -QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (%u-%u, default: %u)"), +QT_TRANSLATE_NOOP("dash-core", "Keep N DASH mixed (%u-%u, default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keep at most unconnectable transactions in memory (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keep the transaction memory pool below megabytes (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keypool ran out, please call keypoolrefill first"), @@ -482,7 +482,7 @@ QT_TRANSLATE_NOOP("dash-core", "Node relay options:"), QT_TRANSLATE_NOOP("dash-core", "Non-standard public key detected."), QT_TRANSLATE_NOOP("dash-core", "Not compatible with existing transactions."), QT_TRANSLATE_NOOP("dash-core", "Not enough file descriptors available."), -QT_TRANSLATE_NOOP("dash-core", "Not enough funds to anonymize."), +QT_TRANSLATE_NOOP("dash-core", "Not enough funds to mix."), QT_TRANSLATE_NOOP("dash-core", "Not in the Masternode list."), QT_TRANSLATE_NOOP("dash-core", "Number of automatic wallet backups (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Only connect to nodes in network (ipv4, ipv6 or onion)"), diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index d2b12b9bf4..c8a5504475 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -221,7 +221,7 @@ - This setting determines the amount of individual masternodes that an input will be anonymized through.<br/>More rounds of anonymization gives a higher degree of privacy, but also costs more in fees. + This setting determines the amount of individual masternodes that an input will be mixed through.<br/>More rounds of mixing gives a higher degree of privacy, but also costs more in fees. PrivateSend rounds to use @@ -263,7 +263,7 @@ - Amount of Dash to keep anonymized + Amount of Dash to keep mixed diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index a2179df9f1..74ee78160d 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -272,11 +272,11 @@ void SendCoinsDialog::on_sendButton_clicked() return; } - QString strFunds = tr("using") + " " + tr("anonymous funds") + ""; + QString strFunds = tr("using") + " " + tr("mixed funds") + ""; QString strFee = ""; if(ui->checkUsePrivateSend->isChecked()) { - strFunds = tr("using") + " " + tr("anonymous funds") + ""; + strFunds = tr("using") + " " + tr("mixed funds") + ""; QString strNearestAmount( BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), CPrivateSend::GetSmallestDenomination())); @@ -284,7 +284,7 @@ void SendCoinsDialog::on_sendButton_clicked() "(privatesend requires this amount to be rounded up to the nearest %1)." ).arg(strNearestAmount)); } else { - strFunds = tr("using") + " " + tr("any available funds (not anonymous)") + ""; + strFunds = tr("using") + " " + tr("any available funds (not mixed)") + ""; } fNewRecipientAllowed = false; diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index f02adaa43d..50647de2dd 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -155,7 +155,7 @@ Your wallet pays that denomination directly to itself, but in a different addres
  • In order to fully obscure your funds, your wallet must repeat this process a number of times with each denomination. \ Each time the process is completed, it's called a \"round.\" Each round of PrivateSend makes it exponentially more difficult to determine where your funds originated.
    • \
  • This mixing process happens in the background without any intervention on your part. When you wish to make a transaction, \ -your funds will already be anonymized. No additional waiting is required.
    • \ +your funds will already be mixed. No additional waiting is required. \
    \ IMPORTANT: Your wallet only contains 1000 of these \"change addresses.\" Every time a mixing event happens, up to 9 of your addresses are used up. \ This means those 1000 addresses last for about 100 mixing events. When 900 of them are used, your wallet must create more addresses. \ diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index 821d210fbb..fe3141cd2a 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -113,7 +113,7 @@ UniValue getprivatesendinfo(const JSONRPCRequest& request) " \"multisession\": true|false, (bool) Whether PrivateSend Multisession option is enabled\n" " \"max_sessions\": xxx, (numeric) How many parallel mixing sessions can there be at once\n" " \"max_rounds\": xxx, (numeric) How many rounds to mix\n" - " \"max_amount\": xxx, (numeric) How many " + CURRENCY_UNIT + " to keep anonymized\n" + " \"max_amount\": xxx, (numeric) How many " + CURRENCY_UNIT + " to keep mixed\n" " \"max_denoms\": xxx, (numeric) How many inputs of each denominated amount to create\n" " \"queue_size\": xxx, (numeric) How many queues there are currently on the network\n" " \"sessions\": (array of json objects)\n" diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 5bcaa97509..603e5682bf 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -64,7 +64,7 @@ UniValue getinfo(const JSONRPCRequest& request) " \"protocolversion\": xxxxx, (numeric) the protocol version\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" " \"balance\": xxxxxxx, (numeric) the total dash balance of the wallet\n" - " \"privatesend_balance\": xxxxxx, (numeric) the anonymized dash balance of the wallet\n" + " \"privatesend_balance\": xxxxxx, (numeric) the mixed dash balance of the wallet\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"timeoffset\": xxxxx, (numeric) the time offset\n" " \"connections\": xxxxx, (numeric) the number of connections\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e4e9e73413..c418f61e0b 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -435,7 +435,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" " The recipient will receive less amount of Dash than you enter in the amount field.\n" "6. \"use_is\" (bool, optional, default=false) Deprecated and ignored\n" - "7. \"use_ps\" (bool, optional, default=false) Use anonymized funds only\n" + "7. \"use_ps\" (bool, optional, default=false) Use mixed funds only\n" "8. conf_target (numeric, optional) Confirmation target (in blocks)\n" "9. \"estimate_mode\" (string, optional, default=UNSET) The fee estimate mode, must be one of:\n" " \"UNSET\"\n" @@ -1004,7 +1004,7 @@ UniValue sendmany(const JSONRPCRequest& request) " ,...\n" " ]\n" "7. \"use_is\" (bool, optional, default=false) Deprecated and ignored\n" - "8. \"use_ps\" (bool, optional, default=false) Use anonymized funds only\n" + "8. \"use_ps\" (bool, optional, default=false) Use mixed funds only\n" "9. conf_target (numeric, optional) Confirmation target (in blocks)\n" "10. \"estimate_mode\" (string, optional, default=UNSET) The fee estimate mode, must be one of:\n" " \"UNSET\"\n" @@ -2534,7 +2534,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request) " \"walletname\": xxxxx, (string) the wallet name\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" " \"balance\": xxxxxxx, (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n" - " \"privatesend_balance\": xxxxxx, (numeric) the anonymized dash balance of the wallet in " + CURRENCY_UNIT + "\n" + " \"privatesend_balance\": xxxxxx, (numeric) the mixed dash balance of the wallet in " + CURRENCY_UNIT + "\n" " \"unconfirmed_balance\": xxx, (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n" " \"immature_balance\": xxxxxx, (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n" " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c4f4cb0c72..6d0114477d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2990,7 +2990,7 @@ bool CWallet::SelectCoinsMinConf(const CAmount& nTargetValue, const int nConfMin if (tryDenom == 0 && CPrivateSend::IsDenominatedAmount(coin.txout.nValue)) continue; // we don't want denom values on first run if (nCoinType == CoinType::ONLY_DENOMINATED) { - // Make sure it's actually anonymized + // Make sure it's actually mixed COutPoint outpoint = COutPoint(pcoin->GetHash(), i); int nRounds = GetRealOutpointPrivateSendRounds(outpoint); if (nRounds < privateSendClient.nPrivateSendRounds) continue; @@ -3100,7 +3100,7 @@ bool CWallet::SelectCoins(const std::vector& vAvailableCoins, const CAm if(nCoinType == CoinType::ONLY_DENOMINATED) { COutPoint outpoint = COutPoint(out.tx->GetHash(),out.i); int nRounds = GetCappedOutpointPrivateSendRounds(outpoint); - // make sure it's actually anonymized + // make sure it's actually mixed if(nRounds < privateSendClient.nPrivateSendRounds) continue; } nValueRet += out.tx->tx->vout[out.i].nValue; @@ -3132,8 +3132,8 @@ bool CWallet::SelectCoins(const std::vector& vAvailableCoins, const CAm if (pcoin->tx->vout.size() <= outpoint.n) return false; if (nCoinType == CoinType::ONLY_DENOMINATED) { - // Make sure to include anonymized preset inputs only, - // even if some non-anonymized inputs were manually selected via CoinControl + // Make sure to include mixed preset inputs only, + // even if some non-mixed inputs were manually selected via CoinControl int nRounds = GetRealOutpointPrivateSendRounds(outpoint); if (nRounds < privateSendClient.nPrivateSendRounds) continue; } @@ -3286,7 +3286,7 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector& vecTa isminefilter filter = ISMINE_SPENDABLE; - // Try using the cache for already confirmed anonymizable inputs. + // Try using the cache for already confirmed mixable inputs. // This should only be used if nMaxOupointsPerAddress was NOT specified. if(nMaxOupointsPerAddress == -1 && fAnonymizable && fSkipUnconfirmed) { if(fSkipDenominated && fAnonymizableTallyCachedNonDenom) { @@ -3339,7 +3339,7 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector& vecTa // ignore outputs that are 10 times smaller then the smallest denomination // otherwise they will just lead to higher fee / lower priority if(wtx.tx->vout[i].nValue <= nSmallestDenom/10) continue; - // ignore anonymized + // ignore mixed if(GetCappedOutpointPrivateSendRounds(COutPoint(outpoint.hash, i)) >= privateSendClient.nPrivateSendRounds) continue; } @@ -3360,7 +3360,7 @@ bool CWallet::SelectCoinsGroupedByAddresses(std::vector& vecTa vecTallyRet.push_back(item.second); } - // Cache already confirmed anonymizable entries for later use. + // Cache already confirmed mixable entries for later use. // This should only be used if nMaxOupointsPerAddress was NOT specified. if(nMaxOupointsPerAddress == -1 && fAnonymizable && fSkipUnconfirmed) { if(fSkipDenominated) { @@ -3789,7 +3789,7 @@ bool CWallet::CreateTransaction(const std::vector& vecSend, CWalletT strFailReason = _("Unable to locate enough PrivateSend non-denominated funds for this transaction."); } else if (coin_control.nCoinType == CoinType::ONLY_DENOMINATED) { strFailReason = _("Unable to locate enough PrivateSend denominated funds for this transaction."); - strFailReason += " " + _("PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); + strFailReason += " " + _("PrivateSend uses exact denominated amounts to send funds, you might simply need to mix some more coins."); } else if (nValueIn < nValueToSelect) { strFailReason = _("Insufficient funds."); }