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

Test

Browse Source
This commit is contained in:
jl777
2018-07-23 19:16:28 -11:00
parent 7c76699435
commit 32b0978b57
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cc/faucet.cpp
View File

@@ -119,8 +119,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts)); return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
} }
} }
fprintf(stderr,"faucet validated\n");
return(true);
} }
bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn) bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
@@ -131,7 +129,10 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
else if ( ctx.vout.size() == 0 ) else if ( ctx.vout.size() == 0 )
return eval->Invalid("no-vouts"); return eval->Invalid("no-vouts");
if ( FaucetValidate(eval,ctx) != 0 ) if ( FaucetValidate(eval,ctx) != 0 )
{
fprintf(stderr,"faucet validated\n");
return(true); return(true);
}
fprintf(stderr,"faucet validate failed\n"); fprintf(stderr,"faucet validate failed\n");
return(false); return(false);
} }

8
src/miner.cpp
View File

@@ -726,7 +726,8 @@ void static BitcoinMiner()
if ( komodo_baseid(ASSETCHAINS_SYMBOL) < 0 ) if ( komodo_baseid(ASSETCHAINS_SYMBOL) < 0 )
break; break;
} }
komodo_chosennotary(&notaryid,chainActive.LastTip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.LastTip()->GetBlockTime()); if ( ASSETCHAINS_SYMBOL[0] == 0 )
komodo_chosennotary(&notaryid,chainActive.LastTip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.LastTip()->GetBlockTime());
if ( notaryid != My_notaryid ) if ( notaryid != My_notaryid )
My_notaryid = notaryid; My_notaryid = notaryid;
std::string solver; std::string solver;
@@ -786,7 +787,7 @@ void static BitcoinMiner()
} }
if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_STAKED == 0 ) if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_STAKED == 0 )
{ {
//fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height); fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
//sleep(3); //sleep(3);
} }
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
@@ -802,6 +803,7 @@ void static BitcoinMiner()
sleep(1); sleep(1);
continue; continue;
} }
fprintf(stderr,"get template\n");
unique_ptr<CBlockTemplate> pblocktemplate(ptr); unique_ptr<CBlockTemplate> pblocktemplate(ptr);
if (!pblocktemplate.get()) if (!pblocktemplate.get())
{ {
@@ -829,6 +831,7 @@ void static BitcoinMiner()
} }
} }
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
frintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION)); LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
// //
// Search // Search
@@ -909,6 +912,7 @@ void static BitcoinMiner()
sleep(10); sleep(10);
break; break;
}*/ }*/
fprintf(stderr,"top of while\n");
// Hash state // Hash state
KOMODO_CHOSEN_ONE = 0; KOMODO_CHOSEN_ONE = 0;
crypto_generichash_blake2b_state state; crypto_generichash_blake2b_state state;