[BDAP] Remove private data from debug.log file logging

AmirAbrams · AmirAbrams · commit 16b18658eb63 · 2019-07-22T11:47:46.000-05:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1041,7 +1041,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             if (nBDAPBurn > 0)
                 nFees += nBDAPBurn;
 
-            LogPrintf("%s -- BDAP Burn Amount %d, Total Fees %d, BDAP Deposit Amount %d\n", __func__, FormatMoney(nBDAPBurn), FormatMoney(nFees), FormatMoney(nOpCodeAmount));
+            LogPrint("bdap", "%s -- BDAP Burn Amount %d, Total Fees %d, BDAP Deposit Amount %d\n", __func__, FormatMoney(nBDAPBurn), FormatMoney(nFees), FormatMoney(nOpCodeAmount));
         }
         // nModifiedFees includes any fee deltas from PrioritiseTransaction
         CAmount nModifiedFees = nFees;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1410,7 +1410,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex
                             if (GetBDAPData(ptx, vchData, vchHash, nOut)) {
                                 CLinkStorage link(vchData, vchLinkPubKey, vchSharedPubKey, (uint8_t)BDAP::LinkType::RequestType, nHeight, nExpireTime, GetTime(), tx.GetHash());
                                 if (walletdb.WriteLink(link)) {
-                                    LogPrintf("%s -- WriteLinkRequest nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());
+                                    LogPrint("bdap", "%s -- WriteLinkRequest nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());
                                 }
                             }
                         }
@@ -1420,7 +1420,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex
                             if (GetBDAPData(ptx, vchData, vchHash, nOut)) {
                                 CLinkStorage link(vchData, vchLinkPubKey, vchSharedPubKey, (uint8_t)BDAP::LinkType::AcceptType, nHeight, nExpireTime, GetTime(), tx.GetHash());
                                 if (walletdb.WriteLink(link)) {
-                                    LogPrintf("%s -- WriteLinkAccept nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());
+                                    LogPrint("bdap", "%s -- WriteLinkAccept nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());
                                 }
                             }
                         }
@@ -6005,7 +6005,7 @@ bool CWallet::ProcessStealthOutput(const CTxDestination& address, std::vector<ui
         if (idMatchShared != idExtracted) {
             continue;
         }
-        LogPrintf("%s -- Found txn output from address %s belongs to stealth address %s\n", __func__, CDynamicAddress(idExtracted).ToString(), sxAddr.Encoded());
+        LogPrint("bdap", "%s -- Found txn output from address %s belongs to stealth address %s\n", __func__, CDynamicAddress(idExtracted).ToString(), sxAddr.Encoded());
 
         if (IsLocked()) {
             LogPrintf("%s: Wallet locked, adding stealth key to queue wallet.\n", __func__);

Original file line number	Diff line number	Diff line change
`@@ -1041,7 +1041,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C`
`1041`	`1041`	`if (nBDAPBurn > 0)`
`1042`	`1042`	`nFees += nBDAPBurn;`
`1043`	`1043`
`1044`		`- LogPrintf("%s -- BDAP Burn Amount %d, Total Fees %d, BDAP Deposit Amount %d\n", __func__, FormatMoney(nBDAPBurn), FormatMoney(nFees), FormatMoney(nOpCodeAmount));`
	`1044`	`+ LogPrint("bdap", "%s -- BDAP Burn Amount %d, Total Fees %d, BDAP Deposit Amount %d\n", __func__, FormatMoney(nBDAPBurn), FormatMoney(nFees), FormatMoney(nOpCodeAmount));`
`1045`	`1045`	`}`
`1046`	`1046`	`// nModifiedFees includes any fee deltas from PrioritiseTransaction`
`1047`	`1047`	`CAmount nModifiedFees = nFees;`
Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex`
`1410`	`1410`	`if (GetBDAPData(ptx, vchData, vchHash, nOut)) {`
`1411`	`1411`	`CLinkStorage link(vchData, vchLinkPubKey, vchSharedPubKey, (uint8_t)BDAP::LinkType::RequestType, nHeight, nExpireTime, GetTime(), tx.GetHash());`
`1412`	`1412`	`if (walletdb.WriteLink(link)) {`
`1413`		`- LogPrintf("%s -- WriteLinkRequest nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());`
	`1413`	`+ LogPrint("bdap", "%s -- WriteLinkRequest nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());`
`1414`	`1414`	`}`
`1415`	`1415`	`}`
`1416`	`1416`	`}`
`@@ -1420,7 +1420,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlockIndex`
`1420`	`1420`	`if (GetBDAPData(ptx, vchData, vchHash, nOut)) {`
`1421`	`1421`	`CLinkStorage link(vchData, vchLinkPubKey, vchSharedPubKey, (uint8_t)BDAP::LinkType::AcceptType, nHeight, nExpireTime, GetTime(), tx.GetHash());`
`1422`	`1422`	`if (walletdb.WriteLink(link)) {`
`1423`		`- LogPrintf("%s -- WriteLinkAccept nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());`
	`1423`	`+ LogPrint("bdap", "%s -- WriteLinkAccept nHeight = %llu, txid = %s\n", __func__, nHeight, tx.GetHash().ToString());`
`1424`	`1424`	`}`
`1425`	`1425`	`}`
`1426`	`1426`	`}`
`@@ -6005,7 +6005,7 @@ bool CWallet::ProcessStealthOutput(const CTxDestination& address, std::vector<ui`
`6005`	`6005`	`if (idMatchShared != idExtracted) {`
`6006`	`6006`	`continue;`
`6007`	`6007`	`}`
`6008`		`- LogPrintf("%s -- Found txn output from address %s belongs to stealth address %s\n", __func__, CDynamicAddress(idExtracted).ToString(), sxAddr.Encoded());`
	`6008`	`+ LogPrint("bdap", "%s -- Found txn output from address %s belongs to stealth address %s\n", __func__, CDynamicAddress(idExtracted).ToString(), sxAddr.Encoded());`
`6009`	`6009`
`6010`	`6010`	`if (IsLocked()) {`
`6011`	`6011`	`LogPrintf("%s: Wallet locked, adding stealth key to queue wallet.\n", __func__);`