Skip to content

Commit dfa057b

Browse files
Duality-CDOODuality-CDOO
committed
dsin to psin
1 parent 34ae289 commit dfa057b

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎src/privatesend-client.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxPSIn>& vecTx
495495
for (const auto& txin : txMyCollateral.vin)
496496
vecOutPointLocked.push_back(txin.prevout);
497497

498-
for (const auto& txdsin : vecTxPSIn)
499-
vecOutPointLocked.push_back(txdsin.prevout);
498+
for (const auto& txpsin : vecTxPSIn)
499+
vecOutPointLocked.push_back(txpsin.prevout);
500500

501501
// we should already be connected to a Dynode
502502
if (!nSessionID) {
@@ -525,9 +525,9 @@ bool CPrivateSendClientSession::SendDenominate(const std::vector<CTxPSIn>& vecTx
525525

526526
CMutableTransaction tx;
527527

528-
for (const auto& txdsin : vecTxPSIn) {
529-
LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txdsin=%s\n", txdsin.ToString());
530-
tx.vin.push_back(txdsin);
528+
for (const auto& txpsin : vecTxPSIn) {
529+
LogPrint("privatesend", "CPrivateSendClientSession::SendDenominate -- txpsin=%s\n", txpsin.ToString());
530+
tx.vin.push_back(txpsin);
531531
}
532532

533533
for (const CTxOut& txout : vecTxOut) {
@@ -622,17 +622,17 @@ bool CPrivateSendClientSession::SignFinalTransaction(const CTransaction& finalTr
622622

623623
//make sure my inputs/outputs are present, otherwise refuse to sign
624624
for (const auto& entry : vecEntries) {
625-
for (const auto& txdsin : entry.vecTxPSIn) {
625+
for (const auto& txpsin : entry.vecTxPSIn) {
626626
/* Sign my transaction and all outputs */
627627
int nMyInputIndex = -1;
628628
CScript prevPubKey = CScript();
629629
CTxIn txin = CTxIn();
630630

631631
for (unsigned int i = 0; i < finalMutableTransaction.vin.size(); i++) {
632-
if (finalMutableTransaction.vin[i] == txdsin) {
632+
if (finalMutableTransaction.vin[i] == txpsin) {
633633
nMyInputIndex = i;
634-
prevPubKey = txdsin.prevPubKey;
635-
txin = txdsin;
634+
prevPubKey = txpsin.prevPubKey;
635+
txin = txpsin;
636636
}
637637
}
638638

‎src/privatesend-server.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ void CPrivateSendServer::CreateFinalTransaction(CConnman& connman)
306306
for (const auto& txout : vecEntries[i].vecTxOut)
307307
txNew.vout.push_back(txout);
308308

309-
for (const auto& txdsin : vecEntries[i].vecTxPSIn)
310-
txNew.vin.push_back(txdsin);
309+
for (const auto& txpsin : vecEntries[i].vecTxPSIn)
310+
txNew.vin.push_back(txpsin);
311311
}
312312

313313
sort(txNew.vin.begin(), txNew.vin.end(), CompareInputBIP69());
@@ -411,8 +411,8 @@ void CPrivateSendServer::ChargeFees(CConnman& connman)
411411
if (nState == POOL_STATE_SIGNING) {
412412
// who didn't sign?
413413
for (const auto& entry : vecEntries) {
414-
for (const auto& txdsin : entry.vecTxPSIn) {
415-
if (!txdsin.fHasSig) {
414+
for (const auto& txpsin : entry.vecTxPSIn) {
415+
if (!txpsin.fHasSig) {
416416
LogPrintf("CPrivateSendServer::ChargeFees -- found uncooperative node (didn't sign), found offence\n");
417417
vecOffendersCollaterals.push_back(entry.txCollateral);
418418
}
@@ -541,12 +541,12 @@ bool CPrivateSendServer::IsInputScriptSigValid(const CTxIn& txin)
541541
for (const auto& txout : entry.vecTxOut)
542542
txNew.vout.push_back(txout);
543543

544-
for (const auto& txdsin : entry.vecTxPSIn) {
545-
txNew.vin.push_back(txdsin);
544+
for (const auto& txpsin : entry.vecTxPSIn) {
545+
txNew.vin.push_back(txpsin);
546546

547-
if (txdsin.prevout == txin.prevout) {
547+
if (txpsin.prevout == txin.prevout) {
548548
nTxInIndex = i;
549-
sigPubKey = txdsin.prevPubKey;
549+
sigPubKey = txpsin.prevPubKey;
550550
}
551551
i++;
552552
}
@@ -599,8 +599,8 @@ bool CPrivateSendServer::AddEntry(const CPrivateSendEntry& entryNew, PoolMessage
599599
for (const auto& txin : entryNew.vecTxPSIn) {
600600
LogPrint("privatesend", "looking for txin -- %s\n", txin.ToString());
601601
for (const auto& entry : vecEntries) {
602-
for (const auto& txdsin : entry.vecTxPSIn) {
603-
if (txdsin.prevout == txin.prevout) {
602+
for (const auto& txpsin : entry.vecTxPSIn) {
603+
if (txpsin.prevout == txin.prevout) {
604604
LogPrint("privatesend", "CPrivateSendServer::AddEntry -- found in txin\n");
605605
nMessageIDRet = ERR_ALREADY_HAVE;
606606
return false;
@@ -623,8 +623,8 @@ bool CPrivateSendServer::AddScriptSig(const CTxIn& txinNew)
623623
LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- scriptSig=%s\n", ScriptToAsmStr(txinNew.scriptSig).substr(0, 24));
624624

625625
for (const auto& entry : vecEntries) {
626-
for (const auto& txdsin : entry.vecTxPSIn) {
627-
if (txdsin.scriptSig == txinNew.scriptSig) {
626+
for (const auto& txpsin : entry.vecTxPSIn) {
627+
if (txpsin.scriptSig == txinNew.scriptSig) {
628628
LogPrint("privatesend", "CPrivateSendServer::AddScriptSig -- already exists\n");
629629
return false;
630630
}
@@ -659,8 +659,8 @@ bool CPrivateSendServer::AddScriptSig(const CTxIn& txinNew)
659659
bool CPrivateSendServer::IsSignaturesComplete()
660660
{
661661
for (const auto& entry : vecEntries)
662-
for (const auto& txdsin : entry.vecTxPSIn)
663-
if (!txdsin.fHasSig)
662+
for (const auto& txpsin : entry.vecTxPSIn)
663+
if (!txpsin.fHasSig)
664664
return false;
665665

666666
return true;

‎src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3296,7 +3296,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std
32963296

32973297
// pay collateral charge in fees
32983298
// NOTE: no need for protobump patch here,
3299-
// CPrivateSend::IsCollateralAmount in GetCollateralTxDSIn should already take care of this
3299+
// CPrivateSend::IsCollateralAmount in GetCollateralTxPSIn should already take care of this
33003300
if (nValue >= CPrivateSend::GetCollateralAmount() * 2) {
33013301
// make our change address
33023302
CScript scriptChange;

0 commit comments

Comments
 (0)