sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compliance changes to terminology (#3211)

Browse Source 
Replace inaccurate user-facing descriptions of PS as anonymous to mixed or private, since Dash is a transparent blockchain.
This commit is contained in:
strophy 2019-11-21 21:49:35 +01:00 committed by UdjinM6
parent d475f17bc2
commit 9de994988b
15 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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

6
contrib/debian/control
View File

@ -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

2
doc/man/dash-qt.1
View File

@ -550,7 +550,7 @@ Use N separate masternodes for each denominated input to mix funds
.HP
\fB\-privatesendamount=\fR<n>
.IP
Keep N DASH anonymized (2\-21000000, default: 1000)
Keep N DASH mixed (2\-21000000, default: 1000)
.HP
\fB\-privatesenddenoms=\fR<n>
.IP

2
doc/man/dashd.1
View File

@ -551,7 +551,7 @@ Use N separate masternodes for each denominated input to mix funds
.HP
\fB\-privatesendamount=\fR<n>
.IP
Keep N DASH anonymized (2\-21000000, default: 1000)
Keep N DASH mixed (2\-21000000, default: 1000)
.HP
\fB\-privatesenddenoms=\fR<n>
.IP

2
src/init.cpp
View File

@ -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=<n>", 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=<n>", 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=<n>", strprintf(_("Keep N DASH anonymized (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT));
strUsage += HelpMessageOpt("-privatesendamount=<n>", strprintf(_("Keep N DASH mixed (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT));
strUsage += HelpMessageOpt("-privatesenddenoms=<n>", 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

8
src/privatesend/privatesend-client.cpp
View File

@ -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;
}

2
src/qt/coincontroldialog.cpp
View File

@ -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. <b>PrivateSend will be disabled.</b><br><br>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. <b>PrivateSend will be disabled.</b><br><br>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);
}

6
src/qt/dashstrings.cpp
View File

@ -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 <n> unconnectable transactions in memory (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Keep the transaction memory pool below <n> 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 <net> (ipv4, ipv6 or onion)"),

4
src/qt/forms/optionsdialog.ui
View File

@ -221,7 +221,7 @@
<item>
<widget class="QLabel" name="label">
<property name="toolTip">
<string>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</string>
<string>This setting determines the amount of individual masternodes that an input will be mixed through.&lt;br/&gt;More rounds of mixing gives a higher degree of privacy, but also costs more in fees.</string>
</property>
<property name="text">
<string>PrivateSend rounds to use</string>
@ -263,7 +263,7 @@
<string notr="true"/>
</property>
<property name="text">
<string>Amount of Dash to keep anonymized</string>
<string>Amount of Dash to keep mixed</string>
</property>
</widget>
</item>

6
src/qt/sendcoinsdialog.cpp
View File

@ -272,11 +272,11 @@ void SendCoinsDialog::on_sendButton_clicked()
return;
}
QString strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
QString strFunds = tr("using") + " <b>" + tr("mixed funds") + "</b>";
QString strFee = "";
if(ui->checkUsePrivateSend->isChecked()) {
strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
strFunds = tr("using") + " <b>" + tr("mixed funds") + "</b>";
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") + " <b>" + tr("any available funds (not anonymous)") + "</b>";
strFunds = tr("using") + " <b>" + tr("any available funds (not mixed)") + "</b>";
}
fNewRecipientAllowed = false;

2
src/qt/utilitydialog.cpp
View File

@ -155,7 +155,7 @@ Your wallet pays that denomination directly to itself, but in a different addres
<li>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.</li> \
<li>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.</li> \
your funds will already be mixed. No additional waiting is required.</li> \
</ol> <hr>\
<b>IMPORTANT:</b> 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. \

2
src/rpc/masternode.cpp
View File

@ -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"

2
src/rpc/misc.cpp
View File

@ -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"

6
src/wallet/rpcwallet.cpp
View File

@ -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"

16
src/wallet/wallet.cpp
View File

@ -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<COutput>& 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<COutput>& 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<CompactTallyItem>& 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<CompactTallyItem>& 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<CompactTallyItem>& 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<CRecipient>& 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.");
}