neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[UI] Darksend changed to PrivacyProtect (UI+log)

Browse Source
This commit is contained in:
crowning- 2016-04-18 23:46:51 +02:00
parent 5fc47d4c7b
commit e44dab084a
16 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/activemasternode.cpp Normal file → Executable file
View File

@ -206,7 +206,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage) {
else else
{ {
// Seems like we are trying to send a ping while the Masternode is not registered in the network // Seems like we are trying to send a ping while the Masternode is not registered in the network
errorMessage = "Darksend Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString(); errorMessage = "PrivacyProtect Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString();
status = ACTIVE_MASTERNODE_NOT_CAPABLE; status = ACTIVE_MASTERNODE_NOT_CAPABLE;
notCapableReason = errorMessage; notCapableReason = errorMessage;
return false; return false;

40
src/darksend.cpp
View File

@ -132,7 +132,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
} }
if(state == POOL_STATUS_QUEUE){ if(state == POOL_STATUS_QUEUE){
LogPrint("darksend", "Darksend queue is ready - %s\n", addr.ToString()); LogPrint("darksend", "PrivacyProtect queue is ready - %s\n", addr.ToString());
PrepareDarksendDenominate(); PrepareDarksendDenominate();
} }
} else { } else {
@ -151,7 +151,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
pmn->nLastDsq = mnodeman.nDsqCount; pmn->nLastDsq = mnodeman.nDsqCount;
pmn->allowFreeTx = true; pmn->allowFreeTx = true;
LogPrint("darksend", "dsq - new Darksend queue object - %s\n", addr.ToString()); LogPrint("darksend", "dsq - new PrivacyProtect queue object - %s\n", addr.ToString());
vecDarksendQueue.push_back(dsq); vecDarksendQueue.push_back(dsq);
dsq.Relay(); dsq.Relay();
dsq.time = GetTime(); dsq.time = GetTime();
@ -242,7 +242,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
} }
if (nValueIn > DARKSEND_POOL_MAX) { if (nValueIn > DARKSEND_POOL_MAX) {
LogPrintf("dsi -- more than Darksend pool max! %s\n", tx.ToString()); LogPrintf("dsi -- more than PrivacyProtect pool max! %s\n", tx.ToString());
errorID = ERR_MAXIMUM; errorID = ERR_MAXIMUM;
pfrom->PushMessage(NetMsgType::DSSTATUSUPDATE, sessionID, GetState(), GetEntriesCount(), MASTERNODE_REJECTED, errorID); pfrom->PushMessage(NetMsgType::DSSTATUSUPDATE, sessionID, GetState(), GetEntriesCount(), MASTERNODE_REJECTED, errorID);
return; return;
@ -305,7 +305,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
LogPrint("darksend", "dssu - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, GetMessageByID(errorID)); LogPrint("darksend", "dssu - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, GetMessageByID(errorID));
if((accepted != 1 && accepted != 0) && sessionID != sessionIDMessage){ if((accepted != 1 && accepted != 0) && sessionID != sessionIDMessage){
LogPrintf("dssu - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); LogPrintf("dssu - message doesn't match current PrivacyProtect session %d %d\n", sessionID, sessionIDMessage);
return; return;
} }
@ -350,7 +350,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
vRecv >> sessionIDMessage >> txNew; vRecv >> sessionIDMessage >> txNew;
if(sessionID != sessionIDMessage){ if(sessionID != sessionIDMessage){
LogPrint("darksend", "dsf - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); LogPrint("darksend", "dsf - message doesn't match current PrivacyProtect session %d %d\n", sessionID, sessionIDMessage);
return; return;
} }
@ -375,7 +375,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand
vRecv >> sessionIDMessage >> error >> errorID; vRecv >> sessionIDMessage >> error >> errorID;
if(sessionID != sessionIDMessage){ if(sessionID != sessionIDMessage){
LogPrint("darksend", "dsc - message doesn't match current Darksend session %d %d\n", darkSendPool.sessionID, sessionIDMessage); LogPrint("darksend", "dsc - message doesn't match current PrivacyProtect session %d %d\n", darkSendPool.sessionID, sessionIDMessage);
return; return;
} }
@ -424,7 +424,7 @@ bool CDarksendPool::SetCollateralAddress(std::string strAddress){
CBitcoinAddress address; CBitcoinAddress address;
if (!address.SetString(strAddress)) if (!address.SetString(strAddress))
{ {
LogPrintf("CDarksendPool::SetCollateralAddress - Invalid Darksend collateral address\n"); LogPrintf("CDarksendPool::SetCollateralAddress - Invalid PrivacyProtect collateral address\n");
return false; return false;
} }
collateralPubKey = GetScriptForDestination(address.Get()); collateralPubKey = GetScriptForDestination(address.Get());
@ -457,7 +457,7 @@ std::string CDarksendPool::GetStatus()
} }
switch(state) { switch(state) {
case POOL_STATUS_IDLE: case POOL_STATUS_IDLE:
return _("Darksend is idle."); return _("PrivacyProtect is idle.");
case POOL_STATUS_ACCEPTING_ENTRIES: case POOL_STATUS_ACCEPTING_ENTRIES:
if(entriesCount == 0) { if(entriesCount == 0) {
showingDarkSendMessage = 0; showingDarkSendMessage = 0;
@ -467,7 +467,7 @@ std::string CDarksendPool::GetStatus()
lastEntryAccepted = 0; lastEntryAccepted = 0;
showingDarkSendMessage = 0; showingDarkSendMessage = 0;
} }
return _("Darksend request complete:") + " " + _("Your transaction was accepted into the pool!"); return _("PrivacyProtect request complete:") + " " + _("Your transaction was accepted into the pool!");
} else { } else {
std::string suffix = ""; std::string suffix = "";
if( showingDarkSendMessage % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), entriesCount, GetMaxPoolTransactions()); if( showingDarkSendMessage % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), entriesCount, GetMaxPoolTransactions());
@ -487,9 +487,9 @@ std::string CDarksendPool::GetStatus()
case POOL_STATUS_FINALIZE_TRANSACTION: case POOL_STATUS_FINALIZE_TRANSACTION:
return _("Finalizing transaction."); return _("Finalizing transaction.");
case POOL_STATUS_ERROR: case POOL_STATUS_ERROR:
return _("Darksend request incomplete:") + " " + lastMessage + " " + _("Will retry..."); return _("PrivacyProtect request incomplete:") + " " + lastMessage + " " + _("Will retry...");
case POOL_STATUS_SUCCESS: case POOL_STATUS_SUCCESS:
return _("Darksend request complete:") + " " + lastMessage; return _("PrivacyProtect request complete:") + " " + lastMessage;
case POOL_STATUS_QUEUE: case POOL_STATUS_QUEUE:
if( showingDarkSendMessage % 70 <= 30) suffix = "."; if( showingDarkSendMessage % 70 <= 30) suffix = ".";
else if(showingDarkSendMessage % 70 <= 50) suffix = ".."; else if(showingDarkSendMessage % 70 <= 50) suffix = "..";
@ -1102,12 +1102,12 @@ bool CDarksendPool::SignaturesComplete(){
void CDarksendPool::SendDarksendDenominate(std::vector<CTxIn>& vin, std::vector<CTxOut>& vout, CAmount amount){ void CDarksendPool::SendDarksendDenominate(std::vector<CTxIn>& vin, std::vector<CTxOut>& vout, CAmount amount){
if(fMasterNode) { if(fMasterNode) {
LogPrintf("CDarksendPool::SendDarksendDenominate() - Darksend from a Masternode is not supported currently.\n"); LogPrintf("CDarksendPool::SendDarksendDenominate() - PrivacyProtect from a Masternode is not supported currently.\n");
return; return;
} }
if(txCollateral == CMutableTransaction()){ if(txCollateral == CMutableTransaction()){
LogPrintf ("CDarksendPool:SendDarksendDenominate() - Darksend collateral not set"); LogPrintf ("CDarksendPool:SendDarksendDenominate() - PrivacyProtect collateral not set");
return; return;
} }
@ -1134,7 +1134,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector<CTxIn>& vin, std::vector<
UnlockCoins(); UnlockCoins();
SetNull(); SetNull();
fEnableDarksend = false; fEnableDarksend = false;
LogPrintf("CDarksendPool::SendDarksendDenominate() - Not enough disk space, disabling Darksend.\n"); LogPrintf("CDarksendPool::SendDarksendDenominate() - Not enough disk space, disabling PrivacyProtect.\n");
return; return;
} }
@ -1388,8 +1388,8 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun)
} }
if(!fDarksendMultiSession && pCurrentBlockIndex->nHeight - cachedLastSuccess < minBlockSpacing) { if(!fDarksendMultiSession && pCurrentBlockIndex->nHeight - cachedLastSuccess < minBlockSpacing) {
LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful Darksend action was too recent\n"); LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful PrivacyProtect action was too recent\n");
strAutoDenomResult = _("Last successful Darksend action was too recent."); strAutoDenomResult = _("Last successful PrivacyProtect action was too recent.");
return false; return false;
} }
@ -1644,13 +1644,13 @@ bool CDarksendPool::PrepareDarksendDenominate()
// Try to use only inputs with the same number of rounds starting from lowest number of rounds possible // Try to use only inputs with the same number of rounds starting from lowest number of rounds possible
for(int i = 0; i < nDarksendRounds; i++) { for(int i = 0; i < nDarksendRounds; i++) {
strError = pwalletMain->PrepareDarksendDenominate(i, i+1); strError = pwalletMain->PrepareDarksendDenominate(i, i+1);
LogPrintf("DoAutomaticDenominating : Running Darksend denominate for %d rounds. Return '%s'\n", i, strError); LogPrintf("DoAutomaticDenominating : Running PrivacyProtect denominate for %d rounds. Return '%s'\n", i, strError);
if(strError == "") return true; if(strError == "") return true;
} }
// We failed? That's strange but let's just make final attempt and try to mix everything // We failed? That's strange but let's just make final attempt and try to mix everything
strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds); strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds);
LogPrintf("DoAutomaticDenominating : Running Darksend denominate for all rounds. Return '%s'\n", strError); LogPrintf("DoAutomaticDenominating : Running PrivacyProtect denominate for all rounds. Return '%s'\n", strError);
if(strError == "") return true; if(strError == "") return true;
// Should never actually get here but just in case // Should never actually get here but just in case
@ -2029,13 +2029,13 @@ std::string CDarksendPool::GetMessageByID(int messageID) {
case ERR_INVALID_INPUT: return _("Input is not valid."); case ERR_INVALID_INPUT: return _("Input is not valid.");
case ERR_INVALID_SCRIPT: return _("Invalid script detected."); case ERR_INVALID_SCRIPT: return _("Invalid script detected.");
case ERR_INVALID_TX: return _("Transaction not valid."); case ERR_INVALID_TX: return _("Transaction not valid.");
case ERR_MAXIMUM: return _("Value more than Darksend pool maximum allows."); case ERR_MAXIMUM: return _("Value more than PrivacyProtect pool maximum allows.");
case ERR_MN_LIST: return _("Not in the Masternode list."); case ERR_MN_LIST: return _("Not in the Masternode list.");
case ERR_MODE: return _("Incompatible mode."); case ERR_MODE: return _("Incompatible mode.");
case ERR_NON_STANDARD_PUBKEY: return _("Non-standard public key detected."); case ERR_NON_STANDARD_PUBKEY: return _("Non-standard public key detected.");
case ERR_NOT_A_MN: return _("This is not a Masternode."); case ERR_NOT_A_MN: return _("This is not a Masternode.");
case ERR_QUEUE_FULL: return _("Masternode queue is full."); case ERR_QUEUE_FULL: return _("Masternode queue is full.");
case ERR_RECENT: return _("Last Darksend was too recent."); case ERR_RECENT: return _("Last PrivacyProtect was too recent.");
case ERR_SESSION: return _("Session not complete!"); case ERR_SESSION: return _("Session not complete!");
case ERR_MISSING_TX: return _("Missing input transaction information."); case ERR_MISSING_TX: return _("Missing input transaction information.");
case ERR_VERSION: return _("Incompatible version."); case ERR_VERSION: return _("Incompatible version.");

12
src/init.cpp
View File

@ -538,7 +538,7 @@ std::string HelpMessage(HelpMessageMode mode)
} }
strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)")); strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)"));
AppendParamsHelpMessages(strUsage, showDebug); AppendParamsHelpMessages(strUsage, showDebug);
strUsage += HelpMessageOpt("-litemode=<n>", strprintf(_("Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u)"), 0)); strUsage += HelpMessageOpt("-litemode=<n>", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivacyProtect, InstantX, Budgeting) (0-1, default: %u)"), 0));
strUsage += HelpMessageGroup(_("Masternode options:")); strUsage += HelpMessageGroup(_("Masternode options:"));
strUsage += HelpMessageOpt("-masternode=<n>", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0)); strUsage += HelpMessageOpt("-masternode=<n>", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0));
@ -548,12 +548,12 @@ std::string HelpMessage(HelpMessageMode mode)
strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999")); strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999"));
strUsage += HelpMessageOpt("-budgetvotemode=<mode>", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)")); strUsage += HelpMessageOpt("-budgetvotemode=<mode>", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)"));
strUsage += HelpMessageGroup(_("Darksend options:")); strUsage += HelpMessageGroup(_("PrivacyProtect options:"));
strUsage += HelpMessageOpt("-enabledarksend=<n>", strprintf(_("Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend)); strUsage += HelpMessageOpt("-enabledarksend=<n>", strprintf(_("Enable use of automated PrivacyProtect for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend));
strUsage += HelpMessageOpt("-darksendmultisession=<n>", strprintf(_("Enable multiple darksend mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession)); strUsage += HelpMessageOpt("-darksendmultisession=<n>", strprintf(_("Enable multiple PrivacyProtect mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession));
strUsage += HelpMessageOpt("-darksendrounds=<n>", strprintf(_("Use N separate masternodes to anonymize funds (2-8, default: %u)"), nDarksendRounds)); strUsage += HelpMessageOpt("-darksendrounds=<n>", strprintf(_("Use N separate masternodes to anonymize funds (2-8, default: %u)"), nDarksendRounds));
strUsage += HelpMessageOpt("-anonymizedashamount=<n>", strprintf(_("Keep N DASH anonymized (default: %u)"), nAnonymizeDashAmount)); strUsage += HelpMessageOpt("-anonymizedashamount=<n>", strprintf(_("Keep N DASH anonymized (default: %u)"), nAnonymizeDashAmount));
strUsage += HelpMessageOpt("-liquidityprovider=<n>", strprintf(_("Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), nLiquidityProvider)); strUsage += HelpMessageOpt("-liquidityprovider=<n>", strprintf(_("Provide liquidity to PrivacyProtect by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), nLiquidityProvider));
strUsage += HelpMessageGroup(_("InstantX options:")); strUsage += HelpMessageGroup(_("InstantX options:"));
strUsage += HelpMessageOpt("-enableinstantx=<n>", strprintf(_("Enable instantx, show confirmations for locked transactions (0-1, default: %u)"), fEnableInstantX)); strUsage += HelpMessageOpt("-enableinstantx=<n>", strprintf(_("Enable instantx, show confirmations for locked transactions (0-1, default: %u)"), fEnableInstantX));
@ -1941,7 +1941,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
LogPrintf("fLiteMode %d\n", fLiteMode); LogPrintf("fLiteMode %d\n", fLiteMode);
LogPrintf("nInstantXDepth %d\n", nInstantXDepth); LogPrintf("nInstantXDepth %d\n", nInstantXDepth);
LogPrintf("Darksend rounds %d\n", nDarksendRounds); LogPrintf("PrivacyProtect rounds %d\n", nDarksendRounds);
LogPrintf("Anonymize Dash Amount %d\n", nAnonymizeDashAmount); LogPrintf("Anonymize Dash Amount %d\n", nAnonymizeDashAmount);
LogPrintf("Budget Mode %s\n", strBudgetMode); LogPrintf("Budget Mode %s\n", strBudgetMode);

2
src/qt/coincontroldialog.cpp
View File

@ -451,7 +451,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
int rounds = pwalletMain->GetInputDarksendRounds(vin); int rounds = pwalletMain->GetInputDarksendRounds(vin);
if(coinControl->useDarkSend && rounds < nDarksendRounds) { if(coinControl->useDarkSend && rounds < nDarksendRounds) {
QMessageBox::warning(this, windowTitle(), QMessageBox::warning(this, windowTitle(),
tr("Non-anonymized input selected. <b>Darksend will be disabled.</b><br><br>If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again."), tr("Non-anonymized input selected. <b>PrivacyProtect will be disabled.</b><br><br>If you still want to use PrivacyProtect, please deselect all non-nonymized inputs first and then check PrivacyProtect checkbox again."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
coinControl->useDarkSend = false; coinControl->useDarkSend = false;
} }

12
src/qt/darksendconfig.cpp
View File

@ -40,9 +40,9 @@ void DarksendConfig::clickBasic()
QString strAmount(BitcoinUnits::formatWithUnit( QString strAmount(BitcoinUnits::formatWithUnit(
model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
QMessageBox::information(this, tr("Darksend Configuration"), QMessageBox::information(this, tr("PrivacyProtect Configuration"),
tr( tr(
"Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen." "PrivacyProtect was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen."
).arg(strAmount) ).arg(strAmount)
); );
@ -55,9 +55,9 @@ void DarksendConfig::clickHigh()
QString strAmount(BitcoinUnits::formatWithUnit( QString strAmount(BitcoinUnits::formatWithUnit(
model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
QMessageBox::information(this, tr("Darksend Configuration"), QMessageBox::information(this, tr("PrivacyProtect Configuration"),
tr( tr(
"Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen." "PrivacyProtect was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen."
).arg(strAmount) ).arg(strAmount)
); );
@ -70,9 +70,9 @@ void DarksendConfig::clickMax()
QString strAmount(BitcoinUnits::formatWithUnit( QString strAmount(BitcoinUnits::formatWithUnit(
model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); model->getOptionsModel()->getDisplayUnit(), 1000 * COIN));
QMessageBox::information(this, tr("Darksend Configuration"), QMessageBox::information(this, tr("PrivacyProtect Configuration"),
tr( tr(
"Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen." "PrivacyProtect was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen."
).arg(strAmount) ).arg(strAmount)
); );

26
src/qt/dashstrings.cpp
View File

@ -42,13 +42,13 @@ QT_TRANSLATE_NOOP("dash-core", ""
"Create new files with system default permissions, instead of umask 077 (only " "Create new files with system default permissions, instead of umask 077 (only "
"effective with disabled wallet functionality)"), "effective with disabled wallet functionality)"),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Darksend uses exact denominated amounts to send funds, you might simply need " "PrivacyProtect uses exact denominated amounts to send funds, you might simply need "
"to anonymize some more coins."), "to anonymize some more coins."),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Delete all wallet transactions and only recover those parts of the " "Delete all wallet transactions and only recover those parts of the "
"blockchain through -rescan on startup"), "blockchain through -rescan on startup"),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Disable all Dash specific functionality (Masternodes, Darksend, InstantX, " "Disable all Dash specific functionality (Masternodes, PrivacyProtect, InstantX, "
"Budgeting) (0-1, default: %u)"), "Budgeting) (0-1, default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Distributed under the MIT software license, see the accompanying file " "Distributed under the MIT software license, see the accompanying file "
@ -120,7 +120,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Output debugging information (default: %u, supplying <category> is optional)"), "Output debugging information (default: %u, supplying <category> is optional)"),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Provide liquidity to Darksend by infrequently mixing coins on a continual " "Provide liquidity to PrivacyProtect by infrequently mixing coins on a continual "
"basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, " "basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, "
"low fees)"), "low fees)"),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
@ -164,9 +164,9 @@ QT_TRANSLATE_NOOP("dash-core", ""
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Unable to bind to %s on this computer. Dash Core is probably already running."), "Unable to bind to %s on this computer. Dash Core is probably already running."),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Unable to locate enough Darksend denominated funds for this transaction."), "Unable to locate enough PrivacyProtect denominated funds for this transaction."),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Unable to locate enough Darksend non-denominated funds for this transaction " "Unable to locate enough PrivacyProtect non-denominated funds for this transaction "
"that are not equal 1000 DASH."), "that are not equal 1000 DASH."),
QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", ""
"Unable to locate enough funds for this transaction that are not equal 1000 " "Unable to locate enough funds for this transaction that are not equal 1000 "
@ -239,10 +239,10 @@ QT_TRANSLATE_NOOP("dash-core", "Copyright (C) 2014-%i The Dash Core Developers")
QT_TRANSLATE_NOOP("dash-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("dash-core", "Corrupted block database detected"),
QT_TRANSLATE_NOOP("dash-core", "Could not parse -rpcbind value %s as network address"), QT_TRANSLATE_NOOP("dash-core", "Could not parse -rpcbind value %s as network address"),
QT_TRANSLATE_NOOP("dash-core", "Could not parse masternode.conf"), QT_TRANSLATE_NOOP("dash-core", "Could not parse masternode.conf"),
QT_TRANSLATE_NOOP("dash-core", "Darksend is idle."), QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect is idle."),
QT_TRANSLATE_NOOP("dash-core", "Darksend options:"), QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect options:"),
QT_TRANSLATE_NOOP("dash-core", "Darksend request complete:"), QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect request complete:"),
QT_TRANSLATE_NOOP("dash-core", "Darksend request incomplete:"), QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect request incomplete:"),
QT_TRANSLATE_NOOP("dash-core", "Debugging/Testing options:"), QT_TRANSLATE_NOOP("dash-core", "Debugging/Testing options:"),
QT_TRANSLATE_NOOP("dash-core", "Disable safemode, override a real safe mode event (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Disable safemode, override a real safe mode event (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("dash-core", "Discover own IP address (default: 1 when listening and no -externalip)"),
@ -267,7 +267,7 @@ QT_TRANSLATE_NOOP("dash-core", "Error: Can't select current denominated inputs")
QT_TRANSLATE_NOOP("dash-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("dash-core", "Error: Disk space is low!"),
QT_TRANSLATE_NOOP("dash-core", "Error: Unsupported argument -tor found, use -onion."), QT_TRANSLATE_NOOP("dash-core", "Error: Unsupported argument -tor found, use -onion."),
QT_TRANSLATE_NOOP("dash-core", "Error: Wallet locked, unable to create transaction!"), QT_TRANSLATE_NOOP("dash-core", "Error: Wallet locked, unable to create transaction!"),
QT_TRANSLATE_NOOP("dash-core", "Error: You already have pending entries in the Darksend pool"), QT_TRANSLATE_NOOP("dash-core", "Error: You already have pending entries in the PrivacyProtect pool"),
QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."), QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."),
QT_TRANSLATE_NOOP("dash-core", "Failed to read block"), QT_TRANSLATE_NOOP("dash-core", "Failed to read block"),
QT_TRANSLATE_NOOP("dash-core", "Fee (in DASH/kB) to add to transactions you send (default: %s)"), QT_TRANSLATE_NOOP("dash-core", "Fee (in DASH/kB) to add to transactions you send (default: %s)"),
@ -305,8 +305,8 @@ 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", "KeePassHttp key for AES encrypted communication with KeePass"),
QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Last Darksend was too recent."), QT_TRANSLATE_NOOP("dash-core", "Last PrivacyProtect was too recent."),
QT_TRANSLATE_NOOP("dash-core", "Last successful Darksend action was too recent."), QT_TRANSLATE_NOOP("dash-core", "Last successful PrivacyProtect action was too recent."),
QT_TRANSLATE_NOOP("dash-core", "Limit size of signature cache to <n> entries (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Limit size of signature cache to <n> entries (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Line: %d"), QT_TRANSLATE_NOOP("dash-core", "Line: %d"),
QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"),
@ -420,7 +420,7 @@ QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: %u)
QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: 1 when listening)"), QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: 1 when listening)"),
QT_TRANSLATE_NOOP("dash-core", "Use the test network"), QT_TRANSLATE_NOOP("dash-core", "Use the test network"),
QT_TRANSLATE_NOOP("dash-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("dash-core", "Username for JSON-RPC connections"),
QT_TRANSLATE_NOOP("dash-core", "Value more than Darksend pool maximum allows."), QT_TRANSLATE_NOOP("dash-core", "Value more than PrivacyProtect pool maximum allows."),
QT_TRANSLATE_NOOP("dash-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("dash-core", "Verifying blocks..."),
QT_TRANSLATE_NOOP("dash-core", "Verifying wallet..."), QT_TRANSLATE_NOOP("dash-core", "Verifying wallet..."),
QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"), QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"),

2
src/qt/forms/coincontroldialog.ui
View File

@ -477,7 +477,7 @@
</column> </column>
<column> <column>
<property name="text"> <property name="text">
<string>DS Rounds</string> <string>PP Rounds</string>
</property> </property>
</column> </column>
<column> <column>

2
src/qt/forms/darksendconfig.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Configure Darksend</string> <string>Configure PrivacyProtect</string>
</property> </property>
<widget class="QPushButton" name="buttonBasic"> <widget class="QPushButton" name="buttonBasic">
<property name="geometry"> <property name="geometry">

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

@ -138,7 +138,7 @@
<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 anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Darksend rounds to use</string> <string>PrivacyProtect rounds to use</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -162,7 +162,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="toolTip"> <property name="toolTip">
<string>This amount acts as a threshold to turn off Darksend once it's reached.</string> <string>This amount acts as a threshold to turn off PrivacyProtect once it's reached.</string>
</property> </property>
<property name="statusTip"> <property name="statusTip">
<string notr="true"/> <string notr="true"/>

10
src/qt/forms/overviewpage.ui
View File

@ -458,7 +458,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="labelAnonymizedText"> <widget class="QLabel" name="labelAnonymizedText">
<property name="text"> <property name="text">
<string>Darksend Balance:</string> <string>Privacy Balance:</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1025,7 +1025,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Try to manually submit a Darksend request.</string> <string>Try to manually submit a PrivacyProtect request.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Try Mix</string> <string>Try Mix</string>
@ -1034,7 +1034,7 @@
<widget class="QPushButton" name="darksendReset"> <widget class="QPushButton" name="darksendReset">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>230</x> <x>220</x>
<y>319</y> <y>319</y>
<width>221</width> <width>221</width>
<height>28</height> <height>28</height>
@ -1047,7 +1047,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!)</string> <string>Reset the current status of PrivacyProtect (can interrupt PrivacyProtect if it's in the process of Mixing, which can cost you money!)</string>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
@ -1075,7 +1075,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Darksend</string> <string>PrivacyProtect</string>
</property> </property>
</widget> </widget>
</item> </item>

6
src/qt/forms/sendcoinsdialog.ui
View File

@ -616,8 +616,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>828</width> <width>830</width>
<height>67</height> <height>69</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1"> <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@ -1324,7 +1324,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Darksend</string> <string>PrivacyProtect</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>

32
src/qt/overviewpage.cpp Normal file → Executable file
View File

@ -158,9 +158,9 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
ui->frameDarksend->setEnabled(false); ui->frameDarksend->setEnabled(false);
} else { } else {
if(!fEnableDarksend){ if(!fEnableDarksend){
ui->toggleDarksend->setText(tr("Start Darksend Mixing")); ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing"));
} else { } else {
ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); ui->toggleDarksend->setText(tr("Stop PrivacyProtect Mixing"));
} }
timer = new QTimer(this); timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus()));
@ -448,7 +448,7 @@ void OverviewPage::darkSendStatus()
ui->darksendEnabled->setText(tr("Disabled")); ui->darksendEnabled->setText(tr("Disabled"));
ui->darksendStatus->setText(""); ui->darksendStatus->setText("");
ui->toggleDarksend->setText(tr("Start Darksend Mixing")); ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing"));
} }
return; return;
@ -466,10 +466,10 @@ void OverviewPage::darkSendStatus()
QString strStatus = QString(darkSendPool.GetStatus().c_str()); QString strStatus = QString(darkSendPool.GetStatus().c_str());
QString s = tr("Last Darksend message:\n") + strStatus; QString s = tr("Last PrivacyProtect message:\n") + strStatus;
if(s != ui->darksendStatus->text()) if(s != ui->darksendStatus->text())
LogPrintf("Last Darksend message: %s\n", strStatus.toStdString()); LogPrintf("Last PrivacyProtect message: %s\n", strStatus.toStdString());
ui->darksendStatus->setText(s); ui->darksendStatus->setText(s);
@ -491,8 +491,8 @@ void OverviewPage::darksendAuto(){
void OverviewPage::darksendReset(){ void OverviewPage::darksendReset(){
darkSendPool.Reset(); darkSendPool.Reset();
QMessageBox::warning(this, tr("Darksend"), QMessageBox::warning(this, tr("PrivacyProtect"),
tr("Darksend was successfully reset."), tr("PrivacyProtect was successfully reset."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
} }
@ -501,8 +501,8 @@ void OverviewPage::toggleDarksend(){
// Popup some information on first mixing // Popup some information on first mixing
QString hasMixed = settings.value("hasMixed").toString(); QString hasMixed = settings.value("hasMixed").toString();
if(hasMixed.isEmpty()){ if(hasMixed.isEmpty()){
QMessageBox::information(this, tr("Darksend"), QMessageBox::information(this, tr("PrivacyProtect"),
tr("If you don't want to see internal Darksend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), tr("If you don't want to see internal PrivacyProtect fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
settings.setValue("hasMixed", "hasMixed"); settings.setValue("hasMixed", "hasMixed");
} }
@ -511,8 +511,8 @@ void OverviewPage::toggleDarksend(){
float minAmount = 1.49 * COIN; float minAmount = 1.49 * COIN;
if(balance < minAmount){ if(balance < minAmount){
QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, minAmount)); QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, minAmount));
QMessageBox::warning(this, tr("Darksend"), QMessageBox::warning(this, tr("PrivacyProtect"),
tr("Darksend requires at least %1 to use.").arg(strMinAmount), tr("PrivacyProtect requires at least %1 to use.").arg(strMinAmount),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
return; return;
} }
@ -525,10 +525,10 @@ void OverviewPage::toggleDarksend(){
{ {
//unlock was cancelled //unlock was cancelled
darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max(); darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
QMessageBox::warning(this, tr("Darksend"), QMessageBox::warning(this, tr("PrivacyProtect"),
tr("Wallet is locked and user declined to unlock. Disabling Darksend."), tr("Wallet is locked and user declined to unlock. Disabling PrivacyProtect."),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Ok, QMessageBox::Ok);
if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling Darksend.\n"); if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling PrivacyProtect.\n");
return; return;
} }
} }
@ -539,10 +539,10 @@ void OverviewPage::toggleDarksend(){
darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max(); darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
if(!fEnableDarksend){ if(!fEnableDarksend){
ui->toggleDarksend->setText(tr("Start Darksend Mixing")); ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing"));
darkSendPool.UnlockCoins(); darkSendPool.UnlockCoins();
} else { } else {
ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); ui->toggleDarksend->setText(tr("Stop PrivacyProtect Mixing"));
/* show darksend configuration if client has defaults set */ /* show darksend configuration if client has defaults set */

12
src/qt/transactiontablemodel.cpp
View File

@ -371,7 +371,7 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
case TransactionRecord::RecvFromOther: case TransactionRecord::RecvFromOther:
return tr("Received from"); return tr("Received from");
case TransactionRecord::RecvWithDarksend: case TransactionRecord::RecvWithDarksend:
return tr("Received via Darksend"); return tr("Received via PrivacyProtect");
case TransactionRecord::SendToAddress: case TransactionRecord::SendToAddress:
case TransactionRecord::SendToOther: case TransactionRecord::SendToOther:
return tr("Sent to"); return tr("Sent to");
@ -381,15 +381,15 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
return tr("Mined"); return tr("Mined");
case TransactionRecord::DarksendDenominate: case TransactionRecord::DarksendDenominate:
return tr("Darksend Denominate"); return tr("PrivacyProtect Denominate");
case TransactionRecord::DarksendCollateralPayment: case TransactionRecord::DarksendCollateralPayment:
return tr("Darksend Collateral Payment"); return tr("PrivacyProtect Collateral Payment");
case TransactionRecord::DarksendMakeCollaterals: case TransactionRecord::DarksendMakeCollaterals:
return tr("Darksend Make Collateral Inputs"); return tr("PrivacyProtect Make Collateral Inputs");
case TransactionRecord::DarksendCreateDenominations: case TransactionRecord::DarksendCreateDenominations:
return tr("Darksend Create Denominations"); return tr("PrivacyProtect Create Denominations");
case TransactionRecord::Darksent: case TransactionRecord::Darksent:
return tr("Darksent"); return tr("PrivacyProtect");
default: default:
return QString(); return QString();

10
src/qt/transactionview.cpp
View File

@ -92,11 +92,11 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther)); TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther));
typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) | typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)); TransactionFilterProxy::TYPE(TransactionRecord::SendToOther));
typeWidget->addItem(tr("Darksent"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent)); typeWidget->addItem(tr("PrivacyProtect"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent));
typeWidget->addItem(tr("Darksend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals)); typeWidget->addItem(tr("PrivacyProtect Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals));
typeWidget->addItem(tr("Darksend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations)); typeWidget->addItem(tr("PrivacyProtect Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations));
typeWidget->addItem(tr("Darksend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate)); typeWidget->addItem(tr("PrivacyProtect Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate));
typeWidget->addItem(tr("Darksend Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment)); typeWidget->addItem(tr("PrivacyProtect Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment));
typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf)); typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated)); typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other)); typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));

