Skip to content

Commit ca89c7b

Browse files
thephezUdjinM6
authored andcommitted
[Trivial] Update PrivateSend denominations in comments / typo fixes (#1910)
1 parent 8f2c199 commit ca89c7b

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

src/privatesend-client.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ void CPrivateSendClient::CheckTimeout()
346346
bool fTimeout = GetTimeMillis() - nTimeLastSuccessfulStep >= nTimeout*1000 + nLagTime;
347347

348348
if(nState != POOL_STATE_IDLE && fTimeout) {
349-
LogPrint("privatesend", "CPrivateSendClient::CheckTimeout -- %s timed out (%ds) -- restting\n",
349+
LogPrint("privatesend", "CPrivateSendClient::CheckTimeout -- %s timed out (%ds) -- resetting\n",
350350
(nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
351351
UnlockCoins();
352352
keyHolderStorage.ReturnAll();
@@ -626,14 +626,14 @@ bool CPrivateSendClient::CheckAutomaticBackup()
626626
case -1:
627627
// Automatic backup failed, nothing else we can do until user fixes the issue manually.
628628
// There is no way to bring user attention in daemon mode so we just update status and
629-
// keep spaming if debug is on.
629+
// keep spamming if debug is on.
630630
LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- ERROR! Failed to create automatic backup.\n");
631631
strAutoDenomResult = _("ERROR! Failed to create automatic backup") + ", " + _("see debug.log for details.");
632632
return false;
633633
case -2:
634634
// We were able to create automatic backup but keypool was not replenished because wallet is locked.
635635
// There is no way to bring user attention in daemon mode so we just update status and
636-
// keep spaming if debug is on.
636+
// keep spamming if debug is on.
637637
LogPrint("privatesend", "CPrivateSendClient::CheckAutomaticBackup -- WARNING! Failed to create replenish keypool, please unlock your wallet to do so.\n");
638638
strAutoDenomResult = _("WARNING! Failed to replenish keypool, please unlock your wallet to do so.") + ", " + _("see debug.log for details.");
639639
return false;
@@ -1096,7 +1096,7 @@ bool CPrivateSendClient::PrepareDenominate(int nMinRounds, int nMaxRounds, std::
10961096
if ((*it2).tx->tx->vout[(*it2).i].nValue == nValueDenom) {
10971097
// add new input in resulting vector
10981098
vecTxDSInRet.push_back(*it);
1099-
// remove corresponting items from initial vectors
1099+
// remove corresponding items from initial vectors
11001100
vecTxDSIn.erase(it);
11011101
vCoins.erase(it2);
11021102

@@ -1209,7 +1209,7 @@ bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem
12091209
nFeeRet, nChangePosRet, strFail, &coinControl, true, ONLY_NONDENOMINATED);
12101210
if(!fSuccess) {
12111211
LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- ONLY_NONDENOMINATED: %s\n", strFail);
1212-
// If we failed then most likeky there are not enough funds on this address.
1212+
// If we failed then most likely there are not enough funds on this address.
12131213
if(fTryDenominated) {
12141214
// Try to also use denominated coins (we can't mix denominated without collaterals anyway).
12151215
if(!pwalletMain->CreateTransaction(vecSend, wtx, reservekeyChange,
@@ -1229,7 +1229,7 @@ bool CPrivateSendClient::MakeCollateralAmounts(const CompactTallyItem& tallyItem
12291229

12301230
LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- txid=%s\n", wtx.GetHash().GetHex());
12311231

1232-
// use the same nCachedLastSuccessBlock as for DS mixinx to prevent race
1232+
// use the same nCachedLastSuccessBlock as for DS mixing to prevent race
12331233
CValidationState state;
12341234
if(!pwalletMain->CommitTransaction(wtx, reservekeyChange, &connman, state)) {
12351235
LogPrintf("CPrivateSendClient::MakeCollateralAmounts -- CommitTransaction failed! Reason given: %s\n", state.GetRejectReason());

src/privatesend-server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ void CPrivateSendServer::CommitFinalTransaction(CConnman& connman)
384384
// Why bother? PrivateSend uses collateral to ensure abuse to the process is kept to a minimum.
385385
// The submission and signing stages are completely separate. In the cases where
386386
// a client submits a transaction then refused to sign, there must be a cost. Otherwise they
387-
// would be able to do this over and over again and bring the mixing to a hault.
387+
// would be able to do this over and over again and bring the mixing to a halt.
388388
//
389389
// How does this work? Messages to Masternodes come in via NetMsgType::DSVIN, these require a valid collateral
390390
// transaction for the client to be able to enter the pool. This transaction is kept by the Masternode
@@ -504,7 +504,7 @@ void CPrivateSendServer::CheckTimeout(CConnman& connman)
504504
bool fTimeout = GetTimeMillis() - nTimeLastSuccessfulStep >= nTimeout*1000 + nLagTime;
505505

506506
if(nState != POOL_STATE_IDLE && fTimeout) {
507-
LogPrint("privatesend", "CPrivateSendServer::CheckTimeout -- %s timed out (%ds) -- restting\n",
507+
LogPrint("privatesend", "CPrivateSendServer::CheckTimeout -- %s timed out (%ds) -- resetting\n",
508508
(nState == POOL_STATE_SIGNING) ? "Signing" : "Session", nTimeout);
509509
ChargeFees(connman);
510510
SetNull();

src/privatesend.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ void CPrivateSend::InitStandardDenominations()
156156
vecStandardDenominations.clear();
157157
/* Denominations
158158
159-
A note about convertability. Within mixing pools, each denomination
160-
is convertable to another.
159+
A note about convertibility. Within mixing pools, each denomination
160+
is convertible to another.
161161
162162
For example:
163163
1DRK+1000 == (.1DRK+100)*10
@@ -233,10 +233,10 @@ bool CPrivateSend::IsCollateralAmount(CAmount nInputAmount)
233233
/* Create a nice string to show the denominations
234234
Function returns as follows (for 4 denominations):
235235
( bit on if present )
236-
bit 0 - 100
237-
bit 1 - 10
238-
bit 2 - 1
239-
bit 3 - .1
236+
bit 0 - 10
237+
bit 1 - 1
238+
bit 2 - .1
239+
bit 3 - .01
240240
bit 4 and so on - out-of-bounds
241241
none of above - non-denom
242242
*/
@@ -265,10 +265,10 @@ std::string CPrivateSend::GetDenominationsToString(int nDenom)
265265
/* Return a bitshifted integer representing the denominations in this list
266266
Function returns as follows (for 4 denominations):
267267
( bit on if present )
268-
100 - bit 0
269-
10 - bit 1
270-
1 - bit 2
271-
.1 - bit 3
268+
10 - bit 0
269+
1 - bit 1
270+
.1 - bit 2
271+
.01 - bit 3
272272
non-denom - 0, all bits off
273273
*/
274274
int CPrivateSend::GetDenominations(const std::vector<CTxOut>& vecTxOut, bool fSingleRandomDenom)

src/privatesend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class CDarkSendEntry
166166

167167

168168
/**
169-
* A currently inprogress mixing merge and denomination information
169+
* A currently in progress mixing merge and denomination information
170170
*/
171171
class CDarksendQueue
172172
{

0 commit comments

Comments
 (0)