sharpetronics/hush3
1
0
Fork 0
mirror of https://git.hush.is/hush/hush3.git synced 2025-09-25 00:04:03 -04:00
Code Issues Projects Releases Wiki Activity

Increase logspam for deletetx=1 and -zdebug

Browse Source
This commit is contained in:
Duke Leto 2020-09-20 14:33:15 -04:00
parent e880a45995
commit 8317beef1e
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wallet/wallet.cpp
View File

@ -2389,6 +2389,8 @@ void CWallet::WitnessNoteCommitment(std::vector<uint256> commitments,
void CWallet::ReorderWalletTransactions(std::map<std::pair<int,int>, CWalletTx*> &mapSorted, int64_t &maxOrderPos)
{
LOCK2(cs_main, cs_wallet);
if(fZdebug)
fprintf(stderr,"%s: maxOrderPos=%li\n",__func__, maxOrderPos);
int maxSortNumber = chainActive.Tip()->GetHeight() + 1;
@ -2419,6 +2421,9 @@ void CWallet::UpdateWalletTransactionOrder(std::map<std::pair<int,int>, CWalletT
int64_t previousPosition = 0;
std::map<const uint256, CWalletTx*> mapUpdatedTxs;
if(fZdebug)
fprintf(stderr,"%s: maxSorted.size=%li\n",__func__, mapSorted.size());
//Check the postion of each transaction relative to the previous one.
for (map<std::pair<int,int>, CWalletTx*>::iterator it = mapSorted.begin(); it != mapSorted.end(); ++it) {
CWalletTx* pwtx = it->second;
@ -2456,9 +2461,13 @@ for (map<std::pair<int,int>, CWalletTx*>::iterator it = mapSorted.begin(); it !=
void CWallet::DeleteTransactions(std::vector<uint256> &removeTxs) {
LOCK(cs_wallet);
int numTx = removeTxs.size();
if(fZdebug)
fprintf(stderr,"%s: removeTxs.size=%d\n", __func__, numTx);
CWalletDB walletdb(strWalletFile, "r+", false);
for (int i = 0; i< removeTxs.size(); i++) {
for (int i = 0; i< numTx; i++) {
if (mapWallet.erase(removeTxs[i])) {
walletdb.EraseTx(removeTxs[i]);
LogPrintf("%s: Deleting tx %s, %i.\n", __func__, removeTxs[i].ToString(),i);
@ -2481,6 +2490,9 @@ void CWallet::DeleteWalletTransactions(const CBlockIndex* pindex) {
int nDeleteAfter = (int)fDeleteTransactionsAfterNBlocks;
bool runCompact = false;
if(fZdebug)
fprintf(stderr,"%s: nDeleteAfter=%d\n",__func__,nDeleteAfter);
if (pindex && fTxDeleteEnabled) {
//Check for acentries - exit function if found
@ -2646,10 +2658,13 @@ void CWallet::DeleteWalletTransactions(const CBlockIndex* pindex) {
LogPrintf("Delete Tx - Total Transaction Count %i, Transactions Deleted %i\n ", txCount, int(removeTxs.size()));
//Compress Wallet
if (runCompact)
if (runCompact) {
if(fZdebug)
fprintf(stderr,"%s: compacting wallet\n",__func__);
CWalletDB::Compact(bitdb,strWalletFile);
}
}
}
/**
* Scan the block chain (starting in pindexStart) for transactions
@ -2689,11 +2704,9 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
}
}
//SproutMerkleTree sproutTree;
SaplingMerkleTree saplingTree;
// This should never fail: we should always be able to get the tree
// state on the path to the tip of our chain
//assert(pcoinsTip->GetSproutAnchorAt(pindex->hashSproutAnchor, sproutTree));
if (pindex->pprev) {
if (NetworkUpgradeActive(pindex->pprev->GetHeight(), Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) {
assert(pcoinsTip->GetSaplingAnchorAt(pindex->pprev->hashFinalSaplingRoot, saplingTree));