2
src/wallet/rpcwallet.cpp
View File

@ -2008,7 +2008,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp)
"\nExamples:\n" "\nExamples:\n"
"\nUnlock the wallet for 60 seconds\n" "\nUnlock the wallet for 60 seconds\n"
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") + + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") +
"\nUnlock the wallet for 60 seconds but allow Darksend mixing only\n" "\nUnlock the wallet for 60 seconds but allow PrivacyProtect mixing only\n"
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60 true") + + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60 true") +
"\nLock the wallet again (before 60 seconds)\n" "\nLock the wallet again (before 60 seconds)\n"
+ HelpExampleCli("walletlock", "") + + HelpExampleCli("walletlock", "") +

12
src/wallet/wallet.cpp
View File

@ -2708,7 +2708,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std
if (!SelectCoinsCollateral(vCoinsCollateral, nValueIn2)) if (!SelectCoinsCollateral(vCoinsCollateral, nValueIn2))
{ {
strReason = "Error: Darksend requires a collateral transaction and could not locate an acceptable input!"; strReason = "Error: PrivacyProtect requires a collateral transaction and could not locate an acceptable input!";
return false; return false;
} }
@ -2918,10 +2918,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
} else if (coin_type == ONLY_NOT1000IFMN) { } else if (coin_type == ONLY_NOT1000IFMN) {
strFailReason = _("Unable to locate enough funds for this transaction that are not equal 1000 DASH."); strFailReason = _("Unable to locate enough funds for this transaction that are not equal 1000 DASH.");
} else if (coin_type == ONLY_NONDENOMINATED_NOT1000IFMN) { } else if (coin_type == ONLY_NONDENOMINATED_NOT1000IFMN) {
strFailReason = _("Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH."); strFailReason = _("Unable to locate enough PrivacyProtect non-denominated funds for this transaction that are not equal 1000 DASH.");
} else { } else {
strFailReason = _("Unable to locate enough Darksend denominated funds for this transaction."); strFailReason = _("Unable to locate enough PrivacyProtect denominated funds for this transaction.");
strFailReason += " " + _("Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); strFailReason += " " + _("PrivacyProtect uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.");
} }
if(useIX){ if(useIX){
@ -3256,7 +3256,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds)
if(darkSendPool.GetState() != POOL_STATUS_ERROR && darkSendPool.GetState() != POOL_STATUS_SUCCESS) if(darkSendPool.GetState() != POOL_STATUS_ERROR && darkSendPool.GetState() != POOL_STATUS_SUCCESS)
if(darkSendPool.GetEntriesCount() > 0) if(darkSendPool.GetEntriesCount() > 0)
return _("Error: You already have pending entries in the Darksend pool"); return _("Error: You already have pending entries in the PrivacyProtect pool");
// ** find the coins we'll use // ** find the coins we'll use
std::vector<CTxIn> vCoins; std::vector<CTxIn> vCoins;
@ -3275,7 +3275,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds)
return _("Error: Can't select current denominated inputs"); return _("Error: Can't select current denominated inputs");
} }
LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nValueIn); LogPrintf("PrepareDarksendDenominate - preparing PrivacyProtect denominate . Got: %d \n", nValueIn);
{ {
LOCK(cs_wallet); LOCK(cs_wallet);