DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

try fix wallet get corrupt, add prints

Browse Source
This commit is contained in:
blackjok3r
2018-12-05 01:21:12 +08:00
parent 4ba6f2bc28
commit 6595ab0201
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@@ -1757,7 +1757,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
{ {
if (pfMissingInputs) if (pfMissingInputs)
*pfMissingInputs = true; *pfMissingInputs = true;
//fprintf(stderr,"missing inputs\n"); fprintf(stderr,"missing inputs in %s\n",tx.GetHash().ToString().c_str());
return state.DoS(0, error("AcceptToMemoryPool: tx inputs not found"),REJECT_INVALID, "bad-txns-inputs-missing"); return state.DoS(0, error("AcceptToMemoryPool: tx inputs not found"),REJECT_INVALID, "bad-txns-inputs-missing");
} }
} }
@@ -3839,7 +3839,10 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
//if ((i == (block.vtx.size() - 1)) && ((ASSETCHAINS_LWMAPOS && block.IsVerusPOSBlock()) || (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0)))) //if ((i == (block.vtx.size() - 1)) && ((ASSETCHAINS_LWMAPOS && block.IsVerusPOSBlock()) || (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0))))
if ((i == (block.vtx.size() - 1)) && (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0))) if ((i == (block.vtx.size() - 1)) && (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0)))
{ {
EraseFromWallets(tx.GetHash()); //EraseFromWallets(tx.GetHash());
#ifdef ENABLE_WALLET
pwalletMain->EraseFromWallet(tx.GetHash());
#endif
} }
else else
{ {

6
src/miner.cpp
View File

@@ -1569,7 +1569,7 @@ void static BitcoinMiner()
} //else fprintf(stderr,"duplicate at j.%d\n",j); } //else fprintf(stderr,"duplicate at j.%d\n",j);
} else Mining_start = 0; } else Mining_start = 0;
} else Mining_start = 0; } else Mining_start = 0;
if ( ASSETCHAINS_STAKED != 0 ) if ( ASSETCHAINS_STAKED > 0 )
{ {
int32_t percPoS,z; bool fNegative,fOverflow; int32_t percPoS,z; bool fNegative,fOverflow;
HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED); HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
@@ -1858,8 +1858,10 @@ void static BitcoinMiner()
} }
//fprintf(stderr,"nThreads.%d fGenerate.%d\n",(int32_t)nThreads,fGenerate); //fprintf(stderr,"nThreads.%d fGenerate.%d\n",(int32_t)nThreads,fGenerate);
if ( nThreads == 0 && ASSETCHAINS_STAKED ) if ( ASSETCHAINS_STAKED > 0 && pwallet != NULL && nThreads == 0 )
nThreads = 1; nThreads = 1;
else
return;
if ((nThreads == 0 || !fGenerate) && (VERUS_MINTBLOCKS == 0 || pwallet == NULL)) if ((nThreads == 0 || !fGenerate) && (VERUS_MINTBLOCKS == 0 || pwallet == NULL))
return; return;

4
src/wallet/rpcwallet.cpp
View File

@@ -5365,7 +5365,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
} }
} //else fprintf(stderr,"utxo not eligible\n"); } //else fprintf(stderr,"utxo not eligible\n");
} }
if ( numkp < 10000 && array != 0 ) if ( numkp < 1000000 && array != 0 )
{ {
free(array); free(array);
array = 0; array = 0;
@@ -7283,7 +7283,7 @@ UniValue tokenfillask(const UniValue& params, bool fHelp)
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);
tokenid = Parseuint256((char *)params[0].get_str().c_str()); tokenid = Parseuint256((char *)params[0].get_str().c_str());
asktxid = Parseuint256((char *)params[1].get_str().c_str()); asktxid = Parseuint256((char *)params[1].get_str().c_str());
//fillunits = atol(params[2].get_str().c_str()); //fillunits = atol(params[2].get_str().c_str());
fillunits = atoll(params[2].get_str().c_str()); // dimxy changed to prevent loss of significance fillunits = atoll(params[2].get_str().c_str()); // dimxy changed to prevent loss of significance
if ( fillunits <= 0 ) if ( fillunits <= 0 )
{ {